Merge branch 'main' of http://124.220.209.120:3010/renfan/charging_pile

# Conflicts:
#	admin/src/main/java/com/hcy/admin/validate/client/EquipmentParam.java
#	admin/src/main/java/com/hcy/admin/vo/client/EquipmentListVo.java
#	common/src/main/java/com/hcy/common/entity/client/Equipment.java

.gitignore

@@ -24,3 +24,9 @@
 hs_err_pid*
 replay_pid*
 
+www/wwwroot/java-smyy/server/like-admin/admin-log4j2-ERROR-2024-07-26_1.log.gz
+www/wwwroot/java-smyy/server/like-admin/admin-log4j2-WARN-2024-08-01_1.log.gz
+www/wwwroot/java-smyy/server/like-admin/admin-log4j2-ERROR-2024-08-03_1.log.gz
+www/wwwroot/java-smyy/server/like-admin/admin-log4j2-INFO-2024-08-03_1.log.gz
+www/wwwroot/java-smyy/server/like-admin/admin-log4j2-WARN-2024-08-04_1.log.gz
+www/wwwroot/java-smyy/server/like-admin/admin-log4j2-INFO-2024-08-04_1.log.gz

admin/src/main/java/com/hcy/admin/controller/client/ClientContactsController.java

@@ -0,0 +1,102 @@
+package com.hcy.admin.controller.client;
+
+import com.hcy.admin.config.aop.Log;
+import com.hcy.admin.service.client.IClientContactsService;
+import com.hcy.admin.validate.client.ClientContactsParam;
+import com.hcy.admin.validate.common.PageParam;
+import com.hcy.admin.vo.client.ClientContactsDetailVo;
+import com.hcy.admin.vo.client.ClientContactsListVo;
+import com.hcy.common.core.AjaxResult;
+import com.hcy.common.core.PageResult;
+import com.hcy.common.validator.annotation.IDMust;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 客户联系人管理
+ */
+@RestController
+@RequestMapping("api/contacts")
+public class ClientContactsController {
+
+    @Resource
+    IClientContactsService iClientContactsService;
+
+    /**
+     * 客户联系人列表
+     *
+     * @param clientContactsParam 参数
+     * @return Object
+     */
+    @GetMapping("/list")
+    public Object list(ClientContactsParam clientContactsParam) {
+        return AjaxResult.success(iClientContactsService.list(clientContactsParam));
+    }
+    /**
+     * 客户联系人详情
+     *
+     * @param id 主键ID
+     * @return Object
+     */
+    @GetMapping("/detail")
+    public Object detail(@Validated @IDMust() @RequestParam("id") Integer id) {
+        ClientContactsDetailVo detail = iClientContactsService.detail(id);
+        return AjaxResult.success(detail);
+    }
+
+    /**
+     * 客户联系人新增
+     *
+     * @param clientContactsParam 参数
+     * @return Object
+     */
+    @Log(title = "客户联系人新增")
+    @PostMapping("/add")
+    public Object add(@Validated(value = ClientContactsParam.create.class) @RequestBody ClientContactsParam clientContactsParam) {
+        iClientContactsService.add(clientContactsParam);
+        return AjaxResult.success();
+    }
+
+    /**
+     * 客户联系人编辑
+     *
+     * @param clientContactsParam 参数
+     * @return Object
+     */
+    @Log(title = "客户联系人编辑")
+    @PostMapping("/edit")
+    public Object edit(@Validated(value = ClientContactsParam.update.class) @RequestBody ClientContactsParam clientContactsParam) {
+        iClientContactsService.edit(clientContactsParam);
+        return AjaxResult.success();
+    }
+
+    /**
+     * 修改联系人状态
+     * @param clientContactsParam 参数
+     * @return Object
+     */
+    @Log(title = "修改联系人状态")
+    @PostMapping("/editStatus")
+    public Object editStatus(@RequestBody ClientContactsParam clientContactsParam) {
+        iClientContactsService.editStatus(clientContactsParam);
+        return AjaxResult.success();
+    }
+
+    /**
+     * 客户联系人删除
+     *
+     * @param clientContactsParam 参数
+     * @return Object
+     */
+    @Log(title = "客户联系人删除")
+    @PostMapping("/del")
+    public Object del(@Validated(value = ClientContactsParam.delete.class) @RequestBody ClientContactsParam clientContactsParam) {
+        iClientContactsService.del(clientContactsParam.getId());
+        return AjaxResult.success();
+    }
+
+}

admin/src/main/java/com/hcy/admin/controller/client/ClientController.java

@@ -0,0 +1,92 @@
+package com.hcy.admin.controller.client;
+
+import com.hcy.admin.config.aop.Log;
+import com.hcy.admin.service.client.IClientService;
+import com.hcy.admin.validate.client.ClientParam;
+import com.hcy.admin.validate.common.PageParam;
+import com.hcy.admin.vo.client.ClientListVo;
+import com.hcy.admin.vo.client.ClientDetailVo;
+import com.hcy.common.core.AjaxResult;
+import com.hcy.common.core.PageResult;
+import com.hcy.common.validator.annotation.IDMust;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Map;
+
+/**
+ * 客户管理
+ */
+@RestController
+@RequestMapping("api/client")
+public class ClientController {
+
+    @Resource
+    IClientService iClientService;
+
+    /**
+     * 客户列表
+     *
+     * @param pageParam 分页参数
+     * @param params 搜索参数
+     * @return Object
+     */
+    @GetMapping("/list")
+    public Object list(@Validated PageParam pageParam,
+                       @RequestParam Map<String, String> params) {
+        PageResult<ClientListVo> list = iClientService.list(pageParam, params);
+        return AjaxResult.success(list);
+    }
+    /**
+     * 客户详情
+     *
+     * @param id 主键ID
+     * @return Object
+     */
+    @GetMapping("/detail")
+    public Object detail(@Validated @IDMust() @RequestParam("id") Integer id) {
+        ClientDetailVo detail = iClientService.detail(id);
+        return AjaxResult.success(detail);
+    }
+
+    /**
+     * 客户新增
+     *
+     * @param clientParam 参数
+     * @return Object
+     */
+    @Log(title = "客户新增")
+    @PostMapping("/add")
+    public Object add(@Validated(value = ClientParam.create.class) @RequestBody ClientParam clientParam) {
+        iClientService.add(clientParam);
+        return AjaxResult.success();
+    }
+
+    /**
+     * 客户编辑
+     *
+     * @param clientParam 参数
+     * @return Object
+     */
+    @Log(title = "客户编辑")
+    @PostMapping("/edit")
+    public Object edit(@Validated(value = ClientParam.update.class) @RequestBody ClientParam clientParam) {
+        iClientService.edit(clientParam);
+        return AjaxResult.success();
+    }
+
+    /**
+     * 客户删除
+     *
+     * @param clientParam 参数
+     * @return Object
+     */
+    @Log(title = "客户删除")
+    @PostMapping("/del")
+    public Object del(@Validated(value = ClientParam.delete.class) @RequestBody ClientParam clientParam) {
+        iClientService.del(clientParam.getId());
+        return AjaxResult.success();
+    }
+
+}

admin/src/main/java/com/hcy/admin/controller/client/EquipmentController.java

@@ -1,12 +1,11 @@
-package com.hcy.admin.controller.equipment;
+package com.hcy.admin.controller.client;
 
 import com.hcy.admin.config.aop.Log;
-import com.hcy.admin.service.equipment.IEquipmentService;
+import com.hcy.admin.service.client.IEquipmentService;
-import com.hcy.admin.validate.commonFault.CommonFaultParam;
+import com.hcy.admin.validate.client.EquipmentParam;
-import com.hcy.admin.validate.equipment.EquipmentParam;
 import com.hcy.admin.validate.common.PageParam;
-import com.hcy.admin.vo.equipment.EquipmentListVo;
+import com.hcy.admin.vo.client.EquipmentListVo;
-import com.hcy.admin.vo.equipment.EquipmentDetailVo;
+import com.hcy.admin.vo.client.EquipmentDetailVo;
 import com.hcy.common.core.AjaxResult;
 import com.hcy.common.core.PageResult;
 import com.hcy.common.utils.QRCodeUtil;
@@ -15,7 +14,6 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Map;
 

admin/src/main/java/com/hcy/admin/controller/fault/FaultController.java

@@ -0,0 +1,92 @@
+package com.hcy.admin.controller.fault;
+
+import com.hcy.admin.config.aop.Log;
+import com.hcy.admin.service.fault.IFaultService;
+import com.hcy.admin.validate.fault.FaultParam;
+import com.hcy.admin.validate.common.PageParam;
+import com.hcy.admin.vo.fault.FaultListVo;
+import com.hcy.admin.vo.fault.FaultDetailVo;
+import com.hcy.common.core.AjaxResult;
+import com.hcy.common.core.PageResult;
+import com.hcy.common.validator.annotation.IDMust;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Map;
+
+/**
+ * 常见故障管理
+ */
+@RestController
+@RequestMapping("api/fault")
+public class FaultController {
+
+    @Resource
+    IFaultService iFaultService;
+
+    /**
+     * 常见故障列表
+     *
+     * @param pageParam 分页参数
+     * @param faultParam 搜索参数
+     * @return Object
+     */
+    @GetMapping("/list")
+    public Object list(@Validated PageParam pageParam,
+                       @RequestParam FaultParam faultParam) {
+        PageResult<FaultListVo> list = iFaultService.list(pageParam, faultParam);
+        return AjaxResult.success(list);
+    }
+    /**
+     * 常见故障详情
+     *
+     * @param id 主键ID
+     * @return Object
+     */
+    @GetMapping("/detail")
+    public Object detail(@Validated @IDMust() @RequestParam("id") Integer id) {
+        FaultDetailVo detail = iFaultService.detail(id);
+        return AjaxResult.success(detail);
+    }
+
+    /**
+     * 常见故障新增
+     *
+     * @param faultParam 参数
+     * @return Object
+     */
+    @Log(title = "常见故障新增")
+    @PostMapping("/add")
+    public Object add(@Validated(value = FaultParam.create.class) @RequestBody FaultParam faultParam) {
+        iFaultService.add(faultParam);
+        return AjaxResult.success();
+    }
+
+    /**
+     * 常见故障编辑
+     *
+     * @param faultParam 参数
+     * @return Object
+     */
+    @Log(title = "常见故障编辑")
+    @PostMapping("/edit")
+    public Object edit(@Validated(value = FaultParam.update.class) @RequestBody FaultParam faultParam) {
+        iFaultService.edit(faultParam);
+        return AjaxResult.success();
+    }
+
+    /**
+     * 常见故障删除
+     *
+     * @param faultParam 参数
+     * @return Object
+     */
+    @Log(title = "常见故障删除")
+    @PostMapping("/del")
+    public Object del(@Validated(value = FaultParam.delete.class) @RequestBody FaultParam faultParam) {
+        iFaultService.del(faultParam.getId());
+        return AjaxResult.success();
+    }
+
+}

admin/src/main/java/com/hcy/admin/controller/order/MaintenanceOrderController.java

@@ -0,0 +1,92 @@
+package com.hcy.admin.controller.order;
+
+import com.hcy.admin.config.aop.Log;
+import com.hcy.admin.service.order.IMaintenanceOrderService;
+import com.hcy.admin.validate.order.MaintenanceOrderParam;
+import com.hcy.admin.validate.common.PageParam;
+import com.hcy.admin.vo.order.MaintenanceOrderListVo;
+import com.hcy.admin.vo.order.MaintenanceOrderDetailVo;
+import com.hcy.common.core.AjaxResult;
+import com.hcy.common.core.PageResult;
+import com.hcy.common.validator.annotation.IDMust;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Map;
+
+/**
+ * 检修订单管理
+ */
+@RestController
+@RequestMapping("api/maintenanceOrder")
+public class MaintenanceOrderController {
+
+    @Resource
+    IMaintenanceOrderService iMaintenanceOrderService;
+
+    /**
+     * 检修订单列表
+     *
+     * @param pageParam 分页参数
+     * @param params 搜索参数
+     * @return Object
+     */
+    @GetMapping("/list")
+    public Object list(@Validated PageParam pageParam,
+                       @RequestParam Map<String, String> params) {
+        PageResult<MaintenanceOrderListVo> list = iMaintenanceOrderService.list(pageParam, params);
+        return AjaxResult.success(list);
+    }
+    /**
+     * 检修订单详情
+     *
+     * @param id 主键ID
+     * @return Object
+     */
+    @GetMapping("/detail")
+    public Object detail(@Validated @IDMust() @RequestParam("id") Integer id) {
+        MaintenanceOrderDetailVo detail = iMaintenanceOrderService.detail(id);
+        return AjaxResult.success(detail);
+    }
+
+    /**
+     * 检修订单新增
+     *
+     * @param maintenanceOrderParam 参数
+     * @return Object
+     */
+    @Log(title = "检修订单新增")
+    @PostMapping("/add")
+    public Object add(@Validated(value = MaintenanceOrderParam.create.class) @RequestBody MaintenanceOrderParam maintenanceOrderParam) {
+        iMaintenanceOrderService.add(maintenanceOrderParam);
+        return AjaxResult.success();
+    }
+
+    /**
+     * 检修订单编辑
+     *
+     * @param maintenanceOrderParam 参数
+     * @return Object
+     */
+    @Log(title = "检修订单编辑")
+    @PostMapping("/edit")
+    public Object edit(@Validated(value = MaintenanceOrderParam.update.class) @RequestBody MaintenanceOrderParam maintenanceOrderParam) {
+        iMaintenanceOrderService.edit(maintenanceOrderParam);
+        return AjaxResult.success();
+    }
+
+    /**
+     * 检修订单删除
+     *
+     * @param maintenanceOrderParam 参数
+     * @return Object
+     */
+    @Log(title = "检修订单删除")
+    @PostMapping("/del")
+    public Object del(@Validated(value = MaintenanceOrderParam.delete.class) @RequestBody MaintenanceOrderParam maintenanceOrderParam) {
+        iMaintenanceOrderService.del(maintenanceOrderParam.getId());
+        return AjaxResult.success();
+    }
+
+}

admin/src/main/java/com/hcy/admin/controller/order/OrderPartController.java

@@ -0,0 +1,92 @@
+package com.hcy.admin.controller.order;
+
+import com.hcy.admin.config.aop.Log;
+import com.hcy.admin.service.order.IOrderPartService;
+import com.hcy.admin.validate.common.PageParam;
+import com.hcy.admin.validate.order.OrderPartParam;
+import com.hcy.admin.vo.order.OrderPartDetailVo;
+import com.hcy.admin.vo.order.OrderPartListVo;
+import com.hcy.common.core.AjaxResult;
+import com.hcy.common.core.PageResult;
+import com.hcy.common.validator.annotation.IDMust;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Map;
+
+/**
+ * 订单配件管理
+ */
+@RestController
+@RequestMapping("api/part")
+public class OrderPartController {
+
+    @Resource
+    IOrderPartService iOrderPartService;
+
+    /**
+     * 订单配件列表
+     *
+     * @param pageParam 分页参数
+     * @param params 搜索参数
+     * @return Object
+     */
+    @GetMapping("/list")
+    public Object list(@Validated PageParam pageParam,
+                       @RequestParam Map<String, String> params) {
+        PageResult<OrderPartListVo> list = iOrderPartService.list(pageParam, params);
+        return AjaxResult.success(list);
+    }
+    /**
+     * 订单配件详情
+     *
+     * @param id 主键ID
+     * @return Object
+     */
+    @GetMapping("/detail")
+    public Object detail(@Validated @IDMust() @RequestParam("id") Integer id) {
+        OrderPartDetailVo detail = iOrderPartService.detail(id);
+        return AjaxResult.success(detail);
+    }
+
+    /**
+     * 订单配件新增
+     *
+     * @param orderPartParam 参数
+     * @return Object
+     */
+    @Log(title = "订单配件新增")
+    @PostMapping("/add")
+    public Object add(@Validated(value = OrderPartParam.create.class) @RequestBody OrderPartParam orderPartParam) {
+        iOrderPartService.add(orderPartParam);
+        return AjaxResult.success();
+    }
+
+    /**
+     * 订单配件编辑
+     *
+     * @param orderPartParam 参数
+     * @return Object
+     */
+    @Log(title = "订单配件编辑")
+    @PostMapping("/edit")
+    public Object edit(@Validated(value = OrderPartParam.update.class) @RequestBody OrderPartParam orderPartParam) {
+        iOrderPartService.edit(orderPartParam);
+        return AjaxResult.success();
+    }
+
+    /**
+     * 订单配件删除
+     *
+     * @param orderPartParam 参数
+     * @return Object
+     */
+    @Log(title = "订单配件删除")
+    @PostMapping("/del")
+    public Object del(@Validated(value = OrderPartParam.delete.class) @RequestBody OrderPartParam orderPartParam) {
+        iOrderPartService.del(orderPartParam.getId());
+        return AjaxResult.success();
+    }
+
+}

admin/src/main/java/com/hcy/admin/controller/order/repair/MaintenanceRepairController.java

@@ -0,0 +1,92 @@
+package com.hcy.admin.controller.order.repair;
+
+import com.hcy.admin.config.aop.Log;
+import com.hcy.admin.service.order.IMaintenanceRepairService;
+import com.hcy.admin.validate.common.PageParam;
+import com.hcy.admin.validate.order.repair.MaintenanceRepairParam;
+import com.hcy.admin.vo.order.repair.MaintenanceRepairDetailVo;
+import com.hcy.admin.vo.order.repair.MaintenanceRepairListVo;
+import com.hcy.common.core.AjaxResult;
+import com.hcy.common.core.PageResult;
+import com.hcy.common.validator.annotation.IDMust;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Map;
+
+/**
+ * 旧模块返修信息管理
+ */
+@RestController
+@RequestMapping("api/repair")
+public class MaintenanceRepairController {
+
+    @Resource
+    IMaintenanceRepairService iMaintenanceRepairService;
+
+    /**
+     * 旧模块返修信息列表
+     *
+     * @param pageParam 分页参数
+     * @param params 搜索参数
+     * @return Object
+     */
+    @GetMapping("/list")
+    public Object list(@Validated PageParam pageParam,
+                       @RequestParam Map<String, String> params) {
+        PageResult<MaintenanceRepairListVo> list = iMaintenanceRepairService.list(pageParam, params);
+        return AjaxResult.success(list);
+    }
+    /**
+     * 旧模块返修信息详情
+     *
+     * @param id 主键ID
+     * @return Object
+     */
+    @GetMapping("/detail")
+    public Object detail(@Validated @IDMust() @RequestParam("id") Integer id) {
+        MaintenanceRepairDetailVo detail = iMaintenanceRepairService.detail(id);
+        return AjaxResult.success(detail);
+    }
+
+    /**
+     * 旧模块返修信息新增
+     *
+     * @param maintenanceRepairParam 参数
+     * @return Object
+     */
+    @Log(title = "旧模块返修信息新增")
+    @PostMapping("/add")
+    public Object add(@Validated(value = MaintenanceRepairParam.create.class) @RequestBody MaintenanceRepairParam maintenanceRepairParam) {
+        iMaintenanceRepairService.add(maintenanceRepairParam);
+        return AjaxResult.success();
+    }
+
+    /**
+     * 旧模块返修信息编辑
+     *
+     * @param maintenanceRepairParam 参数
+     * @return Object
+     */
+    @Log(title = "旧模块返修信息编辑")
+    @PostMapping("/edit")
+    public Object edit(@Validated(value = MaintenanceRepairParam.update.class) @RequestBody MaintenanceRepairParam maintenanceRepairParam) {
+        iMaintenanceRepairService.edit(maintenanceRepairParam);
+        return AjaxResult.success();
+    }
+
+    /**
+     * 旧模块返修信息删除
+     *
+     * @param maintenanceRepairParam 参数
+     * @return Object
+     */
+    @Log(title = "旧模块返修信息删除")
+    @PostMapping("/del")
+    public Object del(@Validated(value = MaintenanceRepairParam.delete.class) @RequestBody MaintenanceRepairParam maintenanceRepairParam) {
+        iMaintenanceRepairService.del(maintenanceRepairParam.getId());
+        return AjaxResult.success();
+    }
+
+}

