From c2c4369c149af9a62416fd6725510fd8896b1402 Mon Sep 17 00:00:00 2001 From: gengby <858962040@qq.com> Date: Fri, 24 May 2024 10:32:35 +0800 Subject: [PATCH] rev:task --- .../da94e2f9402ad75ef272f2e95148c573aee9a1ff | 11 - .../hd/.idea/sonarlint/issuestore/index.pb | 34 ++- .../org/nl/config/mybatis/CodeGenerator.java | 2 +- .../controller/SchBaseTaskController.java | 69 ++--- .../handler/impl/StackingTaskHandler.java | 2 +- .../task/service/ISchBaseTaskService.java | 49 +++- .../service/dao/mapper/SchBaseTaskMapper.java | 6 + .../dao/mapper/xml/SchBaseTaskMapper.xml | 38 ++- .../task/service/dto/SchBaseTaskQuery.java | 23 ++ .../service/impl/SchBaseTaskServiceImpl.java | 78 +++++- .../resources/config/application-dev3.yml | 2 +- wms_pro/qd/src/views/system/dict/dict.js | 9 +- .../views/wms/dispatch_manage/task/index.vue | 243 ++++++++++++++++++ .../wms/dispatch_manage/task/schBaseTask.js | 42 +++ 14 files changed, 516 insertions(+), 92 deletions(-) delete mode 100644 wms_pro/hd/.idea/sonarlint/issuestore/d/a/da94e2f9402ad75ef272f2e95148c573aee9a1ff create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/dto/SchBaseTaskQuery.java create mode 100644 wms_pro/qd/src/views/wms/dispatch_manage/task/schBaseTask.js diff --git a/wms_pro/hd/.idea/sonarlint/issuestore/d/a/da94e2f9402ad75ef272f2e95148c573aee9a1ff b/wms_pro/hd/.idea/sonarlint/issuestore/d/a/da94e2f9402ad75ef272f2e95148c573aee9a1ff deleted file mode 100644 index de211bf5..00000000 --- a/wms_pro/hd/.idea/sonarlint/issuestore/d/a/da94e2f9402ad75ef272f2e95148c573aee9a1ff +++ /dev/null @@ -1,11 +0,0 @@ - -d -java:S1192E"IDefine a constant instead of duplicating this literal "service." 5 times.( -N java:S106"9Replace this use of System.out or System.err by a logger.( -Q java:S125B" @@ -38,67 +30,48 @@ import java.util.Map; @RestController @RequestMapping("api/schBaseTask") public class SchBaseTaskController { - @Autowired - private ISchBaseTaskService iSchBaseTaskService; + private ISchBaseTaskService schBaseTaskService; + + @PostMapping("getVehicleTask") public ResponseEntity getVehicleTask(@RequestBody JSONObject param) { if (CollectionUtils.isEmpty(param)){ throw new BadRequestException("参数不能为空"); } - return new ResponseEntity<>(iSchBaseTaskService.getByVehicle(param.getString("vehicle_code")), HttpStatus.OK); + return new ResponseEntity<>(schBaseTaskService.getByVehicle(param.getString("vehicle_code")), HttpStatus.OK); } + @GetMapping - @Log("查询任务") - public ResponseEntity query(TaskQuery query, PageQuery pageQuery) { - Page page = iSchBaseTaskService.page(pageQuery.build(), query.build()); - return new ResponseEntity<>(TableDataInfo.build(page), HttpStatus.OK); - } - - - @GetMapping("/undo") - @Log("查询任务") - public ResponseEntity undo() { - int count = iSchBaseTaskService.count(new QueryWrapper() - .lt("task_status", StatusEnum.FORM_STATUS.code("完成"))); - return new ResponseEntity<>(count, HttpStatus.OK); + public ResponseEntity query(SchBaseTaskQuery whereJson, PageQuery page){ + return new ResponseEntity<>(TableDataInfo.build(schBaseTaskService.queryAll(whereJson,page)), HttpStatus.OK); } @PostMapping - @Log("新增任务") - public ResponseEntity create(@RequestBody JSONObject task) { - SchBaseTask schBaseTask = task.toJavaObject(SchBaseTask.class); - schBaseTask.setId(IdUtil.getStringId()); - schBaseTask.setCreate_name(SecurityUtils.getCurrentNickName()); - schBaseTask.setCreate_time(DateUtil.now()); - iSchBaseTaskService.save(schBaseTask); + public ResponseEntity create(@Validated @RequestBody SchBaseTask entity){ + schBaseTaskService.create(entity); return new ResponseEntity<>(HttpStatus.CREATED); } @PutMapping - @Log("修改任务") - public ResponseEntity update(@Validated @RequestBody JSONObject task) { - iSchBaseTaskService.updateById(task.toJavaObject(SchBaseTask.class)); + public ResponseEntity update(@Validated @RequestBody SchBaseTask entity){ + schBaseTaskService.update(entity); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } + @DeleteMapping - @Log("删除任务") - public ResponseEntity delete(@RequestBody String[] ids) { - if (ids!=null && ids.length>0){ - iSchBaseTaskService.removeByIds(Arrays.asList(ids)); - } + public ResponseEntity delete(@RequestBody Set ids) { + schBaseTaskService.deleteAll(ids); return new ResponseEntity<>(HttpStatus.OK); } - @PostMapping("/operation") - @Log("任务操作") - public ResponseEntity taskOperation(@RequestBody JSONObject map) { - iSchBaseTaskService.operation(map); - return new ResponseEntity<>(HttpStatus.OK); + @PutMapping("/operation") + public ResponseEntity update(@RequestBody Map map) { + schBaseTaskService.operation(map); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); } - } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/StackingTaskHandler.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/StackingTaskHandler.java index a5a517af..9b571177 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/StackingTaskHandler.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/StackingTaskHandler.java @@ -62,7 +62,7 @@ public class StackingTaskHandler implements TaskHandler { task.setVehicle_code(vehicle_code); task.setPoint_code1(start_point); task.setPoint_code2(struct_code); - taskService.createTask(task); + taskService.create(task); Boolean isSend = param.getBoolean("is_send"); if (isSend){ //参数封装，调acs接口 diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/ISchBaseTaskService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/ISchBaseTaskService.java index 52609dbc..219065c6 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/ISchBaseTaskService.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/ISchBaseTaskService.java @@ -1,12 +1,15 @@ package org.nl.wms.dispatch_manage.task.service; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.nl.common.domain.entity.PageQuery; import org.nl.wms.dispatch_manage.task.service.dao.SchBaseTask; import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.wms.dispatch_manage.task.service.dto.SchBaseTaskQuery; import java.util.List; import java.util.Map; +import java.util.Set; + /** *

@@ -18,11 +21,43 @@ import java.util.Map; */ public interface ISchBaseTaskService extends IService { - void createTask(SchBaseTask task); - - void operation(JSONObject param); - - List getByVehicle(String vehicle_code); + /** + * 查询数据分页 + * + * @param whereJson 条件 + * @param pageable 分页参数 + * @return IPage + */ + IPage queryAll(SchBaseTaskQuery whereJson, PageQuery pageable); + + + /** + * 创建 + * + * @param entity / + */ + void create(SchBaseTask entity); + + /** + * 编辑 + * + * @param entity / + */ + void update(SchBaseTask entity); + + /** + * 多选删除 + * + * @param ids / + */ + void deleteAll(Set ids); + + /** + * 任务操作 + * + * @param param + */ + void operation(Map param); } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/dao/mapper/SchBaseTaskMapper.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/dao/mapper/SchBaseTaskMapper.java index 302e5354..02916312 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/dao/mapper/SchBaseTaskMapper.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/dao/mapper/SchBaseTaskMapper.java @@ -1,8 +1,13 @@ package org.nl.wms.dispatch_manage.task.service.dao.mapper; import org.apache.ibatis.annotations.Select; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; import org.nl.wms.dispatch_manage.task.service.dao.SchBaseTask; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.nl.wms.dispatch_manage.task.service.dto.SchBaseTaskQuery; + +import java.util.List; import java.util.List; import java.util.Map; @@ -16,6 +21,7 @@ import java.util.Map; * @since 2024-05-06 */ public interface SchBaseTaskMapper extends BaseMapper { + IPage selectPageLeftJoin(IPage pages, @Param("whereJson") SchBaseTaskQuery whereJson, @Param("collect") List collect); @Select("SELECT\n" + "\tsch_base_task.*, md_pb_vehicleMater.*,md_me_materialbase.material_code,md_me_materialbase.material_name,md_me_materialbase.material_spec\n" + diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/dao/mapper/xml/SchBaseTaskMapper.xml b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/dao/mapper/xml/SchBaseTaskMapper.xml index 4caf4153..83667251 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/dao/mapper/xml/SchBaseTaskMapper.xml +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/dao/mapper/xml/SchBaseTaskMapper.xml @@ -1,5 +1,41 @@ - + diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/dto/SchBaseTaskQuery.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/dto/SchBaseTaskQuery.java new file mode 100644 index 00000000..d195123e --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/dto/SchBaseTaskQuery.java @@ -0,0 +1,23 @@ +package org.nl.wms.dispatch_manage.task.service.dto; + +import lombok.Data; + +import java.io.Serializable; + +/** +* @author lyd +* @date 2023-05-15 +**/ +@Data +public class SchBaseTaskQuery implements Serializable { + private String task_code; + private String vehicle_code; + private String point_code; + private String begin_time; + private String end_time; + private String more_task_status; + private String unFinished; + + private String config_code; + +} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/impl/SchBaseTaskServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/impl/SchBaseTaskServiceImpl.java index ca7f1b13..d82cd224 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/impl/SchBaseTaskServiceImpl.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/impl/SchBaseTaskServiceImpl.java @@ -1,21 +1,26 @@ package org.nl.wms.dispatch_manage.task.service.impl; -import com.alibaba.fastjson.JSONObject; import org.apache.commons.lang3.StringUtils; -import org.nl.common.utils.ListOf; -import org.nl.wms.dispatch_manage.task.handler.TaskHandler; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.lang.Assert; +import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.nl.common.domain.entity.PageQuery; +import org.nl.common.domain.exception.BadRequestException; +import org.nl.common.enums.StatusEnum; +import org.nl.common.utils.SecurityUtils; import org.nl.wms.dispatch_manage.task.service.dao.SchBaseTask; import org.nl.wms.dispatch_manage.task.service.dao.mapper.SchBaseTaskMapper; import org.nl.wms.dispatch_manage.task.service.ISchBaseTaskService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.nl.wms.external_system.acs.service.WmsToAcsService; +import org.nl.wms.dispatch_manage.task.service.dto.SchBaseTaskQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; +import java.util.stream.Collectors; /** *

@@ -29,13 +34,27 @@ import java.util.Map; public class SchBaseTaskServiceImpl extends ServiceImpl implements ISchBaseTaskService { @Autowired - private WmsToAcsService wmsToAcsService; + private SchBaseTaskMapper schBaseTaskMapper; + @Override - public void createTask(SchBaseTask task) { - this.save(task); + public IPage queryAll(SchBaseTaskQuery whereJson, PageQuery page) { + List collect = ObjectUtil.isNotEmpty(whereJson.getMore_task_status()) + ? Arrays.stream(whereJson.getMore_task_status().split(",")).collect(Collectors.toList()) : null; + if (collect != null) { + if (collect.contains("")) { + collect = null; + whereJson.setUnFinished(StatusEnum.FORM_STATUS.code("执行中")); + } + } + IPage pages = new Page<>(page.getPage() + 1, page.getSize()); + pages = schBaseTaskMapper.selectPageLeftJoin(pages, whereJson, collect); + return pages; } + + + @Override public List getByVehicle(String vehicle_code) { if (StringUtils.isEmpty(vehicle_code)){ @@ -45,7 +64,42 @@ public class SchBaseTaskServiceImpl extends ServiceImpl ids) { + // 真删除 + schBaseTaskMapper.deleteBatchIds(ids); + } + + @Override + public void create(SchBaseTask entity) { + String nickName = SecurityUtils.getCurrentNickName(); + String now = DateUtil.now(); + Assert.notNull(entity.getTask_status(), "任务状态不能为空!"); + + entity.setId(IdUtil.getSnowflake(1, 1).nextIdStr()); + entity.setTask_code(IdUtil.getSnowflake(1, 1).nextIdStr()); + entity.setCreate_name(nickName); + entity.setCreate_time(now); + entity.setUpdate_name(nickName); + entity.setUpdate_time(now); + schBaseTaskMapper.insert(entity); } + + @Override + public void operation(Map param) { + } + + } diff --git a/wms_pro/hd/nladmin-system/src/main/resources/config/application-dev3.yml b/wms_pro/hd/nladmin-system/src/main/resources/config/application-dev3.yml index 11ee79f3..6fe761a9 100644 --- a/wms_pro/hd/nladmin-system/src/main/resources/config/application-dev3.yml +++ b/wms_pro/hd/nladmin-system/src/main/resources/config/application-dev3.yml @@ -9,7 +9,7 @@ spring: driverClassName: com.mysql.cj.jdbc.Driver url: jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:wms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false username: ${DB_USER:root} - password: ${DB_PWD:123456} + password: ${DB_PWD:password} # 初始连接数 initial-size: 5 diff --git a/wms_pro/qd/src/views/system/dict/dict.js b/wms_pro/qd/src/views/system/dict/dict.js index 99170f7d..a24d9257 100644 --- a/wms_pro/qd/src/views/system/dict/dict.js +++ b/wms_pro/qd/src/views/system/dict/dict.js @@ -31,4 +31,11 @@ export function edit(data) { }) } -export default { add, edit, del } +export function getStatusEnum(data) { + return request({ + url: 'api/dict/getStatusEnum/' + data, + method: 'get' + }) +} + +export default {add, edit, del, getStatusEnum} diff --git a/wms_pro/qd/src/views/wms/dispatch_manage/task/index.vue b/wms_pro/qd/src/views/wms/dispatch_manage/task/index.vue index 1ab42a7f..5c9b3f45 100644 --- a/wms_pro/qd/src/views/wms/dispatch_manage/task/index.vue +++ b/wms_pro/qd/src/views/wms/dispatch_manage/task/index.vue @@ -10,6 +10,7 @@ label-width="80px" label-suffix=":" > +<<<<<<< Updated upstream +======= +>>>>>>> Stashed changes >>>>>> Stashed changes placeholder="任务号" @keyup.enter.native="crud.toQuery" /> @@ -42,7 +49,11 @@ >>>>>> Stashed changes placeholder="载具号" @keyup.enter.native="crud.toQuery" /> @@ -51,11 +62,16 @@ >>>>>> Stashed changes placeholder="起点" @keyup.enter.native="crud.toQuery" /> +<<<<<<< Updated upstream + + + + + >>>>>> Stashed changes placeholder="任务状态" class="filter-item" clearable @change="handTaskStatus" > >>>>>> Stashed changes :label="item.label" :value="item.value" /> +<<<<<<< Updated upstream @@ -208,15 +248,114 @@ icon="el-icon-success" @click="doOperate(scope.row, 'a')" >完成 +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+ 取消 + 确认 +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +<<<<<<< Updated upstream 确 定 +======= + + +>>>>>>> Stashed changes diff --git a/wms_pro/qd/src/views/wms/dispatch_manage/task/schBaseTask.js b/wms_pro/qd/src/views/wms/dispatch_manage/task/schBaseTask.js new file mode 100644 index 00000000..c1f04371 --- /dev/null +++ b/wms_pro/qd/src/views/wms/dispatch_manage/task/schBaseTask.js @@ -0,0 +1,42 @@ +import request from '@/utils/request' + +export function add(data) { + return request({ + url: 'api/schBaseTask', + method: 'post', + data + }) +} + +export function del(ids) { + return request({ + url: 'api/schBaseTask/', + method: 'delete', + data: ids + }) +} + +export function edit(data) { + return request({ + url: 'api/schBaseTask', + method: 'put', + data + }) +} + +export function getTaskStatusList() { + return request({ + url: 'api/schBaseTask/taskStatusList', + method: 'get' + }) +} + +export function operation(data) { + return request({ + url: 'api/schBaseTask/operation', + method: 'put', + data + }) +} + +export default { add, edit, del, getTaskStatusList, operation}