From c5fc5dfff2d2a0adbd9410556020e67417be0334 Mon Sep 17 00:00:00 2001 From: Chujinwang <17638147107@163.com> Date: Sat, 27 Jul 2024 11:26:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B4=BE=E5=8D=95=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inspection/work/po/WrkDispatchRecord.java | 122 ++++++++++++++++++ .../consumer/InspectionConsumerService.java | 2 +- .../controller/TerminalController.java | 12 ++ .../terminal/mapper/DispatchRecordMapper.java | 12 ++ .../service/DispatchRecordService.java | 17 +++ .../terminal/service/TerminalService.java | 7 + .../impl/DispatchRecordServiceImpl.java | 49 +++++++ .../service/impl/TerminalServiceImpl.java | 13 ++ .../controller/WrkAuditRuleController.java | 6 +- .../work/service/impl/WrkInfoServiceImpl.java | 24 +++- .../system/consumer/LogConsumerService.java | 2 +- 11 files changed, 257 insertions(+), 9 deletions(-) create mode 100644 chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/po/WrkDispatchRecord.java create mode 100644 chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/mapper/DispatchRecordMapper.java create mode 100644 chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/DispatchRecordService.java create mode 100644 chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/impl/DispatchRecordServiceImpl.java diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/po/WrkDispatchRecord.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/po/WrkDispatchRecord.java new file mode 100644 index 0000000..8d59247 --- /dev/null +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/po/WrkDispatchRecord.java @@ -0,0 +1,122 @@ +package com.chushang.inspection.work.po; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.chushang.common.mybatis.base.BaseEntity; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import java.time.LocalDateTime; + +/** + * @auther: zhao + * @date: 2024/6/26 17:13 + */ + +/** + * 工单商户信息 + */ +@Data +@EqualsAndHashCode(callSuper=true) +@AllArgsConstructor +@NoArgsConstructor +@TableName(value = "dispatch_record") +public class WrkDispatchRecord extends BaseEntity { + + /** + * id + */ + @TableId(value = "id", type = IdType.ASSIGN_ID) + private Long id; + /** + * 工单id + */ + @TableField(value = "wrk_id") + private Long wrkId; + + /** + * 租户id + */ + @TableField(value = "dept_id") + private Long deptId; + + /** + * 商户编号 + */ + @TableField(value = "store_no") + private String storeNo; + + /** + * 商户id + */ + @TableField(value = "store_id") + private Long storeId; + + /** + * 商户名称 + */ + @TableField(value = "store_name") + private String storeName; + + /** + * 租户名称 + */ + @TableField(value = "dept_name") + private String deptName; + + @TableField(value = "task_id") + private Long taskId; + + @TableField(value = "lower_task_id") + private Long lowerTaskId; + + @TableField(value = "task_name") + private String taskName; + + @TableField(value = "lower_task_name") + private String lowerTaskName; + + @TableField(value = "user_name") + private String userName; + + @TableField(value = "work_no") + private Long workNo; + + @TableField(value = "terminal_source") + private Integer terminalSource; + + @TableField(value = "terminal_type") + private String terminalType; + + @TableField(value = "terminal_no") + private String terminalNo; + + @TableField(value = "terminal_model") + private String terminalModel; + + @TableField(value = "terminal_version") + private String terminalVersion; + + @TableField(value = "terminal_sn") + private String terminalSn; + + @TableField(value = "admin_id") + private String adminId; + + @TableField(value = "terminal_address") + private String terminalAddress; + + @TableField(value = "remark") + private String remark; + + @TableField(value = "user_id") + private Long userId; + + + + +} diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/consumer/InspectionConsumerService.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/consumer/InspectionConsumerService.java index 3b9ebda..2161e6e 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/consumer/InspectionConsumerService.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/consumer/InspectionConsumerService.java @@ -33,7 +33,7 @@ import java.util.Objects; */ @Slf4j @Component -@RocketMQMessageListener(topic = ServiceConstant.INSPECTION + 1, consumerGroup = ServiceConstant.INSPECTION_CONSUMER_GROUP) +//@RocketMQMessageListener(topic = ServiceConstant.INSPECTION + 1, consumerGroup = ServiceConstant.INSPECTION_CONSUMER_GROUP) public class InspectionConsumerService implements RocketMQListener { @Resource RemoteTaskService remoteTaskService; diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/controller/TerminalController.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/controller/TerminalController.java index d5cead2..daa41f9 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/controller/TerminalController.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/controller/TerminalController.java @@ -41,6 +41,18 @@ public class TerminalController { return AjaxResult.success(terminalService.pageList(query)); } + + /** + * 查询工单详情 + */ + @SysLog("派单记录") + @GetMapping("/dispatchRecord") + @RequiresPermissions("ins:terminal:record") + public AjaxResult dispatchRecord(@PathVariable TerminalQuery query) + { + return AjaxResult.success(terminalService.dispatchRecord(query)); + } + /** * 查询终端app * @param query 条件 diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/mapper/DispatchRecordMapper.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/mapper/DispatchRecordMapper.java new file mode 100644 index 0000000..d5c8120 --- /dev/null +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/mapper/DispatchRecordMapper.java @@ -0,0 +1,12 @@ +package com.chushang.inspection.terminal.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.chushang.inspection.terminal.po.StoreImport; +import com.chushang.inspection.work.po.WrkDispatchRecord; + +/** + * @auther: chujinwang + * @date: 2024/7/3 9:52 + */ +public interface DispatchRecordMapper extends BaseMapper { +} diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/DispatchRecordService.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/DispatchRecordService.java new file mode 100644 index 0000000..5545c54 --- /dev/null +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/DispatchRecordService.java @@ -0,0 +1,17 @@ +package com.chushang.inspection.terminal.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.chushang.common.mybatis.utils.PageResult; +import com.chushang.inspection.terminal.query.FiveUnifiedStoreDetailsQuery; +import com.chushang.inspection.terminal.query.TerminalQuery; +import com.chushang.inspection.work.po.WrkDispatchRecord; + +/** + * @auther: zhao + * @date: 2024/6/21 16:39 + */ +public interface DispatchRecordService extends IService{ + + PageResult pageList(TerminalQuery query); + +} diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/TerminalService.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/TerminalService.java index 2b550c2..bbc758c 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/TerminalService.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/TerminalService.java @@ -30,6 +30,13 @@ public interface TerminalService extends IService{ */ PageResult pageList(TerminalQuery query); + /** + * 派单记录 + * @param query + * @return + */ + PageResult dispatchRecord(TerminalQuery query); + /** * 查询终端app */ diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/impl/DispatchRecordServiceImpl.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/impl/DispatchRecordServiceImpl.java new file mode 100644 index 0000000..eaa6b07 --- /dev/null +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/impl/DispatchRecordServiceImpl.java @@ -0,0 +1,49 @@ +package com.chushang.inspection.terminal.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.chushang.common.mybatis.enums.Operator; +import com.chushang.common.mybatis.page.CommonParam; +import com.chushang.common.mybatis.utils.PageResult; +import com.chushang.common.mybatis.utils.WrapperUtils; +import com.chushang.datascope.annotation.DataScope; +import com.chushang.inspection.project.po.WrkProjectContract; +import com.chushang.inspection.terminal.dto.ConsumablesTotalDTO; +import com.chushang.inspection.terminal.mapper.ConsumablesTotalMapper; +import com.chushang.inspection.terminal.mapper.DispatchRecordMapper; +import com.chushang.inspection.terminal.po.ConsumablesTotal; +import com.chushang.inspection.terminal.query.ConsumablesTotalQuery; +import com.chushang.inspection.terminal.query.FiveUnifiedStoreDetailsQuery; +import com.chushang.inspection.terminal.query.TerminalQuery; +import com.chushang.inspection.terminal.service.ConsumableDetailsService; +import com.chushang.inspection.terminal.service.ConsumablesTotalService; +import com.chushang.inspection.terminal.service.DispatchRecordService; +import com.chushang.inspection.work.po.WrkDispatchRecord; +import com.chushang.security.utils.SecurityUtils; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; + +/** + * @auther: zhao + * @date: 2024/6/21 11:47 + */ +@Slf4j +@Service +public class DispatchRecordServiceImpl extends ServiceImpl implements DispatchRecordService { + + + @Override + public PageResult pageList(TerminalQuery query) { + CommonParam commonParam = TerminalQuery.buildPageRequest(); + LambdaQueryWrapper queryWrapper = WrapperUtils.builder(query, commonParam); + IPage page = this.page(new Page<>(commonParam.getPage(), commonParam.getLimit()), queryWrapper); + return new PageResult(page); + } +} diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/impl/TerminalServiceImpl.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/impl/TerminalServiceImpl.java index 629d0dd..c1e0c2f 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/impl/TerminalServiceImpl.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/impl/TerminalServiceImpl.java @@ -7,6 +7,8 @@ import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.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.plugins.pagination.Page; import com.chushang.common.core.constant.SecurityConstants; import com.chushang.common.core.exception.utils.AssertUtil; @@ -15,6 +17,7 @@ import com.chushang.common.mybatis.enums.Operator; import com.chushang.common.mybatis.page.CommonParam; import com.chushang.common.mybatis.utils.PageResult; import com.chushang.common.mybatis.utils.WrapperUtils; +import com.chushang.inspection.project.po.WrkProjectContract; import com.chushang.inspection.project.vo.CountVO; import com.chushang.inspection.project.vo.TerminalApp; import com.chushang.inspection.project.vo.TerminalAppVO; @@ -23,6 +26,7 @@ import com.chushang.inspection.terminal.po.Terminal; import com.chushang.inspection.terminal.po.TerminalIns; import com.chushang.inspection.terminal.query.TerminalAppQuery; import com.chushang.inspection.terminal.query.TerminalQuery; +import com.chushang.inspection.terminal.service.DispatchRecordService; import com.chushang.inspection.terminal.service.StoreService; import com.chushang.inspection.terminal.service.TerminalInsService; import com.chushang.inspection.terminal.service.TerminalService; @@ -32,6 +36,7 @@ import com.chushang.inspection.utils.BeanCopyUtils; import com.chushang.inspection.utils.TaskConfigUtils; import com.chushang.inspection.work.dto.DispatchDTO; import com.chushang.inspection.work.dto.WrkIcbcJsReceive; +import com.chushang.inspection.work.po.WrkDispatchRecord; import com.chushang.inspection.work.po.WrkInfo; import com.chushang.inspection.work.query.DispatchQuery; import com.chushang.system.feign.RemoteDeptService; @@ -59,6 +64,9 @@ public class TerminalServiceImpl extends ServiceImpl i @Resource private RemoteDeptService remoteDeptService; + @Resource + private DispatchRecordService dispatchRecordService; + @Override public PageResult pageList(TerminalQuery query) { @@ -78,6 +86,11 @@ public class TerminalServiceImpl extends ServiceImpl i return new PageResult(terminalVOS, page); } + @Override + public PageResult dispatchRecord(TerminalQuery query) { + return dispatchRecordService.pageList(query); + } + @Override public PageResult queryPageApp(TerminalAppQuery query) { CommonParam commonParam = CommonParam.buildPageRequest(); diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/controller/WrkAuditRuleController.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/controller/WrkAuditRuleController.java index abd230b..4d91e3b 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/controller/WrkAuditRuleController.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/controller/WrkAuditRuleController.java @@ -31,10 +31,10 @@ public class WrkAuditRuleController { /** * 工单审核 */ - @PostMapping ("/pages") + @GetMapping ("/page") @RequiresPermissions("wrk:aduit:page") @SysLog(value = "工单审核", businessType = BusinessType.AUDIT) - public AjaxResult page(@Validated @RequestBody WrkAuditRuleQuery query) { + public AjaxResult page(@Validated WrkAuditRuleQuery query) { return AjaxResult.success(wrkAuditRuleService.queryRulePage(query)); } @@ -43,7 +43,7 @@ public class WrkAuditRuleController { * 新增和修改 */ @PostMapping ("/saveOrUpdate") - @RequiresPermissions("wrk:aduit:audit") + @RequiresPermissions("wrk:aduit:su") @SysLog(value = "工单审核", businessType = BusinessType.AUDIT) public AjaxResult saveOrUpdate(@Validated @RequestBody WrkAuditRuleDTO dto) { return AjaxResult.success(wrkAuditRuleService.saveOrUpdate(dto)); diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/impl/WrkInfoServiceImpl.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/impl/WrkInfoServiceImpl.java index af04995..3784db1 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/impl/WrkInfoServiceImpl.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/impl/WrkInfoServiceImpl.java @@ -38,10 +38,7 @@ import com.chushang.inspection.terminal.po.FiveStore; import com.chushang.inspection.terminal.po.Store; import com.chushang.inspection.terminal.po.Terminal; import com.chushang.inspection.terminal.po.TerminalIns; -import com.chushang.inspection.terminal.service.FiveStoreService; -import com.chushang.inspection.terminal.service.StoreService; -import com.chushang.inspection.terminal.service.TerminalInsService; -import com.chushang.inspection.terminal.service.TerminalService; +import com.chushang.inspection.terminal.service.*; import com.chushang.inspection.terminal.vo.FiveStoreVO; import com.chushang.inspection.utils.PoolUtils; import com.chushang.inspection.utils.TaskConfigUtils; @@ -106,6 +103,7 @@ public class WrkInfoServiceImpl extends ServiceImpl impl private final RemoteTaskService remoteTaskService; private final RemoteUserService userFeignService; private final RemoteDeptService remoteDeptService; + private final DispatchRecordService dispatchRecordService; @Value("${push.icbc-js.enable:false}") private boolean enable; @@ -265,6 +263,24 @@ public class WrkInfoServiceImpl extends ServiceImpl impl wrkInfo.setProjectId(store.getProjectId()); // 处理时间 save(wrkInfo); + + WrkDispatchRecord wrkDispatchRecord = BeanUtil.copyProperties(t, WrkDispatchRecord.class); + wrkDispatchRecord.setId(IdUtil.getSnowflake().nextId()); + wrkDispatchRecord.setStoreId(store.getStoreId()); + wrkDispatchRecord.setStoreNo(store.getStoreNo()); + wrkDispatchRecord.setStoreName(store.getStoreName()); + wrkDispatchRecord.setWrkId(wrkInfo.getWrkId()); + wrkDispatchRecord.setWorkNo(wrkInfo.getWorkNo()); + wrkDispatchRecord.setDeptName(deptName); + wrkDispatchRecord.setDeptId(store.getDeptId()); + wrkDispatchRecord.setTaskId(store.getTaskId()); + wrkDispatchRecord.setLowerTaskId(store.getLowerTaskId()); + wrkDispatchRecord.setTaskName(wrkInfo.getTaskName()); + wrkDispatchRecord.setLowerTaskName(wrkInfo.getLowerTaskName()); + wrkDispatchRecord.setUserId(query.getUserId()); + wrkDispatchRecord.setUserName(wrkInfo.getUserName()); + dispatchRecordService.save(wrkDispatchRecord); + WrkInfoTerminalRecord wrkInfoTerminalRecord = BeanUtil.copyProperties(t, WrkInfoTerminalRecord.class); wrkInfoTerminalRecord.setWrkId(wrkInfo.getWrkId()); wrkInfoTerminalRecord.setVersion(0L); diff --git a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/consumer/LogConsumerService.java b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/consumer/LogConsumerService.java index 5a63f12..36208e9 100644 --- a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/consumer/LogConsumerService.java +++ b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/consumer/LogConsumerService.java @@ -30,7 +30,7 @@ import java.util.Objects; */ @Slf4j @Component -@RocketMQMessageListener(topic = ServiceConstant.QUEUE_NAME, consumerGroup = ServiceConstant.SYSTEM_CONSUMER_GROUP) +//@RocketMQMessageListener(topic = ServiceConstant.QUEUE_NAME, consumerGroup = ServiceConstant.SYSTEM_CONSUMER_GROUP) public class LogConsumerService implements RocketMQListener { @Resource private SysLogService logService;