admin/src/main/java/com/hcy/admin/service/client/IClientContactsService.java

@@ -0,0 +1,61 @@
+package com.hcy.admin.service.client;
+
+import com.hcy.admin.validate.client.ClientContactsParam;
+import com.hcy.admin.validate.common.PageParam;
+import com.hcy.admin.vo.client.ClientContactsDetailVo;
+import com.hcy.admin.vo.client.ClientContactsListVo;
+import com.hcy.common.core.PageResult;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 客户联系人服务接口类
+ */
+public interface IClientContactsService {
+
+    /**
+     * 客户联系人列表
+     *
+     * @param clientContactsParam 参数
+     * @return PageResult<ClientContactsVo>
+     */
+    List<ClientContactsListVo> list(ClientContactsParam clientContactsParam);
+
+    /**
+     * 客户联系人详情
+     *
+     * @param id 主键ID
+     * @return ClientContacts
+     */
+    ClientContactsDetailVo detail(Integer id);
+
+    /**
+     * 客户联系人新增
+     *
+     * @param clientContactsParam 参数
+     */
+    void add(ClientContactsParam clientContactsParam);
+
+    /**
+     * 客户联系人编辑
+     *
+     * @param clientContactsParam 参数
+     */
+    void edit(ClientContactsParam clientContactsParam);
+
+    /**
+     * 修改联系人状态
+     *
+     * @param clientContactsParam 参数
+     */
+    void editStatus(ClientContactsParam clientContactsParam);
+
+    /**
+     * 客户联系人删除
+     *
+     * @param id 主键ID
+     */
+    void del(Long id);
+
+}

admin/src/main/java/com/hcy/admin/service/client/IClientService.java

@@ -0,0 +1,54 @@
+package com.hcy.admin.service.client;
+
+import com.hcy.admin.validate.common.PageParam;
+import com.hcy.admin.validate.client.ClientParam;
+import com.hcy.admin.vo.client.ClientListVo;
+import com.hcy.admin.vo.client.ClientDetailVo;
+import com.hcy.common.core.PageResult;
+
+import java.util.Map;
+
+/**
+ * 客户服务接口类
+ */
+public interface IClientService {
+
+    /**
+     * 客户列表
+     *
+     * @param pageParam 分页参数
+     * @param params 搜索参数
+     * @return PageResult<ClientVo>
+     */
+    PageResult<ClientListVo> list(PageParam pageParam, Map<String, String> params);
+
+    /**
+     * 客户详情
+     *
+     * @param id 主键ID
+     * @return Client
+     */
+    ClientDetailVo detail(Integer id);
+
+    /**
+     * 客户新增
+     *
+     * @param clientParam 参数
+     */
+    void add(ClientParam clientParam);
+
+    /**
+     * 客户编辑
+     *
+     * @param clientParam 参数
+     */
+    void edit(ClientParam clientParam);
+
+    /**
+     * 客户删除
+     *
+     * @param id 主键ID
+     */
+    void del(Long id);
+
+}

admin/src/main/java/com/hcy/admin/service/client/IEquipmentService.java

@@ -1,9 +1,9 @@
-package com.hcy.admin.service.equipment;
+package com.hcy.admin.service.client;
 
 import com.hcy.admin.validate.common.PageParam;
-import com.hcy.admin.validate.equipment.EquipmentParam;
+import com.hcy.admin.validate.client.EquipmentParam;
-import com.hcy.admin.vo.equipment.EquipmentListVo;
+import com.hcy.admin.vo.client.EquipmentListVo;
-import com.hcy.admin.vo.equipment.EquipmentDetailVo;
+import com.hcy.admin.vo.client.EquipmentDetailVo;
 import com.hcy.common.core.PageResult;
 
 import java.util.List;

admin/src/main/java/com/hcy/admin/service/client/impl/ClientContactsServiceImpl.java

@@ -0,0 +1,177 @@
+package com.hcy.admin.service.client.impl;
+
+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.hcy.admin.AdminThreadLocal;
+import com.hcy.admin.service.client.IClientContactsService;
+import com.hcy.admin.service.region.IDevRegionService;
+import com.hcy.admin.validate.client.ClientContactsParam;
+import com.hcy.admin.validate.common.PageParam;
+import com.hcy.admin.vo.client.ClientContactsDetailVo;
+import com.hcy.admin.vo.client.ClientContactsListVo;
+import com.hcy.common.constant.GlobalConstant;
+import com.hcy.common.core.PageResult;
+import com.hcy.common.entity.client.Client;
+import com.hcy.common.entity.client.ClientContacts;
+import com.hcy.common.exception.OperateException;
+import com.hcy.common.mapper.client.ClientContactsMapper;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.util.Assert;
+
+import javax.annotation.Resource;
+import java.util.*;
+
+/**
+ * 客户联系人实现类
+ */
+@Service
+public class ClientContactsServiceImpl implements IClientContactsService {
+        
+    @Resource
+    ClientContactsMapper clientContactsMapper;
+
+    @Resource
+    private IDevRegionService regionService;
+
+    /**
+     * 客户联系人列表
+     *
+     * @param clientContactsParam 参数
+     * @return List<ClientContactsListVo>
+     */
+    @Override
+    public List<ClientContactsListVo> list(ClientContactsParam clientContactsParam) {
+        LambdaQueryWrapper<ClientContacts> queryWrapper = new LambdaQueryWrapper<ClientContacts>()
+                .eq(ClientContacts::getIsDelete, GlobalConstant.NOT_DELETE)
+                .eq(ClientContacts::getClientId, clientContactsParam.getClientId())
+                .orderByDesc(ClientContacts::getId);
+
+        List<ClientContacts> clientContacts = clientContactsMapper.selectList(queryWrapper);
+
+        List<ClientContactsListVo> list = new LinkedList<>();
+        Map<Long, String> regionMap = regionService.getRegionMap();
+        for(ClientContacts item : clientContacts) {
+            ClientContactsListVo vo = new ClientContactsListVo();
+            BeanUtils.copyProperties(item, vo);
+            vo.setProvince(regionMap.get(vo.getProvinceId()));
+            vo.setCity(regionMap.get(vo.getCityId()));
+            vo.setDistrict(regionMap.get(vo.getDistrictId()));
+            list.add(vo);
+        }
+
+        return list;
+    }
+
+    /**
+     * 客户联系人详情
+     *
+     * @param id 主键参数
+     * @return ClientContacts
+     */
+    @Override
+    public ClientContactsDetailVo detail(Integer id) {
+        ClientContacts model = clientContactsMapper.selectOne(
+                new QueryWrapper<ClientContacts>()
+                    .eq("id", id)
+                    .eq("is_delete", GlobalConstant.NOT_DELETE)
+                    .last("limit 1"));
+
+        Assert.notNull(model, "数据不存在");
+
+        ClientContactsDetailVo vo = new ClientContactsDetailVo();
+        BeanUtils.copyProperties(model, vo);
+
+        Map<Long, String> regionMap = regionService.getRegionMap();
+        vo.setProvince(regionMap.get(vo.getProvinceId()));
+        vo.setCity(regionMap.get(vo.getCityId()));
+        vo.setDistrict(regionMap.get(vo.getDistrictId()));
+
+        return vo;
+    }
+
+    /**
+     * 客户联系人新增
+     *
+     * @param clientContactsParam 参数
+     */
+    @Override
+    public void add(ClientContactsParam clientContactsParam) {
+        Integer count = clientContactsMapper.checkClientContactsPhoneRepetition(clientContactsParam.getPhone());
+        if(count > 0){
+            throw new OperateException("已存在客户或联系人相同手机号码");
+        }
+
+        ClientContacts model = new ClientContacts();
+        BeanUtils.copyProperties(clientContactsParam,model);
+        model.setCreatorId(AdminThreadLocal.getAdminId().longValue());
+
+        clientContactsMapper.insert(model);
+    }
+
+    /**
+     * 客户联系人编辑
+     *
+     * @param clientContactsParam 参数
+     */
+    @Override
+    public void edit(ClientContactsParam clientContactsParam) {
+        ClientContacts model = clientContactsMapper.selectOne(
+                new QueryWrapper<ClientContacts>()
+                    .eq("id",  clientContactsParam.getId())
+                    .eq("is_delete", GlobalConstant.NOT_DELETE)
+                    .last("limit 1"));
+
+        Assert.notNull(model, "数据不存在!");
+
+        Integer count = clientContactsMapper.checkEditClientContactsPhoneRepetition(
+                clientContactsParam.getId(),
+                clientContactsParam.getClientId(),
+                clientContactsParam.getPhone());
+
+        if(count > 0){
+            throw new OperateException("已存在客户或联系人相同手机号码");
+        }
+
+        BeanUtils.copyProperties(model,clientContactsParam);
+        clientContactsMapper.updateById(model);
+    }
+
+    @Override
+    public void editStatus(ClientContactsParam clientContactsParam) {
+        ClientContacts model = clientContactsMapper.selectOne(
+                new QueryWrapper<ClientContacts>()
+                        .eq("id",  clientContactsParam.getId())
+                        .eq("is_delete", GlobalConstant.NOT_DELETE)
+                        .last("limit 1"));
+
+        Assert.notNull(model, "联系人不存在!");
+
+        model.setStatus(clientContactsParam.getStatus());
+
+        clientContactsMapper.updateById(model);
+    }
+
+
+    /**
+     * 客户联系人删除
+     *
+     * @param id 主键ID
+     */
+    @Override
+    public void del(Long id) {
+        ClientContacts model = clientContactsMapper.selectOne(
+                new QueryWrapper<ClientContacts>()
+                    .eq("id", id)
+                    .eq("is_delete", 0)
+                    .last("limit 1"));
+
+        Assert.notNull(model, "数据不存在!");
+
+        model.setIsDelete(1);
+        clientContactsMapper.updateById(model);
+    }
+
+}

admin/src/main/java/com/hcy/admin/service/client/impl/ClientServiceImpl.java

@@ -0,0 +1,197 @@
+package com.hcy.admin.service.client.impl;
+
+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.hcy.admin.AdminThreadLocal;
+import com.hcy.admin.service.client.IClientService;
+import com.hcy.admin.service.region.IDevRegionService;
+import com.hcy.admin.validate.common.PageParam;
+import com.hcy.admin.validate.client.ClientParam;
+import com.hcy.admin.vo.client.ClientListVo;
+import com.hcy.admin.vo.client.ClientDetailVo;
+import com.hcy.common.constant.GlobalConstant;
+import com.hcy.common.core.PageResult;
+import com.hcy.common.entity.client.Client;
+import com.hcy.common.exception.OperateException;
+import com.hcy.common.mapper.client.ClientMapper;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.util.Assert;
+
+import javax.annotation.Resource;
+import java.util.*;
+
+/**
+ * 客户实现类
+ */
+@Service
+public class ClientServiceImpl implements IClientService {
+        
+    @Resource
+    ClientMapper clientMapper;
+
+    @Resource
+    private IDevRegionService regionService;
+
+    /**
+     * 客户列表
+     *
+     * @param pageParam 分页参数
+     * @param params 搜索参数
+     * @return PageResult<ClientListVo>
+     */
+    @Override
+    public PageResult<ClientListVo> list(PageParam pageParam, Map<String, String> params) {
+        Integer page  = pageParam.getPageNo();
+        Integer limit = pageParam.getPageSize();
+
+        String clientNo = params.get("clientNo");
+        String clientName = params.get("clientName");
+
+        QueryWrapper<Client> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("is_delete", 0);
+        queryWrapper.like(StringUtils.isNotEmpty(clientNo),"client_no",clientNo);
+        queryWrapper.like(StringUtils.isNotEmpty(clientName),"client_name",clientName);
+        queryWrapper.orderByDesc("id");
+
+        clientMapper.setSearch(queryWrapper, params, new String[]{
+            "=:userId@user_id:long",
+            "like:clientNo@client_no:str",
+            "like:clientName@client_name:str",
+            "=:director:str",
+            "=:phone:str",
+            "=:provinceId@province_id:long",
+            "=:cityId@city_id:long",
+            "=:districtId@district_id:long",
+            "=:address:str",
+            "=:clientType@client_type:int",
+            "=:maintainType@maintain_type:int",
+            "=:purchaseDivisor@purchase_divisor:str",
+            "=:remark:str",
+            "=:creatorId@creator_id:long",
+        });
+
+        IPage<Client> iPage = clientMapper.selectPage(new Page<>(page, limit), queryWrapper);
+
+        List<ClientListVo> list = new LinkedList<>();
+        Map<Long, String> regionMap = regionService.getRegionMap();
+        for(Client item : iPage.getRecords()) {
+            ClientListVo vo = new ClientListVo();
+            BeanUtils.copyProperties(item, vo);
+            vo.setProvince(regionMap.get(vo.getProvinceId()));
+            vo.setCity(regionMap.get(vo.getCityId()));
+            vo.setDistrict(regionMap.get(vo.getDistrictId()));
+            list.add(vo);
+        }
+
+        return PageResult.iPageHandle(iPage.getTotal(), iPage.getCurrent(), iPage.getSize(), list);
+    }
+
+    /**
+     * 客户详情
+     *
+     * @param id 主键参数
+     * @return Client
+     */
+    @Override
+    public ClientDetailVo detail(Integer id) {
+        Client model = clientMapper.selectOne(
+                new QueryWrapper<Client>()
+                    .eq("id", id)
+                    .eq("is_delete", GlobalConstant.NOT_DELETE)
+                    .last("limit 1"));
+
+        Assert.notNull(model, "数据不存在");
+
+        ClientDetailVo vo = new ClientDetailVo();
+        BeanUtils.copyProperties(model, vo);
+
+        Map<Long, String> regionMap = regionService.getRegionMap();
+        vo.setProvince(regionMap.get(vo.getProvinceId()));
+        vo.setCity(regionMap.get(vo.getCityId()));
+        vo.setDistrict(regionMap.get(vo.getDistrictId()));
+
+        return vo;
+    }
+
+    /**
+     * 客户新增
+     *
+     * @param clientParam 参数
+     */
+    @Override
+    public void add(ClientParam clientParam) {
+        LambdaQueryWrapper<Client> queryWrapper = new LambdaQueryWrapper<Client>()
+                .eq(Client::getIsDelete, GlobalConstant.NOT_DELETE)
+                .eq(Client::getPhone, clientParam.getPhone())
+                .eq(Client::getClientNo, clientParam.getClientNo());
+
+        Integer count = clientMapper.selectCount(queryWrapper);
+        if(count > 0){
+            throw new OperateException("客户编号或手机号码重复");
+        }
+
+        Client model = new Client();
+        BeanUtils.copyProperties(clientParam,model);
+        model.setCreatorId(AdminThreadLocal.getAdminId().longValue());
+
+        clientMapper.insert(model);
+    }
+
+    /**
+     * 客户编辑
+     *
+     * @param clientParam 参数
+     */
+    @Override
+    public void edit(ClientParam clientParam) {
+        Long id = clientParam.getId();
+        String clientNo = clientParam.getClientNo();
+
+        Client model = clientMapper.selectOne(
+                new QueryWrapper<Client>()
+                    .eq("id",  id)
+                    .eq("is_delete", GlobalConstant.NOT_DELETE)
+                    .last("limit 1"));
+
+        Assert.notNull(model, "数据不存在!");
+
+        LambdaQueryWrapper<Client> queryWrapper = new LambdaQueryWrapper<Client>()
+                .eq(Client::getIsDelete, GlobalConstant.NOT_DELETE)
+                .ne(Client::getId,id)
+                .eq(Client::getPhone, clientParam.getPhone())
+                .eq(Client::getClientNo,clientNo);
+
+        Integer count = clientMapper.selectCount(queryWrapper);
+        if(count > 0){
+            throw new OperateException("客户编号或手机号码重复");
+        }
+
+        BeanUtils.copyProperties(clientParam,model);
+
+        clientMapper.updateById(model);
+    }
+
+    /**
+     * 客户删除
+     *
+     * @param id 主键ID
+     */
+    @Override
+    public void del(Long id) {
+        Client model = clientMapper.selectOne(
+                new QueryWrapper<Client>()
+                    .eq("id", id)
+                    .eq("is_delete", GlobalConstant.NOT_DELETE)
+                    .last("limit 1"));
+
+        Assert.notNull(model, "数据不存在!");
+
+        model.setIsDelete(GlobalConstant.DELETE);
+        clientMapper.updateById(model);
+    }
+
+}

admin/src/main/java/com/hcy/admin/service/client/impl/EquipmentServiceImpl.java

@@ -1,26 +1,18 @@
-package com.hcy.admin.service.equipment.impl;
+package com.hcy.admin.service.client.impl;
 
 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.github.yulichang.query.MPJQueryWrapper;
+import com.hcy.admin.service.client.IEquipmentService;
-import com.hcy.admin.service.equipment.IEquipmentService;
 import com.hcy.admin.validate.common.PageParam;
-import com.hcy.admin.validate.equipment.EquipmentParam;
+import com.hcy.admin.validate.client.EquipmentParam;
-import com.hcy.admin.vo.equipment.EquipmentListVo;
+import com.hcy.admin.vo.client.EquipmentListVo;
-import com.hcy.admin.vo.equipment.EquipmentDetailVo;
+import com.hcy.admin.vo.client.EquipmentDetailVo;
-import com.hcy.common.constant.GlobalConstant;
 import com.hcy.common.core.PageResult;
-import com.hcy.common.entity.commonFault.CommonFault;
+import com.hcy.common.entity.client.Equipment;
-import com.hcy.common.entity.equipment.Equipment;
-import com.hcy.common.entity.sparePart.SparePart;
-import com.hcy.common.enums.commonFault.CommonFaultEnum;
 import com.hcy.common.enums.equipment.EquipmentStateEnum;
-import com.hcy.common.mapper.equipment.EquipmentMapper;
+import com.hcy.common.mapper.client.EquipmentMapper;
-import com.hcy.common.utils.ArrayUtil;
 import com.hcy.common.utils.TimeUtil;
-import com.hcy.common.utils.UrlUtil;
-import com.hcy.common.config.GlobalConfig;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.util.Assert;

admin/src/main/java/com/hcy/admin/service/fault/IFaultService.java

@@ -0,0 +1,54 @@
+package com.hcy.admin.service.fault;
+
+import com.hcy.admin.validate.common.PageParam;
+import com.hcy.admin.validate.fault.FaultParam;
+import com.hcy.admin.vo.fault.FaultListVo;
+import com.hcy.admin.vo.fault.FaultDetailVo;
+import com.hcy.common.core.PageResult;
+
+import java.util.Map;
+
+/**
+ * 常见故障服务接口类
+ */
+public interface IFaultService {
+
+    /**
+     * 常见故障列表
+     *
+     * @param pageParam 分页参数
+     * @param faultParam 搜索参数
+     * @return PageResult<FaultVo>
+     */
+    PageResult<FaultListVo> list(PageParam pageParam, FaultParam faultParam);
+
+    /**
+     * 常见故障详情
+     *
+     * @param id 主键ID
+     * @return Fault
+     */
+    FaultDetailVo detail(Integer id);
+
+    /**
+     * 常见故障新增
+     *
+     * @param faultParam 参数
+     */
+    void add(FaultParam faultParam);
+
+    /**
+     * 常见故障编辑
+     *
+     * @param faultParam 参数
+     */
+    void edit(FaultParam faultParam);
+
+    /**
+     * 常见故障删除
+     *
+     * @param id 主键ID
+     */
+    void del(Long id);
+
+}

admin/src/main/java/com/hcy/admin/service/fault/impl/FaultServiceImpl.java

