From 48bde43e82d1f404a1f9ddea667e890e4f86d5aa Mon Sep 17 00:00:00 2001 From: tuqiang <437016993@qq.com> Date: Wed, 18 Sep 2024 08:40:15 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E4=BC=98=E5=8C=96=E4=B8=80=E4=BD=93?= =?UTF-8?q?=E6=9C=BA=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/acs/region/domain/PageBean.java | 17 ++++ .../java/org/nl/acs/region/domain/Region.java | 14 +-- .../nl/acs/region/rest/RegionController.java | 45 ++++++++- .../nl/acs/region/service/RegionService.java | 13 +++ .../nl/acs/region/service/dto/RegionDto.java | 4 +- .../acs/region/service/dto/RegionPageDTO.java | 15 +++ .../service/impl/RegionServiceImpl.java | 68 ++++++++++++- .../region/service/mapper/RegionMapper.java | 9 ++ .../task/service/dto/TaskIdAndStatusDTO.java | 4 + .../task/service/impl/TaskServiceImpl.java | 24 ++--- .../java/org/nl/hand/rest/PdaController.java | 12 +-- .../java/org/nl/hand/service/PdaService.java | 4 +- .../nl/hand/service/impl/PdaServiceImpl.java | 42 ++++++-- acs2/nladmin-ui/src/api/acs/device/region.js | 27 ++++++ .../{newlogo.png => background4444.png} | Bin acs2/nladmin-ui/src/assets/images/newloge.png | Bin 0 -> 8346 bytes acs2/nladmin-ui/src/i18n/langs/Korean.js | 4 +- acs2/nladmin-ui/src/i18n/langs/chinese.js | 4 +- acs2/nladmin-ui/src/i18n/langs/english.js | 4 +- acs2/nladmin-ui/src/i18n/langs/indonesian.js | 4 +- acs2/nladmin-ui/src/i18n/langs/region/en.js | 12 +++ acs2/nladmin-ui/src/i18n/langs/region/in.js | 12 +++ acs2/nladmin-ui/src/i18n/langs/region/zh.js | 12 +++ .../src/layout/components/Sidebar/Logo.vue | 2 +- .../src/views/acs/device/region/index.vue | 91 ++++++++++++++++++ 25 files changed, 396 insertions(+), 47 deletions(-) create mode 100644 acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/region/domain/PageBean.java create mode 100644 acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/region/service/dto/RegionPageDTO.java create mode 100644 acs2/nladmin-ui/src/api/acs/device/region.js rename acs2/nladmin-ui/src/assets/images/{newlogo.png => background4444.png} (100%) create mode 100644 acs2/nladmin-ui/src/assets/images/newloge.png create mode 100644 acs2/nladmin-ui/src/i18n/langs/region/en.js create mode 100644 acs2/nladmin-ui/src/i18n/langs/region/in.js create mode 100644 acs2/nladmin-ui/src/i18n/langs/region/zh.js create mode 100644 acs2/nladmin-ui/src/views/acs/device/region/index.vue diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/region/domain/PageBean.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/region/domain/PageBean.java new file mode 100644 index 0000000..46482ad --- /dev/null +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/region/domain/PageBean.java @@ -0,0 +1,17 @@ +package org.nl.acs.region.domain; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.List; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class PageBean implements Serializable { + private long total; //总记录数 + + private List records; //当前页数据集合 +} diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/region/domain/Region.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/region/domain/Region.java index 1a3ffbc..3a51c3d 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/region/domain/Region.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/region/domain/Region.java @@ -14,20 +14,14 @@ import java.math.BigDecimal; @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = false) -@TableName("acs_region") public class Region implements Serializable { private static final long serialVersionUID = 1L; - @TableField(exist = false) - private String id; + private Long id; - @TableId(type = IdType.ASSIGN_ID) - private String region_id; - - @NotBlank private String region_code; @@ -44,9 +38,6 @@ public class Region implements Serializable { @NotBlank private String has_agv; - - @NotBlank - @TableField(fill = FieldFill.INSERT) private String create_by; @@ -55,8 +46,7 @@ public class Region implements Serializable { private String create_time; - @TableField(fill = FieldFill.INSERT_UPDATE) - private String update_by; + private String update_user; private String update_time; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/region/rest/RegionController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/region/rest/RegionController.java index 2a8a9ee..a4f831f 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/region/rest/RegionController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/region/rest/RegionController.java @@ -1,9 +1,52 @@ package org.nl.acs.region.rest; import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.RestController; +import lombok.extern.slf4j.Slf4j; +import org.nl.acs.region.service.RegionService; +import org.nl.acs.region.service.dto.RegionDto; +import org.nl.common.logging.annotation.Log; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Pageable; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; @RestController @RequiredArgsConstructor +@RequestMapping("/api/region") +@Slf4j public class RegionController { + @Autowired + private RegionService regionService; + + @GetMapping + @Log("查询自定义策略") + public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { + return new ResponseEntity<>(regionService.queryAll(whereJson, page), HttpStatus.OK); + } + + @PostMapping + @Log("新增自定义策略基础信息") + public ResponseEntity create(@Validated @RequestBody RegionDto dto) { + regionService.create(dto); + return new ResponseEntity<>(HttpStatus.CREATED); + } + + @PutMapping + @Log("修改自定义策略") + public ResponseEntity update(@Validated @RequestBody RegionDto dto) { + regionService.update(dto); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + + @Log("删除自定义策略") + @DeleteMapping + public ResponseEntity delete(@RequestBody String[] ids) { + regionService.deleteAll(ids); + return new ResponseEntity<>(HttpStatus.OK); + } + } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/region/service/RegionService.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/region/service/RegionService.java index 2dba6e7..881aad0 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/region/service/RegionService.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/region/service/RegionService.java @@ -2,11 +2,24 @@ package org.nl.acs.region.service; import com.alibaba.fastjson.JSONArray; import org.nl.acs.common.base.CommonService; +import org.nl.acs.common.base.PageInfo; +import org.nl.acs.custompolicy.server.dto.CustomPolicyDTO; import org.nl.acs.region.domain.Region; import org.nl.acs.region.service.dto.RegionDto; +import org.springframework.data.domain.Pageable; + +import java.util.Map; public interface RegionService extends CommonService { JSONArray queryAllRegions(); Region findByCode(String code); + + PageInfo queryAll(Map whereJson, Pageable page); + + void create(RegionDto dto); + + void update(RegionDto dto); + + void deleteAll(String[] ids); } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/region/service/dto/RegionDto.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/region/service/dto/RegionDto.java index 378d94a..618533a 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/region/service/dto/RegionDto.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/region/service/dto/RegionDto.java @@ -15,6 +15,8 @@ public class RegionDto implements Serializable { private static final long serialVersionUID = 1L; + private Long id; + private String region_code; @@ -33,7 +35,7 @@ public class RegionDto implements Serializable { private String create_time; - private String update_by; + private String update_user; private String update_time; } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/region/service/dto/RegionPageDTO.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/region/service/dto/RegionPageDTO.java new file mode 100644 index 0000000..5b9c7db --- /dev/null +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/region/service/dto/RegionPageDTO.java @@ -0,0 +1,15 @@ +package org.nl.acs.region.service.dto; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class RegionPageDTO { + private Integer page = 1; + private Integer pageSize = 5; +} diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/region/service/impl/RegionServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/region/service/impl/RegionServiceImpl.java index e7d2e77..b1e3e82 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/region/service/impl/RegionServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/region/service/impl/RegionServiceImpl.java @@ -1,26 +1,42 @@ package org.nl.acs.region.service.impl; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import lombok.AllArgsConstructor; import org.nl.acs.auto.initial.ApplicationAutoInitial; +import org.nl.acs.common.base.CommonFinalParam; +import org.nl.acs.common.base.PageInfo; import org.nl.acs.common.base.impl.CommonServiceImpl; +import org.nl.acs.custompolicy.domain.CustomPolicy; +import org.nl.acs.custompolicy.server.dto.CustomPolicyDTO; +import org.nl.acs.device.domain.Device; import org.nl.acs.region.domain.Region; import org.nl.acs.region.service.RegionService; +import org.nl.acs.region.service.dto.RegionDto; import org.nl.acs.region.service.mapper.RegionMapper; +import org.nl.acs.task.domain.Task; +import org.nl.acs.utils.ConvertUtil; +import org.nl.acs.utils.PageUtil; import org.nl.common.exception.BadRequestException; +import org.nl.common.utils.SecurityUtils; import org.nl.config.language.LangProcess; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; +import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; -import java.util.List; +import java.util.*; @Service @AllArgsConstructor @@ -60,4 +76,54 @@ public class RegionServiceImpl extends CommonServiceImpl im .one(); return region; } + + @Override + public PageInfo queryAll(Map whereJson, Pageable page) { + IPage queryPage = PageUtil.toMybatisPage(page); + IPage regionIPage = regionMapper.selectPage(queryPage,new LambdaQueryWrapper<>()); + PageInfo regionDtoPageInfo = ConvertUtil.convertPage(regionIPage, RegionDto.class); + return regionDtoPageInfo; + } + + + @Override + public void create(RegionDto dto) { + if (StrUtil.isEmpty(dto.getRegion_code())){ + throw new BadRequestException("区域编码不能为空"); + } + String currentUsername = SecurityUtils.getCurrentNickName(); + String now = DateUtil.now(); + dto.setCreate_by(currentUsername); + dto.setUpdate_user(currentUsername); + dto.setUpdate_time(now); + dto.setCreate_time(now); + if (StrUtil.isEmpty(dto.getHas_agv())){ + dto.setHas_agv(CommonFinalParam.ZERO); + } + if (StrUtil.isEmpty(dto.getIs_charge())){ + dto.setIs_charge(CommonFinalParam.ZERO); + } + Region region = ConvertUtil.convert(dto, Region.class); + regionMapper.insert(region); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(RegionDto dto) { + String currentUsername = SecurityUtils.getCurrentNickName(); + String now = DateUtil.now(); + dto.setUpdate_time(now); + dto.setUpdate_user(currentUsername); + Region convert = ConvertUtil.convert(dto, Region.class); + regionMapper.updateById(convert); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void deleteAll(String[] ids) { + Set idsSet = new HashSet<>(1); + idsSet.addAll(Arrays.asList(ids)); + regionMapper.upBatchIds(idsSet); + } + } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/region/service/mapper/RegionMapper.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/region/service/mapper/RegionMapper.java index 4f4e373..202ed77 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/region/service/mapper/RegionMapper.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/region/service/mapper/RegionMapper.java @@ -1,9 +1,18 @@ package org.nl.acs.region.service.mapper; +import org.apache.ibatis.annotations.Param; import org.nl.acs.common.base.CommonMapper; import org.nl.acs.region.domain.Region; import org.springframework.stereotype.Repository; +import java.util.Set; + @Repository public interface RegionMapper extends CommonMapper { + + /** + * 批量更新 + * @param idsSet + */ + void upBatchIds(@Param("ids") Set idsSet); } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/dto/TaskIdAndStatusDTO.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/dto/TaskIdAndStatusDTO.java index 6d1e4c7..01b87f0 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/dto/TaskIdAndStatusDTO.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/dto/TaskIdAndStatusDTO.java @@ -1,8 +1,12 @@ package org.nl.acs.task.service.dto; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; @Data +@AllArgsConstructor +@NoArgsConstructor public class TaskIdAndStatusDTO { private String task_id; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java index 7a38733..e1b4e9d 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java @@ -842,12 +842,12 @@ public class TaskServiceImpl extends CommonServiceImpl impleme //移除任务缓存信息 this.removeByCodeFromCache(entity.getTask_code()); - //反馈上位系统任务状态 - this.feedWmsTaskStatus(entity); - //关闭仙工运单序列 - if(StrUtil.equals(task.getTask_type(),TaskTypeEnum.Standard_AGV_Task.getCode()) && (StrUtil.equals(task.getAgv_system_type(), AgvSystemTypeEnum.One_NDC_System_Type.getCode())||StrUtil.equals(task.getAgv_system_type(), AgvSystemTypeEnum.XG_System_Type.getCode()))) { - this.markComplete(entity); - } +// //反馈上位系统任务状态 +// this.feedWmsTaskStatus(entity); +// //关闭仙工运单序列 +// if(StrUtil.equals(task.getTask_type(),TaskTypeEnum.Standard_AGV_Task.getCode()) && (StrUtil.equals(task.getAgv_system_type(), AgvSystemTypeEnum.One_NDC_System_Type.getCode())||StrUtil.equals(task.getAgv_system_type(), AgvSystemTypeEnum.XG_System_Type.getCode()))) { +// this.markComplete(entity); +// } } @Override @@ -905,12 +905,12 @@ public class TaskServiceImpl extends CommonServiceImpl impleme //移除任务缓存信息 this.removeByCodeFromCache(entity.getTask_code()); - //反馈上位系统任务状态 - this.feedWmsTaskStatus(entity); - //关闭仙工运单序列 - if(StrUtil.equals(task.getTask_type(),TaskTypeEnum.Standard_AGV_Task.getCode()) && (StrUtil.equals(task.getAgv_system_type(), AgvSystemTypeEnum.One_NDC_System_Type.getCode())||StrUtil.equals(task.getAgv_system_type(), AgvSystemTypeEnum.XG_System_Type.getCode()))) { - this.markComplete(entity); - } +// //反馈上位系统任务状态 +// this.feedWmsTaskStatus(entity); +// //关闭仙工运单序列 +// if(StrUtil.equals(task.getTask_type(),TaskTypeEnum.Standard_AGV_Task.getCode()) && (StrUtil.equals(task.getAgv_system_type(), AgvSystemTypeEnum.One_NDC_System_Type.getCode())||StrUtil.equals(task.getAgv_system_type(), AgvSystemTypeEnum.XG_System_Type.getCode()))) { +// this.markComplete(entity); +// } } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/hand/rest/PdaController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/hand/rest/PdaController.java index 41a013f..448dc43 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/hand/rest/PdaController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/hand/rest/PdaController.java @@ -44,12 +44,12 @@ public class PdaController { return new ResponseEntity<>(pdaService.queryAreas(), HttpStatus.OK); } - @PostMapping("/queryMaterials/{material_type}") + @PostMapping("/queryMaterials") @Log("查询物料类型") @ApiOperation("查询物料类型") @SaIgnore //@PreAuthorize("@el.check('sect:list')") - public ResponseEntity queryMaterials(@RequestParam String material_type) { + public ResponseEntity queryMaterials(@RequestBody String material_type) { return new ResponseEntity<>(pdaService.queryMaterials(material_type), HttpStatus.OK); } @@ -83,8 +83,8 @@ public class PdaController { @ApiOperation("强制完成") @SaIgnore //@PreAuthorize("@el.check('sect:list')") - public ResponseEntity forceFinish(@RequestBody HeadTaskDto dto) throws Exception { - return new ResponseEntity<>(pdaService.forceFinish(dto), HttpStatus.OK); + public ResponseEntity forceFinish(@RequestBody String whereJson) throws Exception { + return new ResponseEntity<>(pdaService.forceFinish(whereJson), HttpStatus.OK); } @PostMapping("/queryTaskIds") @@ -101,8 +101,8 @@ public class PdaController { @ApiOperation("取消任务") @SaIgnore //@PreAuthorize("@el.check('sect:list')") - public ResponseEntity cancel(TaskIdAndStatusDTO dto) throws Exception { - return new ResponseEntity<>(pdaService.cancel(dto), HttpStatus.OK); + public ResponseEntity cancel(@RequestBody String whereJson) throws Exception { + return new ResponseEntity<>(pdaService.cancel(whereJson), HttpStatus.OK); } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/hand/service/PdaService.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/hand/service/PdaService.java index ebee1c1..9f2ce9f 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/hand/service/PdaService.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/hand/service/PdaService.java @@ -19,11 +19,11 @@ public interface PdaService { Map areaControl(String whereJson); - Map forceFinish(HeadTaskDto dto); + Map forceFinish(String whereJson); JSONArray queryTaskIds(); - Map cancel(TaskIdAndStatusDTO dto) throws Exception; + Map cancel(String whereJson) throws Exception; JSONArray queryAreas(); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/hand/service/impl/PdaServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/hand/service/impl/PdaServiceImpl.java index 75f1ff0..1339e64 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/hand/service/impl/PdaServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/hand/service/impl/PdaServiceImpl.java @@ -13,9 +13,12 @@ import org.nl.acs.common.base.CommonFinalParam; import org.nl.acs.device.domain.Device; import org.nl.acs.device.service.DeviceService; import org.nl.acs.device_driver.conveyor.standard_ordinary_site.StandardOrdinarySiteDeviceDriver; +import org.nl.acs.instruction.domain.Instruction; +import org.nl.acs.instruction.service.InstructionService; import org.nl.acs.opc.DeviceAppService; import org.nl.acs.region.domain.Region; import org.nl.acs.region.service.RegionService; +import org.nl.acs.task.enums.TaskStatusEnum; import org.nl.acs.task.service.TaskService; import org.nl.acs.task.service.dto.TaskDto; import org.nl.acs.task.service.dto.TaskIdAndStatusDTO; @@ -55,6 +58,9 @@ public class PdaServiceImpl implements PdaService { @Autowired private TaskService taskserver; + @Autowired + private InstructionService instructionService; + @Override public JSONArray queryAllPoints() { JSONArray data = new JSONArray(); @@ -77,11 +83,13 @@ public class PdaServiceImpl implements PdaService { } @Override - public JSONArray queryMaterials(String code) { + public JSONArray queryMaterials(String whereJson) { + JSONObject jsonObject = JSON.parseObject(whereJson); + String code = jsonObject.getString("material_type"); List list = sysDictMapper.selectList(new LambdaQueryWrapper() .eq(ObjectUtil.isNotEmpty(code), Dict::getCode, code)); - if (ObjectUtil.isNotEmpty(list)) { - throw new BadRequestException(LangProcess.msg("error_checkExist",code)); + if (ObjectUtil.isEmpty(list)) { + throw new BadRequestException("物料类型未配置！"); } JSONArray arr = JSONArray.parseArray(JSON.toJSONString(list)); JSONArray result = new JSONArray(); @@ -168,10 +176,22 @@ public class PdaServiceImpl implements PdaService { } @Override - public Map forceFinish(HeadTaskDto dto) { + public Map forceFinish(String whereJson) { + JSONObject jsonObject = JSON.parseObject(whereJson); + String task_code = jsonObject.getString("task_id"); + TaskDto dto = taskserver.findByCode(task_code); + if (ObjectUtil.isEmpty(dto)) { + throw new BadRequestException("当前任务不存在！"); + } JSONObject resultJson = new JSONObject(); + Instruction instruction = instructionService.findByTaskid(dto.getTask_id(), "instruction_status <2 "); + if (instruction!=null){ + resultJson.put("message", "有指令未完成!"); + return resultJson; + } TaskIdAndStatusDTO taskIdAndStatusDTO = new TaskIdAndStatusDTO(); taskIdAndStatusDTO.setTask_id(dto.getTask_id()); + taskIdAndStatusDTO.setTask_status(TaskStatusEnum.FINISHED.getIndex()); try { taskserver.finish(taskIdAndStatusDTO); } catch (Exception e) { @@ -194,17 +214,25 @@ public class PdaServiceImpl implements PdaService { for (int i = 0; i < arr.size(); i++) { JSONObject obj = arr.getJSONObject(i); JSONObject json = new JSONObject(); - json.put("task_id", obj.getString("task_id")); + json.put("task_id", obj.getString("task_code")); result.add(json); } return result; } @Override - public Map cancel(TaskIdAndStatusDTO dto) { + public Map cancel(String whereJson) { + JSONObject jsonObject = JSON.parseObject(whereJson); + String task_code = jsonObject.getString("task_id"); JSONObject resultJson = new JSONObject(); + TaskDto dto = taskserver.findByCode(task_code); + if (Integer.parseInt(dto.getTask_status())==0) { + resultJson.put("message", "取消成功"); + return resultJson; + } + Instruction instruction = instructionService.findByTaskid(dto.getTask_id(),"instruction_status <2 "); try { - taskserver.cancelAndInst(dto.getTask_id()); + instructionService.cancel(instruction.getInstruction_id()); } catch (Exception e) { resultJson.put("message", e.getMessage()); return resultJson; diff --git a/acs2/nladmin-ui/src/api/acs/device/region.js b/acs2/nladmin-ui/src/api/acs/device/region.js new file mode 100644 index 0000000..afc2508 --- /dev/null +++ b/acs2/nladmin-ui/src/api/acs/device/region.js @@ -0,0 +1,27 @@ +import request from '@/utils/request' + +export function add(data) { + return request({ + url: 'api/region', + method: 'post', + data + }) +} + +export function del(ids) { + return request({ + url: 'api/region/', + method: 'delete', + data: ids + }) +} + +export function edit(data) { + return request({ + url: 'api/region', + method: 'put', + data + }) +} + +export default { add, edit, del } diff --git a/acs2/nladmin-ui/src/assets/images/newlogo.png b/acs2/nladmin-ui/src/assets/images/background4444.png similarity index 100% rename from acs2/nladmin-ui/src/assets/images/newlogo.png rename to acs2/nladmin-ui/src/assets/images/background4444.png diff --git a/acs2/nladmin-ui/src/assets/images/newloge.png b/acs2/nladmin-ui/src/assets/images/newloge.png new file mode 100644 index 0000000000000000000000000000000000000000..f1662c472b568629fbf5e1a0f29ada3f980c90fc GIT binary patch literal 8346 zcmds62UL^Wvi@m;Sdgk9y_1L>dM60df&>Br(h(F0RjLR|lqyY{pwdE--g^@fkfMS} zs8R$33B83-L-OLe=bd}*S$Dm4-+lMpwch*Jnq;^2@A+nC&&)rYI8K}eE~8Cdzb1qJxH`FMpz<$n9MdFo; zgzk5Mq&_(XCDkcvn$xsrNDJyN0OVv86y%f?R8*9dq}fNLd4Q6hih)P`+9^i(ZE9Xm zCW$8r*))7=Rqf1%gIoNPc3#1!X<05_Vr3H$6cQEzNlDAd%E>FJU)Rvo($;|*-842a zy=7)@f9I})qZ7i}+sD`MzW;-OkkGL3h^LWJiAm3sQ(nA$m70_LIxoMVu&B7YrnauW zp|PpCqw{@NcTew!kLaP{k0M=NEn~VwRRyws)|*xV`;@!=slBQXU0800H(GdW2H-FryJGh+1GBGa8E- zP167rAK-Ey;PMAm&wqR5^z9L%)_|e`WiE>{cVqhhzv%UcLT6_n_9)d&oT;tzL z%+l&c29zGdLx_RlAtxXwO8DPOMa68XkNJY~(_kc0rDB5rdr8k=c$n-mPHMuNM1XKk z)W4NL&f)o4G&4o{L#U$sFJu}_27iwzgfbPKI1y>CPO{=X*UZ|sl9p|-`$XWG?7__= z4E~82WHo_cyokem-}cVt&q*oBd(z%X&$2L4vlKvw=RY#VpCIRB3Cv!r2KCkT7SWMv z*WcU5!@LKav5for=oSbQvbWBIu!96e$$kCIkfeJZVM7MX(AJQ3z)3;ogwROL8gk|w zfr*X*0aJ^v)MY2DYB~WAAohsBHumE2Dt?vfm9fVipEt#crY*{X$MCu#W3~(}C&DSjB19kJYX= zjncTQYZC!qzl78;72w!ZAyYNu;cydoE)1^h-pd}d#t-~` z;*A1o=&%XwhSmLBgBj15&L%CJp-94lVD})K;Y5J8?LHCUyw8Q}Z%cmQbey}aDaovG zPB^b{OHSL4ana49YRTqT+5Wb?ReG0Y59yq$S2-)Q#@N1$U;Q*N4S{adRU9%Bf%SAG zIwxGhmroEqcro%_$MdYDfEI}!JpY6~oe?>kKt~F7cx-e0qpc(E*EZhfc!3CnJ@~
RAy91Fhi3-GPaMLZxey-yE) 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 MOdgW~HSz0z0N{-=0RR91 literal 0 HcmV?d00001 diff --git a/acs2/nladmin-ui/src/i18n/langs/Korean.js b/acs2/nladmin-ui/src/i18n/langs/Korean.js index 18406f3..98d1b8f 100644 --- a/acs2/nladmin-ui/src/i18n/langs/Korean.js +++ b/acs2/nladmin-ui/src/i18n/langs/Korean.js @@ -24,6 +24,7 @@ import dict from './dict/zh' import angle from './angle/zh' import regional from './regional/zh' import stage from './stage/zh' +import region from './region/zh' export default { ...koLocale, @@ -51,6 +52,7 @@ export default { ...dict, ...angle, ...regional, - ...stage + ...stage, + ...region } diff --git a/acs2/nladmin-ui/src/i18n/langs/chinese.js b/acs2/nladmin-ui/src/i18n/langs/chinese.js index 1a29c69..3472427 100644 --- a/acs2/nladmin-ui/src/i18n/langs/chinese.js +++ b/acs2/nladmin-ui/src/i18n/langs/chinese.js @@ -24,6 +24,7 @@ import dict from './dict/zh' import angle from './angle/zh' import regional from './regional/zh' import stage from './stage/zh' +import region from './region/zh' export default { ...zhLocale, @@ -51,6 +52,7 @@ export default { ...dict, ...angle, ...regional, - ...stage + ...stage, + ...region } diff --git a/acs2/nladmin-ui/src/i18n/langs/english.js b/acs2/nladmin-ui/src/i18n/langs/english.js index fbf4503..3a7791b 100644 --- a/acs2/nladmin-ui/src/i18n/langs/english.js +++ b/acs2/nladmin-ui/src/i18n/langs/english.js @@ -24,6 +24,7 @@ import dict from './dict/en' import angle from './angle/en' import regional from './regional/en' import stage from './stage/en' +import region from './region/en' export default { ...enLocale, @@ -51,6 +52,7 @@ export default { ...dict, ...angle, ...regional, - ...stage + ...stage, + ...region } diff --git a/acs2/nladmin-ui/src/i18n/langs/indonesian.js b/acs2/nladmin-ui/src/i18n/langs/indonesian.js index e2e3e4c..e7c971e 100644 --- a/acs2/nladmin-ui/src/i18n/langs/indonesian.js +++ b/acs2/nladmin-ui/src/i18n/langs/indonesian.js @@ -24,6 +24,7 @@ import dict from './dict/in' import angle from './angle/in' import regional from './regional/in' import stage from './stage/in' +import region from './region/in' export default { ...idLocale, @@ -52,5 +53,6 @@ export default { ...dict, ...angle, ...regional, - ...stage + ...stage, + ...region } diff --git a/acs2/nladmin-ui/src/i18n/langs/region/en.js b/acs2/nladmin-ui/src/i18n/langs/region/en.js new file mode 100644 index 0000000..ff3ba24 --- /dev/null +++ b/acs2/nladmin-ui/src/i18n/langs/region/en.js @@ -0,0 +1,12 @@ +export default { + 'region': { + 'title': '区域', + 'region_code': '区域编号', + 'region_name': '区域名称', + 'is_charge': '是否管控', + 'has_agv': '是否存在agv' + }, + 'msg': { + 'delete_msg': 'Are You Sure To Delete It? If There Are Subordinate Nodes, they Will Be Deleted Together. This Operation Cannot Be Undone!' + } +} diff --git a/acs2/nladmin-ui/src/i18n/langs/region/in.js b/acs2/nladmin-ui/src/i18n/langs/region/in.js new file mode 100644 index 0000000..ff3ba24 --- /dev/null +++ b/acs2/nladmin-ui/src/i18n/langs/region/in.js @@ -0,0 +1,12 @@ +export default { + 'region': { + 'title': '区域', + 'region_code': '区域编号', + 'region_name': '区域名称', + 'is_charge': '是否管控', + 'has_agv': '是否存在agv' + }, + 'msg': { + 'delete_msg': 'Are You Sure To Delete It? If There Are Subordinate Nodes, they Will Be Deleted Together. This Operation Cannot Be Undone!' + } +} diff --git a/acs2/nladmin-ui/src/i18n/langs/region/zh.js b/acs2/nladmin-ui/src/i18n/langs/region/zh.js new file mode 100644 index 0000000..ff3ba24 --- /dev/null +++ b/acs2/nladmin-ui/src/i18n/langs/region/zh.js @@ -0,0 +1,12 @@ +export default { + 'region': { + 'title': '区域', + 'region_code': '区域编号', + 'region_name': '区域名称', + 'is_charge': '是否管控', + 'has_agv': '是否存在agv' + }, + 'msg': { + 'delete_msg': 'Are You Sure To Delete It? If There Are Subordinate Nodes, they Will Be Deleted Together. This Operation Cannot Be Undone!' + } +} diff --git a/acs2/nladmin-ui/src/layout/components/Sidebar/Logo.vue b/acs2/nladmin-ui/src/layout/components/Sidebar/Logo.vue index d876549..ef5074c 100644 --- a/acs2/nladmin-ui/src/layout/components/Sidebar/Logo.vue +++ b/acs2/nladmin-ui/src/layout/components/Sidebar/Logo.vue @@ -14,7 +14,7 @@ + +