From c182da5a1bd9300de50f1f986b1c573e16d7a250 Mon Sep 17 00:00:00 2001 From: zhaowenyuan Date: Wed, 3 Jul 2024 18:29:59 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E6=A8=A1=E6=9D=BF=E8=BF=81=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chushang/common/dict/utils/DictUtils.java | 10 + .../terminal/query/TerminalQuery.java | 97 +++--- .../terminal/vo/StoreTerminalVO.java | 204 +++++++++++++ .../inspection/terminal/vo/StoreVO.java | 2 +- .../inspection/terminal/vo/TerminalVO.java | 12 +- .../work/po/WrkInfoStoreRecord.java | 36 --- .../work/po/WrkInfoTerminalInsRecord.java | 131 ++++++++ .../work/po/WrkInfoTerminalRecord.java | 6 - .../inspection/work/vo/WrkInfoDetailsVO.java | 5 + .../inspection/work/vo/WrkInfoStoreVO.java | 30 -- .../work/vo/WrkInfoTerminalInsVO.java | 86 ++++++ .../common/controller/CommonController.java | 39 --- .../common/service/CommonService.java | 43 --- .../controller/TemplateController.java | 34 ++- .../project/service/TbTemplateService.java | 4 + .../service/impl/PollingTaskServiceImpl.java | 2 +- .../service/impl/TemplateServiceImpl.java | 17 ++ .../terminal/controller/StoreController.java | 13 +- .../controller/StoreImportController.java | 3 - .../controller/TerminalController.java | 5 +- .../terminal/mapper/TerminalMapper.java | 5 +- .../service/impl/StoreServiceImpl.java | 3 - .../service/impl/TerminalServiceImpl.java | 25 +- .../work/controller/WrkInfoController.java | 8 +- .../inspection/work/mapper/WrkInfoMapper.java | 6 +- .../WrkInfoTerminalInsRecordMapper.java | 11 + .../WrkInfoTerminalInsRecordService.java | 11 + .../work/service/impl/WrkInfoServiceImpl.java | 287 ++++++++++++------ .../WrkInfoTerminalInsRecordServiceImpl.java | 18 ++ .../src/main/resources/mapper/StoreMapper.xml | 41 --- .../main/resources/mapper/TerminalMapper.xml | 171 +++++------ .../main/resources/mapper/WrkInfoMapper.xml | 103 +++---- .../system/feign/RemoteDeptService.java | 30 ++ .../system/remote/RemoteDeptController.java | 40 +++ 34 files changed, 1018 insertions(+), 520 deletions(-) create mode 100644 chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/vo/StoreTerminalVO.java create mode 100644 chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/po/WrkInfoTerminalInsRecord.java create mode 100644 chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/vo/WrkInfoTerminalInsVO.java delete mode 100644 chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/common/controller/CommonController.java delete mode 100644 chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/common/service/CommonService.java create mode 100644 chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/mapper/WrkInfoTerminalInsRecordMapper.java create mode 100644 chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/WrkInfoTerminalInsRecordService.java create mode 100644 chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/impl/WrkInfoTerminalInsRecordServiceImpl.java create mode 100644 chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system/feign/RemoteDeptService.java create mode 100644 chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/remote/RemoteDeptController.java diff --git a/chushang-common/chushang-common-dict/src/main/java/com/chushang/common/dict/utils/DictUtils.java b/chushang-common/chushang-common-dict/src/main/java/com/chushang/common/dict/utils/DictUtils.java index f4caf89..30791a4 100644 --- a/chushang-common/chushang-common-dict/src/main/java/com/chushang/common/dict/utils/DictUtils.java +++ b/chushang-common/chushang-common-dict/src/main/java/com/chushang/common/dict/utils/DictUtils.java @@ -60,6 +60,16 @@ public class DictUtils { return dictMap.get(value); } + /** + * 根据字段值获取字典标签 + * + * @param value 字典值 + * @return 字典标签 + */ + public static String getDictWrkStatusLabel(String value) { + return getDictLabel("wrk_status", value); + } + /** * 根据字典标签获取字段值 * diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/query/TerminalQuery.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/query/TerminalQuery.java index f082d16..8e6c15c 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/query/TerminalQuery.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/query/TerminalQuery.java @@ -19,91 +19,102 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) public class TerminalQuery extends CommonParam { - /** - * 任务id - */ - private Long taskId; - /** * 商户编号 */ @Size(max = 64, message = "商户编号不能超过64个字符") + @Condition(name = "store_no", type = Condition.ConditionType.eq, tableName = "s") private String storeNo; - + @Condition(name = "store_name", type = Condition.ConditionType.like, tableName = "s") + private String storeName; /** * 终端编号 */ @Size(max = 30, message = "终端编号不能超过30个字符") + @Condition(name = "terminal_no", type = Condition.ConditionType.eq, tableName = "t") private String terminalNo; - /** * 终端sn号 */ @Size(max = 100, message = "终端sn号不能超过100个字符") + @Condition(name = "terminal_sn", type = Condition.ConditionType.eq, tableName = "t") private String terminalSn; - - /** - * 终端类型 - */ - @Range(min = 1, max = 10, message = "终端类型输入错误") - private Integer terminalType; - - /** - * 终端来源 - */ - @Range(min = 1, max = 10, message = "终端来源输入错误") - private Integer terminalSource; - /** * 终端版本号 */ @Size(max = 64, message = "终端版本号不能超过64个字符") + @Condition(name = "terminal_version", type = Condition.ConditionType.like, tableName = "t") private String terminalVersion; - + /** + * 终端类型 + */ + @Range(min = 1, max = 10, message = "终端类型输入错误") + @Condition(name = "terminal_type", type = Condition.ConditionType.eq, tableName = "t") + private Integer terminalType; /** * 终端地址 */ @Size(max = 300, message = "终端版本号不能超过300个字符") + @Condition(name = "terminal_address", type = Condition.ConditionType.eq, tableName = "t") private String terminalAddress; - /** - * 终端型号 + * 所属部门 */ - @Size(max = 64, message = "终端型号不能超过64个字符") - private String terminalModel; - + @Condition(name = "dept_id", type = Condition.ConditionType.eq, tableName = "s") + private Long deptId; /** - * 下级任务id + * 所属银行 */ - private List lowerTaskIds; - - /** - * 商户名称 - */ - @Size(max = 128, message = "商户名称不能超过128个字符") - private String storeName; - - /** - * 商户状态 - */ - @Range(min = 1, max = 3, message = "商户状态输入错误") - private Integer storeState; - + @Condition(name = "task_id", type = Condition.ConditionType.eq, tableName = "s") + private Long taskId; /** * 巡检状态 1 以巡检 2未巡检 */ @Range(min = 1, max = 2, message = "巡检状态输入错误") + @Condition(name = "inspection_status", type = Condition.ConditionType.eq, tableName = "ti") private Integer inspectionStatus; - + /** + * 终端来源 + */ + @Range(min = 1, max = 10, message = "终端来源输入错误") + @Condition(name = "inspection_source", type = Condition.ConditionType.eq, tableName = "ti") + private Integer terminalSource; + /** + * 商户状态 + */ + @Range(min = 1, max = 3, message = "商户状态输入错误") + @Condition(name = "`state`", type = Condition.ConditionType.eq, tableName = "s") + private Integer storeState; /** * 巡检时间 */ @JsonFormat(pattern = DatePattern.NORM_DATETIME_PATTERN) + @Condition(name = "`inspection_time`", type = Condition.ConditionType.in, tableName = "ti") private List inspectionTime; - /** * 创建时间 */ @JsonFormat(pattern = DatePattern.NORM_DATETIME_PATTERN) + @Condition(name = "`create_time`", type = Condition.ConditionType.in, tableName = "s") private List createTimes; + /** + * 终端型号 + */ + @Size(max = 64, message = "终端型号不能超过64个字符") + @Condition(name = "`terminal_model`", type = Condition.ConditionType.like, tableName = "t") + private String terminalModel; + /** + * 下级任务id + */ + private List lowerTaskIds; + /** + * 用于 查询用户id + */ + @Condition(name = "`admin_id`", type = Condition.ConditionType.in, tableName = "s") + private List userIds; + /** + * 所属项目id + */ + @Condition(name = "`project_id`", type = Condition.ConditionType.eq, tableName = "p") + private Long projectId; } 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 new file mode 100644 index 0000000..eec1f25 --- /dev/null +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/vo/StoreTerminalVO.java @@ -0,0 +1,204 @@ +package com.chushang.inspection.terminal.vo; + +import cn.hutool.core.date.DatePattern; +import com.alibaba.excel.annotation.format.DateTimeFormat; +import com.chushang.common.dict.annotation.DictFormat; +import lombok.Data; + +import java.time.LocalDate; +import java.time.LocalDateTime; + +/** + * 终端商户池 + * @auther: zhao + * @date: 2024/7/3 15:04 + */ +@Data +public class StoreTerminalVO { + /** + * 所属项目id + */ + private Long projectId; + /** + * 所属项目 + */ + private String projectName; + + /** + * id + */ + private Long storeId; + /** + * 商户编号 + */ + private String storeNo; + /** + * 商户名称 + */ + private String storeName; + /** + * 商户联系人 + */ + private String storeContact; + /** + * 门店名称 + */ + private String shopName; + /** + * 特殊商户编号 + */ + private String specialNum; + /** + * 商户联系方式 + */ + private String storePhone; + /** + * 商户地址 + */ + private String storeAddress; + /** + * 当前任务id + */ + private Long lowerTaskId; + /** + * 当前任务名称 + * lower_task_id + */ + private String lowerTaskName; + /** + * 商户类型 + */ + @DictFormat(dictType = "store_type") + private Integer storeType; + /** + * 现有其他收单产品 + */ + private String products; + /** + * 商户提示工具 + */ + private String tipTool; + /** + * 建档日期 + */ + private LocalDate registerTime; + /** + * 巡检频次 + */ + @DictFormat(dictType = "ins_fre") + private Integer insFre; + /** + * 客户经理 + */ + private String accountManager; + /** + * 经理电话 + */ + private String accountPhone; + /** + * 任务id + */ + private Long taskId; + /** + * 总任务名 + * -- taskId + */ + private String taskName; + /** + * 注册地址 + */ + private String registerAddress; + /** + * 法人/负责人 + */ + private String legalName; + /** + * 创建者 + * -- 创建人 + */ + protected String createBy; + /** + * 创建日期 + */ + protected LocalDateTime createTime; + /** + * 终端 主键 + */ + private Long terminalId; + /** + * 商户状态 + */ + @DictFormat(dictType = "mer_status") + private Integer storeState; + + /** + * 终端sn号 + */ + private String terminalSn; + /** + * 终端编号 + */ + private String terminalNo; + /** + * 终端类型 + */ + @DictFormat(dictType = "terminal_type") + private Integer terminalType; + /** + * 终端型号 + */ + private String terminalModel; + /** + * 终端版本号 + */ + private String terminalVersion; + /** + * 终端地址 + */ + private String terminalAddress; + /** + * 终端来源 + */ + @DictFormat(dictType = "terminal_source") + private Integer terminalSource; + /** + * 是否占用 + */ + private Integer occupy; + /** + * 巡检状态 + */ + @DictFormat(dictType = "terminal_status") + private Integer terminalStatus; + /** + * 终端--状态 + */ + @DictFormat(dictType = "mer_status") + private Integer state; + + /** + * 偏差（直线距离 米） + */ + private Long deviation; + /** + * 操作人 + */ + private String operatorId; + + /** + * 巡检状态 1 以巡检 2未巡检 + */ + private Integer inspectionStatus; + + /** + * 巡检时间 + */ + @DateTimeFormat(DatePattern.NORM_DATETIME_MS_PATTERN) + private LocalDateTime inspectionTime; + + private Long deptId; + + private String deptName; + + +} diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/vo/StoreVO.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/vo/StoreVO.java index a6fb451..9adddee 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/vo/StoreVO.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/vo/StoreVO.java @@ -73,7 +73,7 @@ public class StoreVO implements Serializable { * 商户类型 */ @DictFormat(dictType = "store_type") - private Integer type; + private Integer storeType; /** * 现有其他收单产品 diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/vo/TerminalVO.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/vo/TerminalVO.java index 221544e..3e13e8f 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/vo/TerminalVO.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/vo/TerminalVO.java @@ -20,9 +20,6 @@ public class TerminalVO implements Serializable { @Serial private static final long serialVersionUID = 1L; - - - /** * 终端 主键 */ @@ -37,17 +34,18 @@ public class TerminalVO implements Serializable { * 下级任务id */ private Long lowerTaskId; - + /** + * 顶级任务id + */ + private Long taskId; /** * 任务名称 */ - private String pollingName; - + private String taskName; /** * 商户编号 */ private String storeNo; - /** * 商户名称 * 查询商户表 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 967a78d..0a6093b 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 @@ -117,40 +117,4 @@ public class WrkInfoStoreRecord extends BaseEntity { */ @TableField(value = "legal_name") private String legalName; - - /** - * 地理位置信息 - */ - @TableField(value = "geographic_location") - private String geographicLocation; - - /** - * 地理位置信息地址 - */ - @TableField(value = "location_address") - private String locationAddress; - - /** - * 本次巡检位置经纬度 - */ - @TableField(value = "work_location") - private String workLocation; - - /** - * 本次巡检位置信息（根据经纬度） - */ - @TableField(value = "work_address") - private String workAddress; - - /** - * 偏差（直线距离 米） - */ - @TableField(value = "deviation") - private Long deviation; - - /** - * 预制码编码 - */ - @TableField(value = "pre_code_encoding") - private String preCodeEncoding; } 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 new file mode 100644 index 0000000..3bc5583 --- /dev/null +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/po/WrkInfoTerminalInsRecord.java @@ -0,0 +1,131 @@ +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/7/3 11:31 + */ +@Data +@EqualsAndHashCode(callSuper=true) +@AllArgsConstructor +@NoArgsConstructor +@TableName(value = "wrk_info_terminal_ins_record") +public class WrkInfoTerminalInsRecord extends BaseEntity { + /** + * 工单id + */ + @TableId(value = "wrk_id", type = IdType.INPUT) + private Long wrkId; + /** + * 终端id + */ + @TableField(value = "terminal_id") + private Long terminalId; + + /** + * 银行资产管理码 + */ + @TableField(value = "management_code") + private String managementCode; + + /** + * 地理位置信息 + */ + @TableField(value = "geographic_location") + private String geographicLocation; + + /** + * 地理位置信息地址 + */ + @TableField(value = "geographic_address") + private String geographicAddress; + + /** + * 巡检位置信息 + */ + @TableField(value = "work_location") + private String workLocation; + + /** + * 巡检位置信息 + */ + @TableField(value = "work_address") + private String workAddress; + + /** + * 偏差（直线距离 米） + */ + @TableField(value = "deviation") + private Long deviation; + + /** + * 入库时间 + */ + @TableField(value = "storage_time") + private LocalDateTime storageTime; + + /** + * 出库时间 + */ + @TableField(value = "delivery_time") + private LocalDateTime deliveryTime; + + /** + * 出库原因 + */ + @TableField(value = "reason_for_shipment") + private Integer reasonForShipment; + + /** + * 操作员编号 + */ + @TableField(value = "operator_id") + private String operatorId; + + /** + * 预制码编码 + */ + @TableField(value = "pre_code_encoding") + private String preCodeEncoding; + + /** + * 是否为业务员录入（1是 2否） + */ + @TableField(value = "is_enter") + private Integer isEnter; + + /** + * 上次服务结果 + */ + @TableField(value = "service_result") + private Integer serviceResult; + + /** + * 审核通过次数 + */ + @TableField(value = "times_pass") + private Integer timesPass; + + /** + * 巡检状态 1 已巡检 2 未巡检 + */ + @TableField(value = "inspection_status") + private Integer inspectionStatus; + + /** + * 巡检时间（上次业务员处理时间） + */ + @TableField(value = "inspection_time") + private LocalDateTime inspectionTime; +} 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 2e7c786..ec1f2a4 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 @@ -86,12 +86,6 @@ public class WrkInfoTerminalRecord extends BaseEntity { @TableField(value = "terminal_property") private Integer terminalProperty; - /** - * 是否占用 - */ - @TableField(value = "occupy") - private Integer occupy; - /** * 终端状态 */ diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/vo/WrkInfoDetailsVO.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/vo/WrkInfoDetailsVO.java index fd8dff9..ed8ded0 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/vo/WrkInfoDetailsVO.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/vo/WrkInfoDetailsVO.java @@ -1,6 +1,7 @@ package com.chushang.inspection.work.vo; import com.chushang.inspection.terminal.vo.FiveStoreVO; +import com.chushang.inspection.work.po.WrkInfoTerminalInsRecord; import lombok.Data; import java.io.Serial; @@ -27,6 +28,10 @@ public class WrkInfoDetailsVO implements java.io.Serializable{ * 工单终端 */ private WrkInfoTerminalVO infoTerminal; + /** + * 工单终端巡检信息 + */ + private WrkInfoTerminalInsVO infoTerminalIns; /** * 工单图片 */ diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/vo/WrkInfoStoreVO.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/vo/WrkInfoStoreVO.java index c19da0c..229afbf 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/vo/WrkInfoStoreVO.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/vo/WrkInfoStoreVO.java @@ -89,34 +89,4 @@ public class WrkInfoStoreVO implements Serializable { * 法人/负责人 */ private String legalName; - - /** - * 地理位置信息 - */ - private String geographicLocation; - - /** - * 地理位置信息地址 - */ - private String locationAddress; - - /** - * 本次巡检位置经纬度 - */ - private String workLocation; - - /** - * 本次巡检位置信息（根据经纬度） - */ - private String workAddress; - - /** - * 偏差（直线距离 米） - */ - private Long deviation; - - /** - * 预制码编码 - */ - private String preCodeEncoding; } diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/vo/WrkInfoTerminalInsVO.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/vo/WrkInfoTerminalInsVO.java new file mode 100644 index 0000000..14b5645 --- /dev/null +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/vo/WrkInfoTerminalInsVO.java @@ -0,0 +1,86 @@ +package com.chushang.inspection.work.vo; + +import com.baomidou.mybatisplus.annotation.TableField; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + * @auther: zhao + * @date: 2024/7/3 11:38 + */ +@Data +public class WrkInfoTerminalInsVO implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + /** + * 终端id + */ + private Long terminalId; + + /** + * 地理位置信息 + */ + private String geographicLocation; + + /** + * 地理位置信息地址 + */ + private String locationAddress; + + /** + * 本次巡检位置经纬度 + */ + private String workLocation; + + /** + * 本次巡检位置信息（根据经纬度） + */ + private String workAddress; + + /** + * 偏差（直线距离 米） + */ + private Long deviation; + + /** + * 预制码编码 + */ + private String preCodeEncoding; + /** + * 巡检结果 + */ + private Integer serviceResult; + /** + * 审核通过次数 + */ + private Integer timesPass; + + /** + * 巡检状态 1 已巡检 2 未巡检 + */ + private Integer inspectionStatus; + + /** + * 巡检时间（上次业务员处理时间） + */ + private LocalDateTime inspectionTime; + + /** + * 入库时间 + */ + private LocalDateTime storageTime; + + /** + * 出库时间 + */ + private LocalDateTime deliveryTime; + + /** + * 出库原因 + */ + private Integer reasonForShipment; + +} diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/common/controller/CommonController.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/common/controller/CommonController.java deleted file mode 100644 index b911e63..0000000 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/common/controller/CommonController.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.chushang.inspection.common.controller; - -import com.chushang.common.core.web.AjaxResult; -import com.chushang.common.log.annotation.SysLog; -import com.chushang.common.log.enums.BusinessType; -import com.chushang.inspection.common.service.CommonService; -import com.chushang.security.annotation.RequiresPermissions; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.multipart.MultipartFile; - -import javax.annotation.Resource; - -/** - * @auther: zhao - * @date: 2024/7/2 11:26 - */ -@RestController -@RequestMapping(value = "/common") -public class CommonController { - - @Resource - CommonService commonService; - - /** - * 上传文件上传 - */ - @SysLog(value = "上传模板", businessType = BusinessType.UPLOAD) - @PostMapping(value = "/upload") - @RequiresPermissions("ins:template:upload") - public AjaxResult templateUpload(@RequestParam("file") MultipartFile file, - @RequestParam("fileType") String fileType) - { - return AjaxResult.success(commonService.uploadFile(file, fileType)); - } - -} diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/common/service/CommonService.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/common/service/CommonService.java deleted file mode 100644 index ffb8eab..0000000 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/common/service/CommonService.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.chushang.inspection.common.service; - -import cn.hutool.core.collection.CollectionUtil; -import com.chushang.common.core.constant.SecurityConstants; -import com.chushang.common.core.exception.ResultException; -import com.chushang.common.core.web.Result; -import com.chushang.oss.entity.dto.UploadFileDTO; -import com.chushang.oss.entity.vo.FileSourceVo; -import com.chushang.oss.feign.RemoteOssService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import org.springframework.web.multipart.MultipartFile; - -import javax.annotation.Resource; -import java.util.List; - -/** - * @auther: zhao - * @date: 2024/7/2 11:25 - */ -@Slf4j -@Service -public class CommonService { - - @Resource - RemoteOssService remoteOssService; - - /** - * 上传文件 -- 公共 - */ - public FileSourceVo uploadFile(MultipartFile file, String fileType) { - // 上传模板信息 - Result> listResult = - remoteOssService.uploadFile(UploadFileDTO.builder() - .files(new MultipartFile[]{file}) - .build(), null, false, null, fileType, SecurityConstants.INNER); - if (listResult.isSuccess() && CollectionUtil.isNotEmpty(listResult.getData())){ - return listResult.getData().get(0); - } - throw new ResultException("上传失败"); - } - -} diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/TemplateController.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/TemplateController.java index 670d74c..2b03e90 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/TemplateController.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/TemplateController.java @@ -1,11 +1,14 @@ package com.chushang.inspection.project.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.chushang.common.core.validator.Create; import com.chushang.common.core.web.AjaxResult; import com.chushang.common.log.annotation.SysLog; import com.chushang.common.log.enums.BusinessType; import com.chushang.inspection.project.po.Template; import com.chushang.inspection.project.service.TbTemplateService; +import com.chushang.oss.entity.dto.UploadFileDTO; +import com.chushang.oss.feign.RemoteOssService; import com.chushang.security.annotation.RequiresPermissions; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -22,8 +25,26 @@ import javax.annotation.Resource; @RequestMapping(value = "/template") public class TemplateController { + /** + * 新增 模板, 然后 巡检单模板, 去进行筛选选择 + */ + @Resource TbTemplateService tbTemplateService; + + /** + * 获取全部类型的模板信息 + * 用于筛选 + * @param templateType 模板类型 + */ + @GetMapping(value = "/list") + public AjaxResult allList(@RequestParam(name = "templateType") String templateType){ + return AjaxResult.success(tbTemplateService.list( + new LambdaQueryWrapper