@@ -0,0 +1,146 @@
+package com.hcy.admin.service.fault.impl;
+
+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.github.yulichang.query.MPJQueryWrapper;
+import com.hcy.admin.service.fault.IFaultService;
+import com.hcy.admin.validate.common.PageParam;
+import com.hcy.admin.validate.fault.FaultParam;
+import com.hcy.admin.vo.fault.FaultListVo;
+import com.hcy.admin.vo.fault.FaultDetailVo;
+import com.hcy.common.constant.GlobalConstant;
+import com.hcy.common.core.PageResult;
+import com.hcy.common.entity.fault.Fault;
+import com.hcy.common.mapper.fault.FaultMapper;
+import com.hcy.common.utils.ArrayUtil;
+import com.hcy.common.utils.TimeUtil;
+import com.hcy.common.utils.UrlUtil;
+import com.hcy.common.config.GlobalConfig;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.util.Assert;
+
+import javax.annotation.Resource;
+import java.util.*;
+
+/**
+ * 常见故障实现类
+ */
+@Service
+public class FaultServiceImpl implements IFaultService {
+        
+    @Resource
+    FaultMapper faultMapper;
+
+    /**
+     * 常见故障列表
+     *
+     * @param pageParam 分页参数
+     * @param faultParam 搜索参数
+     * @return PageResult<FaultListVo>
+     */
+    @Override
+    public PageResult<FaultListVo> list(PageParam pageParam, FaultParam faultParam) {
+        Integer page  = pageParam.getPageNo();
+        Integer limit = pageParam.getPageSize();
+
+        Long faultType = faultParam.getFaultType();
+        String name = faultParam.getName();
+
+        LambdaQueryWrapper<Fault> wrapper = new LambdaQueryWrapper<Fault>()
+                .eq(Fault::getIsDelete, GlobalConstant.NOT_DELETE)
+                .eq(faultType != null, Fault::getFaultType, faultType)
+                .like(name != null, Fault::getName, name)
+                .orderByAsc(Fault::getSort)
+                .orderByDesc(Fault::getCreateTime);
+
+        IPage<Fault> iPage = faultMapper.selectPage(new Page<>(page, limit), wrapper);
+
+        List<FaultListVo> list = new LinkedList<>();
+        for(Fault item : iPage.getRecords()) {
+            FaultListVo vo = new FaultListVo();
+            BeanUtils.copyProperties(item, vo);
+            vo.setCreateTime(item.getCreateTime());
+            list.add(vo);
+        }
+
+        return PageResult.iPageHandle(iPage.getTotal(), iPage.getCurrent(), iPage.getSize(), list);
+    }
+
+    /**
+     * 常见故障详情
+     *
+     * @param id 主键参数
+     * @return Fault
+     */
+    @Override
+    public FaultDetailVo detail(Integer id) {
+        Fault model = faultMapper.selectOne(
+                new QueryWrapper<Fault>()
+                    .eq("id", id)
+                    .eq("is_delete", GlobalConstant.NOT_DELETE)
+                    .last("limit 1"));
+
+        Assert.notNull(model, "数据不存在");
+
+        FaultDetailVo vo = new FaultDetailVo();
+        BeanUtils.copyProperties(model, vo);
+        return vo;
+    }
+
+    /**
+     * 常见故障新增
+     *
+     * @param faultParam 参数
+     */
+    @Override
+    public void add(FaultParam faultParam) {
+        Fault model = new Fault();
+        model.setFaultType(faultParam.getFaultType());
+        model.setSort(faultParam.getSort());
+        model.setName(faultParam.getName());
+        model.setDescription(faultParam.getDescription());
+        faultMapper.insert(model);
+    }
+
+    /**
+     * 常见故障编辑
+     *
+     * @param faultParam 参数
+     */
+    @Override
+    public void edit(FaultParam faultParam) {
+        Fault model = faultMapper.selectOne(
+                new QueryWrapper<Fault>()
+                    .eq("id",  faultParam.getId())
+                    .eq("is_delete", GlobalConstant.NOT_DELETE)
+                    .last("limit 1"));
+
+        Assert.notNull(model, "数据不存在!");
+
+        BeanUtils.copyProperties(model,faultParam);
+        faultMapper.updateById(model);
+    }
+
+    /**
+     * 常见故障删除
+     *
+     * @param id 主键ID
+     */
+    @Override
+    public void del(Long id) {
+        Fault model = faultMapper.selectOne(
+                new QueryWrapper<Fault>()
+                    .eq("id", id)
+                    .eq("is_delete", GlobalConstant.NOT_DELETE)
+                    .last("limit 1"));
+
+        Assert.notNull(model, "数据不存在!");
+
+        model.setIsDelete(GlobalConstant.DELETE);
+        faultMapper.updateById(model);
+    }
+
+}

admin/src/main/java/com/hcy/admin/service/order/IMaintenanceOrderService.java

@@ -0,0 +1,54 @@
+package com.hcy.admin.service.order;
+
+import com.hcy.admin.validate.common.PageParam;
+import com.hcy.admin.validate.order.MaintenanceOrderParam;
+import com.hcy.admin.vo.order.MaintenanceOrderListVo;
+import com.hcy.admin.vo.order.MaintenanceOrderDetailVo;
+import com.hcy.common.core.PageResult;
+
+import java.util.Map;
+
+/**
+ * 检修订单服务接口类
+ */
+public interface IMaintenanceOrderService {
+
+    /**
+     * 检修订单列表
+     *
+     * @param pageParam 分页参数
+     * @param params 搜索参数
+     * @return PageResult<MaintenanceOrderVo>
+     */
+    PageResult<MaintenanceOrderListVo> list(PageParam pageParam, Map<String, String> params);
+
+    /**
+     * 检修订单详情
+     *
+     * @param id 主键ID
+     * @return MaintenanceOrder
+     */
+    MaintenanceOrderDetailVo detail(Integer id);
+
+    /**
+     * 检修订单新增
+     *
+     * @param maintenanceOrderParam 参数
+     */
+    void add(MaintenanceOrderParam maintenanceOrderParam);
+
+    /**
+     * 检修订单编辑
+     *
+     * @param maintenanceOrderParam 参数
+     */
+    void edit(MaintenanceOrderParam maintenanceOrderParam);
+
+    /**
+     * 检修订单删除
+     *
+     * @param id 主键ID
+     */
+    void del(Long id);
+
+}

admin/src/main/java/com/hcy/admin/service/order/IMaintenanceRepairService.java

@@ -0,0 +1,54 @@
+package com.hcy.admin.service.order;
+
+import com.hcy.admin.validate.common.PageParam;
+import com.hcy.admin.validate.order.repair.MaintenanceRepairParam;
+import com.hcy.admin.vo.order.repair.MaintenanceRepairDetailVo;
+import com.hcy.admin.vo.order.repair.MaintenanceRepairListVo;
+import com.hcy.common.core.PageResult;
+
+import java.util.Map;
+
+/**
+ * 旧模块返修信息服务接口类
+ */
+public interface IMaintenanceRepairService {
+
+    /**
+     * 旧模块返修信息列表
+     *
+     * @param pageParam 分页参数
+     * @param params 搜索参数
+     * @return PageResult<MaintenanceRepairVo>
+     */
+    PageResult<MaintenanceRepairListVo> list(PageParam pageParam, Map<String, String> params);
+
+    /**
+     * 旧模块返修信息详情
+     *
+     * @param id 主键ID
+     * @return MaintenanceRepair
+     */
+    MaintenanceRepairDetailVo detail(Integer id);
+
+    /**
+     * 旧模块返修信息新增
+     *
+     * @param maintenanceRepairParam 参数
+     */
+    void add(MaintenanceRepairParam maintenanceRepairParam);
+
+    /**
+     * 旧模块返修信息编辑
+     *
+     * @param maintenanceRepairParam 参数
+     */
+    void edit(MaintenanceRepairParam maintenanceRepairParam);
+
+    /**
+     * 旧模块返修信息删除
+     *
+     * @param id 主键ID
+     */
+    void del(Long id);
+
+}

admin/src/main/java/com/hcy/admin/service/order/IOrderPartService.java

@@ -0,0 +1,54 @@
+package com.hcy.admin.service.order;
+
+import com.hcy.admin.validate.common.PageParam;
+import com.hcy.admin.validate.order.OrderPartParam;
+import com.hcy.admin.vo.order.OrderPartDetailVo;
+import com.hcy.admin.vo.order.OrderPartListVo;
+import com.hcy.common.core.PageResult;
+
+import java.util.Map;
+
+/**
+ * 订单配件服务接口类
+ */
+public interface IOrderPartService {
+
+    /**
+     * 订单配件列表
+     *
+     * @param pageParam 分页参数
+     * @param params 搜索参数
+     * @return PageResult<OrderPartVo>
+     */
+    PageResult<OrderPartListVo> list(PageParam pageParam, Map<String, String> params);
+
+    /**
+     * 订单配件详情
+     *
+     * @param id 主键ID
+     * @return OrderPart
+     */
+    OrderPartDetailVo detail(Integer id);
+
+    /**
+     * 订单配件新增
+     *
+     * @param orderPartParam 参数
+     */
+    void add(OrderPartParam orderPartParam);
+
+    /**
+     * 订单配件编辑
+     *
+     * @param orderPartParam 参数
+     */
+    void edit(OrderPartParam orderPartParam);
+
+    /**
+     * 订单配件删除
+     *
+     * @param id 主键ID
+     */
+    void del(Long id);
+
+}

admin/src/main/java/com/hcy/admin/service/order/impl/MaintenanceOrderServiceImpl.java

@@ -0,0 +1,212 @@
+package com.hcy.admin.service.order.impl;
+
+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.hcy.admin.service.order.IMaintenanceOrderService;
+import com.hcy.admin.validate.common.PageParam;
+import com.hcy.admin.validate.order.MaintenanceOrderParam;
+import com.hcy.admin.vo.order.MaintenanceOrderListVo;
+import com.hcy.admin.vo.order.MaintenanceOrderDetailVo;
+import com.hcy.common.core.PageResult;
+import com.hcy.common.entity.order.MaintenanceOrder;
+import com.hcy.common.mapper.order.MaintenanceOrderMapper;
+import com.hcy.common.utils.TimeUtil;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.util.Assert;
+
+import javax.annotation.Resource;
+import java.util.*;
+
+/**
+ * 检修订单实现类
+ */
+@Service
+public class MaintenanceOrderServiceImpl implements IMaintenanceOrderService {
+        
+    @Resource
+    MaintenanceOrderMapper maintenanceOrderMapper;
+
+    /**
+     * 检修订单列表
+     *
+     * @param pageParam 分页参数
+     * @param params 搜索参数
+     * @return PageResult<MaintenanceOrderListVo>
+     */
+    @Override
+    public PageResult<MaintenanceOrderListVo> list(PageParam pageParam, Map<String, String> params) {
+        Integer page  = pageParam.getPageNo();
+        Integer limit = pageParam.getPageSize();
+
+        QueryWrapper<MaintenanceOrder> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("is_delete", 0);
+        queryWrapper.orderByDesc("id");
+
+        maintenanceOrderMapper.setSearch(queryWrapper, params, new String[]{
+            "=:orderNo@order_no:str",
+            "=:orderSource@order_source:long",
+            "=:orderStatus@order_status:long",
+            "=:clientId@client_id:long",
+            "=:deviceId@device_id:long",
+            "=:faultId@fault_id:long",
+            "=:faultDescription@fault_description:str",
+            "=:faultImg@fault_img:str",
+            "=:receiverType@receiver_type:long",
+            "=:provinceId@province_id:long",
+            "=:cityId@city_id:long",
+            "=:districtId@district_id:long",
+            "=:orderDistance@order_distance:str",
+            "=:totalAmount@total_amount:str",
+            "=:actualAmount@actual_amount:str",
+            "=:receiverId@receiver_id:long",
+            "=:repairId@repair_id:long",
+            "=:receiverTime@receiver_time:str",
+            "=:cancelOrderTime@cancel_order_time:str",
+            "=:cancelCause@cancel_cause:str",
+            "=:refuseMaintenanceCause@refuse_maintenance_cause:str",
+            "=:remark:str",
+            "=:creatorId@creator_id:long",
+            "=:orderAccomplishTime@order_accomplish_time:str",
+            "=:familiarFaultId@familiar_fault_id:long",
+            "=:familiarFaultDescription@familiar_fault_description:str",
+        });
+
+        IPage<MaintenanceOrder> iPage = maintenanceOrderMapper.selectPage(new Page<>(page, limit), queryWrapper);
+
+        List<MaintenanceOrderListVo> list = new LinkedList<>();
+        for(MaintenanceOrder item : iPage.getRecords()) {
+            MaintenanceOrderListVo vo = new MaintenanceOrderListVo();
+            BeanUtils.copyProperties(item, vo);
+            vo.setCreateTime(item.getCreateTime());
+            vo.setUpdateTime(item.getCreateTime());
+            list.add(vo);
+        }
+
+        return PageResult.iPageHandle(iPage.getTotal(), iPage.getCurrent(), iPage.getSize(), list);
+    }
+
+    /**
+     * 检修订单详情
+     *
+     * @param id 主键参数
+     * @return MaintenanceOrder
+     */
+    @Override
+    public MaintenanceOrderDetailVo detail(Integer id) {
+        MaintenanceOrder model = maintenanceOrderMapper.selectOne(
+                new QueryWrapper<MaintenanceOrder>()
+                    .eq("id", id)
+                    .eq("is_delete", 0)
+                    .last("limit 1"));
+
+        Assert.notNull(model, "数据不存在");
+
+        MaintenanceOrderDetailVo vo = new MaintenanceOrderDetailVo();
+        BeanUtils.copyProperties(model, vo);
+        return vo;
+    }
+
+    /**
+     * 检修订单新增
+     *
+     * @param maintenanceOrderParam 参数
+     */
+    @Override
+    public void add(MaintenanceOrderParam maintenanceOrderParam) {
+        MaintenanceOrder model = new MaintenanceOrder();
+        model.setOrderNo(maintenanceOrderParam.getOrderNo());
+        model.setOrderSource(maintenanceOrderParam.getOrderSource());
+        model.setOrderStatus(maintenanceOrderParam.getOrderStatus());
+        model.setClientId(maintenanceOrderParam.getClientId());
+        model.setDeviceId(maintenanceOrderParam.getDeviceId());
+        model.setFaultId(maintenanceOrderParam.getFaultId());
+        model.setFaultDescription(maintenanceOrderParam.getFaultDescription());
+        model.setFaultImg(maintenanceOrderParam.getFaultImg());
+        model.setReceiverType(maintenanceOrderParam.getReceiverType());
+        model.setProvinceId(maintenanceOrderParam.getProvinceId());
+        model.setCityId(maintenanceOrderParam.getCityId());
+        model.setDistrictId(maintenanceOrderParam.getDistrictId());
+        model.setOrderDistance(maintenanceOrderParam.getOrderDistance());
+        model.setTotalAmount(maintenanceOrderParam.getTotalAmount());
+        model.setActualAmount(maintenanceOrderParam.getActualAmount());
+        model.setReceiverId(maintenanceOrderParam.getReceiverId());
+        model.setRepairId(maintenanceOrderParam.getRepairId());
+        model.setReceiverTime(maintenanceOrderParam.getReceiverTime());
+        model.setCancelOrderTime(maintenanceOrderParam.getCancelOrderTime());
+        model.setCancelCause(maintenanceOrderParam.getCancelCause());
+        model.setRefuseMaintenanceCause(maintenanceOrderParam.getRefuseMaintenanceCause());
+        model.setRemark(maintenanceOrderParam.getRemark());
+        model.setCreatorId(maintenanceOrderParam.getCreatorId());
+        model.setOrderAccomplishTime(maintenanceOrderParam.getOrderAccomplishTime());
+        model.setFamiliarFaultId(maintenanceOrderParam.getFamiliarFaultId());
+        model.setFamiliarFaultDescription(maintenanceOrderParam.getFamiliarFaultDescription());
+        maintenanceOrderMapper.insert(model);
+    }
+
+    /**
+     * 检修订单编辑
+     *
+     * @param maintenanceOrderParam 参数
+     */
+    @Override
+    public void edit(MaintenanceOrderParam maintenanceOrderParam) {
+        MaintenanceOrder model = maintenanceOrderMapper.selectOne(
+                new QueryWrapper<MaintenanceOrder>()
+                    .eq("id",  maintenanceOrderParam.getId())
+                    .eq("is_delete", 0)
+                    .last("limit 1"));
+
+        Assert.notNull(model, "数据不存在!");
+
+        model.setId(maintenanceOrderParam.getId());
+        model.setOrderNo(maintenanceOrderParam.getOrderNo());
+        model.setOrderSource(maintenanceOrderParam.getOrderSource());
+        model.setOrderStatus(maintenanceOrderParam.getOrderStatus());
+        model.setClientId(maintenanceOrderParam.getClientId());
+        model.setDeviceId(maintenanceOrderParam.getDeviceId());
+        model.setFaultId(maintenanceOrderParam.getFaultId());
+        model.setFaultDescription(maintenanceOrderParam.getFaultDescription());
+        model.setFaultImg(maintenanceOrderParam.getFaultImg());
+        model.setReceiverType(maintenanceOrderParam.getReceiverType());
+        model.setProvinceId(maintenanceOrderParam.getProvinceId());
+        model.setCityId(maintenanceOrderParam.getCityId());
+        model.setDistrictId(maintenanceOrderParam.getDistrictId());
+        model.setOrderDistance(maintenanceOrderParam.getOrderDistance());
+        model.setTotalAmount(maintenanceOrderParam.getTotalAmount());
+        model.setActualAmount(maintenanceOrderParam.getActualAmount());
+        model.setReceiverId(maintenanceOrderParam.getReceiverId());
+        model.setRepairId(maintenanceOrderParam.getRepairId());
+        model.setReceiverTime(maintenanceOrderParam.getReceiverTime());
+        model.setCancelOrderTime(maintenanceOrderParam.getCancelOrderTime());
+        model.setCancelCause(maintenanceOrderParam.getCancelCause());
+        model.setRefuseMaintenanceCause(maintenanceOrderParam.getRefuseMaintenanceCause());
+        model.setRemark(maintenanceOrderParam.getRemark());
+        model.setCreatorId(maintenanceOrderParam.getCreatorId());
+        model.setOrderAccomplishTime(maintenanceOrderParam.getOrderAccomplishTime());
+        model.setFamiliarFaultId(maintenanceOrderParam.getFamiliarFaultId());
+        model.setFamiliarFaultDescription(maintenanceOrderParam.getFamiliarFaultDescription());
+        maintenanceOrderMapper.updateById(model);
+    }
+
+    /**
+     * 检修订单删除
+     *
+     * @param id 主键ID
+     */
+    @Override
+    public void del(Long id) {
+        MaintenanceOrder model = maintenanceOrderMapper.selectOne(
+                new QueryWrapper<MaintenanceOrder>()
+                    .eq("id", id)
+                    .eq("is_delete", 0)
+                    .last("limit 1"));
+
+        Assert.notNull(model, "数据不存在!");
+
+        model.setIsDelete(1);
+        maintenanceOrderMapper.updateById(model);
+    }
+
+}

admin/src/main/java/com/hcy/admin/service/order/impl/MaintenanceRepairServiceImpl.java

