From 909a4aee093041819c7903b578e3b4aaa9076674 Mon Sep 17 00:00:00 2001 From: ant Date: Fri, 12 Jul 2024 10:39:50 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E6=8E=A5=E5=8F=A3=E8=81=94=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inspection/project/vo/TerminalAppVO.java | 4 + .../inspection/terminal/po/Store.java | 4 +- .../inspection/terminal/query/StoreQuery.java | 1 - .../terminal/vo/StoreTerminalVO.java | 4 + .../work/po/WrkInfoStoreRecord.java | 57 ++++++++-- .../work/po/WrkInfoTerminalInsRecord.java | 7 +- .../work/po/WrkInfoTerminalRecord.java | 55 +++++++--- .../inspection/work/query/DispatchQuery.java | 3 +- .../inspection/work/query/ReviewedQuery.java | 1 - .../inspection/work/query/WrkAppQuery.java | 1 - .../inspection/work/query/WrkInfoQuery.java | 1 - .../inspection/work/mapper/WrkInfoMapper.java | 3 +- .../work/service/impl/WrkInfoServiceImpl.java | 2 +- .../src/main/resources/mapper/StoreMapper.xml | 2 +- .../main/resources/mapper/TerminalMapper.xml | 49 ++++----- .../main/resources/mapper/WrkInfoMapper.xml | 10 +- .../mapper/WrkInfoTerminalRecordMapper.xml | 103 +++++++++--------- .../src/test/java/DemoTest.java | 2 + 18 files changed, 191 insertions(+), 118 deletions(-) diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/vo/TerminalAppVO.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/vo/TerminalAppVO.java index 600da19..6098ce1 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/vo/TerminalAppVO.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/vo/TerminalAppVO.java @@ -51,6 +51,10 @@ public class TerminalAppVO implements Serializable { */ @DictFormat(dictType = "ins_fre") private Integer insFre; + /** + * 巡检状态 + */ + private Integer inspectionStatus; /** * 上次工单处理时间 diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/po/Store.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/po/Store.java index 8ebd7dd..99df54f 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/po/Store.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/po/Store.java @@ -5,6 +5,8 @@ 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 java.time.LocalDateTime; import java.util.Date; import lombok.AllArgsConstructor; import lombok.Data; @@ -88,7 +90,7 @@ public class Store extends BaseEntity { * 建档日期 */ @TableField(value = "register_time") - private Date registerTime; + private LocalDateTime registerTime; /** * 商户类型 diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/query/StoreQuery.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/query/StoreQuery.java index 16fa59b..db3f919 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/query/StoreQuery.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/query/StoreQuery.java @@ -47,7 +47,6 @@ public class StoreQuery extends CommonParam { * 任务id */ @Condition(name = "task_id") - @NotNull(message = "任务id不能为空") private Long taskId; /** diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/vo/StoreTerminalVO.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/vo/StoreTerminalVO.java index d38d6bc..4828289 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/vo/StoreTerminalVO.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/vo/StoreTerminalVO.java @@ -16,6 +16,10 @@ import java.time.LocalDateTime; */ @Data public class StoreTerminalVO { + + private Long wrkId; + private Long workNo; + /** * 所属项目id */ diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/po/WrkInfoStoreRecord.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/po/WrkInfoStoreRecord.java index 0a6093b..5750aea 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/po/WrkInfoStoreRecord.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/po/WrkInfoStoreRecord.java @@ -11,6 +11,8 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import java.time.LocalDateTime; + /** * @auther: zhao * @date: 2024/6/26 17:13 @@ -30,18 +32,6 @@ public class WrkInfoStoreRecord extends BaseEntity { @TableId(value = "wrk_id", type = IdType.INPUT) private Long wrkId; - /** - * 商户id - */ - @TableField(value = "store_id") - private Long storeId; - - /** - * 门店状态 - */ - @TableField(value = "store_status") - private Integer storeStatus; - /** * 商户编号 */ @@ -84,6 +74,12 @@ public class WrkInfoStoreRecord extends BaseEntity { @TableField(value = "shop_name") private String shopName; + /** + * 建档日期 + */ + @TableField(value = "register_time") + private LocalDateTime registerTime; + /** * 商户类型 */ @@ -101,20 +97,57 @@ public class WrkInfoStoreRecord extends BaseEntity { */ @TableField(value = "tip_tool") private String tipTool; + + /** + * 操作员编号 + */ + @TableField(value = "admin_id") + private String adminId; + /** * 巡检频次 */ @TableField(value = "ins_fre") private Integer insFre; + + /** + * 客户经理 + */ + @TableField(value = "account_manager") + private String accountManager; + + /** + * 经理电话 + */ + @TableField(value = "account_phone") + private String accountPhone; + /** * 注册地址 */ @TableField(value = "register_address") private String registerAddress; + /** + * 租户id + */ + @TableField(value = "dept_id") + private Long deptId; + /** * 法人/负责人 */ @TableField(value = "legal_name") private String legalName; + + /** + * 是否为业务员录入（1是 2否） + */ + @TableField(value = "is_enter") + private Integer isEnter; + /** + * 商户状态 + */ + @TableField(value = "state") + private Integer state; } diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/po/WrkInfoTerminalInsRecord.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/po/WrkInfoTerminalInsRecord.java index 3bc5583..f79d189 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/po/WrkInfoTerminalInsRecord.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/po/WrkInfoTerminalInsRecord.java @@ -28,10 +28,15 @@ public class WrkInfoTerminalInsRecord extends BaseEntity { @TableId(value = "wrk_id", type = IdType.INPUT) private Long wrkId; /** - * 终端id + * 主键 */ @TableField(value = "terminal_id") private Long terminalId; + /** + * 所属商户id + */ + @TableField(value = "store_id") + private Long storeId; /** * 银行资产管理码 diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/po/WrkInfoTerminalRecord.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/po/WrkInfoTerminalRecord.java index ec1f2a4..fa78a42 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/po/WrkInfoTerminalRecord.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/po/WrkInfoTerminalRecord.java @@ -33,17 +33,35 @@ public class WrkInfoTerminalRecord extends BaseEntity { private Long wrkId; /** - * 终端id + * 主键 */ @TableField(value = "terminal_id") private Long terminalId; + /** + * 所属商户id + */ + @TableField(value = "store_id") + private Long storeId; + + /** + * 所属商户编号 + */ + @TableField(value = "store_no") + private String storeNo; + /** * 终端sn号 */ @TableField(value = "terminal_sn") private String terminalSn; + /** + * 终端编号 + */ + @TableField(value = "terminal_no") + private String terminalNo; + /** * 终端类型 */ @@ -57,10 +75,16 @@ public class WrkInfoTerminalRecord extends BaseEntity { private String terminalModel; /** - * 终端编号 + * 版本号 */ - @TableField(value = "terminal_no") - private String terminalNo; + @TableField(value = "terminal_version") + private String terminalVersion; + + /** + * 终端地址 + */ + @TableField(value = "terminal_address") + private String terminalAddress; /** * 终端来源 @@ -68,27 +92,26 @@ public class WrkInfoTerminalRecord extends BaseEntity { @TableField(value = "terminal_source") private Integer terminalSource; - /** - * 终端版地址 - */ - @TableField(value = "terminal_address") - private String terminalAddress; - - /** - * 终端版本号 - */ - @TableField(value = "terminal_version") - private String terminalVersion; - /** * 终端产权人 */ @TableField(value = "terminal_property") private Integer terminalProperty; + /** + * 是否占用 + */ + @TableField(value = "occupy") + private Integer occupy; + /** * 终端状态 */ @TableField(value = "terminal_status") private Integer terminalStatus; + /** + * 备注 + */ + @TableField(value = "remark") + private String remark; } diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/query/DispatchQuery.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/query/DispatchQuery.java index 1612dd9..5ab7f74 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/query/DispatchQuery.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/query/DispatchQuery.java @@ -4,6 +4,7 @@ import cn.hutool.core.collection.ListUtil; import cn.hutool.core.date.DatePattern; import com.chushang.common.core.text.Convert; import com.chushang.common.dict.utils.DictUtils; +import com.chushang.common.mybatis.page.CommonParam; import com.chushang.inspection.work.enums.WorkTypeOperation; import com.chushang.inspection.work.po.WrkIcbcJs; import com.fasterxml.jackson.annotation.JsonFormat; @@ -23,7 +24,7 @@ import java.util.List; @Builder @NoArgsConstructor @AllArgsConstructor -public class DispatchQuery implements Serializable { +public class DispatchQuery extends CommonParam { /** 终端id */ private List terminalIds; diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/query/ReviewedQuery.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/query/ReviewedQuery.java index b1ae80c..6e9cf66 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/query/ReviewedQuery.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/query/ReviewedQuery.java @@ -51,7 +51,6 @@ public class ReviewedQuery extends CommonParam { * 任务id */ @Condition(name = "task_id", tableName = "i") - @NotNull(message = "任务id不能为空") private Long taskId; /** diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/query/WrkAppQuery.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/query/WrkAppQuery.java index 128a53d..4caa99c 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/query/WrkAppQuery.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/query/WrkAppQuery.java @@ -41,7 +41,6 @@ public class WrkAppQuery extends CommonParam { * 任务id */ @Condition(name = "task_id", tableName = "i") - @NotNull(message = "任务id不能为空") private Long taskId; /** diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/query/WrkInfoQuery.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/query/WrkInfoQuery.java index 908e6ba..6cedcf8 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/query/WrkInfoQuery.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/query/WrkInfoQuery.java @@ -43,7 +43,6 @@ public class WrkInfoQuery extends CommonParam { * 任务id */ @Condition(name = "task_id", tableName = "i") - @NotNull(message = "任务id不能为空") private Long taskId; /** diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/mapper/WrkInfoMapper.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/mapper/WrkInfoMapper.java index b28f9d0..24ab7fa 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/mapper/WrkInfoMapper.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/mapper/WrkInfoMapper.java @@ -24,7 +24,8 @@ public interface WrkInfoMapper extends BaseMapper { List queryDispatchPage(@Param("query") WrkInfoQuery query, Page page); @DataScope(deptAlias = "i") - List queryArchivePage(@Param("query") ReviewedQuery query, Page page); + List queryArchivePage(@Param("query") ReviewedQuery query, + Page page); @DataScope(deptAlias = "i") List queryAppPage(@Param("query") WrkAppQuery query, Page page); 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 7ed4e13..beb4ece 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 @@ -303,7 +303,7 @@ public class WrkInfoServiceImpl extends ServiceImpl impl // 修改 终端的状态 getMerState(info, terminal, store); - tempStorageStore.setStoreStatus(store.getState()); + tempStorageStore.setState(store.getState()); tempStorageTerminalInsRecord.setTimesPass(timesPass); tempStorageTerminalInsRecord.setInspectionStatus(1); tempStorageTerminalInsRecord.setInspectionTime(now); diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/StoreMapper.xml b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/StoreMapper.xml index 2b4d63a..9790bce 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/StoreMapper.xml +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/StoreMapper.xml @@ -91,7 +91,7 @@ AND #{query.createTime[1]} - ${query.sqlParam.dataScpoe} + ${query.sqlParam.get('dataScpoe')} ORDER BY #{query.orderBy} #{query.isAsc} diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/TerminalMapper.xml b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/TerminalMapper.xml index 9a10445..c4f15d2 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/TerminalMapper.xml +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/TerminalMapper.xml @@ -118,23 +118,22 @@ INNER JOIN wrk_project p ON pt.project_id = p.project_id - SELECT - pt.project_id AS projectId, - p.project_name AS projectName, - pt.id AS task_id, - pt.`name` AS taskName, - s.lower_task_id AS lowerTaskId, - s.dept_id AS deptId, - s.store_id AS storeId, - s.store_no AS storeNo, - s.store_name AS storeName, - s.store_contact AS storeContact, - s.store_phone AS storePhone, - s.shop_name AS shopName, - s.special_num AS specialNum, - s.store_address AS storeAddress, - s.store_type AS storeType, - s.products AS products, - s.tip_tool AS tipTool, - s.register_time AS registerTime, - s.register_address AS registerAddress, - s.legal_name AS legalName, - s.create_by AS createBy, - s.create_time AS createTime, - s.state AS storeState, - s.ins_fre AS insFre, - s.account_phone AS accountPhone, - s.account_manager AS accountManager, - t.terminal_id AS terminalId, - t.terminal_no AS terminalNo, - t.terminal_sn AS terminalSn, - t.terminal_type AS terminalType, - t.terminal_model AS terminalModel, - t.terminal_version AS terminalVersion, - t.terminal_address AS terminalAddress, - t.terminal_source AS terminalSource, - t.occupy AS occupy, - t.terminal_status AS terminalStatus, - ti.deviation AS deviation, - ti.operator_id AS operatorId, - ti.inspection_status AS inspectionStatus, - ti.inspection_time AS inspectionTime, - ti.times_pass AS timesPass, - ti.service_result AS serviceResult, - ti.geographic_address AS geographicAddress, - ti.geographic_location AS geographicLocation, - ti.work_location AS workLocation, - ti.work_adderss AS workAddress + SELECT pt.project_id AS projectId, + p.project_name AS projectName, + + i.task_id AS task_id, + i.`task_name` AS taskName, + i.lower_task_id AS lowerTaskId, + i.dept_id AS deptId, + i.work_no AS workNo, + i.wrk_id AS wrkId, + + s.store_id AS storeId, + s.store_no AS storeNo, + s.store_name AS storeName, + s.store_contact AS storeContact, + s.store_phone AS storePhone, + s.shop_name AS shopName, + s.special_num AS specialNum, + s.store_address AS storeAddress, + s.store_type AS storeType, + s.products AS products, + s.tip_tool AS tipTool, + s.register_time AS registerTime, + s.register_address AS registerAddress, + s.legal_name AS legalName, + s.create_by AS createBy, + s.create_time AS createTime, + s.state AS storeState, + s.ins_fre AS insFre, + s.account_phone AS accountPhone, + s.account_manager AS accountManager, + t.terminal_id AS terminalId, + t.terminal_no AS terminalNo, + t.terminal_sn AS terminalSn, + t.terminal_type AS terminalType, + t.terminal_model AS terminalModel, + t.terminal_version AS terminalVersion, + t.terminal_address AS terminalAddress, + t.terminal_source AS terminalSource, + t.occupy AS occupy, + t.terminal_status AS terminalStatus, + ti.deviation AS deviation, + ti.operator_id AS operatorId, + ti.inspection_status AS inspectionStatus, + ti.inspection_time AS inspectionTime, + ti.times_pass AS timesPass, + ti.service_result AS serviceResult, + ti.geographic_address AS geographicAddress, + ti.geographic_location AS geographicLocation, + ti.work_location AS workLocation, + ti.work_adderss AS workAddress FROM wrk_info i + LEFT JOIN ta_polling_task pt ON i.task_id = pt.id + LEFT JOIN wrk_project p ON pt.project_id = p.project_id INNER JOIN wrk_info_store_record s ON i.wrk_id = s.wrk_id INNER JOIN wrk_info_terminal_record t ON i.wrk_id = t.wrk_id - INNER JOIN wrk_info_terminal_ins_record ti ON i.wrk_id = ti.wrk_id - INNER JOIN ta_polling_task pt ON i.task_id = pt.id - INNER JOIN wrk_project p ON pt.project_id = p.project_id + LEFT JOIN wrk_info_terminal_ins_record ti ON i.wrk_id = ti.wrk_id ${query.sqlParam.get('sqlWhere')} diff --git a/chushang-modules/chushang-module-system/system-service/src/test/java/DemoTest.java b/chushang-modules/chushang-module-system/system-service/src/test/java/DemoTest.java index 2d1e7c3..82c21d5 100644 --- a/chushang-modules/chushang-module-system/system-service/src/test/java/DemoTest.java +++ b/chushang-modules/chushang-module-system/system-service/src/test/java/DemoTest.java @@ -38,6 +38,8 @@ public class DemoTest { LoginBody loginBody = new LoginBody(); loginBody.setPassword("1"); loginBody.setUsername("2"); + + // 创建任务 remoteTaskService.createTask(CreateTaskDTO.builder() .params(JSON.toJSONString(loginBody)) .taskName("测试后台任务")