From ad8b3ec959d62317784514a3a6d0f46fc62a83d8 Mon Sep 17 00:00:00 2001 From: zhaowenyuan Date: Fri, 21 Jun 2024 16:57:22 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E4=BA=94=E5=95=86=E6=88=B7=20,=20?= =?UTF-8?q?=E7=BB=88=E7=AB=AF,=E5=95=86=E6=88=B7=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inspection/project/po/PollingTask.java | 2 +- .../project/po/PollingTaskAutograph.java | 2 +- .../inspection/project/po/UserAutograph.java | 2 +- .../inspection/terminal/po/FiveStore.java | 110 +++++++++ .../inspection/terminal/po/Store.java | 158 ++++++++++++ .../inspection/terminal/po/Terminal.java | 230 ++++++++++++++++++ .../query/FiveUnifiedStoreDetailsQuery.java | 40 +++ .../inspection/terminal/vo/FiveStoreVO.java | 142 +++++++++++ .../controller/FiveStoreController.java | 36 +++ .../terminal/controller/StoreController.java | 13 + .../controller/TerminalController.java | 13 + .../terminal/mapper/FiveStoreMapper.java | 11 + .../terminal/mapper/StoreMapper.java | 11 + .../terminal/mapper/TerminalMapper.java | 11 + .../terminal/service/FiveStoreService.java | 16 ++ .../terminal/service/StoreService.java | 13 + .../terminal/service/TerminalService.java | 13 + .../service/impl/FiveStoreServiceImpl.java | 24 ++ .../service/impl/StoreServiceImpl.java | 16 ++ .../service/impl/TerminalServiceImpl.java | 16 ++ .../src/main/resources/application.yml | 6 +- .../main/resources/mapper/FiveStoreMapper.xml | 36 +++ .../src/main/resources/mapper/StoreMapper.xml | 43 ++++ .../main/resources/mapper/TerminalMapper.xml | 58 +++++ 24 files changed, 1018 insertions(+), 4 deletions(-) create mode 100644 chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/po/FiveStore.java create mode 100644 chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/po/Store.java create mode 100644 chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/po/Terminal.java create mode 100644 chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/query/FiveUnifiedStoreDetailsQuery.java create mode 100644 chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/vo/FiveStoreVO.java create mode 100644 chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/controller/FiveStoreController.java create mode 100644 chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/controller/StoreController.java create mode 100644 chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/controller/TerminalController.java create mode 100644 chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/mapper/FiveStoreMapper.java create mode 100644 chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/mapper/StoreMapper.java create mode 100644 chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/mapper/TerminalMapper.java create mode 100644 chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/FiveStoreService.java create mode 100644 chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/StoreService.java create mode 100644 chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/TerminalService.java create mode 100644 chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/impl/FiveStoreServiceImpl.java create mode 100644 chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/impl/StoreServiceImpl.java create mode 100644 chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/impl/TerminalServiceImpl.java create mode 100644 chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/FiveStoreMapper.xml create mode 100644 chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/StoreMapper.xml create mode 100644 chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/TerminalMapper.xml diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/PollingTask.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/PollingTask.java index 1b55054..9c430fe 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/PollingTask.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/PollingTask.java @@ -25,7 +25,7 @@ import lombok.NoArgsConstructor; @EqualsAndHashCode(callSuper=true) @AllArgsConstructor @NoArgsConstructor -@TableName(value = "polling_task") +@TableName(value = "ta_polling_task") public class PollingTask extends BaseEntity { /** * 主键 diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/PollingTaskAutograph.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/PollingTaskAutograph.java index 822f2a2..ce7e66c 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/PollingTaskAutograph.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/PollingTaskAutograph.java @@ -17,7 +17,7 @@ import lombok.NoArgsConstructor; @Data @AllArgsConstructor @NoArgsConstructor -@TableName(value = "polling_task_autograph") +@TableName(value = "ta_polling_task_autograph") public class PollingTaskAutograph { /** * 签名所属任务 diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/UserAutograph.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/UserAutograph.java index 011ae47..5213330 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/UserAutograph.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/UserAutograph.java @@ -17,7 +17,7 @@ import lombok.NoArgsConstructor; @Builder @NoArgsConstructor @AllArgsConstructor -@TableName(value = "user_autograph") +@TableName(value = "sy_user_autograph") public class UserAutograph { /** diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/po/FiveStore.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/po/FiveStore.java new file mode 100644 index 0000000..20b4e37 --- /dev/null +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/po/FiveStore.java @@ -0,0 +1,110 @@ +package com.chushang.inspection.terminal.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 java.util.Date; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +/** + * @auther: zhao + * @date: 2024/6/21 16:39 + */ +/** + * 五统一商户明细(内蒙古建行随付贷) + */ +@Data +@EqualsAndHashCode(callSuper=true) +@AllArgsConstructor +@NoArgsConstructor +@TableName(value = "st_five_store") +public class FiveStore extends BaseEntity { + /** + * 五商户id + */ + @TableId(value = "five_id", type = IdType.ASSIGN_ID) + private Long fiveId; + + /** + * 终端id + */ + @TableField(value = "terminal_id") + private Long terminalId; + + /** + * 商户id + */ + @TableField(value = "store_id") + private Long storeId; + + /** + * 租户id + */ + @TableField(value = "dept_id") + private Long deptId; + + /** + * 一级分行id + */ + @TableField(value = "first_level_branch") + private Long firstLevelBranch; + + /** + * 二级分行 + */ + @TableField(value = "secondary_branches") + private Long secondaryBranches; + + /** + * 当年新签约商户标志 + */ + @TableField(value = "logo_of_newly_signed_merchants_that_year") + private Byte logoOfNewlySignedMerchantsThatYear; + + /** + * 当月新签约商户标志 + */ + @TableField(value = "logo_of_newly_signed_merchants_of_the_month") + private Byte logoOfNewlySignedMerchantsOfTheMonth; + + /** + * 当日新签约商户标志 + */ + @TableField(value = "logo_of_newly_signed_merchants_on_the_day") + private Byte logoOfNewlySignedMerchantsOnTheDay; + + /** + * 客户名称 + */ + @TableField(value = "client_name") + private String clientName; + + /** + * 客户身份标识 + */ + @TableField(value = "customer_id") + private Byte customerId; + + /** + * 营销日期 + */ + @TableField(value = "marketing_date") + private Date marketingDate; + + /** + * 消费日期 + */ + @TableField(value = "consumption_date") + private Date consumptionDate; + + /** + * 营销人 + */ + @TableField(value = "marketer") + private String marketer; +} 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 new file mode 100644 index 0000000..aa66fe9 --- /dev/null +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/po/Store.java @@ -0,0 +1,158 @@ +package com.chushang.inspection.terminal.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 java.util.Date; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +/** + * @auther: zhao + * @date: 2024/6/21 16:39 + */ +/** + * 商户信息表 + */ +@Data +@EqualsAndHashCode(callSuper=true) +@AllArgsConstructor +@NoArgsConstructor +@TableName(value = "st_store") +public class Store extends BaseEntity { + /** + * 主键 + */ + @TableId(value = "store_id", type = IdType.ASSIGN_ID) + private Long storeId; + + /** + * 任务id + */ + @TableField(value = "task_id") + private Long taskId; + + /** + * 下级任务id + */ + @TableField(value = "lower_task_id") + private Long lowerTaskId; + + /** + * 商户编号 + */ + @TableField(value = "store_no") + private String storeNo; + + /** + * 商户名称 + */ + @TableField(value = "store_name") + private String storeName; + + /** + * 商户联系人 + */ + @TableField(value = "store_contact") + private String storeContact; + + /** + * 商户联系电话 + */ + @TableField(value = "store_phone") + private String storePhone; + + /** + * 商户地址 + */ + @TableField(value = "store_address") + private String storeAddress; + + /** + * 商户特殊编号 + */ + @TableField(value = "special_num") + private String specialNum; + + /** + * 门店名称 + */ + @TableField(value = "shop_name") + private String shopName; + + /** + * 建档日期 + */ + @TableField(value = "register_time") + private Date registerTime; + + /** + * 商户类型 + */ + @TableField(value = "store_type") + private Byte storeType; + + /** + * 现有其他收单产品 + */ + @TableField(value = "products") + private String products; + + /** + * 商户提示工具 + */ + @TableField(value = "tip_tool") + private String tipTool; + + /** + * 操作员编号 + */ + @TableField(value = "admin_id") + private String adminId; + + /** + * 巡检频次 + */ + @TableField(value = "ins_fre") + private Byte 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 Byte isEnter; +} diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/po/Terminal.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/po/Terminal.java new file mode 100644 index 0000000..35233d5 --- /dev/null +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/po/Terminal.java @@ -0,0 +1,230 @@ +package com.chushang.inspection.terminal.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 java.util.Date; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +/** + * @auther: zhao + * @date: 2024/6/21 16:39 + */ +/** + * 终端信息表 + */ +@Data +@EqualsAndHashCode(callSuper=true) +@AllArgsConstructor +@NoArgsConstructor +@TableName(value = "st_terminal") +public class Terminal extends BaseEntity { + /** + * 主键 + */ + @TableId(value = "terminal_id", type = IdType.ASSIGN_ID) + private Long terminalId; + + /** + * 租户id + */ + @TableField(value = "dept_id") + private Long deptId; + + /** + * 任务id + */ + @TableField(value = "task_id") + private Long taskId; + + /** + * 下级任务id + */ + @TableField(value = "lower_task_id") + private Long lowerTaskId; + + /** + * 所属商户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; + + /** + * 终端类型 + */ + @TableField(value = "terminal_type") + private Byte terminalType; + + /** + * 终端型号 + */ + @TableField(value = "terminal_model") + private String terminalModel; + + /** + * 版本号 + */ + @TableField(value = "terminal_version") + private String terminalVersion; + + /** + * 终端地址 + */ + @TableField(value = "terminal_address") + private String terminalAddress; + + /** + * 终端来源 + */ + @TableField(value = "terminal_source") + private Byte terminalSource; + + /** + * 终端产权人 + */ + @TableField(value = "terminal_property") + private Byte terminalProperty; + + /** + * 是否占用 + */ + @TableField(value = "occupy") + private Boolean occupy; + + /** + * 终端状态 + */ + @TableField(value = "terminal_status") + private Byte terminalStatus; + + /** + * 状态 + */ + @TableField(value = "`state`") + private Byte state; + + /** + * 备注 + */ + @TableField(value = "remark") + private String remark; + + /** + * 银行资产管理码 + */ + @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_adderss") + private String workAdderss; + + /** + * 偏差（直线距离 米） + */ + @TableField(value = "deviation") + private Long deviation; + + /** + * 入库时间 + */ + @TableField(value = "storage_time") + private Date storageTime; + + /** + * 出库时间 + */ + @TableField(value = "delivery_time") + private Date deliveryTime; + + /** + * 出库原因 + */ + @TableField(value = "reason_for_shipment") + private Byte reasonForShipment; + + /** + * 操作员编号 + */ + @TableField(value = "operator_id") + private String operatorId; + + /** + * 预制码编码 + */ + @TableField(value = "precode_encoding") + private String precodeEncoding; + + /** + * 是否为业务员录入（1是 2否） + */ + @TableField(value = "is_enter") + private Byte isEnter; + + /** + * 上次服务结果 + */ + @TableField(value = "service_result") + private Byte serviceResult; + + /** + * 审核通过次数 + */ + @TableField(value = "times_pass") + private Integer timesPass; + + /** + * 巡检状态 1 已巡检 2 未巡检 + */ + @TableField(value = "inspection_status") + private Byte inspectionStatus; + + /** + * 巡检时间（上次业务员处理时间） + */ + @TableField(value = "inspection_time") + private Date inspectionTime; +} diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/query/FiveUnifiedStoreDetailsQuery.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/query/FiveUnifiedStoreDetailsQuery.java new file mode 100644 index 0000000..cce0393 --- /dev/null +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/query/FiveUnifiedStoreDetailsQuery.java @@ -0,0 +1,40 @@ +package com.chushang.inspection.terminal.query; + +import com.chushang.common.mybatis.annotation.Condition; +import com.chushang.common.mybatis.page.CommonParam; +import lombok.*; + +import javax.validation.constraints.Size; +import java.util.List; + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class FiveUnifiedStoreDetailsQuery extends CommonParam { + + /** + * 一级分行id + */ + @Condition(name = "first_level_branch") + private Long firstLevelBranch; + + /** + * 二级分行id + */ + @Condition(name = "secondary_branches", type = Condition.ConditionType.in) + private List secondaryBranches; + + /** + * 商户编号 + */ + @Size(max = 64, message = "商户编号不能超过64个字符") + private String no; + + /** + * 终端编号 + */ + @Size(max = 30, message = "终端sn号不能超过30个字符") + private String terminalNo; +} diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/vo/FiveStoreVO.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/vo/FiveStoreVO.java new file mode 100644 index 0000000..13f2dbf --- /dev/null +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/vo/FiveStoreVO.java @@ -0,0 +1,142 @@ +package com.chushang.inspection.terminal.vo; + +import cn.hutool.core.date.DatePattern; +import com.alibaba.excel.annotation.ExcelIgnore; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.format.DateTimeFormat; +import com.fasterxml.jackson.annotation.JsonIgnore; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDate; + +@Data +public class FiveStoreVO implements Serializable { + + /** + * 主键 + */ + @ExcelIgnore + private Long fiveId; + + /** + * 终端id + */ + @JsonIgnore + @ExcelIgnore + private Long terminalId; + + /** + * 终端编号 + */ + @ExcelProperty("终端编号") + private String terminalNo; + + /** + * 商户id + */ + @JsonIgnore + @ExcelIgnore + private Long storeId; + + /** + * 商户编号 + */ + @ExcelProperty("商户编号") + private String storeNo; + + /** + * 商户名称 + */ + @ExcelProperty("商户名称") + private String storeName; + + /** + * 一级分行id + */ + @JsonIgnore + @ExcelIgnore + private Long firstLevelBranch; + + /** + * 一级分行编号 + */ + @ExcelProperty("一级分行编号") + private String firstLevelBranchNumber; + + /** + * 一级分行名称 + */ + @ExcelProperty("一级分行名称") + private String firstLevelBranchName; + + + /** + * 二级分行 + */ + @JsonIgnore + @ExcelIgnore + private Long secondaryBranches; + + /** + * 二级分行编号 + */ + @ExcelProperty("二级分行编号") + private String secondaryBranchesNumber; + + /** + * 二级分行名称 + */ + @ExcelProperty("二级分行名称") + private String secondaryBranchesName; + + /** + * 当年新签约商户标志 + */ + @ExcelProperty("当年新签约商户标志") + private Integer logoOfNewlySignedMerchantsThatYear; + + /** + * 当月新签约商户标志 + */ + @ExcelProperty("当月新签约商户标志") + private Integer logoOfNewlySignedMerchantsOfTheMonth; + + /** + * 当日新签约商户标志 + */ + @ExcelProperty("当日新签约商户标志") + private Integer logoOfNewlySignedMerchantsOnTheDay; + + /** + * 客户名称 + */ + @ExcelProperty("客户名称") + private String clientName; + + /** + * 客户身份标识 + */ + @ExcelProperty("客户身份标识") + private Integer customerId; + + /** + * 营销日期 + */ + @ExcelProperty("营销日期") + @DateTimeFormat(DatePattern.CHINESE_DATE_PATTERN) + private LocalDate marketingDate; + + /** + * 消费日期 + */ + @ExcelProperty("消费日期") + @DateTimeFormat(DatePattern.CHINESE_DATE_PATTERN) + private LocalDate consumptionDate; + + /** + * 营销人 + */ + @ExcelProperty("营销人") + private String marketer; +} diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/controller/FiveStoreController.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/controller/FiveStoreController.java new file mode 100644 index 0000000..c1dce83 --- /dev/null +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/controller/FiveStoreController.java @@ -0,0 +1,36 @@ +package com.chushang.inspection.terminal.controller; + +import com.chushang.common.core.web.AjaxResult; +import com.chushang.inspection.terminal.query.FiveUnifiedStoreDetailsQuery; +import com.chushang.inspection.terminal.service.FiveStoreService; +import com.chushang.security.annotation.RequiresPermissions; +import lombok.extern.java.Log; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; + +/** +* 五统一商户明细(内蒙古建行随付贷)(st_five_store)表控制层 +* +* @author xxxxx +*/ +@RestController +@RequestMapping("/store/five") +public class FiveStoreController { + + + @Resource + FiveStoreService fiveStoreService; + + /** + * 分页查询五统一商户明细（内蒙古建行随付贷） + */ + @GetMapping("/page") + @RequiresPermissions("five:unified:store") + public AjaxResult pageList(@Validated FiveUnifiedStoreDetailsQuery query) { + return AjaxResult.success(fiveStoreService.pageList(query)); + } + + +} diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/controller/StoreController.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/controller/StoreController.java new file mode 100644 index 0000000..b65d223 --- /dev/null +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/controller/StoreController.java @@ -0,0 +1,13 @@ +package com.chushang.inspection.terminal.controller; + +import org.springframework.web.bind.annotation.*; + +/** +* 商户信息表(st_store)表控制层 +* +* @author xxxxx +*/ +@RestController +@RequestMapping("/store") +public class StoreController { +} 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 new file mode 100644 index 0000000..da856c2 --- /dev/null +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/controller/TerminalController.java @@ -0,0 +1,13 @@ +package com.chushang.inspection.terminal.controller; + +import org.springframework.web.bind.annotation.*; + +/** +* 终端信息表(st_terminal)表控制层 +* +* @author xxxxx +*/ +@RestController +@RequestMapping("/terminal") +public class TerminalController { +} diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/mapper/FiveStoreMapper.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/mapper/FiveStoreMapper.java new file mode 100644 index 0000000..bd0d0d8 --- /dev/null +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/mapper/FiveStoreMapper.java @@ -0,0 +1,11 @@ +package com.chushang.inspection.terminal.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.chushang.inspection.terminal.po.FiveStore; + +/** + * @auther: zhao + * @date: 2024/6/21 16:39 + */ +public interface FiveStoreMapper extends BaseMapper { +} diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/mapper/StoreMapper.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/mapper/StoreMapper.java new file mode 100644 index 0000000..2460f16 --- /dev/null +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/mapper/StoreMapper.java @@ -0,0 +1,11 @@ +package com.chushang.inspection.terminal.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.chushang.inspection.terminal.po.Store; + +/** + * @auther: zhao + * @date: 2024/6/21 16:39 + */ +public interface StoreMapper extends BaseMapper { +} diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/mapper/TerminalMapper.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/mapper/TerminalMapper.java new file mode 100644 index 0000000..6c0c7be --- /dev/null +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/mapper/TerminalMapper.java @@ -0,0 +1,11 @@ +package com.chushang.inspection.terminal.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.chushang.inspection.terminal.po.Terminal; + +/** + * @auther: zhao + * @date: 2024/6/21 16:39 + */ +public interface TerminalMapper extends BaseMapper { +} diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/FiveStoreService.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/FiveStoreService.java new file mode 100644 index 0000000..aed06d9 --- /dev/null +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/FiveStoreService.java @@ -0,0 +1,16 @@ +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.po.FiveStore; +import com.chushang.inspection.terminal.query.FiveUnifiedStoreDetailsQuery; + +/** + * @auther: zhao + * @date: 2024/6/21 16:39 + */ +public interface FiveStoreService extends IService{ + + + PageResult pageList(FiveUnifiedStoreDetailsQuery query); +} diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/StoreService.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/StoreService.java new file mode 100644 index 0000000..d6aafa5 --- /dev/null +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/StoreService.java @@ -0,0 +1,13 @@ +package com.chushang.inspection.terminal.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.chushang.inspection.terminal.po.Store; + +/** + * @auther: zhao + * @date: 2024/6/21 16:39 + */ +public interface StoreService extends IService{ + + +} 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 new file mode 100644 index 0000000..9bfcd52 --- /dev/null +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/TerminalService.java @@ -0,0 +1,13 @@ +package com.chushang.inspection.terminal.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.chushang.inspection.terminal.po.Terminal; + +/** + * @auther: zhao + * @date: 2024/6/21 16:39 + */ +public interface TerminalService extends IService{ + + +} diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/impl/FiveStoreServiceImpl.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/impl/FiveStoreServiceImpl.java new file mode 100644 index 0000000..6fa1d5e --- /dev/null +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/impl/FiveStoreServiceImpl.java @@ -0,0 +1,24 @@ +package com.chushang.inspection.terminal.service.impl; + +import com.chushang.common.mybatis.utils.PageResult; +import com.chushang.datascope.annotation.DataScope; +import com.chushang.inspection.terminal.po.FiveStore; +import com.chushang.inspection.terminal.query.FiveUnifiedStoreDetailsQuery; +import com.chushang.inspection.terminal.service.FiveStoreService; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.chushang.inspection.terminal.mapper.FiveStoreMapper; + +/** + * @auther: zhao + * @date: 2024/6/21 16:39 + */ +@Service +public class FiveStoreServiceImpl extends ServiceImpl implements FiveStoreService { + + @Override + @DataScope + public PageResult pageList(FiveUnifiedStoreDetailsQuery query) { + return null; + } +} diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/impl/StoreServiceImpl.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/impl/StoreServiceImpl.java new file mode 100644 index 0000000..7e6e78c --- /dev/null +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/impl/StoreServiceImpl.java @@ -0,0 +1,16 @@ +package com.chushang.inspection.terminal.service.impl; + +import com.chushang.inspection.terminal.po.Store; +import com.chushang.inspection.terminal.service.StoreService; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.chushang.inspection.terminal.mapper.StoreMapper; + +/** + * @auther: zhao + * @date: 2024/6/21 16:39 + */ +@Service +public class StoreServiceImpl extends ServiceImpl implements StoreService { + +} 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 new file mode 100644 index 0000000..292e602 --- /dev/null +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/impl/TerminalServiceImpl.java @@ -0,0 +1,16 @@ +package com.chushang.inspection.terminal.service.impl; + +import com.chushang.inspection.terminal.po.Terminal; +import com.chushang.inspection.terminal.service.TerminalService; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.chushang.inspection.terminal.mapper.TerminalMapper; + +/** + * @auther: zhao + * @date: 2024/6/21 16:39 + */ +@Service +public class TerminalServiceImpl extends ServiceImpl implements TerminalService { + +} diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/application.yml b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/application.yml index 2485068..89e62e5 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/application.yml +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/application.yml @@ -3,13 +3,17 @@ server: shutdown: graceful port: 8086 servlet: - context-path: /task + context-path: /inspection tomcat: uri-encoding: UTF-8 threads: max: 800 min-spare: 100 spring: + cache: + type: redis + redis: + cache-null-values: true servlet: multipart: # 修改上传文件临时路径为 /data1/tmp diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/FiveStoreMapper.xml b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/FiveStoreMapper.xml new file mode 100644 index 0000000..fa858f9 --- /dev/null +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/FiveStoreMapper.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + five_id, terminal_id, store_id, dept_id, first_level_branch, secondary_branches, + logo_of_newly_signed_merchants_that_year, logo_of_newly_signed_merchants_of_the_month, + logo_of_newly_signed_merchants_on_the_day, client_name, customer_id, marketing_date, + consumption_date, marketer, version, del_state, create_by, create_time, update_by, + update_time + + 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 new file mode 100644 index 0000000..d51c824 --- /dev/null +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/StoreMapper.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + store_id, task_id, lower_task_id, store_no, store_name, store_contact, store_phone, + store_address, special_num, shop_name, register_time, store_type, products, tip_tool, + admin_id, ins_fre, account_manager, account_phone, register_address, dept_id, legal_name, + is_enter, version, del_state, create_by, create_time, update_by, update_time + + 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 new file mode 100644 index 0000000..ba084be --- /dev/null +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/TerminalMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + terminal_id, dept_id, task_id, lower_task_id, store_id, store_no, terminal_sn, terminal_no, + terminal_type, terminal_model, terminal_version, terminal_address, terminal_source, + terminal_property, occupy, terminal_status, `state`, remark, management_code, geographic_location, + geographic_address, work_location, work_adderss, deviation, storage_time, delivery_time, + reason_for_shipment, operator_id, precode_encoding, is_enter, service_result, times_pass, + inspection_status, inspection_time, version, del_state, create_by, create_time, update_by, + update_time + +