@@ -0,0 +1,149 @@
+package com.hcy.admin.service.order.impl;
+
+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.hcy.admin.service.order.IMaintenanceRepairService;
+import com.hcy.admin.validate.common.PageParam;
+import com.hcy.admin.validate.order.repair.MaintenanceRepairParam;
+import com.hcy.admin.vo.order.repair.MaintenanceRepairDetailVo;
+import com.hcy.admin.vo.order.repair.MaintenanceRepairListVo;
+import com.hcy.common.core.PageResult;
+import com.hcy.common.entity.order.repair.MaintenanceRepair;
+import com.hcy.common.mapper.order.repair.MaintenanceRepairMapper;
+import com.hcy.common.utils.TimeUtil;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.util.Assert;
+
+import javax.annotation.Resource;
+import java.util.*;
+
+/**
+ * 旧模块返修信息实现类
+ */
+@Service
+public class MaintenanceRepairServiceImpl implements IMaintenanceRepairService {
+        
+    @Resource
+    MaintenanceRepairMapper maintenanceRepairMapper;
+
+    /**
+     * 旧模块返修信息列表
+     *
+     * @param pageParam 分页参数
+     * @param params 搜索参数
+     * @return PageResult<MaintenanceRepairListVo>
+     */
+    @Override
+    public PageResult<MaintenanceRepairListVo> list(PageParam pageParam, Map<String, String> params) {
+        Integer page  = pageParam.getPageNo();
+        Integer limit = pageParam.getPageSize();
+
+        QueryWrapper<MaintenanceRepair> queryWrapper = new QueryWrapper<>();
+        queryWrapper.orderByDesc("id");
+
+        maintenanceRepairMapper.setSearch(queryWrapper, params, new String[]{
+            "=:priorityId@priority_id:long",
+            "=:logisticsMode@logistics_mode:str",
+            "like:expressageName@expressage_name:str",
+            "=:expressageNo@expressage_no:str",
+            "=:addressId@address_id:long",
+            "=:moduleNo@module_no:str",
+            "=:brand:str",
+            "=:moduleImg@module_img:str",
+            "=:creatorId@creator_id:long",
+        });
+
+        IPage<MaintenanceRepair> iPage = maintenanceRepairMapper.selectPage(new Page<>(page, limit), queryWrapper);
+
+        List<MaintenanceRepairListVo> list = new LinkedList<>();
+        for(MaintenanceRepair item : iPage.getRecords()) {
+            MaintenanceRepairListVo vo = new MaintenanceRepairListVo();
+            BeanUtils.copyProperties(item, vo);
+            vo.setCreateTime(item.getCreateTime());
+            list.add(vo);
+        }
+
+        return PageResult.iPageHandle(iPage.getTotal(), iPage.getCurrent(), iPage.getSize(), list);
+    }
+
+    /**
+     * 旧模块返修信息详情
+     *
+     * @param id 主键参数
+     * @return MaintenanceRepair
+     */
+    @Override
+    public MaintenanceRepairDetailVo detail(Integer id) {
+        MaintenanceRepair model = maintenanceRepairMapper.selectOne(
+                new QueryWrapper<MaintenanceRepair>()
+                    .eq("id", id)
+                    .last("limit 1"));
+
+        Assert.notNull(model, "数据不存在");
+
+        MaintenanceRepairDetailVo vo = new MaintenanceRepairDetailVo();
+        BeanUtils.copyProperties(model, vo);
+        return vo;
+    }
+
+    /**
+     * 旧模块返修信息新增
+     *
+     * @param maintenanceRepairParam 参数
+     */
+    @Override
+    public void add(MaintenanceRepairParam maintenanceRepairParam) {
+        MaintenanceRepair model = new MaintenanceRepair();
+
+        BeanUtils.copyProperties(maintenanceRepairParam,model);
+
+        maintenanceRepairMapper.insert(model);
+    }
+
+    /**
+     * 旧模块返修信息编辑
+     *
+     * @param maintenanceRepairParam 参数
+     */
+    @Override
+    public void edit(MaintenanceRepairParam maintenanceRepairParam) {
+        MaintenanceRepair model = maintenanceRepairMapper.selectOne(
+                new QueryWrapper<MaintenanceRepair>()
+                    .eq("id",  maintenanceRepairParam.getId())
+                    .last("limit 1"));
+
+        Assert.notNull(model, "数据不存在!");
+
+        model.setId(maintenanceRepairParam.getId());
+        model.setPriorityId(maintenanceRepairParam.getPriorityId());
+        model.setLogisticsMode(maintenanceRepairParam.getLogisticsMode());
+        model.setExpressName(maintenanceRepairParam.getExpressageName());
+        model.setExpressNo(maintenanceRepairParam.getExpressageNo());
+        model.setAddressId(maintenanceRepairParam.getAddressId());
+        model.setModuleNo(maintenanceRepairParam.getModuleNo());
+        model.setBrand(maintenanceRepairParam.getBrand());
+        model.setModuleImg(maintenanceRepairParam.getModuleImg());
+        model.setCreatorId(maintenanceRepairParam.getCreatorId());
+        maintenanceRepairMapper.updateById(model);
+    }
+
+    /**
+     * 旧模块返修信息删除
+     *
+     * @param id 主键ID
+     */
+    @Override
+    public void del(Long id) {
+        MaintenanceRepair model = maintenanceRepairMapper.selectOne(
+                new QueryWrapper<MaintenanceRepair>()
+                    .eq("id", id)
+                    .last("limit 1"));
+
+        Assert.notNull(model, "数据不存在!");
+
+        maintenanceRepairMapper.delete(new QueryWrapper<MaintenanceRepair>().eq("id", id));
+    }
+
+}

admin/src/main/java/com/hcy/admin/service/order/impl/OrderPartServiceImpl.java

@@ -0,0 +1,154 @@
+package com.hcy.admin.service.order.impl;
+
+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.hcy.admin.service.order.IOrderPartService;
+import com.hcy.admin.validate.common.PageParam;
+import com.hcy.admin.validate.order.OrderPartParam;
+import com.hcy.admin.vo.order.MaintenanceOrderListVo;
+import com.hcy.admin.vo.order.OrderPartDetailVo;
+import com.hcy.admin.vo.order.OrderPartListVo;
+import com.hcy.common.core.PageResult;
+import com.hcy.common.entity.order.MaintenanceOrder;
+import com.hcy.common.entity.order.OrderPart;
+import com.hcy.common.mapper.order.OrderPartMapper;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.util.Assert;
+
+import javax.annotation.Resource;
+import java.util.*;
+
+/**
+ * 订单配件实现类
+ */
+@Service
+public class OrderPartServiceImpl implements IOrderPartService {
+        
+    @Resource
+    OrderPartMapper orderPartMapper;
+
+    /**
+     * 订单配件列表
+     *
+     * @param pageParam 分页参数
+     * @param params 搜索参数
+     * @return PageResult<OrderPartListVo>
+     */
+    @Override
+    public PageResult<OrderPartListVo> list(PageParam pageParam, Map<String, String> params) {
+        Integer page  = pageParam.getPageNo();
+        Integer limit = pageParam.getPageSize();
+
+        QueryWrapper<OrderPart> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("is_delete", 0);
+        queryWrapper.orderByDesc("id");
+
+        orderPartMapper.setSearch(queryWrapper, params, new String[]{
+            "=:partCode@part_code:str",
+            "like:partName@part_name:str",
+            "=:specificationModel@specification_model:str",
+            "=:unit:str",
+            "=:price:str",
+            "=:quantity:long",
+            "=:totalPrice@total_price:str",
+        });
+
+        IPage<OrderPart> iPage = orderPartMapper.selectPage(new Page<>(page, limit), queryWrapper);
+
+        List<OrderPartListVo> list = new LinkedList<>();
+        for(OrderPart item : iPage.getRecords()) {
+            OrderPartListVo vo = new OrderPartListVo();
+            BeanUtils.copyProperties(item, vo);
+            list.add(vo);
+        }
+
+        return PageResult.iPageHandle(iPage.getTotal(), iPage.getCurrent(), iPage.getSize(), list);
+    }
+
+    /**
+     * 订单配件详情
+     *
+     * @param id 主键参数
+     * @return OrderPart
+     */
+    @Override
+    public OrderPartDetailVo detail(Integer id) {
+        OrderPart model = orderPartMapper.selectOne(
+                new QueryWrapper<OrderPart>()
+                    .eq("id", id)
+                    .eq("is_delete", 0)
+                    .last("limit 1"));
+
+        Assert.notNull(model, "数据不存在");
+
+        OrderPartDetailVo vo = new OrderPartDetailVo();
+        BeanUtils.copyProperties(model, vo);
+        return vo;
+    }
+
+    /**
+     * 订单配件新增
+     *
+     * @param orderPartParam 参数
+     */
+    @Override
+    public void add(OrderPartParam orderPartParam) {
+        OrderPart model = new OrderPart();
+        model.setPartCode(orderPartParam.getPartCode());
+        model.setPartName(orderPartParam.getPartName());
+        model.setSpecificationModel(orderPartParam.getSpecificationModel());
+        model.setUnit(orderPartParam.getUnit());
+        model.setPrice(orderPartParam.getPrice());
+        model.setQuantity(orderPartParam.getQuantity());
+        model.setTotalPrice(orderPartParam.getTotalPrice());
+        orderPartMapper.insert(model);
+    }
+
+    /**
+     * 订单配件编辑
+     *
+     * @param orderPartParam 参数
+     */
+    @Override
+    public void edit(OrderPartParam orderPartParam) {
+        OrderPart model = orderPartMapper.selectOne(
+                new QueryWrapper<OrderPart>()
+                    .eq("id",  orderPartParam.getId())
+                    .eq("is_delete", 0)
+                    .last("limit 1"));
+
+        Assert.notNull(model, "数据不存在!");
+
+        model.setId(orderPartParam.getId());
+        model.setPartCode(orderPartParam.getPartCode());
+        model.setPartName(orderPartParam.getPartName());
+        model.setSpecificationModel(orderPartParam.getSpecificationModel());
+        model.setUnit(orderPartParam.getUnit());
+        model.setPrice(orderPartParam.getPrice());
+        model.setQuantity(orderPartParam.getQuantity());
+        model.setTotalPrice(orderPartParam.getTotalPrice());
+        orderPartMapper.updateById(model);
+    }
+
+    /**
+     * 订单配件删除
+     *
+     * @param id 主键ID
+     */
+    @Override
+    public void del(Long id) {
+        OrderPart model = orderPartMapper.selectOne(
+                new QueryWrapper<OrderPart>()
+                    .eq("id", id)
+                    .eq("is_delete", 0)
+                    .last("limit 1"));
+
+        Assert.notNull(model, "数据不存在!");
+
+        model.setIsDelete(1);
+        orderPartMapper.updateById(model);
+    }
+
+}

admin/src/main/java/com/hcy/admin/service/setting/impl/SettingDictDataServiceImpl.java

@@ -1,5 +1,6 @@
 package com.hcy.admin.service.setting.impl;
 
+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.core.toolkit.Assert;
@@ -8,6 +9,7 @@ import com.hcy.admin.service.setting.ISettingDictDataService;
 import com.hcy.admin.validate.common.PageParam;
 import com.hcy.admin.validate.setting.DictDataParam;
 import com.hcy.admin.vo.setting.DictDataVo;
+import com.hcy.common.constant.GlobalConstant;
 import com.hcy.common.core.PageResult;
 import com.hcy.common.entity.setting.DictData;
 import com.hcy.common.entity.setting.DictType;
@@ -155,10 +157,10 @@ public class SettingDictDataServiceImpl implements ISettingDictDataService {
      */
     @Override
     public void add(DictDataParam dictDataParam) {
-        Assert.isNull(dictDataMapper.selectOne(new QueryWrapper<DictData>()
+        Assert.isNull(dictDataMapper.selectOne(new LambdaQueryWrapper<DictData>()
-                .select("id")
+                .eq(DictData::getName, dictDataParam.getName())
-                .eq("name", dictDataParam.getName())
+                .eq(DictData::getTypeId,dictDataParam.getTypeId())
-                .eq("is_delete", 0)
+                .eq(DictData::getIsDelete, GlobalConstant.NOT_DELETE)
                 .last("limit 1")), "字典数据已存在！");
 
         DictData model = new DictData();
@@ -168,6 +170,7 @@ public class SettingDictDataServiceImpl implements ISettingDictDataService {
         model.setRemark(dictDataParam.getRemark());
         model.setSort(dictDataParam.getSort());
         model.setStatus(dictDataParam.getStatus());
+        model.setTypeValue(dictDataParam.getTypeValue());
         model.setCreateTime(System.currentTimeMillis() / 1000);
         model.setUpdateTime(System.currentTimeMillis() / 1000);
         dictDataMapper.insert(model);
@@ -188,11 +191,11 @@ public class SettingDictDataServiceImpl implements ISettingDictDataService {
 
         Assert.notNull(model, "字典数据不存在！");
 
-        Assert.isNull(dictDataMapper.selectOne(new QueryWrapper<DictData>()
+        Assert.isNull(dictDataMapper.selectOne(new LambdaQueryWrapper<DictData>()
-                .select("id")
+                .eq(DictData::getName, dictDataParam.getName())
-                .ne("id", dictDataParam.getId())
+                .eq(DictData::getTypeId,dictDataParam.getTypeId())
-                .eq("name", dictDataParam.getName())
+                .eq(DictData::getIsDelete, GlobalConstant.NOT_DELETE)
-                .eq("is_delete", 0)
+                .ne(DictData::getId,dictDataParam.getId())
                 .last("limit 1")), "字典数据已存在！");
 
         model.setName(dictDataParam.getName());

admin/src/main/java/com/hcy/admin/validate/client/ClientContactsParam.java

@@ -0,0 +1,65 @@
+package com.hcy.admin.validate.client;
+
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.hibernate.validator.constraints.Length;
+
+import lombok.Data;
+import javax.validation.constraints.*;
+import java.io.Serializable;
+
+/**
+ * 客户联系人参数
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class ClientContactsParam implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    public interface create{}
+    public interface update{}
+    public interface delete{}
+
+    private Long id;
+
+    @NotNull(message = "clientId参数缺失", groups = {create.class, update.class})
+    @DecimalMin(value = "0", message = "clientId参数值不能少于0", groups = {create.class, update.class})
+    private Long clientId;
+
+    private Long userId;
+
+    @NotNull(message = "name参数缺失", groups = {create.class, update.class})
+    @Length(max = 50, message = "name参数不能超出50个字符", groups = {create.class, update.class})
+    private String name;
+
+    @NotNull(message = "sex参数缺失", groups = {create.class, update.class})
+    @DecimalMin(value = "0", message = "sex参数值不能少于0", groups = {create.class, update.class})
+    private Integer sex;
+
+    @NotNull(message = "phone参数缺失", groups = {create.class, update.class})
+    @Length(max = 11, message = "phone参数不能超出11个字符", groups = {create.class, update.class})
+    private String phone;
+
+    @NotNull(message = "provinceId参数缺失", groups = {create.class, update.class})
+    @DecimalMin(value = "0", message = "provinceId参数值不能少于0", groups = {create.class, update.class})
+    private Long provinceId;
+
+    @NotNull(message = "cityId参数缺失", groups = {create.class, update.class})
+    @DecimalMin(value = "0", message = "cityId参数值不能少于0", groups = {create.class, update.class})
+    private Long cityId;
+
+    @NotNull(message = "districtId参数缺失", groups = {create.class, update.class})
+    @DecimalMin(value = "0", message = "districtId参数值不能少于0", groups = {create.class, update.class})
+    private Long districtId;
+
+    @NotNull(message = "address参数缺失", groups = {create.class, update.class})
+    @Length(max = 250, message = "address参数不能超出250个字符", groups = {create.class, update.class})
+    private String address;
+
+    private Integer status;
+
+    private Long creatorId;
+
+}

admin/src/main/java/com/hcy/admin/validate/client/ClientParam.java

@@ -0,0 +1,87 @@
+package com.hcy.admin.validate.client;
+
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.hibernate.validator.constraints.Length;
+
+import lombok.Data;
+import javax.validation.constraints.*;
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 客户参数
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class ClientParam implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    public interface create{}
+    public interface update{}
+    public interface delete{}
+
+    private Long id;
+
+    private Long userId;
+
+    @NotNull(message = "clientNo参数缺失", groups = {create.class, update.class})
+    @DecimalMin(value = "0", message = "clientNo参数值不能少于0", groups = {create.class, update.class})
+    private String clientNo;
+
+    @NotNull(message = "clientName参数缺失", groups = {create.class, update.class})
+    @Length(max = 50, message = "clientName参数不能超出50个字符", groups = {create.class, update.class})
+    private String clientName;
+
+    @NotNull(message = "director参数缺失", groups = {create.class, update.class})
+    @Length(max = 50, message = "director参数不能超出50个字符", groups = {create.class, update.class})
+    private String director;
+
+    private String directorStaffId;
+
+    @NotNull(message = "phone参数缺失", groups = {create.class, update.class})
+    @Length(max = 11, message = "phone参数不能超出11个字符", groups = {create.class, update.class})
+    private String phone;
+
+    @NotNull(message = "provinceId参数缺失", groups = {create.class, update.class})
+    @DecimalMin(value = "0", message = "provinceId参数值不能少于0", groups = {create.class, update.class})
+    private Long provinceId;
+
+    @NotNull(message = "cityId参数缺失", groups = {create.class, update.class})
+    @DecimalMin(value = "0", message = "cityId参数值不能少于0", groups = {create.class, update.class})
+    private Long cityId;
+
+    @NotNull(message = "districtId参数缺失", groups = {create.class, update.class})
+    @DecimalMin(value = "0", message = "districtId参数值不能少于0", groups = {create.class, update.class})
+    private Long districtId;
+
+    @NotNull(message = "address参数缺失", groups = {create.class, update.class})
+    @Length(max = 255, message = "address参数不能超出255个字符", groups = {create.class, update.class})
+    private String address;
+
+    @NotNull(message = "clientType参数缺失", groups = {create.class, update.class})
+    @DecimalMin(value = "0", message = "clientType参数值不能少于0", groups = {create.class, update.class})
+    private Integer clientType;
+
+    @NotNull(message = "maintainType参数缺失", groups = {create.class, update.class})
+    @DecimalMin(value = "0", message = "maintainType参数值不能少于0", groups = {create.class, update.class})
+    private Integer maintainType;
+
+    @NotNull(message = "purchaseDivisor参数缺失", groups = {create.class, update.class})
+    private BigDecimal purchaseDivisor;
+
+    @NotNull(message = "pointMaintainDivisor参数缺失", groups = {create.class, update.class})
+    private BigDecimal pointMaintainDivisor;
+
+    @NotNull(message = "partMaintainDivisor参数缺失", groups = {create.class, update.class})
+    private BigDecimal partMaintainDivisor;
+
+    @NotNull(message = "remark参数缺失", groups = {create.class, update.class})
+    @Length(max = 250, message = "remark参数不能超出250个字符", groups = {create.class, update.class})
+    private String remark;
+
+    private Long creatorId;
+
+}

admin/src/main/java/com/hcy/admin/validate/client/EquipmentParam.java

@@ -1,6 +1,5 @@
-package com.hcy.admin.validate.equipment;
+package com.hcy.admin.validate.client;
 
-import com.hcy.common.entity.equipment.Equipment;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import org.hibernate.validator.constraints.Length;
@@ -26,7 +25,7 @@ public class EquipmentParam implements Serializable {
 
     private Long id;
 
-    @DecimalMin(value = "0", message = "userId参数值不能少于0", groups = {create.class, update.class})
+    @DecimalMin(value = "0", message = "clientId参数值不能少于0", groups = {create.class, update.class})
     private Long clientId;
 
     @DecimalMin(value = "0", message = "moduleId参数值不能少于0", groups = {create.class, update.class})

admin/src/main/java/com/hcy/admin/validate/fault/FaultParam.java

@@ -0,0 +1,47 @@
+package com.hcy.admin.validate.fault;
+
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.hibernate.validator.constraints.Length;
+
+import lombok.Data;
+import javax.validation.constraints.*;
+import java.io.Serializable;
+
+/**
+ * 常见故障参数
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class FaultParam implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    public interface create{}
+    public interface update{}
+    public interface delete{}
+
+    private Long id;
+
+    @NotNull(message = "faultType参数缺失", groups = {create.class, update.class})
+    @DecimalMin(value = "0", message = "faultType参数值不能少于0", groups = {create.class, update.class})
+    private Long faultType;
+
+    @NotNull(message = "sort参数缺失", groups = {create.class, update.class})
+    @DecimalMin(value = "0", message = "sort参数值不能少于0", groups = {create.class, update.class})
+    private Long sort;
+
+    @NotNull(message = "name参数缺失", groups = {create.class, update.class})
+    @Length(max = 50, message = "name参数不能超出50个字符", groups = {create.class, update.class})
+    private String name;
+
+    @NotNull(message = "description参数缺失", groups = {create.class, update.class})
+    @Length(max = 250, message = "description参数不能超出250个字符", groups = {create.class, update.class})
+    private String description;
+
+    @NotNull(message = "status参数缺失", groups = {create.class, update.class})
+    @DecimalMin(value = "0", message = "status参数值不能少于0", groups = {create.class, update.class})
+    private Integer status;
+
+}

admin/src/main/java/com/hcy/admin/validate/order/MaintenanceOrderParam.java

@@ -0,0 +1,127 @@
+package com.hcy.admin.validate.order;
+
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.hibernate.validator.constraints.Length;
+
+import lombok.Data;
+import javax.validation.constraints.*;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 检修订单参数
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class MaintenanceOrderParam implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    public interface create{}
+    public interface update{}
+    public interface delete{}
+
+    private Long id;
+
+    @NotNull(message = "orderNo参数缺失", groups = {create.class, update.class})
+    @Length(max = 50, message = "orderNo参数不能超出50个字符", groups = {create.class, update.class})
+    private String orderNo;
+
+    @NotNull(message = "orderSource参数缺失", groups = {create.class, update.class})
+    @DecimalMin(value = "0", message = "orderSource参数值不能少于0", groups = {create.class, update.class})
+    private Long orderSource;
+
+    @NotNull(message = "orderStatus参数缺失", groups = {create.class, update.class})
+    @DecimalMin(value = "0", message = "orderStatus参数值不能少于0", groups = {create.class, update.class})
+    private Long orderStatus;
+
+    @NotNull(message = "clientId参数缺失", groups = {create.class, update.class})
+    @DecimalMin(value = "0", message = "clientId参数值不能少于0", groups = {create.class, update.class})
+    private Long clientId;
+
+    @NotNull(message = "deviceId参数缺失", groups = {create.class, update.class})
+    @DecimalMin(value = "0", message = "deviceId参数值不能少于0", groups = {create.class, update.class})
+    private Long deviceId;
+
+    @NotNull(message = "faultId参数缺失", groups = {create.class, update.class})
+    @DecimalMin(value = "0", message = "faultId参数值不能少于0", groups = {create.class, update.class})
+    private Long faultId;
+
+    @NotNull(message = "faultDescription参数缺失", groups = {create.class, update.class})
+    @Length(max = 250, message = "faultDescription参数不能超出250个字符", groups = {create.class, update.class})
+    private String faultDescription;
+
+    @NotNull(message = "faultImg参数缺失", groups = {create.class, update.class})
+    @Length(max = 255, message = "faultImg参数不能超出255个字符", groups = {create.class, update.class})
+    private String faultImg;
+
+    @NotNull(message = "receiverType参数缺失", groups = {create.class, update.class})
+    @DecimalMin(value = "0", message = "receiverType参数值不能少于0", groups = {create.class, update.class})
+    private Long receiverType;
+
+    @NotNull(message = "provinceId参数缺失", groups = {create.class, update.class})
+    @DecimalMin(value = "0", message = "provinceId参数值不能少于0", groups = {create.class, update.class})
+    private Long provinceId;
+
+    @NotNull(message = "cityId参数缺失", groups = {create.class, update.class})
+    @DecimalMin(value = "0", message = "cityId参数值不能少于0", groups = {create.class, update.class})
+    private Long cityId;
+
+    @NotNull(message = "districtId参数缺失", groups = {create.class, update.class})
+    @DecimalMin(value = "0", message = "districtId参数值不能少于0", groups = {create.class, update.class})
+    private Long districtId;
+
+    @NotNull(message = "orderDistance参数缺失", groups = {create.class, update.class})
+    private BigDecimal orderDistance;
+
+    @NotNull(message = "totalAmount参数缺失", groups = {create.class, update.class})
+    private BigDecimal totalAmount;
+
+    @NotNull(message = "actualAmount参数缺失", groups = {create.class, update.class})
+    private BigDecimal actualAmount;
+
+    @NotNull(message = "receiverId参数缺失", groups = {create.class, update.class})
+    @DecimalMin(value = "0", message = "receiverId参数值不能少于0", groups = {create.class, update.class})
+    private Long receiverId;
+
+    @NotNull(message = "repairId参数缺失", groups = {create.class, update.class})
+    @DecimalMin(value = "0", message = "repairId参数值不能少于0", groups = {create.class, update.class})
+    private Long repairId;
+
+    @NotNull(message = "receiverTime参数缺失", groups = {create.class, update.class})
+    private Date receiverTime;
+
+    @NotNull(message = "cancelOrderTime参数缺失", groups = {create.class, update.class})
+    private Date cancelOrderTime;
+
+    @NotNull(message = "cancelCause参数缺失", groups = {create.class, update.class})
+    @Length(max = 250, message = "cancelCause参数不能超出250个字符", groups = {create.class, update.class})
+    private String cancelCause;
+
+    @NotNull(message = "refuseMaintenanceCause参数缺失", groups = {create.class, update.class})
+    @Length(max = 250, message = "refuseMaintenanceCause参数不能超出250个字符", groups = {create.class, update.class})
+    private String refuseMaintenanceCause;
+
+    @NotNull(message = "remark参数缺失", groups = {create.class, update.class})
+    @Length(max = 250, message = "remark参数不能超出250个字符", groups = {create.class, update.class})
+    private String remark;
+
+    @NotNull(message = "creatorId参数缺失", groups = {create.class, update.class})
+    @DecimalMin(value = "0", message = "creatorId参数值不能少于0", groups = {create.class, update.class})
+    private Long creatorId;
+
+    @NotNull(message = "orderAccomplishTime参数缺失", groups = {create.class, update.class})
+    private Date orderAccomplishTime;
+
+    @NotNull(message = "familiarFaultId参数缺失", groups = {create.class, update.class})
+    @DecimalMin(value = "0", message = "familiarFaultId参数值不能少于0", groups = {create.class, update.class})
+    private Long familiarFaultId;
+
+    @NotNull(message = "familiarFaultDescription参数缺失", groups = {create.class, update.class})
+    @Length(max = 250, message = "familiarFaultDescription参数不能超出250个字符", groups = {create.class, update.class})
+    private String familiarFaultDescription;
+
+}

admin/src/main/java/com/hcy/admin/validate/order/OrderPartParam.java

@@ -0,0 +1,54 @@
+package com.hcy.admin.validate.order;
+
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.hibernate.validator.constraints.Length;
+
+import lombok.Data;
+import javax.validation.constraints.*;
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 订单配件参数
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class OrderPartParam implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    public interface create{}
+    public interface update{}
+    public interface delete{}
+
+    private Long id;
+
+    @NotNull(message = "partCode参数缺失", groups = {create.class, update.class})
+    @Length(max = 100, message = "partCode参数不能超出100个字符", groups = {create.class, update.class})
+    private String partCode;
+
+    @NotNull(message = "partName参数缺失", groups = {create.class, update.class})
+    @Length(max = 50, message = "partName参数不能超出50个字符", groups = {create.class, update.class})
+    private String partName;
+
+    @NotNull(message = "specificationModel参数缺失", groups = {create.class, update.class})
+    @Length(max = 50, message = "specificationModel参数不能超出50个字符", groups = {create.class, update.class})
+    private String specificationModel;
+
+    @NotNull(message = "unit参数缺失", groups = {create.class, update.class})
+    @Length(max = 20, message = "unit参数不能超出20个字符", groups = {create.class, update.class})
+    private String unit;
+
+    @NotNull(message = "price参数缺失", groups = {create.class, update.class})
+    private BigDecimal price;
+
+    @NotNull(message = "quantity参数缺失", groups = {create.class, update.class})
+    @DecimalMin(value = "0", message = "quantity参数值不能少于0", groups = {create.class, update.class})
+    private Long quantity;
+
+    @NotNull(message = "totalPrice参数缺失", groups = {create.class, update.class})
+    private BigDecimal totalPrice;
+
+}

admin/src/main/java/com/hcy/admin/validate/order/repair/MaintenanceRepairParam.java

@@ -0,0 +1,63 @@
+package com.hcy.admin.validate.order.repair;
+
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.hibernate.validator.constraints.Length;
+
+import lombok.Data;
+import javax.validation.constraints.*;
+import java.io.Serializable;
+
+/**
+ * 旧模块返修信息参数
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class MaintenanceRepairParam implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    public interface create{}
+    public interface update{}
+    public interface delete{}
+
+    private Long id;
+
+    @NotNull(message = "priorityId参数缺失", groups = {create.class, update.class})
+    @DecimalMin(value = "0", message = "priorityId参数值不能少于0", groups = {create.class, update.class})
+    private Long priorityId;
+
+    @NotNull(message = "logisticsMode参数缺失", groups = {create.class, update.class})
+    @Length(max = 100, message = "logisticsMode参数不能超出100个字符", groups = {create.class, update.class})
+    private String logisticsMode;
+
+    @NotNull(message = "expressageName参数缺失", groups = {create.class, update.class})
+    @Length(max = 50, message = "expressageName参数不能超出50个字符", groups = {create.class, update.class})
+    private String expressageName;
+
+    @NotNull(message = "expressageNo参数缺失", groups = {create.class, update.class})
+    @Length(max = 100, message = "expressageNo参数不能超出100个字符", groups = {create.class, update.class})
+    private String expressageNo;
+
+    @NotNull(message = "addressId参数缺失", groups = {create.class, update.class})
+    @DecimalMin(value = "0", message = "addressId参数值不能少于0", groups = {create.class, update.class})
+    private Long addressId;
+
+    @NotNull(message = "moduleNo参数缺失", groups = {create.class, update.class})
+    @Length(max = 50, message = "moduleNo参数不能超出50个字符", groups = {create.class, update.class})
+    private String moduleNo;
+
+    @NotNull(message = "brand参数缺失", groups = {create.class, update.class})
+    @Length(max = 50, message = "brand参数不能超出50个字符", groups = {create.class, update.class})
+    private String brand;
+
+    @NotNull(message = "moduleImg参数缺失", groups = {create.class, update.class})
+    @Length(max = 250, message = "moduleImg参数不能超出250个字符", groups = {create.class, update.class})
+    private String moduleImg;
+
+    @NotNull(message = "creatorId参数缺失", groups = {create.class, update.class})
+    @DecimalMin(value = "0", message = "creatorId参数值不能少于0", groups = {create.class, update.class})
+    private Long creatorId;
+
+}

admin/src/main/java/com/hcy/admin/validate/setting/DictDataParam.java

@@ -35,6 +35,9 @@ public class DictDataParam implements Serializable {
     @IDMust(message = "typeId参数必传且需大于0", groups = {create.class, update.class})
     private Integer typeId;
 
+    @NotNull(message = "typeValue参数缺失", groups = {create.class, update.class})
+    private String typeValue;
+
     @NotNull(message = "name参数缺失", groups = {create.class, update.class})
     private String name;
 

admin/src/main/java/com/hcy/admin/vo/client/ClientContactsDetailVo.java

@@ -0,0 +1,31 @@
+package com.hcy.admin.vo.client;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * ClientContactsVo
+ */
+@Data
+public class ClientContactsDetailVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Long id; // id
+    private Long clientId; // 客户id
+    private Long userId; // 用户id
+    private String name; // 姓名
+    private Integer sex; // 性别 0-男 1-女
+    private String phone; // 联系电话
+    private Long provinceId; // 省id
+    private Long cityId; // 市id
+    private Long districtId; // 区id
+    private String province; // 省
+    private String city; // 市
+    private String district; // 区
+    private String address; // 详细地址
+    private Integer status; // 账户状态 0-正常 1-停用
+    private Long creatorId; // 创建人id
+
+}

admin/src/main/java/com/hcy/admin/vo/client/ClientContactsListVo.java

@@ -0,0 +1,34 @@
+package com.hcy.admin.vo.client;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * ClientContactsVo
+ */
+@Data
+public class ClientContactsListVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Long id; // id
+    private Long clientId; // 客户id
+    private Long userId; // 用户id
+    private String name; // 姓名
+    private Integer sex; // 性别 0-男 1-女
+    private String phone; // 联系电话
+    private Long provinceId; // 省id
+    private Long cityId; // 市id
+    private Long districtId; // 区id
+    private String province; // 省
+    private String city; // 市
+    private String district; // 区
+    private String address; // 详细地址
+    private Integer status; // 账户状态 0-正常 1-停用
+    private Long creatorId; // 创建人id
+    private Date createTime; // 创建时间
+    private Date updateTime; // 更新时间
+
+}

admin/src/main/java/com/hcy/admin/vo/client/ClientDetailVo.java

@@ -0,0 +1,38 @@
+package com.hcy.admin.vo.client;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * ClientVo
+ */
+@Data
+public class ClientDetailVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Long id; // id
+    private Long userId; // 用户id
+    private String clientNo; // 客户编号
+    private String clientName; // 客户名称
+    private String director; // 负责人
+    private String directorStaffId; // 负责员工id
+    private String phone; // 联系电话
+    private Long provinceId; // 省id
+    private Long cityId; // 市id
+    private Long districtId; // 区id
+    private String province; // 省
+    private String city; // 市
+    private String district; // 区
+    private String address; // 详细地址
+    private Integer clientType; // 桩点维修类型 0-全包 1-半包
+    private Integer maintainType; // 模块维修类型 0-全包 1-半包
+    private BigDecimal purchaseDivisor; // 配件采购价格因子
+    private BigDecimal pointMaintainDivisor; // 桩点维修价格因子
+    private BigDecimal partMaintainDivisor; // 配件维修价格因子
+    private String remark; // 备注
+    private Long creatorId; // 创建人id
+
+}

admin/src/main/java/com/hcy/admin/vo/client/ClientListVo.java

@@ -0,0 +1,43 @@
+package com.hcy.admin.vo.client;
+
+import com.hcy.admin.validate.client.ClientParam;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * ClientVo
+ */
+@Data
+public class ClientListVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Long id; // id
+    private Long userId; // 用户id
+    private String clientNo; // 客户编号
+    private String clientName; // 客户名称
+    private String director; // 负责人
+    private String directorStaffId; // 负责员工id
+    private String phone; // 联系电话
+    private Long provinceId; // 省id
+    private Long cityId; // 市id
+    private Long districtId; // 区id
+    private String province; // 省
+    private String city; // 市
+    private String district; // 区
+    private String address; // 详细地址
+    private Integer clientType; // 桩点维修类型 0-全包 1-半包
+    private Integer maintainType; // 模块维修类型 0-全包 1-半包
+    private BigDecimal purchaseDivisor; // 配件采购价格因子
+    private BigDecimal pointMaintainDivisor; // 桩点维修价格因子
+    private BigDecimal partMaintainDivisor; // 配件维修价格因子
+    private String remark; // 备注
+    private Long creatorId; // 创建人id
+    private Date createTime; // 创建时间
+    private Date updateTime; // 更新时间
+
+}

admin/src/main/java/com/hcy/admin/vo/client/EquipmentDetailVo.java

@@ -1,4 +1,4 @@
-package com.hcy.admin.vo.equipment;
+package com.hcy.admin.vo.client;
 
 import lombok.Data;
 

admin/src/main/java/com/hcy/admin/vo/client/EquipmentListVo.java

@@ -1,4 +1,4 @@
-package com.hcy.admin.vo.equipment;
+package com.hcy.admin.vo.client;
 
 import lombok.Data;
 
@@ -13,7 +13,7 @@ public class EquipmentListVo implements Serializable {
     private static final long serialVersionUID = 1L;
 
     private Long id; // 主键id
-    private Long clientId; // 用户id
+    private Long clientId; // 客户id
     private Long moduleId; // 模块id
     private String number; // 设备编号
     private String name; // 设备名称

admin/src/main/java/com/hcy/admin/vo/fault/FaultDetailVo.java

@@ -0,0 +1,22 @@
+package com.hcy.admin.vo.fault;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * FaultVo
+ */
+@Data
+public class FaultDetailVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Long id; // id
+    private Long faultType; // 问题类型 1-常见问题 2-常见维修结论描述
+    private Long sort; // 序号
+    private String name; // 故障名称
+    private String description; // 故障描述
+    private Integer status; // 状态 0-正常 1-停用
+
+}

admin/src/main/java/com/hcy/admin/vo/fault/FaultListVo.java

@@ -0,0 +1,24 @@
+package com.hcy.admin.vo.fault;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * FaultVo
+ */
+@Data
+public class FaultListVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Long id; // id
+    private Long faultType; // 问题类型 1-常见问题 2-常见维修结论描述
+    private Long sort; // 序号
+    private String name; // 故障名称
+    private String description; // 故障描述
+    private Integer status; // 状态 0-正常 1-停用
+    private Date createTime; // 创建时间
+
+}

admin/src/main/java/com/hcy/admin/vo/order/MaintenanceOrderDetailVo.java

@@ -0,0 +1,45 @@
+package com.hcy.admin.vo.order;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * MaintenanceOrderVo
+ */
+@Data
+public class MaintenanceOrderDetailVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Long id; // id
+    private String orderNo; // 订单编号
+    private Long orderSource; // 订单来源 0-客户上报；1-系统创建；2-维修员创建；3-检修员创建；4-客服创建；5-维修主管创建
+    private Long orderStatus; // 订单状态 0-待抢单；1-待接单；2-接单超时；3-检测中；4-待客户确认；5-维修中；6-已完成；7-已退单；8-已关闭
+    private Long clientId; // 客户id
+    private Long deviceId; // 设备id
+    private Long faultId; // 故障id
+    private String faultDescription; // 故障描述
+    private String faultImg; // 故障图片
+    private Long receiverType; // 接单类型 0-区域派单；1-距离派单
+    private Long provinceId; // 省id
+    private Long cityId; // 市id
+    private Long districtId; // 区id
+    private BigDecimal orderDistance; // 订单距离
+    private BigDecimal totalAmount; // 总金额
+    private BigDecimal actualAmount; // 实际金额
+    private Long receiverId; // 接单人id
+    private Long repairId; // 返修id
+    private Date receiverTime; // 接单时间
+    private Date cancelOrderTime; // 取消订单时间
+    private String cancelCause; // 取消原因
+    private String refuseMaintenanceCause; // 拒绝维修原因
+    private String remark; // 备注
+    private Long creatorId; // 创建人id
+    private Date orderAccomplishTime; // 订单完成时间
+    private Long familiarFaultId; // 常见维修结论id
+    private String familiarFaultDescription; // 常见维修结论描述
+
+}

admin/src/main/java/com/hcy/admin/vo/order/MaintenanceOrderListVo.java

@@ -0,0 +1,47 @@
+package com.hcy.admin.vo.order;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * MaintenanceOrderVo
+ */
+@Data
+public class MaintenanceOrderListVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Long id; // id
+    private String orderNo; // 订单编号
+    private Long orderSource; // 订单来源 0-客户上报；1-系统创建；2-维修员创建；3-检修员创建；4-客服创建；5-维修主管创建
+    private Long orderStatus; // 订单状态 0-待抢单；1-待接单；2-接单超时；3-检测中；4-待客户确认；5-维修中；6-已完成；7-已退单；8-已关闭
+    private Long clientId; // 客户id
+    private Long deviceId; // 设备id
+    private Long faultId; // 故障id
+    private String faultDescription; // 故障描述
+    private String faultImg; // 故障图片
+    private Long receiverType; // 接单类型 0-区域派单；1-距离派单
+    private Long provinceId; // 省id
+    private Long cityId; // 市id
+    private Long districtId; // 区id
+    private BigDecimal orderDistance; // 订单距离
+    private BigDecimal totalAmount; // 总金额
+    private BigDecimal actualAmount; // 实际金额
+    private Long receiverId; // 接单人id
+    private Long repairId; // 返修id
+    private Date receiverTime; // 接单时间
+    private Date cancelOrderTime; // 取消订单时间
+    private String cancelCause; // 取消原因
+    private String refuseMaintenanceCause; // 拒绝维修原因
+    private String remark; // 备注
+    private Long creatorId; // 创建人id
+    private Date orderAccomplishTime; // 订单完成时间
+    private Long familiarFaultId; // 常见维修结论id
+    private String familiarFaultDescription; // 常见维修结论描述
+    private Date createTime; // 创建时间
+    private Date updateTime; // 更新时间
+
+}

admin/src/main/java/com/hcy/admin/vo/order/OrderPartDetailVo.java

@@ -0,0 +1,25 @@
+package com.hcy.admin.vo.order;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * OrderPartVo
+ */
+@Data
+public class OrderPartDetailVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Long id; // id
+    private String partCode; // 备件编码
+    private String partName; // 备件名称
+    private String specificationModel; // 规格型号
+    private String unit; // 单位
+    private BigDecimal price; // 价格
+    private Long quantity; // 数量
+    private BigDecimal totalPrice; // 总价
+
+}

admin/src/main/java/com/hcy/admin/vo/order/OrderPartListVo.java

@@ -0,0 +1,25 @@
+package com.hcy.admin.vo.order;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * OrderPartVo
+ */
+@Data
+public class OrderPartListVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Long id; // id
+    private String partCode; // 备件编码
+    private String partName; // 备件名称
+    private String specificationModel; // 规格型号
+    private String unit; // 单位
+    private BigDecimal price; // 价格
+    private Long quantity; // 数量
+    private BigDecimal totalPrice; // 总价
+
+}

admin/src/main/java/com/hcy/admin/vo/order/repair/MaintenanceRepairDetailVo.java

@@ -0,0 +1,26 @@
+package com.hcy.admin.vo.order.repair;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * MaintenanceRepairVo
+ */
+@Data
+public class MaintenanceRepairDetailVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Long id; // id
+    private Long priorityId; // 优先级 0-普通 1-加急
+    private String logisticsMode; // 物流方式
+    private String expressageName; // 快递名称
+    private String expressageNo; // 快递单号
+    private Long addressId; // 回寄地址
+    private String moduleNo; // 模块号
+    private String brand; // 品牌号
+    private String moduleImg; // 模块图片
+    private Long creatorId; // 创建人id
+
+}

admin/src/main/java/com/hcy/admin/vo/order/repair/MaintenanceRepairListVo.java

@@ -0,0 +1,28 @@
+package com.hcy.admin.vo.order.repair;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * MaintenanceRepairVo
+ */
+@Data
+public class MaintenanceRepairListVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Long id; // id
+    private Long priorityId; // 优先级 0-普通 1-加急
+    private String logisticsMode; // 物流方式
+    private String expressName; // 快递名称
+    private String expressNo; // 快递单号
+    private Long addressId; // 回寄地址
+    private String moduleNo; // 模块号
+    private String brand; // 品牌号
+    private String moduleImg; // 模块图片
+    private Long creatorId; // 创建人id
+    private Date createTime; // 创建时间
+
+}

admin/src/main/resources/application.yml

@@ -61,6 +61,8 @@ spring:
 mybatis-plus:
   mapper-locations: classpath*:/mapper/**Mapper.xml # 映射文件路径
   typeAliasesPackage: com.hcy.**.mapper
+  configuration:
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
   global-config:
     banner: false
     db-config:

admin/target/classes/application.yml

@@ -61,6 +61,8 @@ spring:
 mybatis-plus:
   mapper-locations: classpath*:/mapper/**Mapper.xml # 映射文件路径
   typeAliasesPackage: com.hcy.**.mapper
+  configuration:
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
   global-config:
     banner: false
     db-config:

common/pom.xml

@@ -251,6 +251,7 @@
             <artifactId>core</artifactId>
             <version>3.3.3</version>
         </dependency>
+
         <dependency>
             <groupId>com.google.zxing</groupId>
             <artifactId>javase</artifactId>

common/src/main/java/com/hcy/common/entity/client/Client.java

@@ -0,0 +1,42 @@
+package com.hcy.common.entity.client;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 客户实体
+ */
+@Data
+public class Client implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value="id", type= IdType.AUTO)
+    private Long id; // id
+    private Long userId; // 用户id
+    private String clientNo; // 客户编号
+    private String clientName; // 客户名称
+    private String director; // 负责人
+    private String directorStaffId; // 负责员工id
+    private String phone; // 联系电话
+    private Long provinceId; // 省id
+    private Long cityId; // 市id
+    private Long districtId; // 区id
+    private String address; // 详细地址
+    private Integer clientType; // 桩点维修类型 0-全包 1-半包
+    private Integer maintainType; // 模块维修类型 0-全包 1-半包
+    private BigDecimal purchaseDivisor; // 配件采购价格因子
+    private BigDecimal pointMaintainDivisor; // 桩点维修价格因子
+    private BigDecimal partMaintainDivisor; // 配件维修价格因子
+    private String remark; // 备注
+    private Long creatorId; // 创建人id
+    private Date createTime; // 创建时间
+    private Date updateTime; // 更新时间
+    private Integer isDelete; // 是否删除 0-未删除 1-删除
+
+}

common/src/main/java/com/hcy/common/entity/client/ClientContacts.java

@@ -0,0 +1,35 @@
+package com.hcy.common.entity.client;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 客户联系人实体
+ */
+@Data
+public class ClientContacts implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value="id", type= IdType.AUTO)
+    private Long id; // id
+    private Long clientId; // 客户id
+    private Long userId; // 用户id
+    private String name; // 姓名
+    private Integer sex; // 性别 0-男 1-女
+    private String phone; // 联系电话
+    private Long provinceId; // 省id
+    private Long cityId; // 市id
+    private Long districtId; // 区id
+    private String address; // 详细地址
+    private Integer status; // 账户状态 0-正常 1-停用
+    private Long creatorId; // 创建人id
+    private Date createTime; // 创建时间
+    private Date updateTime; // 更新时间
+    private Integer isDelete; // 是否删除 0-未删除 1-删除
+
+}

common/src/main/java/com/hcy/common/entity/client/Equipment.java

@@ -1,4 +1,4 @@
-package com.hcy.common.entity.equipment;
+package com.hcy.common.entity.client;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -16,7 +16,7 @@ public class Equipment implements Serializable {
 
     @TableId(value="id", type= IdType.AUTO)
     private Long id; // 主键id
-    private Long clientId; // 用户id
+    private Long clientId; // 客户id
     private Long moduleId; // 模块id
     private String number; // 设备编号
     private String name; // 设备名称

common/src/main/java/com/hcy/common/entity/fault/Fault.java

@@ -0,0 +1,28 @@
+package com.hcy.common.entity.fault;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 常见故障实体
+ */
+@Data
+public class Fault implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value="id", type= IdType.AUTO)
+    private Long id; // id
+    private Long faultType; // 问题类型 1-常见问题 2-常见维修结论描述
+    private Long sort; // 序号
+    private String name; // 故障名称
+    private String description; // 故障描述
+    private Integer status; // 状态 0-正常 1-停用
+    private Date createTime; // 创建时间
+    private Integer isDelete; // 是否删除  0-未删除 1-删除
+
+}

common/src/main/java/com/hcy/common/entity/order/MaintenanceOrder.java

@@ -0,0 +1,51 @@
+package com.hcy.common.entity.order;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 检修订单实体
+ */
+@Data
+public class MaintenanceOrder implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value="id", type= IdType.AUTO)
+    private Long id; // id
+    private String orderNo; // 订单编号
+    private Long orderSource; // 订单来源 0-客户上报；1-系统创建；2-维修员创建；3-检修员创建；4-客服创建；5-维修主管创建
+    private Long orderStatus; // 订单状态 0-待抢单；1-待接单；2-接单超时；3-检测中；4-待客户确认；5-维修中；6-已完成；7-已退单；8-已关闭
+    private Long clientId; // 客户id
+    private Long deviceId; // 设备id
+    private Long faultId; // 故障id
+    private String faultDescription; // 故障描述
+    private String faultImg; // 故障图片
+    private Long receiverType; // 接单类型 0-区域派单；1-距离派单
+    private Long provinceId; // 省id
+    private Long cityId; // 市id
+    private Long districtId; // 区id
+    private BigDecimal orderDistance; // 订单距离
+    private BigDecimal totalAmount; // 总金额
+    private BigDecimal actualAmount; // 实际金额
+    private Long receiverId; // 接单人id
+    private Long repairId; // 返修id
+    private Date receiverTime; // 接单时间
+    private Date cancelOrderTime; // 取消订单时间
+    private String cancelCause; // 取消原因
+    private String refuseMaintenanceCause; // 拒绝维修原因
+    private String remark; // 备注
+    private Long creatorId; // 创建人id
+    private Date orderAccomplishTime; // 订单完成时间
+    private Long familiarFaultId; // 常见维修结论id
+    private String familiarFaultDescription; // 常见维修结论描述
+    private Date createTime; // 创建时间
+    private Date updateTime; // 更新时间
+    private Integer isDelete; // 是否删除 0-未删除 1-删除
+
+}

common/src/main/java/com/hcy/common/entity/order/OrderPart.java

@@ -0,0 +1,29 @@
+package com.hcy.common.entity.order;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 订单配件实体
+ */
+@Data
+public class OrderPart implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value="id", type= IdType.AUTO)
+    private Long id; // id
+    private String partCode; // 备件编码
+    private String partName; // 备件名称
+    private String specificationModel; // 规格型号
+    private String unit; // 单位
+    private BigDecimal price; // 价格
+    private Long quantity; // 数量
+    private BigDecimal totalPrice; // 总价
+    private Integer isDelete; // 是否删除  0-未删除 1-删除
+
+}

common/src/main/java/com/hcy/common/entity/order/repair/MaintenanceRepair.java

@@ -0,0 +1,31 @@
+package com.hcy.common.entity.order.repair;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 旧模块返修信息实体
+ */
+@Data
+public class MaintenanceRepair implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value="id", type= IdType.AUTO)
+    private Long id; // id
+    private Long priorityId; // 优先级 0-普通 1-加急
+    private String logisticsMode; // 物流方式
+    private String expressName; // 快递名称
+    private String expressNo; // 快递单号
+    private Long addressId; // 回寄地址
+    private String moduleNo; // 模块号
+    private String brand; // 品牌号
+    private String moduleImg; // 模块图片
+    private Long creatorId; // 创建人id
+    private Date createTime; // 创建时间
+
+}

common/src/main/java/com/hcy/common/entity/setting/DictData.java

@@ -17,6 +17,7 @@ public class DictData implements Serializable {
     @TableId(value="id", type= IdType.AUTO)
     private Integer id;       // 主键
     private Integer typeId;   // 类型
+    private String typeValue; //字典類型
     private String name;      // 键名
     private String value;     // 数值
     private String remark;    // 备注

common/src/main/java/com/hcy/common/enums/FaultEnum.java

@@ -0,0 +1,58 @@
+package com.hcy.common.enums;
+
+public enum FaultEnum {
+
+    /**
+     * 用户余额类型
+     */
+    FAMILIAR_FAULT(0, "常见问题"),
+    FAMILIAR_FAULT_CONCLUSION(1,"常见问题结论");
+
+    /**
+     * 构造方法
+     */
+    private final int code;
+    private final String msg;
+
+    FaultEnum(int code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    /**
+     * 获取状态码
+     *
+     * @author fzr
+     * @return Long
+     */
+    public int getCode() {
+        return this.code;
+    }
+
+    /**
+     * 获取提示
+     *
+     * @author fzr
+     * @return String
+     */
+    public String getMsg() {
+        return this.msg;
+    }
+
+    /**
+     * 根据编码获取Msg
+     *
+     * @author fzr
+     * @param code 类型
+     * @return String
+     */
+    public static String getMsgByCode(Integer code){
+        for(AccountEnum enumItem : AccountEnum.values()) {
+            if (enumItem.getCode() == code) {
+                return enumItem.getMsg();
+            }
+        }
+        return null;
+    }
+
+}

common/src/main/java/com/hcy/common/mapper/client/ClientContactsMapper.java

@@ -0,0 +1,49 @@
+package com.hcy.common.mapper.client;
+
+import com.hcy.common.core.basics.IBaseMapper;
+import com.hcy.common.entity.client.ClientContacts;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * 客户联系人Mapper
+ */
+@Mapper
+public interface ClientContactsMapper extends IBaseMapper<ClientContacts> {
+
+    /**
+     * 校验客户联系重复
+     * @param phone 手机号码
+     * @return 数量
+     */
+    @Select("SELECT\n" +
+            "\tcount(*)  \n" +
+            "FROM\n" +
+            "\tla_client_contacts AS cc\n" +
+            "\tLEFT JOIN la_client AS c ON c.id = cc.client_id \n" +
+            "WHERE\n" +
+            "\tc.is_delete = 0 \n" +
+            "\tAND (\n" +
+            "\tcc.phone = #{phone} or c.phone = #{phone})")
+    Integer checkClientContactsPhoneRepetition(@Param("phone") String phone);
+
+    /**
+     * 校验编辑客户联系重复
+     * @param id 联系人id
+     * @param clientId 客户id
+     * @param phone 手机号码
+     * @return 数量
+     */
+    @Select("SELECT\n" +
+            "\tcount(*) \n" +
+            "FROM\n" +
+            "\tla_client_contacts AS cc\n" +
+            "\tLEFT JOIN la_client AS c ON c.id = cc.client_id \n" +
+            "WHERE\n" +
+            "\tc.is_delete = 0 \n" +
+            "\tAND cc.id != ${id}\n" +
+            "\tAND c.id != ${clientId}\n" +
+            "\tAND (cc.phone = #{phone} OR c.phone = #{phone})")
+    Integer checkEditClientContactsPhoneRepetition(@Param("id") Long id,@Param("clientId") Long clientId,@Param("phone") String phone);
+}

common/src/main/java/com/hcy/common/mapper/client/ClientMapper.java

@@ -0,0 +1,12 @@
+package com.hcy.common.mapper.client;
+
+import com.hcy.common.core.basics.IBaseMapper;
+import com.hcy.common.entity.client.Client;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 客户Mapper
+ */
+@Mapper
+public interface ClientMapper extends IBaseMapper<Client> {
+}

common/src/main/java/com/hcy/common/mapper/client/EquipmentMapper.java

@@ -1,8 +1,8 @@
-package com.hcy.common.mapper.equipment;
+package com.hcy.common.mapper.client;
 
 
 import com.hcy.common.core.basics.IBaseMapper;
-import com.hcy.common.entity.equipment.Equipment;
+import com.hcy.common.entity.client.Equipment;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

common/src/main/java/com/hcy/common/mapper/fault/FaultMapper.java

@@ -0,0 +1,13 @@
+package com.hcy.common.mapper.fault;
+
+import com.hcy.common.core.basics.IBaseMapper;
+import com.hcy.common.entity.fault.Fault;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 常见故障Mapper
+ */
+@Mapper
+public interface FaultMapper extends IBaseMapper<Fault> {
+
+}

common/src/main/java/com/hcy/common/mapper/order/MaintenanceOrderMapper.java

@@ -0,0 +1,12 @@
+package com.hcy.common.mapper.order;
+
+import com.hcy.common.core.basics.IBaseMapper;
+import com.hcy.common.entity.order.MaintenanceOrder;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 检修订单Mapper
+ */
+@Mapper
+public interface MaintenanceOrderMapper extends IBaseMapper<MaintenanceOrder> {
+}

common/src/main/java/com/hcy/common/mapper/order/OrderPartMapper.java

@@ -0,0 +1,13 @@
+package com.hcy.common.mapper.order;
+
+import com.hcy.common.core.basics.IBaseMapper;
+import com.hcy.common.entity.order.OrderPart;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 订单配件Mapper
+ */
+@Mapper
+public interface OrderPartMapper extends IBaseMapper<OrderPart> {
+
+}

common/src/main/java/com/hcy/common/mapper/order/repair/MaintenanceRepairMapper.java

@@ -0,0 +1,13 @@
+package com.hcy.common.mapper.order.repair;
+
+import com.hcy.common.core.basics.IBaseMapper;
+import com.hcy.common.entity.order.repair.MaintenanceRepair;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 旧模块返修信息Mapper
+ */
+@Mapper
+public interface MaintenanceRepairMapper extends IBaseMapper<MaintenanceRepair> {
+
+}

common/target/maven-archiver/pom.properties

@@ -0,0 +1,5 @@
+#Generated by Maven
+#Wed Aug 14 10:40:41 CST 2024
+version=1.0.0
+groupId=org.hcy
+artifactId=common

common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -0,0 +1,373 @@
+com\hcy\common\utils\HttpUtils.class
+com\hcy\common\plugin\storage\engine\LocalStorage.class
+com\hcy\common\enums\CancelOrderConfigTypeEnum.class
+com\hcy\common\enums\coupon\ChannelTypeEnum.class
+com\hcy\common\enums\wxpay\WxTradeState.class
+com\hcy\common\plugin\storage\engine\QiniuStorage.class
+com\hcy\common\enums\AccountChangeEnum.class
+com\hcy\common\dto\OrderDistributionDto.class
+com\hcy\common\entity\plant\Plant.class
+com\hcy\common\entity\recharge\Recharge.class
+com\hcy\common\entity\setting\DictData.class
+com\hcy\common\mapper\log\OrderRefundLogMapper.class
+com\hcy\common\utils\ToolsUtil.class
+com\hcy\common\constant\GlobalConstant.class
+com\hcy\common\entity\wxpay\WxPayOrderNotifyV3Result.class
+com\hcy\common\entity\system\SystemLogOperate.class
+com\hcy\common\core\basics\IBaseMapper$1.class
+com\hcy\common\enums\OrderTypeEnum.class
+com\hcy\common\mapper\plant\PlantMapper.class
+com\hcy\common\mapper\comment\GoodsCommentMapper.class
+com\hcy\common\enums\FaultEnum.class
+com\hcy\common\entity\staff\Staff.class
+com\hcy\common\mapper\sparePartStockAudit\SparePartStockAuditMapper.class
+com\hcy\common\mapper\session\UserSessionMapper.class
+com\hcy\common\enums\OrderRefundStatusEnum.class
+com\hcy\common\entity\system\SystemAuthPerm.class
+com\hcy\common\mapper\address\UserAddressMapper.class
+com\hcy\common\entity\goods\OrderGoods.class
+com\hcy\common\mapper\coupon\GoodsCouponMapper.class
+com\hcy\common\config\QRCodeConfig.class
+com\hcy\common\entity\image\GoodsImage.class
+com\hcy\common\entity\setting\DictType.class
+com\hcy\common\utils\FormulaUtil.class
+com\hcy\common\mapper\system\SystemAuthDeptMapper.class
+com\hcy\common\entity\wxpay\WxPayOrderNotifyV3Result$Amount.class
+com\hcy\common\entity\wxpay\WxPayOrderNotifyV3Result$GoodsDetail.class
+com\hcy\common\mapper\decorate\DecoratePageMapper.class
+com\hcy\common\mapper\common\WithdrawCommissionMapper.class
+com\hcy\common\mapper\log\SmsLogMapper.class
+com\hcy\common\plugin\notice\engine\MpNotice.class
+com\hcy\common\mapper\group\DistributeGroupMapper.class
+com\hcy\common\exception\OperateException.class
+com\hcy\common\dto\goods\GoodsDto.class
+com\hcy\common\core\ServerResult.class
+com\hcy\common\config\map\LikeTenCentClient$2.class
+com\hcy\common\mapper\setting\DevNoticeSettingMapper.class
+com\hcy\common\utils\SpringUtil.class
+com\hcy\common\entity\image\GoodsCommentImage.class
+com\hcy\common\config\ResponseControllerAdvice.class
+com\hcy\common\utils\WxPayServiceUtils.class
+com\hcy\common\mapper\coupon\UserCouponMapper.class
+com\hcy\common\dto\OrderDto.class
+com\hcy\common\config\map\LikeTenCentClient.class
+com\hcy\common\plugin\storage\engine\QcloudStorage.class
+com\hcy\common\enums\coupon\CouponTypeEnum.class
+com\hcy\common\utils\ArrayUtil.class
+com\hcy\common\utils\ExcelUtils.class
+com\hcy\common\enums\distributor\DistributorWithdrawStatusEnum.class
+com\hcy\common\entity\staff\StaffPhysicalExamination.class
+com\hcy\common\enums\RecommendEnum.class
+com\hcy\common\mapper\category\GoodsCategoryMapper.class
+com\hcy\common\mapper\fault\FaultMapper.class
+com\hcy\common\mapper\image\GoodsImageMapper.class
+com\hcy\common\enums\OperateEnum.class
+com\hcy\common\entity\refund\OrderRefund.class
+com\hcy\common\entity\wxpay\WxPayRefundQueryV3Result$From.class
+com\hcy\common\entity\system\SystemAuthAdmin.class
+com\hcy\common\mapper\album\AlbumMapper.class
+com\hcy\common\entity\log\OrderRefundLog.class
+com\hcy\common\mapper\setting\DictTypeMapper.class
+com\hcy\common\enums\RegionLevelEnum.class
+com\hcy\common\entity\log\SmsLog.class
+com\hcy\common\entity\sparePartStockAudit\SparePartStockAudit.class
+com\hcy\common\entity\coupon\Coupon.class
+com\hcy\common\entity\wxpay\WxPayRefundNotifyV3Result.class
+com\hcy\common\entity\staff\StaffCommission.class
+com\hcy\common\utils\HttpUtil.class
+com\hcy\common\mapper\notice\NoticeSettingMapper.class
+com\hcy\common\mapper\order\OrderMapper.class
+com\hcy\common\entity\album\Album.class
+com\hcy\common\entity\setting\DevNoticeSetting.class
+com\hcy\common\utils\ArrayUtil$1.class
+com\hcy\common\entity\wxpay\WxPayOrderQueryV3Result$Amount.class
+com\hcy\common\utils\HttpUtil$1.class
+com\hcy\common\entity\address\UserAddress.class
+com\hcy\common\plugin\sms\engine\HuaweiSms$1.class
+com\hcy\common\entity\server\Cpu.class
+com\hcy\common\entity\user\User.class
+com\hcy\common\dto\GoodsCommentPageDto.class
+com\hcy\common\dto\UserDto.class
+com\hcy\common\plugin\notice\NoticeDriver.class
+com\hcy\common\mapper\goods\OrderGoodsMapper.class
+com\hcy\common\utils\HttpClientUtils.class
+com\hcy\common\enums\staff\StaffFeedbackEnum.class
+com\hcy\common\mapper\article\ArticleMapper.class
+com\hcy\common\mapper\crontab\CrontabMapper.class
+com\hcy\common\utils\SnUtils.class
+com\hcy\common\enums\wxpay\WxTransferAccountsSceneType.class
+com\hcy\common\enums\staff\StaffStatusEnum.class
+com\hcy\common\mapper\system\SystemAuthRoleMapper.class
+com\hcy\common\mapper\staff\StaffCommissionMapper.class
+com\hcy\common\entity\wxpay\WxPayOrderQueryV3Result.class
+com\hcy\common\mapper\reply\OfficialAccountReplyMapper.class
+com\hcy\common\plugin\storage\StorageDriver.class
+com\hcy\common\dto\result\OrderPageResultDto.class
+com\hcy\common\utils\ConfigUtil.class
+com\hcy\common\utils\HttpUtil$TrustAnyHostnameVerifier.class
+com\hcy\common\mapper\applyFor\WithdrawCommissionApplyforMapper.class
+com\hcy\common\core\basics\IBaseMapper.class
+com\hcy\common\entity\staff\StaffFeedback.class
+com\hcy\common\mapper\region\DevRegionMapper.class
+com\hcy\common\entity\goods\GoodsTime.class
+com\hcy\common\entity\sparePart\SparePart.class
+com\hcy\common\utils\RegularExpressionUtil.class
+com\hcy\common\entity\coupon\GoodsCategoryCoupon.class
+com\hcy\common\entity\user\UserAuth.class
+com\hcy\common\core\PageSumResult.class
+com\hcy\common\entity\pay\DevPay.class
+com\hcy\common\utils\PinyinUtil.class
+com\hcy\common\utils\ArrayUtil$6.class
+com\hcy\common\enums\HttpEnum.class
+com\hcy\common\entity\wxpay\WxPayRefundQueryV3Result$GoodsDetail.class
+com\hcy\common\enums\NoticeEnum.class
+com\hcy\common\utils\WxGzhTemplateUtil.class
+com\hcy\common\entity\system\SystemLogLogin.class
+com\hcy\common\entity\fault\Fault.class
+com\hcy\common\dto\result\UserResultDto.class
+com\hcy\common\validator\StringContainsValidator.class
+com\hcy\common\utils\UrlUtil.class
+com\hcy\common\mapper\serviceArea\ServiceAreaMapper.class
+com\hcy\common\utils\ArrayUtil$7.class
+com\hcy\common\entity\visit\IndexVisit.class
+com\hcy\common\enums\staff\StaffApplyForStatusEnum.class
+com\hcy\common\enums\RefundEnum.class
+com\hcy\common\enums\staff\StaffReceiveOrderTypeEnum.class
+com\hcy\common\entity\wxpay\WxPayOrderQueryV3Result$SceneInfo.class
+com\hcy\common\core\PageResult.class
+com\hcy\common\entity\jobs\Jobs.class
+com\hcy\common\enums\coupon\UserCouponStatusEnum.class
+com\hcy\common\entity\wxpay\WxPayOrderNotifyV3Result$PromotionDetail.class
+com\hcy\common\enums\GoodsCategoryStatusEnum.class
+com\hcy\common\utils\ToolsUtil$3.class
+com\hcy\common\enums\wxpay\WxToUrlEnum.class
+com\hcy\common\config\map\MapConfig.class
+com\hcy\common\dto\result\GoodsCollectionResultDto.class
+com\hcy\common\mapper\crontab\DevCrontabMapper.class
+com\hcy\common\utils\RequestUtil.class
+com\hcy\common\enums\WithdrawCommissionApplyforEnum.class
+com\hcy\common\utils\ArithUtil.class
+com\hcy\common\enums\StatusEnum.class
+com\hcy\common\utils\RedisUtil.class
+com\hcy\common\utils\ArrayUtil$5.class
+com\hcy\common\utils\HttpUtil$TrustAnyTrustManager.class
+com\hcy\common\plugin\sms\engine\HuaweiSms.class
+com\hcy\common\plugin\notice\engine\OaNotice.class
+com\hcy\common\entity\wxpay\WxPayRefundV3Result$PromotionDetail.class
+com\hcy\common\entity\order\CancelOrderConfig.class
+com\hcy\common\mapper\staff\StaffMapper.class
+com\hcy\common\utils\ArrayUtil$2.class
+com\hcy\common\mapper\user\UserMapper.class
+com\hcy\common\utils\ToolsUtil$1.class
+com\hcy\common\utils\ArrayUtil$3.class
+com\hcy\common\entity\category\GoodsCategory.class
+com\hcy\common\mapper\CommonOverhaul\CommonOverhaulMapper.class
+com\hcy\common\enums\AlbumEnum.class
+com\hcy\common\enums\wxpay\WxRefundStatus.class
+com\hcy\common\dto\staff\StaffDto.class
+com\hcy\common\utils\AmountUtil.class
+com\hcy\common\entity\SparePartAudit\SparePartAudit.class
+com\hcy\common\dto\WithdrawCommissionDto.class
+com\hcy\common\mapper\article\ArticleCollectMapper.class
+com\hcy\common\dto\result\StaffFeedbackResultDto.class
+com\hcy\common\entity\wxpay\WxPayRefundQueryV3Result$PromotionDetail.class
+com\hcy\common\enums\wxpay\WxNotifyType.class
+com\hcy\common\mapper\system\SystemLogSmsMapper.class
+com\hcy\common\mapper\way\DevPayWayMapper.class
+com\hcy\common\validator\IDMustValidator.class
+com\hcy\common\entity\wxpay\WxPayOrderQueryV3Result$GoodsDetail.class
+com\hcy\common\mapper\system\SystemConfigMapper.class
+com\hcy\common\utils\ArrayUtil$4.class
+com\hcy\common\utils\ToolsUtil$2.class
+com\hcy\common\enums\distributor\DistributorWithdrawResultEnum.class
+com\hcy\common\enums\OrderStatusEnum.class
+com\hcy\common\mapper\collect\GoodsCollectMapper.class
+com\hcy\common\entity\wxpay\WxPayRefundQueryV3Result.class
+com\hcy\common\entity\article\ArticleCategory.class
+com\hcy\common\enums\user\UserTypeEnum.class
+com\hcy\common\mapper\article\ArticleCategoryMapper.class
+com\hcy\common\core\AjaxResult.class
+com\hcy\common\mapper\sparePart\SparePartMapper.class
+com\hcy\common\entity\wxpay\SystemWxPayConfig.class
+com\hcy\common\mapper\coupon\GoodsCategoryCouponMapper.class
+com\hcy\common\utils\QRCodeUtil.class
+com\hcy\common\entity\collect\GoodsCollect.class
+com\hcy\common\validator\annotation\IDMust.class
+com\hcy\common\mapper\staff\StaffFeedbackMapper.class
+com\hcy\common\dto\staff\StaffReassignmentDto.class
+com\hcy\common\entity\serviceArea\ServiceAreaStaff.class
+com\hcy\common\enums\OrderDispatchEnum.class
+com\hcy\common\entity\group\DistributeGroup.class
+com\hcy\common\mapper\setting\HotSearchMapper.class
+com\hcy\common\enums\staff\StaffEnum.class
+com\hcy\common\entity\reply\OfficialAccountReply.class
+com\hcy\common\mapper\time\OrderTimeMapper.class
+com\hcy\common\mapper\image\GoodsCommentImageMapper.class
+com\hcy\common\utils\IntegerUtil.class
+com\hcy\common\entity\wxpay\WxPayRefundV3Result.class
+com\hcy\common\mapper\equipment\EquipmentMapper.class
+com\hcy\common\mapper\activity\ActivityMapper.class
+com\hcy\common\enums\ClientEnum.class
+com\hcy\common\enums\AccountEnum.class
+com\hcy\common\entity\server\Disk.class
+com\hcy\common\mapper\staff\StaffApplyForMapper.class
+com\hcy\common\entity\crontab\Crontab.class
+com\hcy\common\entity\distribution\Distributor.class
+com\hcy\common\entity\notice\NoticeSetting.class
+com\hcy\common\entity\warehouse\Warehouse.class
+com\hcy\common\entity\coupon\GoodsCoupon.class
+com\hcy\common\entity\session\UserSession.class
+com\hcy\common\entity\account\AccountLog.class
+com\hcy\common\validator\annotation\IntegerContains.class
+com\hcy\common\entity\staff\StaffUploadFile.class
+com\hcy\common\entity\CommonMaintenance\CommonMaintenance.class
+com\hcy\common\validator\annotation\IntArrayEmpty.class
+com\hcy\common\mapper\recharge\RechargeOrderMapper.class
+com\hcy\common\plugin\notice\engine\SmsNotice.class
+com\hcy\common\utils\WeChatUtil.class
+com\hcy\common\dto\OrderGroupDto.class
+com\hcy\common\dto\result\StaffReassignmentResultDto.class
+com\hcy\common\mapper\commonFault\CommonFaultMapper.class
+com\hcy\common\enums\goods\GoodsEnum.class
+com\hcy\common\mapper\system\SystemAuthPostMapper.class
+com\hcy\common\config\map\LikeTenCentClient$1.class
+com\hcy\common\enums\wxpay\WxApiType.class
+com\hcy\common\config\RedisConfig.class
+com\hcy\common\entity\serviceArea\ServiceArea.class
+com\hcy\common\entity\wxpay\WxPayRefundV3Result$From.class
+com\hcy\common\entity\distribution\DistributorCommission.class
+com\hcy\common\enums\GoodsCommentStatusEnum.class
+com\hcy\common\validator\annotation\StringContains.class
+com\hcy\common\dto\coupon\UserCouponDto.class
+com\hcy\common\entity\order\Order.class
+com\hcy\common\plugin\sms\engine\AliSms.class
+com\hcy\common\entity\OfficialReply.class
+com\hcy\common\entity\wxpay\WxPayOrderQueryV3Result$PromotionDetail.class
+com\hcy\common\enums\OrderVerificationStatusEnum.class
+com\hcy\common\dto\RegionDto.class
+com\hcy\common\mapper\staff\StaffPhysicalExaminationMapper.class
+com\hcy\common\plugin\sms\SmsDriver.class
+com\hcy\common\mapper\album\AlbumCateMapper.class
+com\hcy\common\entity\coupon\ChannelCoupon.class
+com\hcy\common\mapper\account\AccountLogMapper.class
+com\hcy\common\exception\GlobalException.class
+com\hcy\common\utils\CodeUtil.class
+com\hcy\common\dto\result\VisitGroupResultDto.class
+com\hcy\common\mapper\user\UserAuthMapper.class
+com\hcy\common\entity\article\ArticleCollect.class
+com\hcy\common\entity\equipment\Equipment.class
+com\hcy\common\entity\notice\NoticeRecord.class
+com\hcy\common\enums\distributor\DistributorCommissionStatusEnum.class
+com\hcy\common\enums\PayChannelEnum.class
+com\hcy\common\mapper\staff\StaffReassignmentMapper.class
+com\hcy\common\mapper\OfficialReplyMapper.class
+com\hcy\common\utils\CronUtil.class
+com\hcy\common\entity\setting\HotSearch.class
+com\hcy\common\mapper\system\SystemAuthAdminMapper.class
+com\hcy\common\mapper\unit\GoodsUnitMapper.class
+com\hcy\common\enums\commonFault\CommonFaultEnum.class
+com\hcy\common\entity\CommonOverhaul\CommonOverhaul.class
+com\hcy\common\entity\wxpay\WxPayRefundQueryV3Result$Amount.class
+com\hcy\common\dto\result\ServiceAreaResultDto.class
+com\hcy\common\entity\wxpay\WxPayRefundNotifyV3Result$Amount.class
+com\hcy\common\entity\system\SystemLogSms.class
+com\hcy\common\validator\IntArrayEmptyValidator.class
+com\hcy\common\mapper\SparePartAudit\SparePartAuditMapper.class
+com\hcy\common\mapper\session\AdminSessionMapper.class
+com\hcy\common\enums\OrderPayStatusEnum.class
+com\hcy\common\mapper\system\SystemLogLoginMapper.class
+com\hcy\common\entity\server\Sys.class
+com\hcy\common\enums\PaymentEnum.class
+com\hcy\common\mapper\coupon\CouponMapper.class
+com\hcy\common\entity\coupon\UserCoupon.class
+com\hcy\common\mapper\warehouse\WarehouseMapper.class
+com\hcy\common\entity\system\SystemConfig.class
+com\hcy\common\entity\wxpay\WxPayRefundV3Result$GoodsDetail.class
+com\hcy\common\dto\VisitGroupDto.class
+com\hcy\common\entity\log\OrderLog.class
+com\hcy\common\mapper\setting\DictDataMapper.class
+com\hcy\common\config\ThreadPoolConfig.class
+com\hcy\common\entity\system\SystemAuthDept.class
+com\hcy\common\utils\StringUtil.class
+com\hcy\common\dto\OrderRefundDto.class
+com\hcy\common\entity\album\AlbumCate.class
+com\hcy\common\utils\PolygonUtil.class
+com\hcy\common\exception\BaseException.class
+com\hcy\common\mapper\order\CancelOrderConfigMapper.class
+com\hcy\common\dto\result\RegionResultDto.class
+com\hcy\common\entity\wxpay\WxPayOrderNotifyV3Result$SceneInfo.class
+com\hcy\common\enums\audit\AuditStateEnum.class
+com\hcy\common\enums\ShowEnum.class
+com\hcy\common\mapper\system\SystemAuthPermMapper.class
+com\hcy\common\dto\ServiceAreaDto.class
+com\hcy\common\entity\system\SystemAuthMenu.class
+com\hcy\common\utils\YmlUtil.class
+com\hcy\common\dto\result\OrderDistributionResultDto.class
+com\hcy\common\plugin\sms\engine\TencentSms.class
+com\hcy\common\mapper\system\SystemAuthMenuMapper.class
+com\hcy\common\utils\IpUtil.class
+com\hcy\common\mapper\ScrapType\ScrapTypeMapper.class
+com\hcy\common\entity\unit\GoodsUnit.class
+com\hcy\common\entity\crontab\DevCrontab.class
+com\hcy\common\enums\staff\StaffCommissionStatusEnum.class
+com\hcy\common\entity\staff\StaffReassignment.class
+com\hcy\common\utils\HttpClientUtils$1.class
+com\hcy\common\entity\applyFor\WithdrawCommissionApplyfor.class
+com\hcy\common\entity\server\Jvm.class
+com\hcy\common\entity\system\SystemAuthRole.class
+com\hcy\common\entity\recharge\RechargeOrder.class
+com\hcy\common\mapper\log\OrderLogMapper.class
+com\hcy\common\entity\way\DevPayWay.class
+com\hcy\common\enums\wxpay\WxAddressType.class
+com\hcy\common\enums\equipment\EquipmentStateEnum.class
+com\hcy\common\entity\server\Mem.class
+com\hcy\common\entity\commonFault\CommonFault.class
+com\hcy\common\mapper\goods\GoodsMapper.class
+com\hcy\common\entity\staff\StaffApplyFor.class
+com\hcy\common\exception\LoginException.class
+com\hcy\common\entity\wxpay\WxPayOrderQueryV3Result$Payer.class
+com\hcy\common\mapper\CommonMaintenance\CommonMaintenanceMapper.class
+com\hcy\common\utils\Coordinates.class
+com\hcy\common\entity\comment\GoodsComment.class
+com\hcy\common\mapper\coupon\ChannelCouponMapper.class
+com\hcy\common\dto\result\StaffResultDto.class
+com\hcy\common\mapper\jobs\JobsMapper.class
+com\hcy\common\dto\result\GoodsCommentPageResultDto.class
+com\hcy\common\entity\time\OrderTime.class
+com\hcy\common\mapper\visit\IndexVisitMapper.class
+com\hcy\common\enums\goods\GoodsTimeStatusEnum.class
+com\hcy\common\dto\result\OrderGroupResultDto.class
+com\hcy\common\plugin\storage\engine\AliyunStorage.class
+com\hcy\common\config\GlobalConfig.class
+com\hcy\common\entity\goods\Goods.class
+com\hcy\common\dto\staff\StaffPhysicalExaminationDto.class
+com\hcy\common\mapper\decorate\DecorateTabbarMapper.class
+com\hcy\common\mapper\distribution\DistributorCommissionMapper.class
+com\hcy\common\enums\RefundOperateEnum.class
+com\hcy\common\enums\wxpay\WxGzhTemplateEnum.class
+com\hcy\common\entity\ScrapType\ScrapType.class
+com\hcy\common\enums\OrderLogEnum.class
+com\hcy\common\mapper\goods\GoodsTimeMapper.class
+com\hcy\common\mapper\distribution\DistributorMapper.class
+com\hcy\common\mapper\system\SystemLogOperateMapper.class
+com\hcy\common\mapper\refund\OrderRefundMapper.class
+com\hcy\common\entity\region\DevRegion.class
+com\hcy\common\entity\wxpay\WxPayOrderNotifyV3Result$Payer.class
+com\hcy\common\entity\session\AdminSession.class
+com\hcy\common\dto\GoodsCollectionDto.class
+com\hcy\common\entity\decorate\DecorateTabbar.class
+com\hcy\common\enums\GoodsCommentLevelEnum.class
+com\hcy\common\enums\OrderPlayTypeEnum.class
+com\hcy\common\enums\staff\StaffReassignmentEnum.class
+com\hcy\common\entity\system\SystemAuthPost.class
+com\hcy\common\dto\staff\StaffFeedbackDto.class
+com\hcy\common\utils\TimeUtil.class
+com\hcy\common\enums\goods\UseGoodsTypeEnum.class
+com\hcy\common\mapper\serviceArea\ServiceAreaStaffMapper.class
+com\hcy\common\dto\result\OrderRefundPageResultDto.class
+com\hcy\common\entity\article\Article.class
+com\hcy\common\validator\IntegerContainsValidator.class
+com\hcy\common\entity\activity\Activity.class
+com\hcy\common\entity\decorate\DecoratePage.class
+com\hcy\common\entity\wxpay\WxPayRefundV3Result$Amount.class
+com\hcy\common\entity\distribution\WithdrawCommission.class

common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -0,0 +1,339 @@
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\crontab\Crontab.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\fault\Fault.java
+E:\charging_pile\common\src\main\java\com\hcy\common\utils\RedisUtil.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\album\AlbumCate.java
+E:\charging_pile\common\src\main\java\com\hcy\common\enums\distributor\DistributorWithdrawStatusEnum.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\CommonOverhaul\CommonOverhaul.java
+E:\charging_pile\common\src\main\java\com\hcy\common\validator\annotation\StringContains.java
+E:\charging_pile\common\src\main\java\com\hcy\common\dto\VisitGroupDto.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\album\AlbumCateMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\validator\IntegerContainsValidator.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\staff\Staff.java
+E:\charging_pile\common\src\main\java\com\hcy\common\enums\staff\StaffReceiveOrderTypeEnum.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\visit\IndexVisitMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\address\UserAddress.java
+E:\charging_pile\common\src\main\java\com\hcy\common\plugin\storage\engine\LocalStorage.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\log\OrderRefundLogMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\goods\OrderGoodsMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\staff\StaffFeedbackMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\utils\UrlUtil.java
+E:\charging_pile\common\src\main\java\com\hcy\common\enums\OrderPlayTypeEnum.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\coupon\GoodsCouponMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\validator\annotation\IntegerContains.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\staff\StaffCommission.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\ScrapType\ScrapType.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\account\AccountLogMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\enums\wxpay\WxTradeState.java
+E:\charging_pile\common\src\main\java\com\hcy\common\plugin\storage\engine\QcloudStorage.java
+E:\charging_pile\common\src\main\java\com\hcy\common\enums\coupon\ChannelTypeEnum.java
+E:\charging_pile\common\src\main\java\com\hcy\common\validator\StringContainsValidator.java
+E:\charging_pile\common\src\main\java\com\hcy\common\enums\goods\UseGoodsTypeEnum.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\jobs\JobsMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\config\WxPayGlobalConfig.java
+E:\charging_pile\common\src\main\java\com\hcy\common\dto\result\ServiceAreaResultDto.java
+E:\charging_pile\common\src\main\java\com\hcy\common\dto\goods\GoodsDto.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\goods\Goods.java
+E:\charging_pile\common\src\main\java\com\hcy\common\dto\result\OrderGroupResultDto.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\server\Disk.java
+E:\charging_pile\common\src\main\java\com\hcy\common\enums\FaultEnum.java
+E:\charging_pile\common\src\main\java\com\hcy\common\utils\WechatPay2ValidatorForRequest.java
+E:\charging_pile\common\src\main\java\com\hcy\common\dto\GoodsCommentPageDto.java
+E:\charging_pile\common\src\main\java\com\hcy\common\dto\result\OrderDistributionResultDto.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\image\GoodsImage.java
+E:\charging_pile\common\src\main\java\com\hcy\common\utils\TimeUtil.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\article\ArticleCategory.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\collect\GoodsCollect.java
+E:\charging_pile\common\src\main\java\com\hcy\common\utils\ArithUtil.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\crontab\DevCrontab.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\article\ArticleCategoryMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\utils\YmlUtil.java
+E:\charging_pile\common\src\main\java\com\hcy\common\enums\staff\StaffFeedbackEnum.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\order\Order.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\session\AdminSessionMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\enums\OrderRefundStatusEnum.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\region\DevRegion.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\coupon\ChannelCouponMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\system\SystemLogLogin.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\server\Jvm.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\setting\DevNoticeSettingMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\enums\PayChannelEnum.java
+E:\charging_pile\common\src\main\java\com\hcy\common\exception\LoginException.java
+E:\charging_pile\common\src\main\java\com\hcy\common\validator\IntArrayEmptyValidator.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\log\OrderLogMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\utils\ConfigUtil.java
+E:\charging_pile\common\src\main\java\com\hcy\common\utils\ArrayUtil.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\user\UserMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\distribution\DistributorCommissionMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\order\CancelOrderConfigMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\common\WithdrawCommissionMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\setting\HotSearch.java
+E:\charging_pile\common\src\main\java\com\hcy\common\enums\wxpay\WxApiType.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\crontab\DevCrontabMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\enums\RefundEnum.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\staff\StaffReassignmentMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\enums\WithdrawCommissionApplyforEnum.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\staff\StaffPhysicalExamination.java
+E:\charging_pile\common\src\main\java\com\hcy\common\enums\commonFault\CommonFaultEnum.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\goods\GoodsTimeMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\enums\user\UserTypeEnum.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\staff\StaffUploadFile.java
+E:\charging_pile\common\src\main\java\com\hcy\common\enums\staff\StaffReassignmentEnum.java
+E:\charging_pile\common\src\main\java\com\hcy\common\exception\BaseException.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\serviceArea\ServiceAreaMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\enums\AccountEnum.java
+E:\charging_pile\common\src\main\java\com\hcy\common\enums\OperateEnum.java
+E:\charging_pile\common\src\main\java\com\hcy\common\plugin\storage\StorageDriver.java
+E:\charging_pile\common\src\main\java\com\hcy\common\plugin\notice\engine\SmsNotice.java
+E:\charging_pile\common\src\main\java\com\hcy\common\plugin\sms\engine\AliSms.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\system\SystemLogOperateMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\enums\OrderPayStatusEnum.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\system\SystemAuthMenu.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\coupon\UserCoupon.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\staff\StaffCommissionMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\enums\RecommendEnum.java
+E:\charging_pile\common\src\main\java\com\hcy\common\plugin\sms\engine\HuaweiSms.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\wxpay\WxPayRefundNotifyV3Result.java
+E:\charging_pile\common\src\main\java\com\hcy\common\enums\OrderTypeEnum.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\region\DevRegionMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\comment\GoodsCommentMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\plugin\sms\engine\TencentSms.java
+E:\charging_pile\common\src\main\java\com\hcy\common\enums\AccountChangeEnum.java
+E:\charging_pile\common\src\main\java\com\hcy\common\constant\GlobalConstant.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\comment\GoodsComment.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\warehouse\WarehouseMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\enums\staff\StaffEnum.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\plant\PlantMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\config\map\LikeTenCentClient.java
+E:\charging_pile\common\src\main\java\com\hcy\common\enums\OrderVerificationStatusEnum.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\distribution\Distributor.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\wxpay\WxPayRefundQueryV3Result.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\group\DistributeGroup.java
+E:\charging_pile\common\src\main\java\com\hcy\common\enums\wxpay\WxToUrlEnum.java
+E:\charging_pile\common\src\main\java\com\hcy\common\dto\GoodsCollectionDto.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\serviceArea\ServiceAreaStaff.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\system\SystemAuthRole.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\SparePartAudit\SparePartAudit.java
+E:\charging_pile\common\src\main\java\com\hcy\common\utils\QRCodeUtil.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\sparePart\SparePart.java
+E:\charging_pile\common\src\main\java\com\hcy\common\dto\staff\StaffFeedbackDto.java
+E:\charging_pile\common\src\main\java\com\hcy\common\utils\AmountUtil.java
+E:\charging_pile\common\src\main\java\com\hcy\common\utils\ToolsUtil.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\system\SystemAuthPerm.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\time\OrderTime.java
+E:\charging_pile\common\src\main\java\com\hcy\common\validator\IDMustValidator.java
+E:\charging_pile\common\src\main\java\com\hcy\common\enums\equipment\EquipmentStateEnum.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\session\UserSessionMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\config\WxPayConfigBuilder.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\setting\DevNoticeSetting.java
+E:\charging_pile\common\src\main\java\com\hcy\common\config\ResponseControllerAdvice.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\system\SystemConfig.java
+E:\charging_pile\common\src\main\java\com\hcy\common\enums\GoodsCommentLevelEnum.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\article\ArticleMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\refund\OrderRefundMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\system\SystemAuthRoleMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\staff\StaffFeedback.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\notice\NoticeRecord.java
+E:\charging_pile\common\src\main\java\com\hcy\common\dto\ServiceAreaDto.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\decorate\DecoratePage.java
+E:\charging_pile\common\src\main\java\com\hcy\common\dto\OrderGroupDto.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\server\Mem.java
+E:\charging_pile\common\src\main\java\com\hcy\common\core\ServerResult.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\recharge\RechargeOrderMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\utils\IpUtil.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\notice\NoticeSettingMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\validator\annotation\IntArrayEmpty.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\image\GoodsCommentImage.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\activity\ActivityMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\config\RedisConfig.java
+E:\charging_pile\common\src\main\java\com\hcy\common\utils\CronUtil.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\order\OrderMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\utils\Coordinates.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\system\SystemLogLoginMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\staff\StaffApplyFor.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\category\GoodsCategoryMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\article\Article.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\commonFault\CommonFault.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\setting\DictTypeMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\visit\IndexVisit.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\coupon\GoodsCoupon.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\staff\StaffReassignment.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\staff\StaffPhysicalExaminationMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\plugin\notice\engine\OaNotice.java
+E:\charging_pile\common\src\main\java\com\hcy\common\enums\PaymentEnum.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\system\SystemLogSmsMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\log\OrderLog.java
+E:\charging_pile\common\src\main\java\com\hcy\common\utils\RegularExpressionUtil.java
+E:\charging_pile\common\src\main\java\com\hcy\common\utils\WxPayServiceUtils.java
+E:\charging_pile\common\src\main\java\com\hcy\common\config\ThreadPoolConfig.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\decorate\DecorateTabbarMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\utils\StringUtil.java
+E:\charging_pile\common\src\main\java\com\hcy\common\dto\RegionDto.java
+E:\charging_pile\common\src\main\java\com\hcy\common\dto\result\RegionResultDto.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\address\UserAddressMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\session\AdminSession.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\wxpay\SystemWxPayConfig.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\sparePart\SparePartMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\system\SystemAuthAdminMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\utils\SpringUtil.java
+E:\charging_pile\common\src\main\java\com\hcy\common\dto\result\StaffReassignmentResultDto.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\refund\OrderRefund.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\SparePartAudit\SparePartAuditMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\jobs\Jobs.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\goods\OrderGoods.java
+E:\charging_pile\common\src\main\java\com\hcy\common\enums\ShowEnum.java
+E:\charging_pile\common\src\main\java\com\hcy\common\enums\GoodsCommentStatusEnum.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\article\ArticleCollectMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\coupon\UserCouponMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\system\SystemConfigMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\utils\FormulaUtil.java
+E:\charging_pile\common\src\main\java\com\hcy\common\enums\AlbumEnum.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\unit\GoodsUnitMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\system\SystemAuthDeptMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\enums\HttpEnum.java
+E:\charging_pile\common\src\main\java\com\hcy\common\enums\wxpay\WxNotifyType.java
+E:\charging_pile\common\src\main\java\com\hcy\common\utils\IntegerUtil.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\system\SystemAuthMenuMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\decorate\DecoratePageMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\equipment\EquipmentMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\dto\WithdrawCommissionDto.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\system\SystemLogOperate.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\album\AlbumMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\applyFor\WithdrawCommissionApplyfor.java
+E:\charging_pile\common\src\main\java\com\hcy\common\enums\ClientEnum.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\system\SystemAuthAdmin.java
+E:\charging_pile\common\src\main\java\com\hcy\common\enums\coupon\CouponTypeEnum.java
+E:\charging_pile\common\src\main\java\com\hcy\common\plugin\notice\engine\MpNotice.java
+E:\charging_pile\common\src\main\java\com\hcy\common\utils\RequestUtil.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\CommonOverhaul\CommonOverhaulMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\dto\staff\StaffPhysicalExaminationDto.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\log\SmsLog.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\staff\StaffApplyForMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\wxpay\WxPayOrderNotifyV3Result.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\article\ArticleCollect.java
+E:\charging_pile\common\src\main\java\com\hcy\common\utils\HttpUtil.java
+E:\charging_pile\common\src\main\java\com\hcy\common\utils\ExcelUtils.java
+E:\charging_pile\common\src\main\java\com\hcy\common\core\PageSumResult.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\time\OrderTimeMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\enums\wxpay\WxAddressType.java
+E:\charging_pile\common\src\main\java\com\hcy\common\plugin\storage\engine\QiniuStorage.java
+E:\charging_pile\common\src\main\java\com\hcy\common\dto\result\StaffResultDto.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\log\OrderRefundLog.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\system\SystemAuthPermMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\dto\result\VisitGroupResultDto.java
+E:\charging_pile\common\src\main\java\com\hcy\common\enums\staff\StaffStatusEnum.java
+E:\charging_pile\common\src\main\java\com\hcy\common\enums\audit\AuditStateEnum.java
+E:\charging_pile\common\src\main\java\com\hcy\common\enums\OrderStatusEnum.java
+E:\charging_pile\common\src\main\java\com\hcy\common\enums\StatusEnum.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\staff\StaffMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\wxpay\WxPayRefundV3Result.java
+E:\charging_pile\common\src\main\java\com\hcy\common\enums\wxpay\WxTransferAccountsSceneType.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\CommonMaintenance\CommonMaintenanceMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\enums\NoticeEnum.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\way\DevPayWayMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\dto\OrderRefundDto.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\collect\GoodsCollectMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\enums\wxpay\WxRefundStatus.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\coupon\CouponMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\wxpay\WxPayOrderQueryV3Result.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\coupon\Coupon.java
+E:\charging_pile\common\src\main\java\com\hcy\common\enums\distributor\DistributorWithdrawResultEnum.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\plant\Plant.java
+E:\charging_pile\common\src\main\java\com\hcy\common\utils\HttpUtils.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\server\Sys.java
+E:\charging_pile\common\src\main\java\com\hcy\common\dto\result\OrderPageResultDto.java
+E:\charging_pile\common\src\main\java\com\hcy\common\exception\GlobalException.java
+E:\charging_pile\common\src\main\java\com\hcy\common\exception\OperateException.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\setting\DictDataMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\unit\GoodsUnit.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\recharge\RechargeOrder.java
+E:\charging_pile\common\src\main\java\com\hcy\common\dto\staff\StaffDto.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\album\Album.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\reply\OfficialAccountReply.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\serviceArea\ServiceArea.java
+E:\charging_pile\common\src\main\java\com\hcy\common\enums\wxpay\WxGzhTemplateEnum.java
+E:\charging_pile\common\src\main\java\com\hcy\common\utils\HttpClientUtils.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\reply\OfficialAccountReplyMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\config\map\MapConfig.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\sparePartStockAudit\SparePartStockAudit.java
+E:\charging_pile\common\src\main\java\com\hcy\common\enums\OrderLogEnum.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\user\UserAuthMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\setting\HotSearchMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\distribution\DistributorMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\image\GoodsCommentImageMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\user\UserAuth.java
+E:\charging_pile\common\src\main\java\com\hcy\common\enums\OrderDispatchEnum.java
+E:\charging_pile\common\src\main\java\com\hcy\common\utils\PolygonUtil.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\goods\GoodsMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\server\Cpu.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\OfficialReply.java
+E:\charging_pile\common\src\main\java\com\hcy\common\utils\SnUtils.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\setting\DictType.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\goods\GoodsTime.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\system\SystemAuthPost.java
+E:\charging_pile\common\src\main\java\com\hcy\common\utils\WeChatUtil.java
+E:\charging_pile\common\src\main\java\com\hcy\common\dto\coupon\UserCouponDto.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\recharge\Recharge.java
+E:\charging_pile\common\src\main\java\com\hcy\common\core\PageResult.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\image\GoodsImageMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\coupon\GoodsCategoryCoupon.java
+E:\charging_pile\common\src\main\java\com\hcy\common\dto\result\UserResultDto.java
+E:\charging_pile\common\src\main\java\com\hcy\common\enums\staff\StaffCommissionStatusEnum.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\coupon\ChannelCoupon.java
+E:\charging_pile\common\src\main\java\com\hcy\common\plugin\notice\NoticeDriver.java
+E:\charging_pile\common\src\main\java\com\hcy\common\enums\goods\GoodsEnum.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\order\CancelOrderConfig.java
+E:\charging_pile\common\src\main\java\com\hcy\common\dto\result\StaffFeedbackResultDto.java
+E:\charging_pile\common\src\main\java\com\hcy\common\enums\goods\GoodsTimeStatusEnum.java
+E:\charging_pile\common\src\main\java\com\hcy\common\utils\WxGzhTemplateUtil.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\notice\NoticeSetting.java
+E:\charging_pile\common\src\main\java\com\hcy\common\enums\staff\StaffApplyForStatusEnum.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\OfficialReplyMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\warehouse\Warehouse.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\CommonMaintenance\CommonMaintenance.java
+E:\charging_pile\common\src\main\java\com\hcy\common\dto\result\GoodsCollectionResultDto.java
+E:\charging_pile\common\src\main\java\com\hcy\common\dto\UserDto.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\activity\Activity.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\fault\FaultMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\dto\staff\StaffReassignmentDto.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\way\DevPayWay.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\pay\DevPay.java
+E:\charging_pile\common\src\main\java\com\hcy\common\dto\OrderDistributionDto.java
+E:\charging_pile\common\src\main\java\com\hcy\common\core\basics\IBaseMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\enums\coupon\UserCouponStatusEnum.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\account\AccountLog.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\setting\DictData.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\distribution\DistributorCommission.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\ScrapType\ScrapTypeMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\enums\GoodsCategoryStatusEnum.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\crontab\CrontabMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\sparePartStockAudit\SparePartStockAuditMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\enums\CancelOrderConfigTypeEnum.java
+E:\charging_pile\common\src\main\java\com\hcy\common\enums\RegionLevelEnum.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\distribution\WithdrawCommission.java
+E:\charging_pile\common\src\main\java\com\hcy\common\enums\RefundOperateEnum.java
+E:\charging_pile\common\src\main\java\com\hcy\common\dto\result\OrderRefundPageResultDto.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\serviceArea\ServiceAreaStaffMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\plugin\sms\SmsDriver.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\category\GoodsCategory.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\user\User.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\commonFault\CommonFaultMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\plugin\storage\engine\AliyunStorage.java
+E:\charging_pile\common\src\main\java\com\hcy\common\config\QRCodeConfig.java
+E:\charging_pile\common\src\main\java\com\hcy\common\config\GlobalConfig.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\group\DistributeGroupMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\system\SystemLogSms.java
+E:\charging_pile\common\src\main\java\com\hcy\common\validator\annotation\IDMust.java
+E:\charging_pile\common\src\main\java\com\hcy\common\dto\OrderDto.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\system\SystemAuthDept.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\applyFor\WithdrawCommissionApplyforMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\decorate\DecorateTabbar.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\coupon\GoodsCategoryCouponMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\enums\distributor\DistributorCommissionStatusEnum.java
+E:\charging_pile\common\src\main\java\com\hcy\common\dto\result\GoodsCommentPageResultDto.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\log\SmsLogMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\utils\CodeUtil.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\session\UserSession.java
+E:\charging_pile\common\src\main\java\com\hcy\common\utils\PinyinUtil.java
+E:\charging_pile\common\src\main\java\com\hcy\common\mapper\system\SystemAuthPostMapper.java
+E:\charging_pile\common\src\main\java\com\hcy\common\entity\equipment\Equipment.java
+E:\charging_pile\common\src\main\java\com\hcy\common\core\AjaxResult.java