Merge branch 'dev_test1.0' into dev_ksck

# Conflicts:
#	src/main/resources/schemas/schema_v2.3.sql

src/main/java/com/glxp/api/common/util/ResultVOUtils.java

@@ -37,6 +37,34 @@ public class ResultVOUtils {
         return success(data);
     }
 
+    /**
+     * 成功时返回
+     *
+     * @param data 返回的data对象
+     * @return {@link BaseResponse}
+     */
+    public static BaseResponse success(String msg, Object data) {
+        BaseResponse<Object> baseResponse = new BaseResponse<>();
+        baseResponse.setCode(ResultEnum.SUCCESS.getCode());
+        baseResponse.setMessage(msg);
+        baseResponse.setData(data);
+        return baseResponse;
+    }
+
+    /**
+     * 成功时返回
+     *
+     * @return {@link BaseResponse}
+     */
+    public static BaseResponse successMsg(String message) {
+        BaseResponse<Object> baseResponse = new BaseResponse<>();
+        baseResponse.setCode(ResultEnum.SUCCESS.getCode());
+        baseResponse.setMessage(message);
+        Map data = new HashMap();
+        baseResponse.setData(data);
+        return baseResponse;
+    }
+
     /**
      * 错误时返回
      *
@@ -74,6 +102,17 @@ public class ResultVOUtils {
         return error(resultEnum.getCode(), message);
     }
 
+    /**
+     * 错误时返回
+     *
+     * @param message 错误的信息
+     * @return {@link BaseResponse}
+     */
+    public static BaseResponse error(String message) {
+        return error(ResultEnum.NOT_NETWORK.getCode(), message);
+    }
+
+
     /**
      * 根据PageHelper分页对象，直接返回分页结果
      *

src/main/java/com/glxp/api/config/HdSchemaExecutor.java

@@ -77,7 +77,7 @@ public class HdSchemaExecutor implements ApplicationRunner {
 //        schema.add(new SchemaData("v2.1", "schema_v2.1.sql"));
 //        schema.add(new SchemaData("v2.2", "schema_v2.2.sql"));
         schema.add(new SchemaData("v2.3", "schema_v2.3.sql"));
-//        schema.add(new SchemaData("v2.4", "schema_v2.4.sql"));
+        schema.add(new SchemaData("v2.4", "schema_v2.4.sql"));
     }
 
 }

src/main/java/com/glxp/api/constant/BasicExportStatusTimeEnum.java

@@ -127,6 +127,20 @@ public enum BasicExportStatusTimeEnum {
      * 设备任务同步
      */
     DEVICE_TASK("device_task", "设备任务"),
+
+    /**
+     * 设备任务主表
+     */
+    DEVICE_INFO_DATA("device_info", "设备信息数据"),
+    DEV_CHECK_DATA("device_check","巡检管理数据"),
+    DEV_CHECK_DETAIL("device_check_detail","巡检设备具体数据"),
+
+    DEV_CHECK_DETAIL_ITEM("device_check_detail_item","巡检设备项目"),
+    //getDeviceRepairApply
+    DEV_REPAIR_APPLY("device_repair_apply","报修单数据"),
+    DEV_REPAIR_APPLY_DETAIL("device_repair_apply_detail","报修单明细数据"),
+    DEV_REPAIR("device_repair","设备维修单数据"),
+    PRODUCE_BUSINESS_DATA("thr_manufacturer", "生产企业数据"),
     ;
     @EnumValue
     private String key;

src/main/java/com/glxp/api/constant/BasicExportTypeEnum.java

@@ -62,6 +62,16 @@ public enum BasicExportTypeEnum {
      * 设备任务同步
      */
     DEVICE_TASK("device_task", "设备任务"),
+
+    DEVICE_INFO_DATA("device_info", "设备信息数据"),
+
+    DEVICE_CHECK_DATA("device_check", "巡检管理数据"),
+
+    DEVICE_REPAIR_DATA("device_repair_apply", "报修管理数据"),
+
+
+    PRODUCE_BUSINESS_DATA("thr_manufacturer", "生产企业数据"),
+
     ;
     @EnumValue
     private String key;

src/main/java/com/glxp/api/constant/SocketMsgType.java

@@ -21,4 +21,6 @@ public interface SocketMsgType {
 
     String BASIC_BUSINESS_TYPE_DELETE = "BASIC_BUSINESS_TYPE_DELETE"; //单据类型
 
+
+
 }

src/main/java/com/glxp/api/constant/SyncDelType.java

@@ -18,4 +18,6 @@ public interface SyncDelType {
      */
     String DEV_TASK = "DEV_TASK";
 
+    String DEVICE_INFO_DATA = "DEVICE_INFO_DATA";
+
 }

src/main/java/com/glxp/api/controller/dev/DeviceCheckController.java

@@ -0,0 +1,92 @@
+package com.glxp.api.controller.dev;
+
+import com.github.pagehelper.PageInfo;
+import com.glxp.api.annotation.AuthRuleAnnotation;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.controller.BaseController;
+import com.glxp.api.entity.auth.AuthAdmin;
+import com.glxp.api.req.dev.DeviceCheckQuery;
+import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.service.dev.DeviceCheckService;
+import com.glxp.api.vo.dev.DeviceCheckPrintVo;
+import com.glxp.api.vo.dev.DeviceCheckVo;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequiredArgsConstructor
+@Slf4j
+@RequestMapping
+public class DeviceCheckController extends BaseController {
+
+    private final DeviceCheckService deviceCheckService;
+
+    /**
+     * 巡检任务单列表
+     *
+     * @param query
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/check/page")
+    public BaseResponse page(@RequestBody DeviceCheckQuery query) {
+        List<DeviceCheckVo> list = deviceCheckService.pageList(query);
+        PageInfo pageInfo = new PageInfo<>(list);
+        PageSimpleResponse page = new PageSimpleResponse();
+        page.setTotal(pageInfo.getTotal());
+        page.setList(pageInfo.getList());
+        return ResultVOUtils.success(page);
+    }
+
+    /**
+     * 本部门巡检任务单列表
+     *
+     * @param query
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/check/pageByDept")
+    public BaseResponse pageByDept(@RequestBody DeviceCheckQuery query) {
+        AuthAdmin user = super.getUser();
+        query.setChargeDeptCode(user.getLocDeptCode());
+        List<DeviceCheckVo> list = deviceCheckService.pageList(query);
+        PageInfo pageInfo = new PageInfo<>(list);
+        PageSimpleResponse page = new PageSimpleResponse();
+        page.setTotal(pageInfo.getTotal());
+        page.setList(pageInfo.getList());
+        return ResultVOUtils.success(page);
+    }
+
+    /**
+     * 根据计划id生成巡检任务单
+     *
+     * @param planId 计划id
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @GetMapping("/udi/device/check/gen/{planId}")
+    public BaseResponse genDeviceCheck(@PathVariable Long planId) {
+        AuthAdmin user = super.getUser();
+        deviceCheckService.genByPlanId(planId, false, user);
+        return ResultVOUtils.successMsg("操作成功");
+    }
+
+    @AuthRuleAnnotation("")
+    @GetMapping("/udi/device/check/info/print/{taskId}")
+    public BaseResponse checkInfoPrint(@PathVariable Long taskId) {
+        DeviceCheckPrintVo vo = deviceCheckService.checkInfoPrint(taskId, null);
+        return ResultVOUtils.success(vo);
+    }
+
+    @AuthRuleAnnotation("")
+    @GetMapping("/udi/device/check/info/print/{taskId}/{deviceCode}")
+    public BaseResponse checkInfoPrint(@PathVariable Long taskId, @PathVariable String deviceCode) {
+        DeviceCheckPrintVo vo = deviceCheckService.checkInfoPrint(taskId, deviceCode);
+        return ResultVOUtils.success(vo);
+    }
+
+}

src/main/java/com/glxp/api/controller/dev/DeviceCheckDetailController.java

@@ -0,0 +1,81 @@
+package com.glxp.api.controller.dev;
+
+import com.github.pagehelper.PageInfo;
+import com.glxp.api.annotation.AuthRuleAnnotation;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.controller.BaseController;
+import com.glxp.api.entity.auth.AuthAdmin;
+import com.glxp.api.entity.dev.DeviceCheckDetailEntity;
+import com.glxp.api.req.dev.DeviceCheckDetailParam;
+import com.glxp.api.req.dev.DeviceCheckDetailQuery;
+import com.glxp.api.req.dev.DeviceCheckDetailRepairParam;
+import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.service.dev.DeviceCheckDetailItemService;
+import com.glxp.api.service.dev.DeviceCheckDetailService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+@RestController
+@RequiredArgsConstructor
+@Slf4j
+@RequestMapping
+public class DeviceCheckDetailController extends BaseController {
+
+    private final DeviceCheckDetailService deviceCheckDetailService;
+    private final DeviceCheckDetailItemService deviceCheckDetailItemService;
+
+    /**
+     * 巡检任务单明细列表
+     *
+     * @param query
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/check/detail/page")
+    public BaseResponse page(@RequestBody @Valid DeviceCheckDetailQuery query) {
+        List<DeviceCheckDetailEntity> list = deviceCheckDetailService.pageList(query);
+        PageInfo pageInfo = new PageInfo<>(list);
+        PageSimpleResponse page = new PageSimpleResponse();
+        page.setTotal(pageInfo.getTotal());
+        page.setList(pageInfo.getList());
+        return ResultVOUtils.success(page);
+    }
+
+    /**
+     * 巡检任务单明细--创建维修单
+     *
+     * @param param
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/check/detail/repair")
+    public BaseResponse repair(@RequestBody @Valid DeviceCheckDetailRepairParam param) {
+        AuthAdmin user = super.getUser();
+        deviceCheckDetailService.repair(param, user);
+        return ResultVOUtils.successMsg("创建成功");
+    }
+
+    /**
+     * 完成巡检任务单明细项目
+     *
+     * @param param
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/check/detail/finish")
+    public BaseResponse finish(@RequestBody @Valid DeviceCheckDetailParam param) {
+        AuthAdmin user = super.getUser();
+        deviceCheckDetailItemService.finishAll(param, user);
+        return ResultVOUtils.successMsg("操作成功");
+    }
+
+
+}

src/main/java/com/glxp/api/controller/dev/DeviceCheckDetailItemController.java

@@ -0,0 +1,67 @@
+package com.glxp.api.controller.dev;
+
+import com.github.pagehelper.PageInfo;
+import com.glxp.api.annotation.AuthRuleAnnotation;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.controller.BaseController;
+import com.glxp.api.entity.auth.AuthAdmin;
+import com.glxp.api.entity.dev.DeviceCheckDetailItemEntity;
+import com.glxp.api.req.dev.DeviceCheckDetailItemFinishParam;
+import com.glxp.api.req.dev.DeviceCheckDetailItemQuery;
+import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.service.dev.DeviceCheckDetailItemService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * 设备巡检单明细
+ */
+@RestController
+@RequiredArgsConstructor
+@Slf4j
+@RequestMapping
+public class DeviceCheckDetailItemController extends BaseController {
+
+    private final DeviceCheckDetailItemService deviceCheckDetailItemService;
+
+    /**
+     * 巡检任务单明细项目列表
+     *
+     * @param query
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/check/detail/item/page")
+    public BaseResponse page(@RequestBody @Valid DeviceCheckDetailItemQuery query) {
+        List<DeviceCheckDetailItemEntity> list = deviceCheckDetailItemService.pageList(query);
+        PageInfo pageInfo = new PageInfo<>(list);
+        PageSimpleResponse page = new PageSimpleResponse();
+        page.setTotal(pageInfo.getTotal());
+        page.setList(pageInfo.getList());
+        return ResultVOUtils.success(page);
+    }
+
+    /**
+     * 完成巡检任务单明细项目
+     *
+     * @param param
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/check/detail/item/finish")
+    public BaseResponse page(@RequestBody @Valid DeviceCheckDetailItemFinishParam param) {
+        AuthAdmin user = super.getUser();
+        deviceCheckDetailItemService.finish(param, user);
+        return ResultVOUtils.successMsg("操作成功");
+    }
+
+
+}

src/main/java/com/glxp/api/controller/dev/DeviceCheckItemDictController.java

@@ -0,0 +1,98 @@
+package com.glxp.api.controller.dev;
+
+import cn.hutool.core.util.RandomUtil;
+import com.github.pagehelper.PageInfo;
+import com.glxp.api.annotation.AuthRuleAnnotation;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.controller.BaseController;
+import com.glxp.api.entity.dev.DeviceCheckItemDictEntity;
+import com.glxp.api.req.dev.DeviceCheckItemDictParam;
+import com.glxp.api.req.dev.DeviceCheckItemDictQuery;
+import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.service.dev.DeviceCheckItemDictService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+
+@Slf4j
+@RequestMapping
+@RestController
+@RequiredArgsConstructor
+public class DeviceCheckItemDictController extends BaseController {
+
+    private final DeviceCheckItemDictService deviceCheckItemDictService;
+
+
+    /**
+     * 生成一个项目编码
+     *
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @GetMapping("/udi/device/checkItemDict/code/gen")
+    public BaseResponse genItemCode() {
+        String code = "";
+        DeviceCheckItemDictEntity info = null;
+        do {
+            code = "XJ" + RandomUtil.randomNumbers(10);
+            info = deviceCheckItemDictService.getById(code);
+        } while (info != null);
+        return ResultVOUtils.success(code);
+    }
+
+    /**
+     * 设备巡检项目字典分页查询
+     *
+     * @param query
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/checkItemDict/page")
+    public BaseResponse page(@RequestBody DeviceCheckItemDictQuery query) {
+        List<DeviceCheckItemDictEntity> list = deviceCheckItemDictService.pageList(query);
+        PageInfo pageInfo = new PageInfo<>(list);
+        PageSimpleResponse page = new PageSimpleResponse();
+        page.setTotal(pageInfo.getTotal());
+        page.setList(pageInfo.getList());
+        return ResultVOUtils.success(page);
+    }
+
+    /**
+     * 添加巡检项目字典
+     *
+     * @param param
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/checkItemDict/save")
+    public BaseResponse save(@RequestBody @Valid DeviceCheckItemDictParam param) {
+        DeviceCheckItemDictEntity entity = param.getEntity(super.getUser());
+        int i = deviceCheckItemDictService.insertIgnore(entity);
+        if (i == 0) {
+            return ResultVOUtils.error("项目编码已存在");
+        }
+        return ResultVOUtils.successMsg("添加成功");
+    }
+
+    /**
+     * 删除巡检项目字典
+     *
+     * @param itemCode 项目编码
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @DeleteMapping("/udi/device/checkItemDict/del/{itemCode}")
+    public BaseResponse del(@PathVariable String itemCode) {
+
+        boolean b = deviceCheckItemDictService.removeById(itemCode);
+        if (!b) {
+            return ResultVOUtils.error("删除失败，请稍后再试");
+        }
+        return ResultVOUtils.successMsg("删除成功");
+    }
+
+}

src/main/java/com/glxp/api/controller/dev/DeviceInfoController.java

@@ -0,0 +1,399 @@
+package com.glxp.api.controller.dev;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.RandomUtil;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.PageInfo;
+import com.glxp.api.annotation.AuthRuleAnnotation;
+import com.glxp.api.common.enums.ResultEnum;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.controller.BaseController;
+import com.glxp.api.entity.auth.AuthAdmin;
+import com.glxp.api.entity.dev.DeviceChangeLogEntity;
+import com.glxp.api.entity.dev.DeviceInfoEntity;
+import com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity;
+import com.glxp.api.entity.system.SystemPDFTemplateEntity;
+import com.glxp.api.exception.JsonException;
+import com.glxp.api.req.dev.*;
+import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.service.dev.DeviceChangeLogService;
+import com.glxp.api.service.dev.DeviceInfoService;
+import com.glxp.api.service.system.SystemPDFModuleService;
+import com.glxp.api.service.system.SystemPDFTemplateService;
+import com.glxp.api.util.JasperUtils;
+import com.glxp.api.vo.dev.DeviceChangeLogVo;
+import com.glxp.api.vo.dev.DeviceInfoVo;
+import com.google.zxing.BarcodeFormat;
+import com.google.zxing.EncodeHintType;
+import com.google.zxing.WriterException;
+import com.google.zxing.common.BitMatrix;
+import com.google.zxing.qrcode.QRCodeWriter;
+import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.imageio.ImageIO;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.awt.*;
+import java.awt.font.LineMetrics;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.util.*;
+import java.util.List;
+
+
+@RestController
+@RequestMapping
+@RequiredArgsConstructor
+@Slf4j
+public class DeviceInfoController extends BaseController {
+
+    private final DeviceInfoService deviceInfoService;
+    private final DeviceChangeLogService deviceChangeLogService;
+
+
+    @Value("${file_path}")
+    private String filePath;
+
+    /**
+     * 生成一个设备号
+     *
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @GetMapping("/udi/device/code/gen")
+    public BaseResponse genDeviceCode() {
+        return ResultVOUtils.success(deviceInfoService.genDeviceCode());
+    }
+
+    /**
+     * 本科室设备
+     *
+     * @param query
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/info/page")
+    public BaseResponse page(@RequestBody DeviceInfoQuery query) {
+        AuthAdmin user = super.getUser();
+        List<DeviceInfoVo> list = deviceInfoService.pageVo(query, user.getLocDeptCode());
+        PageInfo pageInfo = new PageInfo<>(list);
+        PageSimpleResponse page = new PageSimpleResponse();
+        page.setTotal(pageInfo.getTotal());
+        page.setList(pageInfo.getList());
+        return ResultVOUtils.success(page);
+    }
+
+
+    /**
+     * 所有科室设备
+     *
+     * @param query
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/info/all/page")
+    public BaseResponse allPage(@RequestBody DeviceInfoQuery query) {
+        AuthAdmin user = super.getUser();
+        List<DeviceInfoVo> list = deviceInfoService.allPageVo(query);
+        PageInfo pageInfo = new PageInfo<>(list);
+        PageSimpleResponse page = new PageSimpleResponse();
+        page.setTotal(pageInfo.getTotal());
+        page.setList(pageInfo.getList());
+        return ResultVOUtils.success(page);
+    }
+
+
+    /**
+     * 查看当前用户所在科室设备详情
+     *
+     * @param query
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/info/detailByUser/page")
+    public BaseResponse detailByUser(@RequestBody @Valid DeviceInfoDetailQuery query) {
+        AuthAdmin user = super.getUser();
+        query.setDeptCode(user.getLocDeptCode());
+        List<DeviceInfoVo> list = deviceInfoService.detail(query);
+        PageInfo pageInfo = new PageInfo<>(list);
+        PageSimpleResponse page = new PageSimpleResponse();
+        page.setTotal(pageInfo.getTotal());
+        page.setList(pageInfo.getList());
+        return ResultVOUtils.success(page);
+    }
+
+    /**
+     * 查看当前科室设备详情
+     *
+     * @param query
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/info/detailByDeptCode/page")
+    public BaseResponse detailByDeptCode(@RequestBody @Valid DeviceInfoDetailByDeptCodeQuery query) {
+        AuthAdmin user = super.getUser();
+        query.setDeptCode(user.getLocDeptCode());
+        List<DeviceInfoVo> list = deviceInfoService.detail(query);
+        PageInfo pageInfo = new PageInfo<>(list);
+        PageSimpleResponse page = new PageSimpleResponse();
+        page.setTotal(pageInfo.getTotal());
+        page.setList(pageInfo.getList());
+        return ResultVOUtils.success(page);
+    }
+
+    /**
+     * 查看所有科室设备--设备码级别
+     *
+     * @param query
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/detailInfo/page")
+    public BaseResponse detailInfoPage(@RequestBody DeviceInfoDetailQuery query) {
+        List<DeviceInfoVo> list = deviceInfoService.detail(query);
+        PageInfo pageInfo = new PageInfo<>(list);
+        PageSimpleResponse page = new PageSimpleResponse();
+        page.setTotal(pageInfo.getTotal());
+        page.setList(pageInfo.getList());
+        return ResultVOUtils.success(page);
+    }
+
+
+    /**
+     * 设备详情
+     *
+     * @param query
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/info/detail/page")
+    public BaseResponse detail(@RequestBody @Valid DeviceInfoDetailQuery query) {
+//        AuthAdmin user = super.getUser();
+        List<DeviceInfoVo> list = deviceInfoService.detail(query);
+        PageInfo pageInfo = new PageInfo<>(list);
+        PageSimpleResponse page = new PageSimpleResponse();
+        page.setTotal(pageInfo.getTotal());
+        page.setList(pageInfo.getList());
+        return ResultVOUtils.success(page);
+    }
+
+    /**
+     * 获取设备变更日志
+     *
+     * @param deviceCode 设备编码
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @GetMapping("/udi/device/log/{deviceCode}")
+    public BaseResponse deviceLogs(@PathVariable String deviceCode) {
+        List<DeviceChangeLogEntity> logList = deviceChangeLogService.list(Wrappers.lambdaQuery(DeviceChangeLogEntity.class)
+                .eq(DeviceChangeLogEntity::getDeviceCode, deviceCode)
+                .orderByDesc(DeviceChangeLogEntity::getCreateTime)
+        );
+        return ResultVOUtils.success(BeanUtil.copyToList(logList, DeviceChangeLogVo.class));
+    }
+
+    /**
+     * 生成设备二维码
+     *
+     * @param deviceCode
+     * @throws WriterException
+     */
+    @GetMapping("/udi/device/genQR/{deviceCode}")
+    public BaseResponse genQRImage(@PathVariable String deviceCode) throws WriterException {
+        DeviceInfoEntity deviceInfo = deviceInfoService.getById(deviceCode);
+        if (deviceInfo == null) {
+            throw new JsonException("未找到该设备，无法生成");
+        }
+        String text = deviceInfo.getDeviceCode();
+        // 二维码大小
+        int width = 500, height = 500;
+        Map<EncodeHintType, Object> hints = new HashMap<>();
+        //内容编码格式
+        hints.put(EncodeHintType.CHARACTER_SET, "UTF-8");
+        // 指定纠错等级
+        hints.put(EncodeHintType.ERROR_CORRECTION, ErrorCorrectionLevel.H);
+        //设置二维码边的空度，非负数
+        hints.put(EncodeHintType.MARGIN, 1);
+
+        // 生成二维码图片
+        QRCodeWriter writer = new QRCodeWriter();
+        BitMatrix bm = writer.encode(text, BarcodeFormat.QR_CODE, width, height, hints);
+
+        int margin = 10;
+        int tempM = margin * 2;
+        int[] rec = bm.getEnclosingRectangle();   //获取二维码图案的属性
+        int resWidth = rec[2] + tempM;
+        int resHeight = rec[3] + tempM;
+        BitMatrix resMatrix = new BitMatrix(resWidth, resHeight); // 按照自定义边框生成新的BitMatrix
+        resMatrix.clear();
+        for (int i = margin; i < resWidth - margin; i++) {   //循环，将二维码图案绘制到新的bitMatrix中
+            for (int j = margin; j < resHeight - margin; j++) {
+                if (bm.get(i - margin + rec[0], j - margin + rec[1])) {
+                    resMatrix.set(i, j);
+                }
+            }
+        }
+        bm = resMatrix;
+
+        int w = bm.getWidth();
+        int h = bm.getHeight();
+        BufferedImage qrcodeBuffImg = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
+
+        // 开始利用二维码数据创建Bitmap图片
+        for (int x = 0; x < w; x++) {
+            for (int y = 0; y < h; y++) {
+                qrcodeBuffImg.setRGB(x, y, bm.get(x, y) ? 0xFF000000 : 0xFFFFFFFF);
+            }
+        }
+        // 新的图片，二维码下面加上文字
+        String desc = String.format("设备编码：%s", deviceCode);
+        String desc1 = String.format("设备名称：%s", deviceInfo.getProductName());
+        String desc2 = String.format("设备规格：%s", deviceInfo.getGgxh());
+        String[] descArr = {desc, desc1, desc2};
+        // 字体、字型、字号
+        Font font = new Font("宋体", Font.BOLD, 26);
+        int textHeight = font.getSize();
+        int textMargin = 10;
+        BufferedImage outImage = new BufferedImage(qrcodeBuffImg.getWidth(), qrcodeBuffImg.getHeight() + textHeight + (textMargin * 2), BufferedImage.TYPE_4BYTE_ABGR);
+        Graphics2D outg = outImage.createGraphics();
+        outg.setFont(font);
+        FontMetrics fontMetrics = outg.getFontMetrics();
+        int lineCount = 1;
+        int lineWidth = outImage.getWidth() - textMargin * 2;
+        int hasWidth = lineWidth;
+        HashMap<Integer, Integer> hashMap = new HashMap<>();
+        for (String item : descArr) {
+            for (String s : item.split("")) {
+                int strWidth = fontMetrics.stringWidth(s);
+                hasWidth -= strWidth;
+                if (hasWidth <= 0) {
+                    hasWidth = lineWidth;
+                    lineCount += 1;
+                    hasWidth -= strWidth;
+                }
+                Integer i = hashMap.putIfAbsent(lineCount, 1);
+                if (i != null) {
+                    hashMap.put(lineCount, i + 1);
+                }
+            }
+            hasWidth = lineWidth;
+            lineCount += 1;
+        }
+        lineCount -= 1;
+        desc = desc.concat(desc1).concat(desc2);
+        outImage = new BufferedImage(qrcodeBuffImg.getWidth(), qrcodeBuffImg.getHeight() + lineCount * textHeight + (textMargin * (lineCount + 1)), BufferedImage.TYPE_4BYTE_ABGR);
+        outg = outImage.createGraphics();
+        outg.setFont(font);
+        for (int x = 0; x < outImage.getWidth(); x++) {
+            for (int y = 0; y < outImage.getHeight(); y++) {
+                outImage.setRGB(x, y, 0xFFFFFFFF);
+            }
+        }
+        // 画二维码到新的面板
+        outg.drawImage(qrcodeBuffImg, 0, 0, qrcodeBuffImg.getWidth(), qrcodeBuffImg.getHeight(), null);
+        outg.setColor(Color.BLACK);
+        outg.setBackground(Color.WHITE);
+        int startIndex = 0;
+        for (int i = 0; i < lineCount; i++) {
+            Integer length = hashMap.get(i + 1);
+            String line = desc.substring(startIndex, startIndex + length);
+            if (length != null) {
+                startIndex += length.intValue();
+            }
+//            outg.drawString(line, (outImage.getWidth() - fontMetrics.stringWidth(line) - textMargin) / 2, qrcodeBuffImg.getHeight() + textMargin + (i * textHeight) + (i + 2) * textMargin);
+            outg.drawString(line, textMargin, qrcodeBuffImg.getHeight() + textMargin + (i * textHeight) + (i + 2) * textMargin);
+        }
+        outg.dispose();
+        try {
+            ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+            ImageIO.write(outImage, "png", byteArrayOutputStream);
+            byte[] imageBytes = byteArrayOutputStream.toByteArray();
+
+            // 使用Base64编码器将字节数组编码为Base64字符串
+            String base64String = Base64.getEncoder().encodeToString(imageBytes);
+            return ResultVOUtils.success("data:image/png;base64," + base64String);
+        } catch (IOException e) {
+            log.error("e");
+            throw new JsonException("系统异常");
+        }
+    }
+
+    @Resource
+    private SystemPDFModuleService systemPDFModuleService;
+    @Resource
+    private SystemPDFTemplateService systemPDFTemplateService;
+
+    /**
+     * 设备标签打印
+     *
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udiwms/inv/deptDev/label/print")
+    public BaseResponse printLabel(@RequestBody DeviceInfoDetailQuery query, HttpServletRequest request, HttpServletResponse response) throws Exception {
+
+        List<DeviceInfoVo> list = deviceInfoService.detail(query);
+        if (CollUtil.isEmpty(list)) {
+            throw new JsonException("未找到该设备，无法生成");
+        }
+        DeviceInfoVo obj = list.get(0);
+        SysPdfTemplateRelevanceLabelEntity sysPdfTemplateRelevanceLabelEntity = systemPDFModuleService.selectByLabelId(query.getLabelId() + "");
+        if (null == sysPdfTemplateRelevanceLabelEntity) {
+            return ResultVOUtils.error(ResultEnum.DATA_NOT, "所属模块错误");
+        }
+
+        SystemPDFTemplateEntity systemPDFTemplateEntity = systemPDFTemplateService.selectById(String.valueOf(sysPdfTemplateRelevanceLabelEntity.getTemplateId()));
+        if (null == systemPDFTemplateEntity) {
+            return ResultVOUtils.error(ResultEnum.DATA_NOT, "模板错误");
+        }
+
+        //打印单号标签
+        Map<String, Object> data = new HashMap<>(1);
+        Map<String, Object> supData = new HashMap<>();
+        supData.put("deviceCode", obj.getDeviceCode() == null ? ' ' : obj.getDeviceCode());
+        supData.put("deptName", obj.getDeptName() == null ? ' ' : obj.getDeptName());
+        supData.put("productName", obj.getProductName() == null ? ' ' : obj.getProductName());
+        supData.put("ggxh", obj.getGgxh() == null ? ' ' : obj.getGgxh());
+        supData.put("productionDate", obj.getProductionDate() == null ? ' ' : obj.getProductionDate());
+        supData.put("expireDate", obj.getExpireDate() == null ? ' ' : obj.getExpireDate());
+        supData.put("batchNo", obj.getBatchNo() == null ? ' ' : obj.getBatchNo());
+        supData.put("serialNo", obj.getSerialNo() == null ? ' ' : obj.getSerialNo());
+        supData.put("manufactory", obj.getManufactory() == null ? ' ' : obj.getManufactory());
+        supData.put("measname", obj.getMeasname() == null ? ' ' : obj.getMeasname());
+        supData.put("zczbhhzbapzbh", obj.getZczbhhzbapzbh() == null ? ' ' : obj.getZczbhhzbapzbh());
+        supData.put("supName", obj.getSupName() == null ? ' ' : obj.getSupName());
+        data.put("data", supData);
+        String param = JSON.toJSONString(data);
+        log.error(param);
+        JasperUtils.jasperReport(request, response, param, filePath + "pdf/template/" + systemPDFTemplateEntity.getPath(), "pdf");
+
+        return ResultVOUtils.error(ResultEnum.DATA_NOT, "模板错误");
+    }
+
+    /**
+     * 更新明细
+     *
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/info/update")
+    public BaseResponse updateOrderItem(@RequestBody DeviceInfoEntity entity) {
+        entity.setUpdateTime(LocalDateTime.now());
+        deviceInfoService.updateOrderItem(entity);
+        return ResultVOUtils.successMsg("保存成功！");
+    }
+}

src/main/java/com/glxp/api/controller/dev/DeviceMiniController.java

@@ -0,0 +1,69 @@
+package com.glxp.api.controller.dev;
+
+
+import com.github.pagehelper.PageInfo;
+import com.glxp.api.annotation.AuthRuleAnnotation;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.controller.BaseController;
+import com.glxp.api.entity.dev.DeviceCheckDetailEntity;
+import com.glxp.api.req.dev.DeviceCheckDetailMiniQuery;
+import com.glxp.api.req.dev.DeviceRepairApplyDetailMiniQuery;
+import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.res.dev.DeviceRepairApplyDetailMiniResponse;
+import com.glxp.api.service.dev.DeviceCheckDetailService;
+import com.glxp.api.service.dev.DeviceRepairApplyDetailService;
+import groovy.util.logging.Slf4j;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+@Slf4j
+@RestController
+@RequestMapping
+@RequiredArgsConstructor
+public class DeviceMiniController extends BaseController {
+
+    private final DeviceRepairApplyDetailService deviceRepairApplyDetailService;
+    private final DeviceCheckDetailService deviceCheckDetailService;
+
+    /**
+     * 获取明细报修单列表分页
+     *
+     * @param query
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/repair/apply/detail/mini/page")
+    public BaseResponse miniPage(@RequestBody @Valid DeviceRepairApplyDetailMiniQuery query) {
+        List<DeviceRepairApplyDetailMiniResponse> list = deviceRepairApplyDetailService.miniPage(query);
+        PageInfo pageInfo = new PageInfo<>(list);
+        PageSimpleResponse page = new PageSimpleResponse();
+        page.setTotal(pageInfo.getTotal());
+        page.setList(pageInfo.getList());
+        return ResultVOUtils.success(page);
+    }
+
+
+    /**
+     * 巡检任务单明细列表
+     *
+     * @param query
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/check/detail/mini/page")
+    public BaseResponse miniPage(@RequestBody @Valid DeviceCheckDetailMiniQuery query) {
+        List<DeviceCheckDetailEntity> list = deviceCheckDetailService.miniPage(query);
+        PageInfo pageInfo = new PageInfo<>(list);
+        PageSimpleResponse page = new PageSimpleResponse();
+        page.setTotal(pageInfo.getTotal());
+        page.setList(pageInfo.getList());
+        return ResultVOUtils.success(page);
+    }
+}

src/main/java/com/glxp/api/controller/dev/DevicePlanController.java

@@ -0,0 +1,103 @@
+package com.glxp.api.controller.dev;
+
+import com.github.pagehelper.PageInfo;
+import com.glxp.api.annotation.AuthRuleAnnotation;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.controller.BaseController;
+import com.glxp.api.entity.auth.AuthAdmin;
+import com.glxp.api.entity.dev.DevicePlanEntity;
+import com.glxp.api.req.dev.DevicePlanParam;
+import com.glxp.api.req.dev.DevicePlanQuery;
+import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.service.auth.DeptService;
+import com.glxp.api.service.dev.DevicePlanService;
+import com.glxp.api.vo.dev.DevicePlanVo;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+
+@RestController
+@RequestMapping
+@RequiredArgsConstructor
+@Slf4j
+public class DevicePlanController extends BaseController {
+
+    private final DevicePlanService devicePlanService;
+    private final DeptService deptService;
+
+
+    /**
+     * 设备巡检计划分页
+     *
+     * @param query
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/plan/page")
+    public BaseResponse page(@RequestBody @Valid DevicePlanQuery query) {
+        List<DevicePlanVo> list = devicePlanService.pageList(query);
+        PageInfo pageInfo = new PageInfo<>(list);
+        PageSimpleResponse page = new PageSimpleResponse();
+        page.setTotal(pageInfo.getTotal());
+        page.setList(pageInfo.getList());
+        return ResultVOUtils.success(page);
+    }
+
+
+    /**
+     * 设备巡检计划保存
+     *
+     * @param param 参数
+     * @return 计划id
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/plan/save")
+    public BaseResponse save(@RequestBody @Valid DevicePlanParam param) {
+        AuthAdmin user = super.getUser();
+        param.valid(deptService);
+        DevicePlanEntity entity = param.getEntity(user);
+        if (param.getPlanId() == null) {
+            devicePlanService.save(entity);
+        } else {
+            devicePlanService.updateById(entity);
+        }
+        return ResultVOUtils.success("保存成功", entity.getPlanId());
+    }
+
+
+    /**
+     * 设备巡检计划详情
+     *
+     * @param planId 计划id
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @GetMapping("/udi/device/plan/info/{planId}")
+    public BaseResponse info(@PathVariable Long planId) {
+        DevicePlanEntity entity = devicePlanService.getById(planId);
+        if (entity == null) {
+            return ResultVOUtils.error("计划不存在");
+        }
+        return ResultVOUtils.success(entity);
+    }
+
+
+    /**
+     * 设备巡检计划删除
+     *
+     * @param planId 计划id
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @DeleteMapping("/udi/device/plan/del/{planId}")
+    public BaseResponse del(@PathVariable Long planId) {
+        devicePlanService.deletePlan(planId);
+        return ResultVOUtils.successMsg("删除成功");
+    }
+
+
+}

src/main/java/com/glxp/api/controller/dev/DevicePlanDetailController.java

@@ -0,0 +1,133 @@
+package com.glxp.api.controller.dev;
+
+import com.github.pagehelper.PageInfo;
+import com.glxp.api.annotation.AuthRuleAnnotation;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.controller.BaseController;
+import com.glxp.api.entity.auth.AuthAdmin;
+import com.glxp.api.entity.dev.DevicePlanDetailEntity;
+import com.glxp.api.entity.dev.DevicePlanEntity;
+import com.glxp.api.req.dev.DevicePlanDetailGroupQuery;
+import com.glxp.api.req.dev.DevicePlanDetailParam;
+import com.glxp.api.req.dev.DevicePlanDetailQuery;
+import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.service.dev.DeviceInfoService;
+import com.glxp.api.service.dev.DevicePlanDetailService;
+import com.glxp.api.service.dev.DevicePlanService;
+import com.glxp.api.vo.dev.DevicePlanDetailVo;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * 设备计划明细
+ * data: 2023/11/12
+ */
+@RestController
+@RequestMapping
+@RequiredArgsConstructor
+@Slf4j
+public class DevicePlanDetailController extends BaseController {
+
+    private final DeviceInfoService deviceInfoService;
+    private final DevicePlanService devicePlanService;
+    private final DevicePlanDetailService devicePlanDetailService;
+
+
+    /**
+     * 设备巡检计划分页
+     *
+     * @param query
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/plan/detailGroup/page")
+    public BaseResponse pageGroup(@RequestBody @Valid DevicePlanDetailGroupQuery query) {
+        List<DevicePlanDetailVo> list = devicePlanDetailService.pageGroupVo(query);
+        PageInfo pageInfo = new PageInfo<>(list);
+        PageSimpleResponse page = new PageSimpleResponse();
+        page.setTotal(pageInfo.getTotal());
+        page.setList(pageInfo.getList());
+        return ResultVOUtils.success(page);
+    }
+
+
+    /**
+     * 设备巡检计划明细分页
+     *
+     * @param query
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/plan/detail/page")
+    public BaseResponse pageGroup(@RequestBody @Valid DevicePlanDetailQuery query) {
+        List<DevicePlanDetailVo> list = devicePlanDetailService.pageVo(query);
+        PageInfo pageInfo = new PageInfo<>(list);
+        PageSimpleResponse page = new PageSimpleResponse();
+        page.setTotal(pageInfo.getTotal());
+        page.setList(pageInfo.getList());
+        return ResultVOUtils.success(page);
+    }
+
+
+    /**
+     * 设备巡检计划明细新增
+     *
+     * @param param 参数
+     * @return 计划id
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/plan/detail/add")
+    public BaseResponse add(@RequestBody @Valid DevicePlanDetailParam param) {
+
+
+        DevicePlanEntity entity = null;
+        if (!param.valid(devicePlanService)) {
+            AuthAdmin user = super.getUser();
+            entity = param.getDevicePlanParam().getEntity(user);
+            devicePlanService.save(entity);
+            param.getDevicePlanParam().setPlanId(entity.getPlanId());
+            param.setPlanId(entity.getPlanId());
+        } else {
+            entity = devicePlanService.getById(param.getPlanId());
+        }
+        param.valid(devicePlanService);
+        List<DevicePlanDetailEntity> list = param.getEntity(deviceInfoService);
+        devicePlanDetailService.replaceBatch(list);
+        return ResultVOUtils.success(entity);
+    }
+
+
+    /**
+     * 设备巡检计划明细删除
+     *
+     * @param planId    计划id
+     * @param productId 产品id
+     */
+    @AuthRuleAnnotation("")
+    @DeleteMapping("/udi/device/plan/detail/delByProductId/{planId}/{productId}")
+    public BaseResponse delByProductId(@PathVariable Long planId, @PathVariable Long productId) {
+        devicePlanDetailService.delByProductId(planId, productId);
+        return ResultVOUtils.successMsg("删除成功");
+    }
+
+
+    /**
+     * 设备巡检计划明细删除
+     *
+     * @param planId     计划id
+     * @param deviceCode 设备编码
+     */
+    @AuthRuleAnnotation("")
+    @DeleteMapping("/udi/device/plan/detail/delByDeviceCode/{planId}/{deviceCode}")
+    public BaseResponse delByDeviceCode(@PathVariable Long planId, @PathVariable String deviceCode) {
+        devicePlanDetailService.delByDeviceCode(planId, deviceCode);
+        return ResultVOUtils.successMsg("删除成功");
+    }
+
+
+}

src/main/java/com/glxp/api/controller/dev/DevicePlanDetailItemController.java

@@ -0,0 +1,173 @@
+package com.glxp.api.controller.dev;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.PageInfo;
+import com.glxp.api.annotation.AuthRuleAnnotation;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.controller.BaseController;
+import com.glxp.api.entity.dev.DeviceCheckItemDictEntity;
+import com.glxp.api.entity.dev.DevicePlanDetailItemEntity;
+import com.glxp.api.req.dev.DevicePlanDetailItemParam;
+import com.glxp.api.req.dev.DevicePlanDetailItemQuery;
+import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.service.dev.DeviceCheckItemDictService;
+import com.glxp.api.service.dev.DevicePlanDetailItemService;
+import com.glxp.api.service.dev.DevicePlanDetailService;
+import com.glxp.api.vo.dev.DevicePlanDetailVo;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 设备管理
+ * data: 2023/11/10
+ */
+@RestController
+@RequestMapping
+@RequiredArgsConstructor
+@Slf4j
+public class DevicePlanDetailItemController extends BaseController {
+
+    private final DevicePlanDetailService devicePlanDetailService;
+    private final DevicePlanDetailItemService devicePlanDetailItemService;
+    private final DeviceCheckItemDictService deviceCheckItemDictService;
+
+
+    /**
+     * 设备巡检计划明细项目分页
+     *
+     * @param query
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/plan/detail/item/group/page")
+    public BaseResponse groupPage(@RequestBody @Valid DevicePlanDetailItemQuery query) {
+        List<DevicePlanDetailItemEntity> list = devicePlanDetailItemService.pageList(query);
+        PageInfo pageInfo = new PageInfo<>(list);
+        PageSimpleResponse page = new PageSimpleResponse();
+        page.setTotal(pageInfo.getTotal());
+        page.setList(pageInfo.getList());
+        return ResultVOUtils.success(page);
+    }
+
+
+    /**
+     * 设备巡检计划明细项目分页
+     *
+     * @param query
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/plan/detail/item/page")
+    public BaseResponse page(@RequestBody @Valid DevicePlanDetailItemQuery query) {
+        List<DevicePlanDetailItemEntity> list = devicePlanDetailItemService.pageList(query);
+        PageInfo pageInfo = new PageInfo<>(list);
+        PageSimpleResponse page = new PageSimpleResponse();
+        page.setTotal(pageInfo.getTotal());
+        page.setList(pageInfo.getList());
+        return ResultVOUtils.success(page);
+    }
+
+
+    /**
+     * 设备巡检计划明细项目新增
+     *
+     * @param param 参数
+     * @return 计划id
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/plan/detail/item/add")
+    public BaseResponse add(@RequestBody @Valid DevicePlanDetailItemParam param) {
+        param.valid(devicePlanDetailService);
+        List<DevicePlanDetailItemEntity> entityList = param.getEntity(deviceCheckItemDictService);
+        if (StrUtil.isBlank(param.getDeviceCode())) {
+            devicePlanDetailItemService.replaceBatch(entityList);
+        } else {
+            devicePlanDetailItemService.insertIgnoreBatch(entityList);
+        }
+        return ResultVOUtils.successMsg("添加成功");
+    }
+
+    /**
+     * 设备巡检计划明细项目批量新增
+     *
+     * @param param 参数
+     * @return 计划id
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/plan/detail/item/batch/add")
+    public BaseResponse batchAdd(@RequestBody @Valid DevicePlanDetailItemParam param) {
+        List<DevicePlanDetailVo> list = devicePlanDetailService.listByPlanId(param.getPlanId());
+        if (CollUtil.isNotEmpty(list)) {
+            for (DevicePlanDetailVo item : list) {
+                List<DeviceCheckItemDictEntity> itemDictEntities = deviceCheckItemDictService.listByIds(param.getItemCodes());
+                List<DevicePlanDetailItemEntity> entityList = new ArrayList<>();
+                itemDictEntities.forEach(i -> {
+                    DevicePlanDetailItemEntity build = DevicePlanDetailItemEntity.builder()
+                            .planId(param.getPlanId())
+                            .productId(item.getProductId())
+                            .deviceCode(StrUtil.blankToDefault(item.getDeviceCode(), ""))
+                            .itemCode(i.getCode())
+                            .name(i.getName())
+                            .content(i.getContent())
+                            .build();
+                    entityList.add(build);
+                });
+                if (StrUtil.isBlank(param.getDeviceCode())) {
+                    devicePlanDetailItemService.replaceBatch(entityList);
+                } else {
+                    devicePlanDetailItemService.insertIgnoreBatch(entityList);
+                }
+            }
+
+        }
+        return ResultVOUtils.successMsg("添加成功");
+    }
+
+
+    /**
+     * 设备巡检计划明细项目删除
+     *
+     * @param planId    计划id
+     * @param productId 产品id
+     * @param itemCode  项目编码
+     */
+    @AuthRuleAnnotation("")
+    @DeleteMapping("/udi/device/plan/detail/item/delByProduct/{planId}/{productId}/{itemCode}")
+    public BaseResponse delByProduct(@PathVariable Long planId, @PathVariable Long productId, @PathVariable String itemCode) {
+        devicePlanDetailItemService.remove(Wrappers.lambdaQuery(DevicePlanDetailItemEntity.class)
+                .eq(DevicePlanDetailItemEntity::getPlanId, planId)
+                .eq(DevicePlanDetailItemEntity::getProductId, productId)
+                .eq(DevicePlanDetailItemEntity::getItemCode, itemCode)
+        );
+        return ResultVOUtils.successMsg("删除成功");
+    }
+
+
+    /**
+     * 设备巡检计划明细项目删除
+     *
+     * @param planId     计划id
+     * @param deviceCode 设备编码
+     * @param itemCode   项目编码
+     */
+    @AuthRuleAnnotation("")
+    @DeleteMapping("/udi/device/plan/detail/item/delByDevice/{planId}/{deviceCode}/{itemCode}")
+    public BaseResponse delByDevice(@PathVariable Long planId, @PathVariable String deviceCode, @PathVariable String itemCode) {
+        devicePlanDetailItemService.remove(Wrappers.lambdaQuery(DevicePlanDetailItemEntity.class)
+                .eq(DevicePlanDetailItemEntity::getPlanId, planId)
+                .eq(DevicePlanDetailItemEntity::getDeviceCode, deviceCode)
+                .eq(DevicePlanDetailItemEntity::getItemCode, itemCode)
+        );
+        return ResultVOUtils.successMsg("删除成功");
+    }
+
+
+}

src/main/java/com/glxp/api/controller/dev/DeviceRepairApplyController.java

@@ -0,0 +1,114 @@
+package com.glxp.api.controller.dev;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.github.pagehelper.PageInfo;
+import com.glxp.api.annotation.AuthRuleAnnotation;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.controller.BaseController;
+import com.glxp.api.entity.auth.AuthAdmin;
+import com.glxp.api.entity.dev.DeviceRepairApplyEntity;
+import com.glxp.api.enums.dev.DeviceRepairApplyStatusEnum;
+import com.glxp.api.req.dev.*;
+import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.service.dev.DeviceRepairApplyService;
+import com.glxp.api.vo.dev.DeviceRepairApplyVo;
+import groovy.util.logging.Slf4j;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.ArrayList;
+import java.util.List;
+
+@Slf4j
+@RestController
+@RequestMapping
+@RequiredArgsConstructor
+public class DeviceRepairApplyController extends BaseController {
+
+    private final DeviceRepairApplyService deviceRepairApplyService;
+
+    /**
+     * 本部门的报修单
+     *
+     * @param query
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/repair/apply/page")
+    public BaseResponse page(@RequestBody DeviceRepairApplyQuery query) {
+        AuthAdmin user = super.getUser();
+        query.setApplyDeptCode(user.getLocDeptCode());
+        List<DeviceRepairApplyEntity> list = deviceRepairApplyService.pageList(query);
+        PageInfo pageInfo = new PageInfo<>(list);
+        PageSimpleResponse page = new PageSimpleResponse();
+        page.setTotal(pageInfo.getTotal());
+        page.setList(BeanUtil.copyToList(pageInfo.getList(), DeviceRepairApplyVo.class));
+        return ResultVOUtils.success(page);
+    }
+
+    /**
+     * 报修单大厅
+     *
+     * @param query
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/repair/apply/hall/page")
+    public BaseResponse adminPage(@RequestBody DeviceRepairApplyHallQuery query) {
+        DeviceRepairApplyQuery applyQuery = new DeviceRepairApplyQuery();
+        ArrayList<DeviceRepairApplyStatusEnum> statusEnums = new ArrayList<>();
+        if (query.getIsFinish() == 1){
+            statusEnums.add(DeviceRepairApplyStatusEnum.FINISH);
+        }else {
+            statusEnums.add(DeviceRepairApplyStatusEnum.WAIT_PROCESS);
+            statusEnums.add(DeviceRepairApplyStatusEnum.PROCESSING);
+        }
+        applyQuery.setStatuss(statusEnums);
+        BeanUtil.copyProperties(query,applyQuery);
+        List<DeviceRepairApplyEntity> list = deviceRepairApplyService.pageList(applyQuery);
+        PageInfo pageInfo = new PageInfo<>(list);
+        PageSimpleResponse page = new PageSimpleResponse();
+        page.setTotal(pageInfo.getTotal());
+        page.setList(BeanUtil.copyToList(pageInfo.getList(), DeviceRepairApplyVo.class));
+        return ResultVOUtils.success(page);
+    }
+
+    /**
+     * 我受理的报修单
+     *
+     * @param query
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/repair/apply/confirmByUser/page")
+    public BaseResponse confirmByUserPage(@RequestBody DeviceRepairApplyQuery query) {
+        AuthAdmin user = super.getUser();
+        query.setConfirmUserId(user.getId());
+        List<DeviceRepairApplyEntity> list = deviceRepairApplyService.pageList(query);
+        PageInfo pageInfo = new PageInfo<>(list);
+        PageSimpleResponse page = new PageSimpleResponse();
+        page.setTotal(pageInfo.getTotal());
+        page.setList(BeanUtil.copyToList(pageInfo.getList(), DeviceRepairApplyVo.class));
+        return ResultVOUtils.success(page);
+    }
+
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/repair/apply/add")
+    public BaseResponse addDeviceRepairApply(@RequestBody @Valid DeviceRepairApplyAddParam param) {
+        AuthAdmin user = super.getUser();
+        deviceRepairApplyService.addDeviceRepairApply(param, user);
+        return ResultVOUtils.successMsg("创建成功");
+    }
+
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/repair/apply/confirm")
+    public BaseResponse confirmDeviceRepairApply(@RequestBody @Valid DeviceRepairApplyConfirmParam param) {
+        AuthAdmin user = super.getUser();
+        deviceRepairApplyService.confirmDeviceRepairApply(param, user);
+        return ResultVOUtils.successMsg("操作成功");
+    }
+
+
+}

src/main/java/com/glxp/api/controller/dev/DeviceRepairApplyDetailController.java

@@ -0,0 +1,84 @@
+package com.glxp.api.controller.dev;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.github.pagehelper.PageInfo;
+import com.glxp.api.annotation.AuthRuleAnnotation;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.controller.BaseController;
+import com.glxp.api.entity.auth.AuthAdmin;
+import com.glxp.api.entity.dev.DeviceRepairApplyDetailEntity;
+import com.glxp.api.entity.dev.DeviceRepairApplyEntity;
+import com.glxp.api.req.dev.*;
+import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.service.dev.DeviceRepairApplyDetailService;
+import com.glxp.api.service.dev.DeviceRepairApplyService;
+import com.glxp.api.vo.dev.DeviceRepairApplyDetailVo;
+import com.glxp.api.vo.dev.DeviceRepairApplyVo;
+import groovy.util.logging.Slf4j;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+@Slf4j
+@RestController
+@RequestMapping
+@RequiredArgsConstructor
+public class DeviceRepairApplyDetailController extends BaseController {
+
+    private final DeviceRepairApplyDetailService deviceRepairApplyDetailService;
+
+    /**
+     * 本部门的报修单
+     *
+     * @param query
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/repair/apply/detail/page")
+    public BaseResponse page(@RequestBody @Valid DeviceRepairApplyDetailQuery query) {
+
+        List<DeviceRepairApplyDetailEntity> list = deviceRepairApplyDetailService.pageList(query);
+        PageInfo pageInfo = new PageInfo<>(list);
+        PageSimpleResponse page = new PageSimpleResponse();
+        page.setTotal(pageInfo.getTotal());
+        page.setList(BeanUtil.copyToList(pageInfo.getList(), DeviceRepairApplyDetailVo.class));
+        return ResultVOUtils.success(page);
+    }
+
+
+    /**
+     * 诊断设备
+     *
+     * @param param
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/repair/apply/detail/diagnosis")
+    public BaseResponse diagnosis(@RequestBody @Valid DeviceRepairApplyDetailDiagnosisParam param) {
+        AuthAdmin user = super.getUser();
+        deviceRepairApplyDetailService.diagnosis(param, user);
+        return ResultVOUtils.successMsg("操作成功");
+    }
+
+
+    /**
+     * 查出单条的设备保修单
+     *
+     * @param query
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/repair/apply/listByIdAndCode")
+    public BaseResponse listByIdAndCode(@RequestBody @Valid DeviceRepairApplyListByIdAndCodeQuery query) {
+        DeviceRepairApplyDetailEntity entity = deviceRepairApplyDetailService.listByIdAndCode(query);
+        return ResultVOUtils.success(entity);
+    }
+
+
+}

src/main/java/com/glxp/api/controller/dev/DeviceRepairController.java

@@ -0,0 +1,81 @@
+package com.glxp.api.controller.dev;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.github.pagehelper.PageInfo;
+import com.glxp.api.annotation.AuthRuleAnnotation;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.controller.BaseController;
+import com.glxp.api.entity.auth.AuthAdmin;
+import com.glxp.api.entity.dev.DeviceRepairApplyEntity;
+import com.glxp.api.entity.dev.DeviceRepairEntity;
+import com.glxp.api.enums.dev.DeviceRepairApplyStatusEnum;
+import com.glxp.api.req.dev.*;
+import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.service.dev.DeviceRepairApplyService;
+import com.glxp.api.service.dev.DeviceRepairService;
+import com.glxp.api.vo.dev.DeviceRepairApplyVo;
+import groovy.util.logging.Slf4j;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+
+@Slf4j
+@RestController
+@RequestMapping
+@RequiredArgsConstructor
+public class DeviceRepairController extends BaseController {
+
+    private final DeviceRepairService deviceRepairService;
+
+    /**
+     * 我的维修单
+     *
+     * @param query
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/repair/byUser/page")
+    public BaseResponse pageByUser(@RequestBody DeviceRepairQuery query) {
+        AuthAdmin user = super.getUser();
+        query.setCreateUserId(user.getId());
+        List<DeviceRepairEntity> list = deviceRepairService.pageList(query);
+        PageInfo pageInfo = new PageInfo<>(list);
+        PageSimpleResponse page = new PageSimpleResponse();
+        page.setTotal(pageInfo.getTotal());
+        page.setList(pageInfo.getList());
+        return ResultVOUtils.success(page);
+    }
+
+    /**
+     * 完成我的维修单
+     *
+     * @param deviceRepairEntity
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/repair/finishByUser/repairId")
+    public BaseResponse finishByUser(@RequestBody DeviceRepairEntity deviceRepairEntity) {
+        AuthAdmin user = super.getUser();
+        deviceRepairService.finishByUser(deviceRepairEntity, user);
+        return ResultVOUtils.successMsg("操作成功");
+    }
+
+
+    /**
+     * 维修单信息
+     *
+     * @param repairId 维修单号
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @GetMapping("/udi/device/repair/info/{repairId}")
+    public BaseResponse repairInfo(@PathVariable Long repairId) {
+        DeviceRepairEntity entity = deviceRepairService.getById(repairId);
+        return ResultVOUtils.success(entity);
+    }
+
+
+}

src/main/java/com/glxp/api/controller/dev/DeviceUpkeepController.java

@@ -0,0 +1,113 @@
+package com.glxp.api.controller.dev;
+
+import com.github.pagehelper.PageInfo;
+import com.glxp.api.annotation.AuthRuleAnnotation;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.controller.BaseController;
+import com.glxp.api.entity.auth.AuthAdmin;
+import com.glxp.api.req.dev.DeviceUpkeepQuery;
+import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.service.dev.DeviceUpkeepService;
+import com.glxp.api.vo.dev.DeviceUpkeepDetailVo;
+import com.glxp.api.vo.dev.DeviceUpkeepPrintVo;
+import com.glxp.api.vo.dev.DeviceUpkeepVo;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequiredArgsConstructor
+@Slf4j
+@RequestMapping
+public class DeviceUpkeepController extends BaseController {
+
+    private final DeviceUpkeepService deviceUpkeepService;
+
+    /**
+     * 保养任务单列表
+     *
+     * @param query
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/upkeep/page")
+    public BaseResponse page(@RequestBody DeviceUpkeepQuery query) {
+        List<DeviceUpkeepVo> list = deviceUpkeepService.pageList(query);
+        PageInfo pageInfo = new PageInfo<>(list);
+        PageSimpleResponse page = new PageSimpleResponse();
+        page.setTotal(pageInfo.getTotal());
+        page.setList(pageInfo.getList());
+        return ResultVOUtils.success(page);
+    }
+
+    /**
+     * 本部门任务单列表
+     *
+     * @param query
+     * @return
+//     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/upkeep/pageByDept")
+    public BaseResponse pageByDept(@RequestBody DeviceUpkeepQuery query) {
+        AuthAdmin user = super.getUser();
+        query.setChargeDeptCode(user.getLocDeptCode());
+        List<DeviceUpkeepVo> list = deviceUpkeepService.pageList(query);
+        PageInfo pageInfo = new PageInfo<>(list);
+        PageSimpleResponse page = new PageSimpleResponse();
+        page.setTotal(pageInfo.getTotal());
+        page.setList(pageInfo.getList());
+        return ResultVOUtils.success(page);
+    }
+
+    /**
+     * 根据计划id生成巡检任务单
+     *
+     * @param planId 计划id
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @GetMapping("/udi/device/upkeep/gen/{planId}")
+    public BaseResponse genDeviceUpkeep(@PathVariable Long planId) {
+        AuthAdmin user = super.getUser();
+        deviceUpkeepService.genByPlanId(planId, false, user);
+        return ResultVOUtils.successMsg("操作成功");
+    }
+
+    @AuthRuleAnnotation("")
+    @GetMapping("/udi/device/upkeep/info/print/{taskId}")
+    public BaseResponse checkInfoPrint(@PathVariable Long taskId) {
+        DeviceUpkeepPrintVo vo = deviceUpkeepService.checkInfoPrint(taskId, null);
+        return ResultVOUtils.success(vo);
+    }
+
+    @AuthRuleAnnotation("")
+    @GetMapping("/udi/device/upkeep/info/print/{taskId}/{deviceCode}")
+    public BaseResponse checkInfoPrint(@PathVariable Long taskId, @PathVariable String deviceCode) {
+        DeviceUpkeepPrintVo vo = deviceUpkeepService.checkInfoPrint(taskId, deviceCode);
+        return ResultVOUtils.success(vo);
+    }
+
+
+    /**
+     * 我的维修单
+     *
+     * @param query
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/upkeep/byUser/page")
+    public BaseResponse pageByUser(@RequestBody DeviceUpkeepQuery query) {
+        AuthAdmin user = super.getUser();
+        query.setChargeDeptCode(user.getLocDeptCode());
+        List<DeviceUpkeepDetailVo> list = deviceUpkeepService.pageListDetail(query);
+        PageInfo pageInfo = new PageInfo<>(list);
+        PageSimpleResponse page = new PageSimpleResponse();
+        page.setTotal(pageInfo.getTotal());
+        page.setList(pageInfo.getList());
+        return ResultVOUtils.success(page);
+    }
+
+}

src/main/java/com/glxp/api/controller/dev/DeviceUpkeepDetailController.java

@@ -0,0 +1,102 @@
+package com.glxp.api.controller.dev;
+
+import com.github.pagehelper.PageInfo;
+import com.glxp.api.annotation.AuthRuleAnnotation;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.controller.BaseController;
+import com.glxp.api.entity.auth.AuthAdmin;
+import com.glxp.api.entity.dev.DevicePlanDetailEntity;
+import com.glxp.api.entity.dev.DevicePlanEntity;
+import com.glxp.api.entity.dev.DeviceUpkeepDetailEntity;
+import com.glxp.api.req.dev.DevicePlanDetailParam;
+import com.glxp.api.req.dev.DeviceUpkeepDetailParam;
+import com.glxp.api.req.dev.DeviceUpkeepDetailQuery;
+import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.service.dev.*;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+@RestController
+@RequiredArgsConstructor
+@Slf4j
+@RequestMapping
+public class DeviceUpkeepDetailController extends BaseController {
+
+
+    private final DeviceUpkeepDetailService deviceUpkeepDetailService;
+
+    private final DevicePlanService devicePlanService;
+
+    private final DeviceInfoService deviceInfoService;
+    private final DevicePlanDetailService devicePlanDetailService;
+    private final DeviceUpkeepDetailItemService deviceUpkeepDetailItemService;
+    /**
+     * 保养任务单明细列表
+     *
+     * @param query
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/upkeep/detail/page")
+    public BaseResponse page(@RequestBody @Valid DeviceUpkeepDetailQuery query) {
+        List<DeviceUpkeepDetailEntity> list = deviceUpkeepDetailService.pageList(query);
+        PageInfo pageInfo = new PageInfo<>(list);
+        PageSimpleResponse page = new PageSimpleResponse();
+        page.setTotal(pageInfo.getTotal());
+        page.setList(pageInfo.getList());
+        return ResultVOUtils.success(page);
+    }
+
+
+    /**
+     * 设备保养计划明细新增
+     *
+     * @param param 参数
+     * @return 计划id
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/upkeep/detail/add")
+    public BaseResponse add(@RequestBody @Valid DevicePlanDetailParam param) {
+
+
+        DevicePlanEntity entity = null;
+        if (!param.valid(devicePlanService)) {
+            AuthAdmin user = super.getUser();
+            entity = param.getDevicePlanParam().getEntity(user);
+            devicePlanService.save(entity);
+            param.getDevicePlanParam().setPlanId(entity.getPlanId());
+            param.setPlanId(entity.getPlanId());
+        } else {
+            entity = devicePlanService.getById(param.getPlanId());
+        }
+        param.valid(devicePlanService);
+        List<DevicePlanDetailEntity> list = param.getEntity(deviceInfoService);
+        devicePlanDetailService.replaceBatch(list);
+        return ResultVOUtils.success(entity);
+    }
+
+    /**
+     * 完成保养任务单明细项目
+     *
+     * @param param
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/upkeep/detail/finish")
+    public BaseResponse finish(@RequestBody @Valid DeviceUpkeepDetailParam param) {
+        AuthAdmin user = super.getUser();
+        deviceUpkeepDetailItemService.finishAll(param, user);
+        return ResultVOUtils.successMsg("操作成功");
+    }
+
+
+
+}

src/main/java/com/glxp/api/controller/dev/DeviceUpkeepDetailItemController.java

@@ -0,0 +1,73 @@
+package com.glxp.api.controller.dev;
+
+import com.github.pagehelper.PageInfo;
+import com.glxp.api.annotation.AuthRuleAnnotation;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.controller.BaseController;
+import com.glxp.api.entity.auth.AuthAdmin;
+import com.glxp.api.entity.dev.DeviceUpkeepDetailItemEntity;
+import com.glxp.api.req.dev.DeviceUpkeepDetailItemFinishParam;
+import com.glxp.api.req.dev.DeviceUpkeepDetailItemQuery;
+import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.service.dev.DeviceUpkeepDetailItemService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * 设备巡检单明细
+ */
+@RestController
+@RequiredArgsConstructor
+@Slf4j
+@RequestMapping
+public class DeviceUpkeepDetailItemController extends BaseController {
+
+    private final DeviceUpkeepDetailItemService deviceUpkeepDetailItemService;
+
+    /**
+     * 巡检任务单明细项目列表
+     *
+     * @param query
+     * @return
+     */
+    /**
+     * 保养任务单明细项目列表
+     *
+     * @param query
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/upkeep/detail/item/page")
+    public BaseResponse page(@RequestBody @Valid DeviceUpkeepDetailItemQuery query) {
+        List<DeviceUpkeepDetailItemEntity> list = deviceUpkeepDetailItemService.pageList(query);
+        PageInfo pageInfo = new PageInfo<>(list);
+        PageSimpleResponse page = new PageSimpleResponse();
+        page.setTotal(pageInfo.getTotal());
+        page.setList(pageInfo.getList());
+        return ResultVOUtils.success(page);
+    }
+
+    /**
+     * 完成巡检任务单明细项目
+     *
+     * @param param
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/upkeep/detail/item/finish")
+    public BaseResponse page(@RequestBody @Valid DeviceUpkeepDetailItemFinishParam param) {
+        AuthAdmin user = super.getUser();
+        deviceUpkeepDetailItemService.finish(param, user);
+        return ResultVOUtils.successMsg("操作成功");
+    }
+
+
+}

src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java

@@ -17,15 +17,16 @@ import com.glxp.api.constant.*;
 import com.glxp.api.constant.Constant;
 import com.glxp.api.dao.auth.*;
 import com.glxp.api.dao.basic.*;
+import com.glxp.api.dao.dev.*;
 import com.glxp.api.dao.inout.*;
-import com.glxp.api.dao.inv.DeviceInspectTaskDetailMapper;
-import com.glxp.api.dao.inv.DeviceInspectTaskMapper;
+import com.glxp.api.dao.inv.*;
 import com.glxp.api.dao.purchase.*;
 import com.glxp.api.dao.schedule.SystemParamConfigDao;
 import com.glxp.api.dao.system.*;
 import com.glxp.api.dao.thrsys.*;
 import com.glxp.api.entity.auth.*;
 import com.glxp.api.entity.basic.*;
+import com.glxp.api.entity.dev.*;
 import com.glxp.api.entity.inout.*;
 import com.glxp.api.entity.inv.DeviceInspectTaskEntity;
 import com.glxp.api.entity.purchase.*;
@@ -42,8 +43,6 @@ import com.glxp.api.service.basic.IBasicBussinessTypeService;
 import com.glxp.api.service.inout.IoAddInoutService;
 import com.glxp.api.service.inout.IoCheckInoutService;
 import com.glxp.api.service.inout.IoOrderService;
-import com.glxp.api.service.inv.DeviceInspectTaskDetailService;
-import com.glxp.api.service.inv.DeviceInspectTaskService;
 import com.glxp.api.service.purchase.PurOrderDetailService;
 import com.glxp.api.service.purchase.PurOrderService;
 import com.glxp.api.service.sync.BasicDownloadService;
@@ -59,6 +58,7 @@ import org.apache.ibatis.session.ExecutorType;
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.apache.ibatis.session.TransactionIsolationLevel;
+import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.transaction.annotation.Transactional;
@@ -72,8 +72,13 @@ import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.*;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -379,6 +384,18 @@ public class SpsSyncDownloadController {
                 case DEVICE_TASK:
                     saveUploadDevTask(JSONUtil.toBean(obj, SpsSyncDeviceTaskResponse.class));
                     break;
+                case DEVICE_INFO_DATA:
+                    saveUploadDevTaskInfo(JSONUtil.toBean(obj, SpsSyncDeviceTaskResponse.class));
+                    break;
+                case DEVICE_CHECK_DATA:
+                    saveUploadDevTaskInfo(JSONUtil.toBean(obj, SpsSyncDeviceTaskResponse.class));
+                    break;
+                case DEVICE_REPAIR_DATA:
+                    saveUploadDevTaskInfo(JSONUtil.toBean(obj, SpsSyncDeviceTaskResponse.class));
+                    break;
+                case PRODUCE_BUSINESS_DATA:
+                    saveUploadProBusinessData(JSONUtil.toBean(obj, SpsSyncProBusinessDataResponse.class));
+                    break;
             }
             String taskId = obj.getStr("taskId");
             BasicDownloadStatusEntity downloadStatus = BasicDownloadStatusEntity.builder()
@@ -635,6 +652,86 @@ public class SpsSyncDownloadController {
         }
     }
 
+    @Resource
+    DeviceInfoMapper deviceInfoMapper;
+    @Resource
+    DeviceCheckMapper deviceCheckMapper;
+    @Resource
+    DeviceCheckDetailMapper deviceCheckDetailMapper;
+    @Resource
+    DeviceCheckDetailItemMapper deviceCheckDetailItemMapper;
+    @Resource
+    DeviceRepairApplyMapper deviceRepairApplyMapper;
+
+    @Resource
+    DeviceRepairApplyDetailMapper deviceRepairApplyDetailMapper;
+
+    @Resource
+    DeviceRepairMapper deviceRepairMapper;
+
+
+    // 报修表
+    private void saveUploadDevTaskInfo(SpsSyncDeviceTaskResponse bean) {
+        if (CollectionUtil.isNotEmpty(bean.getDeviceInfoEntities())) {
+            for (DeviceInfoEntity entity : bean.getDeviceInfoEntities()) {
+                entity.setUpdateTime(null);
+            }
+            boolean b = deviceInfoMapper.replaceBatchs(bean.getDeviceInfoEntities());
+        }
+
+        if (CollectionUtil.isNotEmpty(bean.getDeviceCheckEntities())) {
+            for (DeviceCheckEntity entity : bean.getDeviceCheckEntities()) {
+                entity.setUpdateTime(null);
+            }
+            boolean b = deviceCheckMapper.replaceBatchs(bean.getDeviceCheckEntities());
+        }
+        if (CollectionUtil.isNotEmpty(bean.getDeviceCheckDetailEntities())) {
+            for (DeviceCheckDetailEntity entity : bean.getDeviceCheckDetailEntities()) {
+                entity.setUpdateTime(null);
+            }
+            boolean b = deviceCheckDetailMapper.replaceBatchs(bean.getDeviceCheckDetailEntities());
+        }
+
+        if (CollectionUtil.isNotEmpty(bean.getDeviceCheckDetailItemEntities())) {
+            for (DeviceCheckDetailItemEntity entity : bean.getDeviceCheckDetailItemEntities()) {
+                entity.setUpdateTime(null);
+            }
+            boolean b = deviceCheckDetailItemMapper.replaceBatchs(bean.getDeviceCheckDetailItemEntities());
+        }
+
+        if (CollectionUtil.isNotEmpty(bean.getDeviceRepairApplyEntities())) {
+            for (DeviceRepairApplyEntity entity : bean.getDeviceRepairApplyEntities()) {
+                entity.setUpdateTime(null);
+            }
+            boolean b = deviceRepairApplyMapper.replaceBatchs(bean.getDeviceRepairApplyEntities());
+        }
+
+        if (CollectionUtil.isNotEmpty(bean.getDeviceRepairApplyDetailEntities())) {
+            for (DeviceRepairApplyDetailEntity entity : bean.getDeviceRepairApplyDetailEntities()) {
+                entity.setUpdateTime(null);
+            }
+            boolean b = deviceRepairApplyDetailMapper.replaceBatchs(bean.getDeviceRepairApplyDetailEntities());
+        }
+
+        if (CollectionUtil.isNotEmpty(bean.getDeviceRepairEntities())) {
+            for (DeviceRepairEntity entity : bean.getDeviceRepairEntities()) {
+                entity.setUpdateTime(null);
+            }
+            boolean b = deviceRepairMapper.replaceBatchs(bean.getDeviceRepairEntities());
+        }
+    }
+
+
+    @Resource
+    ThrManufacturerMapper thrManufacturerMapper;
+    private void saveUploadProBusinessData(SpsSyncProBusinessDataResponse bean) {
+        if (CollectionUtil.isNotEmpty(bean.getThrManufacturerEntities())) {
+            for (ThrManufacturerEntity entity : bean.getThrManufacturerEntities()) {
+                entity.setUpdateTime(null);
+            }
+            boolean b = thrManufacturerMapper.replaceBatchs(bean.getThrManufacturerEntities());
+        }
+    }
     @Resource
     IoOrderDao orderDao;
     @Resource

src/main/java/com/glxp/api/controller/sync/SpsSyncWebSocket.java

@@ -11,6 +11,7 @@ import com.glxp.api.service.sync.SyncEditLogService;
 import com.glxp.api.service.sync.SyncEditTypeService;
 import com.glxp.api.util.JsonUtils;
 import lombok.extern.slf4j.Slf4j;
+import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
@@ -121,7 +122,7 @@ public class SpsSyncWebSocket {
         }
     }
 
-    public BasicDataRequest insert(BasicDataRequest basicDataRequest, String userId) {
+    public BasicDataRequest insert(@NotNull BasicDataRequest basicDataRequest, String userId) {
         //日志参数类
         DeleteBasicDataRequest deleteBasicDataRequest = new DeleteBasicDataRequest();
         deleteBasicDataRequest.setRecordCode("DL" + new SimpleDateFormat("yyyyMMddHHmmssSSSS").format(System.currentTimeMillis()));

src/main/java/com/glxp/api/controller/sync/SyncDelController.java

@@ -8,9 +8,11 @@ import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.constant.SyncDelType;
 import com.glxp.api.controller.BaseController;
+import com.glxp.api.dao.dev.DeviceInfoMapper;
 import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
 import com.glxp.api.entity.basic.BasicCorpEntity;
 import com.glxp.api.entity.basic.UdiRelevanceEntity;
+import com.glxp.api.entity.dev.DeviceInfoEntity;
 import com.glxp.api.entity.inv.DeviceInspectTaskDetailEntity;
 import com.glxp.api.entity.inv.DeviceInspectTaskEntity;
 import com.glxp.api.entity.sync.SyncEditLogEntity;
@@ -109,6 +111,14 @@ public class SyncDelController extends BaseController {
                 //插入操作数据类型记录表
                 insertType(basicDataRequest.getDeleteBasicDataRequest());
                 break;
+            case SyncDelType.DEVICE_INFO_DATA:
+
+                baseResponse = deleteDevInfoData(basicDataRequest.getDeleteDeviceInfoEntity());
+                //插入日志
+                insertLog(basicDataRequest.getDeleteBasicDataRequest(), baseResponse);
+                //插入操作数据类型记录表
+                insertType(basicDataRequest.getDeleteBasicDataRequest());
+                break;
             default:
                 break;
         }
@@ -218,4 +228,11 @@ public class SyncDelController extends BaseController {
         return ResultVOUtils.success("删除成功");
     }
 
+    @Resource
+    DeviceInfoMapper deviceInfoMapper;
+    public BaseResponse deleteDevInfoData(DeviceInfoEntity deviceInfoEntity) {
+        deviceInfoMapper.delete(new QueryWrapper<DeviceInfoEntity>().eq("deviceCode",deviceInfoEntity.getDeviceCode()));
+        return ResultVOUtils.success("删除成功");
+    }
+
 }

src/main/java/com/glxp/api/controller/thrsys/ThrManusController.java

@@ -0,0 +1,147 @@
+package com.glxp.api.controller.thrsys;
+
+import cn.hutool.core.thread.ThreadUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.github.pagehelper.PageInfo;
+import com.glxp.api.annotation.AuthRuleAnnotation;
+import com.glxp.api.common.enums.ResultEnum;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.entity.basic.BasicProductsEntity;
+import com.glxp.api.entity.thrsys.ThrManufacturerEntity;
+import com.glxp.api.entity.thrsys.ThrSystemDetailEntity;
+import com.glxp.api.http.ErpBasicClient;
+import com.glxp.api.req.system.DeleteRequest;
+import com.glxp.api.req.thrsys.FilterBasicProducstRequest;
+import com.glxp.api.req.thrsys.FilterThrCorpRequest;
+import com.glxp.api.req.thrsys.ThrManuFilterRequest;
+import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.service.thrsys.ThrManufacturerService;
+import com.glxp.api.service.thrsys.ThrSystemDetailService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Slf4j
+@RestController
+public class ThrManusController {
+
+
+    @Resource
+    ThrManufacturerService thrManufacturerService;
+    @Resource
+    private ThrSystemDetailService thrSystemDetailService;
+    @Resource
+    private ErpBasicClient erpBasicClient;
+
+
+    @GetMapping("/udiwms/thrsys/getManus")
+    public BaseResponse getManus(FilterThrCorpRequest filterThrCorpRequest,
+                                 BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<ThrManufacturerEntity> thrManufacturerEntities
+                = thrManufacturerService.filterThrManu(filterThrCorpRequest);
+        PageInfo<ThrManufacturerEntity> pageInfo;
+        pageInfo = new PageInfo<>(thrManufacturerEntities);
+        PageSimpleResponse<ThrManufacturerEntity> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(thrManufacturerEntities);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
+
+    @AuthRuleAnnotation("")
+    @PostMapping("/udiwms/thrsys/delManus")
+    public BaseResponse delCorps(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        String id = deleteRequest.getId();
+        thrManufacturerService.removeById(id);
+        return ResultVOUtils.success("删除成功");
+    }
+
+
+    //选中或者下载全部
+    @AuthRuleAnnotation("")
+    @PostMapping("/udiwms/thrsys/manu/corpsDlAll")
+    public BaseResponse corpsDlAll(@RequestBody ThrManuFilterRequest thrManuFilterRequest) {
+        if (null == thrManuFilterRequest) {
+            return ResultVOUtils.error(500, "参数不能为空");
+        }
+        ThreadUtil.execAsync(() -> {
+            try {
+                thrManufacturerService.downloadByRequest(thrManuFilterRequest);
+            } catch (Exception e) {
+                log.error("下载异常", e);
+                e.printStackTrace();
+            }
+
+        });
+        return ResultVOUtils.success("后台正在下载，请稍后刷新查看！");
+    }
+
+
+    //查询ERP往来单位
+    @AuthRuleAnnotation("")
+    @GetMapping("/udiwms/manu/filterErp")
+    public BaseResponse filterErp(ThrManuFilterRequest thrManuFilterRequest,
+                                  BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        ThrSystemDetailEntity thrSystemDetailEntity = thrSystemDetailService.selectByKey("manuUrl", thrManuFilterRequest.getThirdSys());
+        if (thrSystemDetailEntity == null || thrSystemDetailEntity.getValue() == null)
+            return ResultVOUtils.error(500, "生产企业接口地址未定义");
+        if (thrSystemDetailEntity.getEnabled()) {
+            BaseResponse<PageSimpleResponse<ThrManufacturerEntity>> udiDlDeviceResponse = erpBasicClient.getThrManu(thrManuFilterRequest);
+            if (udiDlDeviceResponse.getCode() == 20000) {
+                for (ThrManufacturerEntity item : udiDlDeviceResponse.getData().getList()) {
+                    ThrManufacturerEntity thrManufacturerEntity = thrManufacturerService.getOne(new QueryWrapper<ThrManufacturerEntity>().eq("unitId", item.getUnitId()).eq("thirdSysFk", thrManuFilterRequest.getThirdSys()).last("limit 1"));
+                    if (thrManufacturerEntity != null) {
+                        item.setChecked(true);
+                    } else {
+                        item.setChecked(false);
+                    }
+                }
+                return udiDlDeviceResponse;
+            } else {
+                return udiDlDeviceResponse;
+            }
+
+        } else {
+            return ResultVOUtils.error(500, "第三方系统往来单位服务接口未启用");
+        }
+    }
+
+    @AuthRuleAnnotation("")
+    @GetMapping("/udiwms/thrsys/getBasicProducts")
+    public BaseResponse getProductTypes(FilterBasicProducstRequest basicProducstRequest,
+                                        BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<ThrManufacturerEntity> thrManufacturerEntities
+                = thrManufacturerService.getProductTypes(basicProducstRequest);
+        PageInfo<ThrManufacturerEntity> pageInfo;
+        pageInfo = new PageInfo<ThrManufacturerEntity>(thrManufacturerEntities);
+        PageSimpleResponse<ThrManufacturerEntity> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(thrManufacturerEntities);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
+
+}

src/main/java/com/glxp/api/dao/basic/BasicProductsDao.java

@@ -5,7 +5,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.glxp.api.dao.BaseMapperPlus;
 import com.glxp.api.entity.basic.BasicProductSetEntity;
 import com.glxp.api.entity.basic.BasicProductsEntity;
+import com.glxp.api.entity.thrsys.ThrProductTypeEntity;
 import com.glxp.api.req.basic.FilterBasicProductSetrequest;
+import com.glxp.api.req.thrsys.FilterBasicProducstRequest;
+import com.glxp.api.req.thrsys.FilterThrProductTypeRequest;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

src/main/java/com/glxp/api/dao/dev/DeviceChangeLogMapper.java

@@ -0,0 +1,15 @@
+package com.glxp.api.dao.dev;
+
+import com.glxp.api.dao.BaseMapperPlus;
+import com.glxp.api.entity.dev.DeviceChangeLogEntity;
+
+/**
+*  针对表【device_change_log(设备变更日志表)】的数据库操作Mapper
+*/
+public interface DeviceChangeLogMapper extends BaseMapperPlus<DeviceChangeLogMapper,DeviceChangeLogEntity,DeviceChangeLogEntity> {
+
+}
+
+
+
+

src/main/java/com/glxp/api/dao/dev/DeviceCheckDetailItemMapper.java

@@ -0,0 +1,15 @@
+package com.glxp.api.dao.dev;
+
+import com.glxp.api.dao.BaseMapperPlus;
+import com.glxp.api.entity.dev.DeviceCheckDetailItemEntity;
+
+/**
+*  针对表【device_check_detail_item(设备巡检项目)】的数据库操作Mapper
+*/
+public interface DeviceCheckDetailItemMapper extends BaseMapperPlus<DeviceCheckDetailItemMapper, DeviceCheckDetailItemEntity,DeviceCheckDetailItemEntity> {
+
+}
+
+
+
+

src/main/java/com/glxp/api/dao/dev/DeviceCheckDetailMapper.java

@@ -0,0 +1,14 @@
+package com.glxp.api.dao.dev;
+
+import com.glxp.api.dao.BaseMapperPlus;
+import com.glxp.api.entity.dev.DeviceCheckDetailEntity;
+
+/**
+*  针对表【device_check_detail(巡检任务明细)】的数据库操作Mapper
+*/
+public interface DeviceCheckDetailMapper extends BaseMapperPlus<DeviceCheckDetailMapper, DeviceCheckDetailEntity,DeviceCheckDetailEntity> {
+}
+
+
+
+

src/main/java/com/glxp/api/dao/dev/DeviceCheckItemDictMapper.java

@@ -0,0 +1,17 @@
+package com.glxp.api.dao.dev;
+
+import com.glxp.api.dao.BaseMapperPlus;
+import com.glxp.api.entity.dev.DeviceCheckItemDictEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 针对表【device_check_item_dict(巡检项目字典)】的数据库操作Mapper
+ */
+@Mapper
+public interface DeviceCheckItemDictMapper extends BaseMapperPlus<DeviceCheckItemDictMapper, DeviceCheckItemDictEntity, DeviceCheckItemDictEntity> {
+
+}
+
+
+
+

src/main/java/com/glxp/api/dao/dev/DeviceCheckMapper.java

@@ -0,0 +1,23 @@
+package com.glxp.api.dao.dev;
+
+import com.glxp.api.dao.BaseMapperPlus;
+import com.glxp.api.entity.dev.DeviceCheckEntity;
+import com.glxp.api.req.dev.DeviceCheckQuery;
+import com.glxp.api.vo.dev.DeviceCheckVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+*  针对表【device_check(巡检任务表)】的数据库操作Mapper
+*/
+public interface DeviceCheckMapper extends BaseMapperPlus<DeviceCheckMapper, DeviceCheckEntity,DeviceCheckEntity> {
+
+    List<DeviceCheckVo> pageVo(DeviceCheckQuery query);
+
+    DeviceCheckVo getVoById(@Param("taskId") Long taskId);
+}
+
+
+
+

src/main/java/com/glxp/api/dao/dev/DeviceInfoMapper.java

@@ -0,0 +1,33 @@
+package com.glxp.api.dao.dev;
+
+import com.glxp.api.dao.BaseMapperPlus;
+import com.glxp.api.entity.dev.DeviceInfoEntity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.glxp.api.enums.dev.DeviceStatusEnum;
+import com.glxp.api.req.dev.DeviceInfoDetailByDeptCodeQuery;
+import com.glxp.api.req.dev.DeviceInfoDetailQuery;
+import com.glxp.api.req.dev.DeviceInfoQuery;
+import com.glxp.api.vo.dev.DeviceInfoVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Set;
+
+/**
+ * 针对表【device_info(设备表)】的数据库操作Mapper
+ */
+public interface DeviceInfoMapper extends BaseMapperPlus<DeviceInfoMapper,DeviceInfoEntity,DeviceInfoEntity> {
+
+    List<DeviceInfoVo> pageVo(@Param("param") DeviceInfoQuery query, @Param("deptCode") String locDeptCode);
+
+    List<DeviceInfoVo> allPageVo(@Param("param") DeviceInfoQuery query);
+
+    List<DeviceInfoVo> detail(@Param("param") DeviceInfoDetailQuery query);
+
+    List<DeviceInfoVo> detail(@Param("param") DeviceInfoDetailByDeptCodeQuery query);
+
+    List<DeviceInfoVo> listVoByProductIdAndStatus(@Param("productId")Long productId, @Param("status")DeviceStatusEnum status);
+
+    List<DeviceInfoVo> listVoByCodes(@Param("list") List<String> deviceCodes,@Param("deptCode") String deptCode,@Param("status") DeviceStatusEnum status);
+}
+

src/main/java/com/glxp/api/dao/dev/DevicePlanDetailItemMapper.java

@@ -0,0 +1,15 @@
+package com.glxp.api.dao.dev;
+
+import com.glxp.api.dao.BaseMapperPlus;
+import com.glxp.api.entity.dev.DevicePlanDetailItemEntity;
+
+/**
+ * 针对表【device_plan_detail_item(巡检设备的项目)】的数据库操作Mapper
+ */
+public interface DevicePlanDetailItemMapper extends BaseMapperPlus<DevicePlanDetailItemMapper, DevicePlanDetailItemEntity, DevicePlanDetailItemEntity> {
+
+}
+
+
+
+

src/main/java/com/glxp/api/dao/dev/DevicePlanDetailMapper.java

@@ -0,0 +1,25 @@
+package com.glxp.api.dao.dev;
+
+import com.glxp.api.dao.BaseMapperPlus;
+import com.glxp.api.entity.dev.DevicePlanDetailEntity;
+import com.glxp.api.req.dev.DevicePlanDetailGroupQuery;
+import com.glxp.api.req.dev.DevicePlanDetailQuery;
+import com.glxp.api.vo.dev.DevicePlanDetailVo;
+
+import java.util.List;
+
+/**
+ * 针对表【device_plan_detail(巡检计划明细)】的数据库操作Mapper
+ */
+public interface DevicePlanDetailMapper extends BaseMapperPlus<DevicePlanDetailMapper, DevicePlanDetailEntity, DevicePlanDetailEntity> {
+
+    List<DevicePlanDetailVo> pageGroupVo(DevicePlanDetailGroupQuery query);
+
+    List<DevicePlanDetailVo> pageVo(DevicePlanDetailQuery query);
+
+    List<DevicePlanDetailVo> listByPlanId(Long planId);
+}
+
+
+
+

src/main/java/com/glxp/api/dao/dev/DevicePlanMapper.java

@@ -0,0 +1,20 @@
+package com.glxp.api.dao.dev;
+
+import com.glxp.api.dao.BaseMapperPlus;
+import com.glxp.api.entity.dev.DevicePlanEntity;
+import com.glxp.api.req.dev.DevicePlanQuery;
+import com.glxp.api.vo.dev.DevicePlanVo;
+
+import java.util.List;
+
+/**
+*  针对表【device_plan(设备巡检计划)】的数据库操作Mapper
+*/
+public interface DevicePlanMapper extends BaseMapperPlus<DevicePlanMapper,DevicePlanEntity,DevicePlanEntity> {
+
+    List<DevicePlanVo> pageVo(DevicePlanQuery query);
+}
+
+
+
+

src/main/java/com/glxp/api/dao/dev/DeviceRepairApplyDetailMapper.java

@@ -0,0 +1,25 @@
+package com.glxp.api.dao.dev;
+
+import com.glxp.api.dao.BaseMapperPlus;
+import com.glxp.api.entity.dev.DeviceRepairApplyDetailEntity;
+import com.glxp.api.req.dev.DeviceRepairApplyDetailMiniQuery;
+import com.glxp.api.req.dev.DeviceRepairApplyListByIdAndCodeQuery;
+import com.glxp.api.res.dev.DeviceRepairApplyDetailMiniResponse;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+* @author Administrator
+* @description 针对表【device_repair_apply_detail(设备报修单明细)】的数据库操作Mapper
+* @createDate 2023-12-07 17:15:49
+* @Entity com.glxp.api.entity.dev.DeviceRepairApplyDetailEntity
+*/
+public interface DeviceRepairApplyDetailMapper extends BaseMapperPlus<DeviceRepairApplyDetailMapper,DeviceRepairApplyDetailEntity,DeviceRepairApplyDetailEntity> {
+
+    List<DeviceRepairApplyDetailMiniResponse> miniPage(@Param("param") DeviceRepairApplyDetailMiniQuery query);
+}
+
+
+
+

src/main/java/com/glxp/api/dao/dev/DeviceRepairApplyMapper.java

@@ -0,0 +1,18 @@
+package com.glxp.api.dao.dev;
+
+import com.glxp.api.dao.BaseMapperPlus;
+import com.glxp.api.entity.dev.DeviceRepairApplyEntity;
+
+/**
+* @author Administrator
+* @description 针对表【device_repair_apply(设备报修单)】的数据库操作Mapper
+* @createDate 2023-12-07 17:15:49
+* @Entity com.glxp.api.entity.dev.DeviceRepairApplyEntity
+*/
+public interface DeviceRepairApplyMapper extends BaseMapperPlus<DeviceRepairApplyMapper,DeviceRepairApplyEntity,DeviceRepairApplyEntity> {
+
+}
+
+
+
+

src/main/java/com/glxp/api/dao/dev/DeviceRepairMapper.java

@@ -0,0 +1,18 @@
+package com.glxp.api.dao.dev;
+
+import com.glxp.api.dao.BaseMapperPlus;
+import com.glxp.api.entity.dev.DeviceRepairEntity;
+
+/**
+* @author Administrator
+* @description 针对表【device_repair(设备维修单)】的数据库操作Mapper
+* @createDate 2023-12-07 17:15:49
+* @Entity com.glxp.api.entity.dev.DeviceRepairEntity
+*/
+public interface DeviceRepairMapper extends BaseMapperPlus<DeviceRepairMapper,DeviceRepairEntity,DeviceRepairEntity> {
+
+}
+
+
+
+

src/main/java/com/glxp/api/dao/dev/DeviceUpkeepDetailItemMapper.java

@@ -0,0 +1,15 @@
+package com.glxp.api.dao.dev;
+
+import com.glxp.api.dao.BaseMapperPlus;
+import com.glxp.api.entity.dev.DeviceUpkeepDetailItemEntity;
+
+/**
+*  针对表【device_upkeep_detail_item(设备保养项目)】的数据库操作Mapper
+*/
+public interface DeviceUpkeepDetailItemMapper extends BaseMapperPlus<DeviceUpkeepDetailItemMapper, DeviceUpkeepDetailItemEntity,DeviceUpkeepDetailItemEntity> {
+
+}
+
+
+
+

src/main/java/com/glxp/api/dao/dev/DeviceUpkeepDetailMapper.java

@@ -0,0 +1,15 @@
+package com.glxp.api.dao.dev;
+
+import com.glxp.api.dao.BaseMapperPlus;
+import com.glxp.api.entity.dev.DeviceUpkeepDetailEntity;
+
+/**
+*  针对表【device_upkeep_detail(保养任务明细)】的数据库操作Mapper
+*/
+public interface DeviceUpkeepDetailMapper extends BaseMapperPlus<DeviceUpkeepDetailMapper, DeviceUpkeepDetailEntity,DeviceUpkeepDetailEntity> {
+
+}
+
+
+
+

src/main/java/com/glxp/api/dao/dev/DeviceUpkeepMapper.java

@@ -0,0 +1,27 @@
+package com.glxp.api.dao.dev;
+
+import com.glxp.api.dao.BaseMapperPlus;
+import com.glxp.api.entity.dev.DeviceUpkeepEntity;
+import com.glxp.api.req.dev.DeviceUpkeepQuery;
+import com.glxp.api.vo.dev.DeviceUpkeepDetailVo;
+import com.glxp.api.vo.dev.DeviceUpkeepVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+*  针对表【device_upkeep(保养任务表)】的数据库操作Mapper
+*/
+public interface DeviceUpkeepMapper extends BaseMapperPlus<DeviceUpkeepMapper, DeviceUpkeepEntity,DeviceUpkeepEntity> {
+
+    List<DeviceUpkeepVo> pageVo(DeviceUpkeepQuery query);
+
+
+    DeviceUpkeepVo getVoById(@Param("taskId") Long taskId);
+
+    List<DeviceUpkeepDetailVo> pageListDetail(DeviceUpkeepQuery query);
+}
+
+
+
+

src/main/java/com/glxp/api/dao/thrsys/ThrManufacturerMapper.java

@@ -0,0 +1,22 @@
+package com.glxp.api.dao.thrsys;
+
+import com.glxp.api.dao.BaseMapperPlus;
+import com.glxp.api.entity.basic.BasicProductsEntity;
+import com.glxp.api.entity.thrsys.ThrManufacturerEntity;
+import com.glxp.api.req.thrsys.FilterBasicProducstRequest;
+import com.glxp.api.req.thrsys.FilterThrCorpRequest;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface ThrManufacturerMapper extends BaseMapperPlus<ThrManufacturerMapper, ThrManufacturerEntity, ThrManufacturerEntity> {
+
+    List<ThrManufacturerEntity> filterThrManu(FilterThrCorpRequest filterThrCorpRequest);
+
+    ThrManufacturerEntity selectByUnitIdAndThirdId(@Param("unitId") String unitId, @Param("thirdId") String thirdId);
+
+    List<ThrManufacturerEntity> getProductTypes(FilterBasicProducstRequest basicProducstRequest);
+
+}

src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java

@@ -41,6 +41,7 @@ public class UdiProductEntity {
     private String ybbm;
     private String sptm;
     private String manufactory;
+    private String manufactoryCode;
     private String measname;
     private Integer productType;
     private String scbssfbhph;

src/main/java/com/glxp/api/entity/dev/DeviceChangeLogEntity.java

@@ -0,0 +1,155 @@
+package com.glxp.api.entity.dev;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.glxp.api.enums.dev.DeviceChangeTypeEnum;
+import com.glxp.api.util.SnowflakeUtil;
+import com.glxp.api.vo.dev.DeviceChangeOrderVo;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 设备变更日志表
+ *
+ * @TableName device_change_log
+ */
+@TableName(value = "device_change_log")
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class DeviceChangeLogEntity implements Serializable {
+    /**
+     * 日志id
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 设备编码
+     */
+    @TableField(value = "deviceCode")
+    private String deviceCode;
+
+    /**
+     * add:新增入库，change:变更归属
+     */
+    @TableField(value = "type")
+    private DeviceChangeTypeEnum type;
+
+    /**
+     * 变更单号
+     */
+    @TableField(value = "changeOrderId")
+    private Long changeOrderId;
+
+    /**
+     * 操作部门
+     */
+    @TableField(value = "deptCode")
+    private String deptCode;
+
+    /**
+     * 操作部门
+     */
+    @TableField(value = "deptName")
+    private String deptName;
+
+    /**
+     * 目标部门
+     */
+    @TableField(value = "toDeptCode")
+    private String toDeptCode;
+
+    /**
+     * 目标部门
+     */
+    @TableField(value = "toDeptName")
+    private String toDeptName;
+
+    /**
+     * 确认人id
+     */
+    @TableField(value = "confirmUser")
+    private Long confirmUser;
+
+    /**
+     * 确认人姓名
+     */
+    @TableField(value = "confirmUserName")
+    private String confirmUserName;
+
+    /**
+     * 确认时间
+     */
+    @TableField(value = "confirmTime")
+    private LocalDateTime confirmTime;
+
+    /**
+     * 确认备注
+     */
+    @TableField(value = "confirmRemark")
+    private String confirmRemark;
+
+    /**
+     * 备注
+     */
+    @TableField(value = "remark")
+    private String remark;
+
+    /**
+     * 操作人姓名
+     */
+    @TableField(value = "createUserName")
+    private String createUserName;
+
+    /**
+     * 操作人id
+     */
+    @TableField(value = "createUser")
+    private Long createUser;
+
+    /**
+     * 操作时间
+     */
+    @TableField(value = "createTime")
+    private LocalDateTime createTime;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 生成日志实体
+     *
+     * @param deviceCode 设备编码
+     * @param order      变更单据VO(需包含(to)deptCode对应的(to)deptName)
+     * @return 日志实体
+     */
+    public static DeviceChangeLogEntity genEntity(String deviceCode, DeviceChangeOrderVo order) {
+
+        return DeviceChangeLogEntity.builder()
+                .id(SnowflakeUtil.getId())
+                .type(order.getType())
+                .deviceCode(deviceCode)
+                .changeOrderId(order.getOrderId())
+                .remark(order.getRemark())
+                .deptCode(order.getDeptCode())
+                .deptName(order.getDeptName())
+                .toDeptCode(order.getToDeptCode())
+                .toDeptName(order.getToDeptName())
+                .confirmUser(order.getConfirmUser())
+                .confirmUserName(order.getConfirmUserName())
+                .confirmTime(order.getConfirmTime())
+                .confirmRemark(order.getConfirmRemark())
+                .createTime(order.getCreateTime())
+                .createUserName(order.getCreateUserName())
+                .createUser(order.getCreateUser())
+                .build();
+    }
+}

src/main/java/com/glxp/api/entity/dev/DeviceChangeOrderEntity.java

@@ -0,0 +1,109 @@
+package com.glxp.api.entity.dev;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.glxp.api.enums.dev.DeviceChangeStatusEnum;
+import com.glxp.api.enums.dev.DeviceChangeTypeEnum;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 设备变更单
+ *
+ * @TableName device_change_order
+ */
+@TableName(value = "device_change_order")
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+public class DeviceChangeOrderEntity implements Serializable {
+    /**
+     * 编码
+     */
+    @TableId(value = "orderId")
+    private Long orderId;
+
+    /**
+     * add:新增入库，change:变更归属
+     */
+    @TableField(value = "type")
+    private DeviceChangeTypeEnum type;
+
+    /**
+     * 1.待目标部门接收 ，2.完成(目标确认接收) ，3.目标部门拒收，4.取消
+     */
+    @TableField(value = "status")
+    private DeviceChangeStatusEnum status;
+
+    /**
+     * 创建部门
+     */
+    @TableField(value = "deptCode")
+    private String deptCode;
+
+    /**
+     * 目标部门
+     */
+    @TableField(value = "toDeptCode")
+    private String toDeptCode;
+
+    /**
+     * 确认人id
+     */
+    @TableField(value = "confirmUser")
+    private Long confirmUser;
+
+    /**
+     * 确认人姓名
+     */
+    @TableField(value = "confirmUserName")
+    private String confirmUserName;
+
+    /**
+     * 确认时间
+     */
+    @TableField(value = "confirmTime")
+    private LocalDateTime confirmTime;
+
+    /**
+     *
+     */
+    @TableField(value = "confirmRemark")
+    private String confirmRemark;
+
+    /**
+     * 备注
+     */
+    @TableField(value = "remark")
+    private String remark;
+
+    /**
+     * 创建人
+     */
+    @TableField(value = "createUserName")
+    private String createUserName;
+
+    /**
+     * 创建人id
+     */
+    @TableField(value = "createUser")
+    private Long createUser;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime")
+    private LocalDateTime createTime;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+}

src/main/java/com/glxp/api/entity/dev/DeviceCheckDetailEntity.java

@@ -0,0 +1,198 @@
+package com.glxp.api.entity.dev;
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+/**
+ * 巡检任务明细
+ *
+ * @TableName device_check_detail
+ */
+@TableName(value = "device_check_detail")
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+public class DeviceCheckDetailEntity {
+    /**
+     * 任务id
+     */
+    @TableField(value = "taskId")
+    private Long taskId;
+
+    /**
+     * 设备编码
+     */
+    @TableField(value = "deviceCode")
+    private String deviceCode;
+
+    /**
+     * 部门编码
+     */
+    @TableField(value = "deptCode")
+    private String deptCode;
+
+    /**
+     * 部门名称
+     */
+    @TableField(value = "deptName")
+    private String deptName;
+
+    /**
+     * 是否完成
+     */
+    @TableField(value = "finishFlag")
+    private Boolean finishFlag;
+
+    /**
+     * 产品id
+     */
+    @TableField(value = "productId")
+    private Long productId;
+
+    /**
+     * UDI码
+     */
+    @TableField(value = "udi")
+    private String udi;
+
+    /**
+     * DI码
+     */
+    @TableField(value = "nameCode")
+    private String nameCode;
+
+    /**
+     * 产品名称
+     */
+    @TableField(value = "productName")
+    private String productName;
+
+    /**
+     * 规格型号
+     */
+    @TableField(value = "ggxh")
+    private String ggxh;
+
+    /**
+     * 批次号
+     */
+    @TableField(value = "batchNo")
+    private String batchNo;
+
+    /**
+     * 序列号
+     */
+    @TableField(value = "serialNo")
+    private String serialNo;
+
+    /**
+     * 生产日期
+     */
+    @TableField(value = "productionDate")
+    private String productionDate;
+
+    /**
+     * 失效日期
+     */
+    @TableField(value = "expireDate")
+    private String expireDate;
+
+    /**
+     * 生产厂家
+     */
+    @TableField(value = "manufactory")
+    private String manufactory;
+
+    /**
+     * 计量单位
+     */
+    @TableField(value = "measname")
+    private String measname;
+
+    /**
+     * 注册/备案凭证号
+     */
+    @TableField(value = "zczbhhzbapzbh")
+    private String zczbhhzbapzbh;
+
+    /**
+     * 供应商ID
+     */
+    @TableField(value = "supId")
+    private String supId;
+
+    /**
+     * 供应商名称
+     */
+    @TableField(value = "supName")
+    private String supName;
+
+    /**
+     * 巡检项目数量
+     */
+    @TableField(value = "itemCount")
+    private Integer itemCount;
+
+    /**
+     * 完成项目数量
+     */
+    @TableField(value = "finishCount")
+    private Integer finishCount;
+
+    /**
+     * 异常项目数量
+     */
+    @TableField(value = "exceptionCount")
+    private Integer exceptionCount;
+
+    /**
+     * 完成时间
+     */
+    @TableField(value = "finishTime")
+    private LocalDateTime finishTime;
+
+    /**
+     * 维修单id
+     */
+    @TableField(value = "repairId")
+    private Long repairId;
+
+    /**
+     * 巡检建议
+     */
+    @TableField(value = "suggestion")
+    private String suggestion;
+    /**
+     * 现场照片
+     */
+    @TableField(value = "livePath")
+    private String livePath;
+    /**
+     * 正常标识
+     */
+    @TableField(value = "normalFlag")
+    private Boolean normalFlag;
+
+
+    /**
+     * 更改时间
+     */
+    @TableField(value = "updateTime")
+    private LocalDateTime updateTime;
+
+}
+

src/main/java/com/glxp/api/entity/dev/DeviceCheckDetailItemEntity.java

@@ -0,0 +1,115 @@
+package com.glxp.api.entity.dev;
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+/**
+ * 设备巡检项目
+ *
+ * @TableName device_check_detail_item
+ */
+@TableName(value = "device_check_detail_item")
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+public class DeviceCheckDetailItemEntity {
+    /**
+     * 任务id
+     */
+    @TableField(value = "taskId")
+    private Long taskId;
+
+    /**
+     * 设备编码
+     */
+    @TableField(value = "deviceCode")
+    private String deviceCode;
+
+    /**
+     * 项目编码
+     */
+    @TableField(value = "itemCode")
+    private String itemCode;
+
+    /**
+     * 项目名称
+     */
+    @TableField(value = "itemName")
+    private String itemName;
+
+    /**
+     * 项目内容
+     */
+    @TableField(value = "itemContent")
+    private String itemContent;
+
+    /**
+     * 正常标识
+     */
+    @TableField(value = "normalFlag")
+    private Boolean normalFlag;
+
+
+    /**
+     * 项目完成标识
+     */
+    @TableField(value = "finishFlag")
+    private Boolean finishFlag;
+
+
+    /**
+     * 项目完成时间
+     */
+    @TableField(value = "finishTime")
+    private LocalDateTime finishTime;
+
+    /**
+     * 巡检建议
+     */
+    @TableField(value = "suggestion")
+    private String suggestion;
+
+    /**
+     * 巡检人id
+     */
+    @TableField(value = "checkUserId")
+    private Long checkUserId;
+
+    /**
+     * 巡检人姓名
+     */
+    @TableField(value = "checkUserName")
+    private String checkUserName;
+
+    /**
+     * 巡检部门
+     */
+    @TableField(value = "checkDeptCode")
+    private String checkDeptCode;
+
+    /**
+     * 巡检部门名称
+     */
+    @TableField(value = "checkDeptName")
+    private String checkDeptName;
+
+    /**
+     * 更改时间
+     */
+    @TableField(value = "updateTime")
+    private LocalDateTime updateTime;
+}

src/main/java/com/glxp/api/entity/dev/DeviceCheckEntity.java

@@ -0,0 +1,140 @@
+package com.glxp.api.entity.dev;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDateTime;
+
+/**
+ * 巡检任务表
+ *
+ * @TableName device_check
+ */
+@TableName(value = "device_check")
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+public class DeviceCheckEntity {
+    /**
+     * 巡检任务id
+     */
+    @TableId(value = "taskId")
+    private Long taskId;
+
+    /**
+     * 计划id
+     */
+    @TableField(value = "planId")
+    private Long planId;
+
+    /**
+     * 计划名称
+     */
+    @TableField(value = "planName")
+    private String planName;
+
+    /**
+     * 负责部门编码
+     */
+    @TableField(value = "chargeDeptCode")
+    private String chargeDeptCode;
+
+    /**
+     * 巡检人id
+     */
+    @TableField(value = "checkUserId")
+    private Long checkUserId;
+
+    /**
+     * 巡检人姓名
+     */
+    @TableField(value = "checkUserName")
+    private String checkUserName;
+
+    /**
+     * 巡检人电话
+     */
+    @TableField(value = "checkUserPhone")
+    private String checkUserPhone;
+
+    /**
+     * 设备数量
+     */
+    @TableField(value = "deviceCount")
+    private Integer deviceCount;
+
+    /**
+     * 完成设备数量
+     */
+    @TableField(value = "finishCount")
+    private Integer finishCount;
+
+    /**
+     * 异常设备数量
+     */
+    @TableField(value = "exceptionCount")
+    private Integer exceptionCount;
+
+    /**
+     * 任务名称
+     */
+    @TableField(value = "name")
+    private String name;
+
+    /**
+     * 任务备注
+     */
+    @TableField(value = "remark")
+    private String remark;
+
+    /**
+     * 是否系统创建 1/true 是 0/false 否
+     */
+    @TableField(value = "sysFlag")
+    private Boolean sysFlag;
+
+    /**
+     * 是否已完成 1/true 是 0/false 否
+     */
+    @TableField(value = "finishFlag")
+    private Boolean finishFlag;
+
+    /**
+     * 完成时间
+     */
+    @TableField(value = "finishTime")
+    private LocalDateTime finishTime;
+
+    /**
+     * 创建时间  updateTime
+     */
+    @TableField(value = "createTime")
+    private LocalDateTime createTime;
+
+    /**
+     * 创建人id
+     */
+    @TableField(value = "createUserId")
+    private Long createUserId;
+
+    /**
+     * 创建人姓名
+     */
+    @TableField(value = "createUserName")
+    private String createUserName;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "updateTime")
+    private LocalDateTime updateTime;
+
+}

src/main/java/com/glxp/api/entity/dev/DeviceCheckItemDictEntity.java

@@ -0,0 +1,68 @@
+package com.glxp.api.entity.dev;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+
+/**
+ * 巡检项目字典
+ *
+ * @TableName device_check_item_dict
+ */
+@TableName(value = "device_check_item_dict")
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class DeviceCheckItemDictEntity {
+    /**
+     * 项目编码
+     */
+    @TableId(value = "code")
+    private String code;
+
+    /**
+     * 项目名称
+     */
+    @TableField(value = "name")
+    private String name;
+
+    /**
+     * 项目内容
+     */
+    @TableField(value = "content")
+    private String content;
+
+    /**
+     * 创建人id
+     */
+    @TableField(value = "createUserId")
+    private String createUserId;
+
+    /**
+     * 创建人名称
+     */
+    @TableField(value = "createUserName")
+    private String createUserName;
+
+
+    /**
+     * 项目类型 1:巡检项目 2:保养项目
+     */
+    @TableField(value = "type")
+    private Integer type;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime")
+    private LocalDateTime createTime;
+
+
+}

src/main/java/com/glxp/api/entity/dev/DeviceInfoEntity.java

@@ -0,0 +1,589 @@
+package com.glxp.api.entity.dev;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.glxp.api.enums.dev.DeviceStatusEnum;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * 设备表
+ *
+ * @TableName device_info
+ */
+@TableName(value = "device_info")
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class DeviceInfoEntity implements Serializable {
+    /**
+     * 设备编码
+     */
+    @TableId(value = "deviceCode")
+    private String deviceCode;
+
+    /**
+     * 部门编码
+     */
+    @TableField(value = "deptCode")
+    private String deptCode;
+
+    /**
+     * 1.正常，2.维修申请中  3.维修中
+     */
+    @TableField(value = "status")
+    private DeviceStatusEnum status;
+
+    /**
+     * 巡检锁定
+     */
+    @TableField(value = "checkLock")
+    private Boolean checkLock;
+
+    /**
+     * UDI码
+     */
+    @TableField(value = "udi")
+    private String udi;
+
+    /**
+     * DI码
+     */
+    @TableField(value = "nameCode")
+    private String nameCode;
+
+    /**
+     * 产品id
+     */
+    @TableField(value = "productId")
+    private Long productId;
+
+    /**
+     * 产品名称
+     */
+    @TableField(value = "productName")
+    private String productName;
+
+    /**
+     * 规格型号
+     */
+    @TableField(value = "ggxh")
+    private String ggxh;
+
+    /**
+     * 批次号
+     */
+    @TableField(value = "batchNo")
+    private String batchNo;
+
+    /**
+     * 序列号
+     */
+    @TableField(value = "serialNo")
+    private String serialNo;
+
+    /**
+     * 生产日期
+     */
+    @TableField(value = "productionDate")
+    private String productionDate;
+
+    /**
+     * 失效日期
+     */
+    @TableField(value = "expireDate")
+    private String expireDate;
+
+    /**
+     * 生产厂家
+     */
+    @TableField(value = "manufactory")
+    private String manufactory;
+
+    /**
+     * 计量单位
+     */
+    @TableField(value = "measname")
+    private String measname;
+
+    /**
+     * 注册/备案凭证号
+     */
+    @TableField(value = "zczbhhzbapzbh")
+    private String zczbhhzbapzbh;
+
+    /**
+     * 供应商ID
+     */
+    @TableField(value = "supId")
+    private String supId;
+
+    /**
+     * 供应商名称
+     */
+    @TableField(value = "supName")
+    private String supName;
+
+    /**
+     * 变更次数
+     */
+    @TableField(value = "changeCount")
+    private Integer changeCount;
+
+    /**
+     * 报修次数
+     */
+    @TableField(value = "repairApplyCount")
+    private Integer repairApplyCount;
+
+    /**
+     * 维修次数
+     */
+    @TableField(value = "repairCount")
+    private Integer repairCount;
+
+    /**
+     * 巡检次数
+     */
+    @TableField(value = "checkCount")
+    private Integer checkCount;
+
+    /**
+     * 最后变更单号
+     */
+    @TableField(value = "lastChangeOrderId")
+    private Long lastChangeOrderId;
+
+    /**
+     * 最后报修申请单号
+     */
+    @TableField(value = "lastRepairApplyId")
+    private String lastRepairApplyId;
+
+    /**
+     * 最后报修申请时间
+     */
+    @TableField(value = "lastRepairApplyTime")
+    private LocalDateTime lastRepairApplyTime;
+
+    /**
+     * 最后维修单号
+     */
+    @TableField(value = "lastRepairId")
+    private String lastRepairId;
+
+    /**
+     * 最后维修负责人名称
+     */
+    @TableField(value = "lastRepairUserName")
+    private String lastRepairUserName;
+
+    /**
+     * 最后维修人联系电话
+     */
+    @TableField(value = "lastRepairUserPhone")
+    private String lastRepairUserPhone;
+
+    /**
+     * 最后维修时间
+     */
+    @TableField(value = "lastRepairTime")
+    private LocalDateTime lastRepairTime;
+
+    /**
+     * 最后检查/巡检负责人
+     */
+    @TableField(value = "lastCheckUserId")
+    private Long lastCheckUserId;
+
+    /**
+     * 最后检查/巡检负责人名称
+     */
+    @TableField(value = "lastCheckUserName")
+    private String lastCheckUserName;
+
+    /**
+     * 最后检查/巡检人联系电话
+     */
+    @TableField(value = "lastCheckPhone")
+    private String lastCheckPhone;
+
+    /**
+     * 最后检查/巡检时间
+     */
+    @TableField(value = "lastCheckTime")
+    private LocalDateTime lastCheckTime;
+
+    /**
+     * 最后检查/巡检任务id
+     */
+    @TableField(value = "lastCheckTaskId")
+    private Long lastCheckTaskId;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime")
+    private LocalDateTime createTime;
+
+    /**
+     * 创建人id
+     */
+    @TableField(value = "createUserId")
+    private Long createUserId;
+
+    /**
+     * 创建人名称
+     */
+    @TableField(value = "createUserName")
+    private String createUserName;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 资产分类
+     */
+    @TableField(value = "assetType")
+    private String assetType;
+
+    /**
+     * 国资分类
+     */
+    @TableField(value = "sasacType")
+    private String sasacType;
+
+    /**
+     * 资产助记码
+     */
+    @TableField(value = "assetMnemonicCode")
+    private String assetMnemonicCode;
+
+    /**
+     * 数量
+     */
+    @TableField(value = "number")
+    private Integer number;
+
+    /**
+     * 取得方式
+     */
+    @TableField(value = "acquisitionMethod")
+    private String acquisitionMethod;
+
+    /**
+     * 用途
+     */
+    @TableField(value = "purpose")
+    private String purpose;
+
+    /**
+     * 折旧年
+     */
+    @TableField(value = "depreciationYear")
+    private Integer depreciationYear;
+
+    /**
+     * 折旧月
+     */
+    @TableField(value = "depreciationMonth")
+    private Integer depreciationMonth;
+
+    /**
+     * 存储仓库
+     */
+    @TableField(value = "invCode")
+    private String invCode;
+
+    /**
+     * 预计总工时
+     */
+    @TableField(value = "estimatedTotalHour")
+    private Integer estimatedTotalHour;
+
+    /**
+     * 单日工时
+     */
+    @TableField(value = "dayHour")
+    private Integer dayHour;
+
+    /**
+     * 单个资产价值
+     */
+    @TableField(value = "assetValue")
+    private BigDecimal assetValue;
+
+    /**
+     * 自有资金
+     */
+    @TableField(value = "ownFund")
+    private BigDecimal ownFund;
+
+    /**
+     * 财政拨款
+     */
+    @TableField(value = "financialAppropriation")
+    private BigDecimal financialAppropriation;
+
+    /**
+     * 科教基金
+     */
+    @TableField(value = "educationFund")
+    private BigDecimal educationFund;
+
+    /**
+     * 其他资金
+     */
+    @TableField(value = "otherFund")
+    private BigDecimal otherFund;
+
+    /**
+     * 非同级财政拨款
+     */
+    @TableField(value = "nonPeerFinancialAppropriation")
+    private BigDecimal nonPeerFinancialAppropriation;
+
+    /**
+     * 医疗器械分类编码
+     */
+    @TableField(value = "ybbm")
+    private String ybbm;
+
+    /**
+     * 一级分类名称(学科，品名）
+     */
+    @TableField(value = "catalogname1")
+    private String catalogname1;
+
+    /**
+     * 二级分类名称(用途、品目）
+     */
+    @TableField(value = "catalogname2")
+    private String catalogname2;
+
+    /**
+     * 三级分类名称(部位、功能、品种）
+     */
+    @TableField(value = "catalogname3")
+    private String catalogname3;
+
+    /**
+     * 编码
+     */
+    @TableField(value = "catalogCode")
+    private String catalogCode;
+
+    /**
+     * 编码
+     */
+    @TableField(value = "catalogCode1")
+    private Integer catalogCode1;
+    /**
+     * 编码
+     */
+    @TableField(value = "catalogCode2")
+    private Integer catalogCode2;
+    /**
+     * 编码
+     */
+    @TableField(value = "catalogCode3")
+    private Integer catalogCode3;
+
+    /**
+     * 管理类别
+     */
+    @TableField(value = "managementCategory")
+    private String managementCategory;
+    /**
+     * 使用人
+     */
+    @TableField(value = "endUser")
+    private String endUser;
+
+    /**
+     * 预计残值
+     */
+    @TableField(value = "estimatedResidualValue")
+    private BigDecimal estimatedResidualValue;
+
+    /**
+     * 币种
+     */
+    @TableField(value = "currencyType")
+    private String currencyType;
+    /**
+     * 采购类型
+     */
+    @TableField(value = "purType")
+    private String purType;
+
+    /**
+     * 购置日期
+     */
+    @TableField(value = "purchaseDate")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8")
+    private Date purchaseDate;
+    /**
+     * 添加日期
+     */
+    @TableField(value = "addDate")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8")
+    private Date addDate;
+
+    /**
+     * 资产品名
+     */
+    @TableField(value = "assetName")
+    private String assetName;
+    /**
+     * 是否强检
+     */
+    @TableField(value = "isImperative")
+    private Boolean isImperative;
+    /**
+     * 是否保养
+     */
+    @TableField(value = "isMaintain")
+    private Boolean isMaintain;
+
+    /**
+     * 检定周期(月）
+     */
+    @TableField(value = "imperativeCycle")
+    private Integer imperativeCycle;
+    /**
+     * 保养周期(月）
+     */
+    @TableField(value = "maintainCycle")
+    private Integer maintainCycle;
+    /**
+     * 开始检定日期
+     */
+    @TableField(value = "startImperativeDate")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8")
+    private Date startImperativeDate;
+    /**
+     * 开始保养日期
+     */
+    @TableField(value = "startMaintainDate")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8")
+    private Date startMaintainDate;
+
+    /**
+     * 维修组
+     */
+    @TableField(value = "serviceType")
+    private String serviceType;
+    /**
+     * 保养组
+     */
+    @TableField(value = "maintainType")
+    private String maintainType;
+    /**
+     * 管理人
+     */
+    @TableField(value = "managerUser")
+    private String managerUser;
+    /**
+     * 审核人
+     */
+    @TableField(value = "approveUser")
+    private String approveUser;
+
+    /**
+     * 对应会计科目
+     */
+    @TableField(value = "ledgerAccount")
+    private String ledgerAccount;
+
+    /**
+     * 减值准备
+     */
+    @TableField(value = "impairmentProvision")
+    private String impairmentProvision;
+
+    /**
+     * 预计工作量
+     */
+    @TableField(value = "estimatedWorkload")
+    private String estimatedWorkload;
+
+    /**
+     * 已完成工作量
+     */
+    @TableField(value = "completedWorkload")
+    private String completedWorkload;
+
+    /**
+     * 维保类型
+     */
+    @TableField(value = "maintenanceType")
+    private String maintenanceType;
+
+    /**
+     * 维保周期
+     */
+    @TableField(value = "maintenanceCycle")
+    private Integer maintenanceCycle;
+
+    /**
+     * 维保开始日期
+     */
+    @TableField(value = "startMaintenancDate")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8")
+    private Date startMaintenancDate;
+
+    /**
+     * 维保结束日期
+     */
+    @TableField(value = "endMaintenancDate")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8")
+    private Date endMaintenancDate;
+
+    /**
+     * 内外网
+     */
+    @TableField(value = "networkType")
+    private Integer networkType;
+    /**
+     * 使用角色
+     */
+    @TableField(value = "userRole")
+    private Integer userRole;
+    /**
+     * 是否加域
+     */
+    @TableField(value = "isAddDomain")
+    private Boolean isAddDomain;
+    /**
+     * u盘是否禁用
+     */
+    @TableField(value = "isUDisc")
+    private Boolean isUDisc;
+    /**
+     * 设备归类
+     */
+    @TableField(value = "ascriptionType")
+    private Integer ascriptionType;
+    /**
+     * 资产备用类型
+     */
+    @TableField(value = "assetReserveType")
+    private String assetReserveType;
+
+    /**
+     * 更改日期
+     */
+    @TableField(value = "updateTime")
+    private LocalDateTime updateTime;
+}

src/main/java/com/glxp/api/entity/dev/DevicePlanDetailEntity.java

@@ -0,0 +1,41 @@
+package com.glxp.api.entity.dev;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+/**
+ * 巡检计划明细
+ *
+ * @TableName device_plan_detail
+ */
+@TableName(value = "device_plan_detail")
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+public class DevicePlanDetailEntity {
+
+    /**
+     * 计划id
+     */
+    @TableField(value = "planId")
+    private Long planId;
+
+    /**
+     * 设备编号
+     */
+    @TableField(value = "deviceCode")
+    private String deviceCode;
+
+    /**
+     * 产品id
+     */
+    @TableField(value = "productId")
+    private Long productId;
+}

src/main/java/com/glxp/api/entity/dev/DevicePlanDetailItemEntity.java

@@ -0,0 +1,64 @@
+package com.glxp.api.entity.dev;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 巡检设备的项目
+ *
+ * @TableName device_plan_detail_item
+ */
+@TableName(value = "device_plan_detail_item")
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class DevicePlanDetailItemEntity {
+
+    /**
+     * 计划id
+     */
+    @TableField(value = "planId")
+    private Long planId;
+
+    /**
+     * 设备编号
+     */
+    @TableField(value = "deviceCode")
+    private String deviceCode;
+
+    /**
+     * 产品Id
+     */
+    @TableField(value = "productId")
+    private Long productId;
+
+
+    /**
+     * 项目编码
+     */
+    @TableField(value = "itemCode")
+    private String itemCode;
+
+    /**
+     * 项目名称
+     */
+    @TableField(value = "name")
+    private String name;
+
+    /**
+     * 项目类型 1巡检计划 2保养计划
+     */
+    @TableField(value = "type")
+    private String type;
+
+    /**
+     * 项目内容
+     */
+    @TableField(value = "content")
+    private String content;
+}

src/main/java/com/glxp/api/entity/dev/DevicePlanEntity.java

@@ -0,0 +1,105 @@
+package com.glxp.api.entity.dev;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * 设备巡检计划
+ *
+ * @TableName device_plan
+ */
+@TableName(value = "device_plan")
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+public class DevicePlanEntity {
+    /**
+     * 计划id
+     */
+    @TableId(value = "planId")
+    private Long planId;
+
+    /**
+     * 计划名称
+     */
+    @TableField(value = "name")
+    private String name;
+
+    /**
+     * 负责部门
+     */
+    @TableField(value = "chargeDeptCode")
+    private String chargeDeptCode;
+
+    /**
+     * 开始日期
+     */
+    @TableField(value = "startDate")
+    private LocalDate startDate;
+
+    /**
+     * 结束日期
+     */
+    @TableField(value = "endDate")
+    private LocalDate endDate;
+
+    /**
+     * 频率(天)
+     */
+    @TableField(value = "frequency")
+    private Integer frequency;
+
+    /**
+     * 执行次数
+     */
+    @TableField(value = "execCount")
+    private Integer execCount;
+
+    /**
+     * 备注
+     */
+    @TableField(value = "remark")
+    private String remark;
+
+    /**
+     * 创建人id
+     */
+    @TableField(value = "createUserId")
+    private Long createUserId;
+
+    /**
+     * 创建人名称
+     */
+    @TableField(value = "createUserName")
+    private String createUserName;
+
+
+    /**
+     * 巡检计划状态
+     */
+    @TableField(value = "status")
+    private Integer status;
+
+    /**
+     * 计划类型 1:巡检计划 2:保养计划
+     */
+    @TableField(value = "type")
+    private Integer type;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime")
+    private LocalDateTime createTime;
+}

src/main/java/com/glxp/api/entity/dev/DeviceRepairApplyDetailEntity.java

@@ -0,0 +1,231 @@
+package com.glxp.api.entity.dev;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.glxp.api.enums.dev.DeviceRepairApplyDetailStatusEnum;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+
+/**
+ * 设备报修单明细
+ *
+ * @TableName device_repair_apply_detail
+ */
+@TableName(value = "device_repair_apply_detail")
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class DeviceRepairApplyDetailEntity {
+    /**
+     * 报修单id
+     */
+    @TableField(value = "applyId")
+    private Long applyId;
+
+    /**
+     * 设备编码
+     */
+    @TableField(value = "deviceCode")
+    private String deviceCode;
+
+    /**
+     * 部门编码
+     */
+    @TableField(value = "deptCode")
+    private String deptCode;
+
+    /**
+     * 部门名称
+     */
+    @TableField(value = "deptName")
+    private String deptName;
+
+    /**
+     * 问题描述
+     */
+    @TableField(value = "description")
+    private String description;
+
+    /**
+     * 诊断信息
+     */
+    @TableField(value = "diagnosisInfo")
+    private String diagnosisInfo;
+
+    /**
+     * 状态  待诊断、待维修、维修中、完成
+     */
+    @TableField(value = "status")
+    private DeviceRepairApplyDetailStatusEnum status;
+
+    /**
+     * 是否需要维修 true/false
+     */
+    @TableField(value = "repairFlag")
+    private Boolean repairFlag;
+
+    /**
+     * 维修单id
+     */
+    @TableField(value = "repairId")
+    private Long repairId;
+
+    /**
+     * 产品id
+     */
+    @TableField(value = "productId")
+    private Long productId;
+
+    /**
+     * UDI码
+     */
+    @TableField(value = "udi")
+    private String udi;
+
+    /**
+     * DI码
+     */
+    @TableField(value = "nameCode")
+    private String nameCode;
+
+    /**
+     * 产品名称
+     */
+    @TableField(value = "productName")
+    private String productName;
+
+    /**
+     * 规格型号
+     */
+    @TableField(value = "ggxh")
+    private String ggxh;
+
+    /**
+     * 批次号
+     */
+    @TableField(value = "batchNo")
+    private String batchNo;
+
+    /**
+     * 序列号
+     */
+    @TableField(value = "serialNo")
+    private String serialNo;
+
+    /**
+     * 生产日期
+     */
+    @TableField(value = "productionDate")
+    private String productionDate;
+
+    /**
+     * 失效日期
+     */
+    @TableField(value = "expireDate")
+    private String expireDate;
+
+    /**
+     * 生产厂家
+     */
+    @TableField(value = "manufactory")
+    private String manufactory;
+
+    /**
+     * 计量单位
+     */
+    @TableField(value = "measname")
+    private String measname;
+
+    /**
+     * 注册/备案凭证号
+     */
+    @TableField(value = "zczbhhzbapzbh")
+    private String zczbhhzbapzbh;
+
+    /**
+     * 供应商ID
+     */
+    @TableField(value = "supId")
+    private String supId;
+
+    /**
+     * 供应商名称
+     */
+    @TableField(value = "supName")
+    private String supName;
+
+    /**
+     * 确认人id
+     */
+    @TableField(value = "confirmUserId")
+    private Long confirmUserId;
+
+    /**
+     * 确认人姓名
+     */
+    @TableField(value = "confirmUserName")
+    private String confirmUserName;
+
+    /**
+     * 确认部门
+     */
+    @TableField(value = "confirmDeptCode")
+    private String confirmDeptCode;
+
+    /**
+     * 确认部门名称
+     */
+    @TableField(value = "confirmDeptName")
+    private String confirmDeptName;
+
+    /**
+     * 确认时间
+     */
+    @TableField(value = "confirmTime")
+    private LocalDateTime confirmTime;
+
+    /**
+     * 确认备注
+     */
+    @TableField(value = "confirmRemark")
+    private String confirmRemark;
+
+
+    /**
+     * 报修图片
+     */
+    @TableField(value = "livePath")
+    private String livePath;
+
+
+    /**
+     * 诊断图片
+     */
+    @TableField(value = "diagnosisLivePath")
+    private String diagnosisLivePath;
+
+    /**
+     * 完成时间
+     */
+    @TableField(value = "finishTime")
+    private LocalDateTime finishTime;
+
+
+    /**
+     * 完成时间
+     */
+    @TableField(value = "updateTime")
+    private LocalDateTime updateTime;
+
+    /**
+     * 报修人联系方式
+     */
+    @TableField(exist = false)
+    private String repairUserPhone;
+
+}

src/main/java/com/glxp/api/entity/dev/DeviceRepairApplyEntity.java

@@ -0,0 +1,132 @@
+package com.glxp.api.entity.dev;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.glxp.api.enums.dev.DeviceRepairApplyStatusEnum;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+
+/**
+ * 设备报修单
+ *
+ * @TableName device_repair_apply
+ */
+@TableName(value = "device_repair_apply")
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class DeviceRepairApplyEntity {
+    /**
+     * 报修单id
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 状态 待受理，受理中，维修中，完成
+     */
+    @TableField(value = "status")
+    private DeviceRepairApplyStatusEnum status;
+
+    /**
+     * 报修部门编码
+     */
+    @TableField(value = "applyDeptCode")
+    private String applyDeptCode;
+
+    /**
+     * 报修部门
+     */
+    @TableField(value = "applyDeptName")
+    private String applyDeptName;
+
+    /**
+     * 报修人id
+     */
+    @TableField(value = "applyUserId")
+    private Long applyUserId;
+
+    /**
+     * 报修人姓名
+     */
+    @TableField(value = "applyUserName")
+    private String applyUserName;
+
+    /**
+     * 报修人联系方式
+     */
+    @TableField(value = "applyUserPhone")
+    private String applyUserPhone;
+
+    /**
+     * 报修时间
+     */
+    @TableField(value = "applyTime")
+    private LocalDateTime applyTime;
+
+    /**
+     * 设备数量
+     */
+    @TableField(value = "deviceCount")
+    private Integer deviceCount;
+
+    /**
+     * 完成数量
+     */
+    @TableField(value = "finishCount")
+    private Integer finishCount;
+
+    /**
+     * 确认部门
+     */
+    @TableField(value = "confirmDeptCode")
+    private String confirmDeptCode;
+
+    /**
+     * 确认部门名称
+     */
+    @TableField(value = "confirmDeptName")
+    private String confirmDeptName;
+
+    /**
+     * 确认人id
+     */
+    @TableField(value = "confirmUserId")
+    private Long confirmUserId;
+
+    /**
+     * 确认人姓名
+     */
+    @TableField(value = "confirmUserName")
+    private String confirmUserName;
+
+    /**
+     * 确认人联系方式
+     */
+    @TableField(value = "confirmPhone")
+    private String confirmPhone;
+
+    /**
+     * 确认时间
+     */
+    @TableField(value = "confirmTime")
+    private LocalDateTime confirmTime;
+
+    /**
+     * 完成时间
+     */
+    @TableField(value = "finishTime")
+    private LocalDateTime finishTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "updateTime")
+    private LocalDateTime updateTime;
+}

src/main/java/com/glxp/api/entity/dev/DeviceRepairEntity.java

@@ -0,0 +1,291 @@
+package com.glxp.api.entity.dev;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDateTime;
+
+/**
+ * 设备维修单
+ *
+ * @TableName device_repair
+ */
+@TableName(value = "device_repair")
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+public class DeviceRepairEntity {
+    /**
+     * 维修id
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 维修申请id
+     */
+    @TableField(value = "applyId")
+    private Long applyId;
+
+    /**
+     * 巡检任务单id
+     */
+    @TableField(value = "checkTaskId")
+    private Long checkTaskId;
+
+    /**
+     * 是否已完成 true/false
+     */
+    @TableField(value = "finishFlag")
+    private Boolean finishFlag;
+
+    /**
+     * 问题描述
+     */
+    @TableField(value = "description")
+    private String description;
+
+    /**
+     * 诊断信息
+     */
+    @TableField(value = "diagnosisInfo")
+    private String diagnosisInfo;
+
+    /**
+     * 是否内部维修
+     */
+    @TableField(value = "innerFlag")
+    private Boolean innerFlag;
+
+    /**
+     * 维修人姓名
+     */
+    @TableField(value = "repairUserName")
+    private String repairUserName;
+    /**
+     * 维修部门
+     */
+    @TableField(value = "repairDeptCode")
+    private String repairDeptCode;
+
+    /**
+     * 维修人联系方式
+     */
+    @TableField(value = "repairUserPhone")
+    private String repairUserPhone;
+
+    /**
+     * 设备码
+     */
+    @TableField(value = "deviceCode")
+    private String deviceCode;
+
+    /**
+     * 部门编码
+     */
+    @TableField(value = "deptCode")
+    private String deptCode;
+
+    /**
+     * 部门名称
+     */
+    @TableField(value = "deptName")
+    private String deptName;
+
+    /**
+     * 产品id
+     */
+    @TableField(value = "productId")
+    private Long productId;
+
+    /**
+     * UDI码
+     */
+    @TableField(value = "udi")
+    private String udi;
+
+    /**
+     * DI码
+     */
+    @TableField(value = "nameCode")
+    private String nameCode;
+
+    /**
+     * 产品名称
+     */
+    @TableField(value = "productName")
+    private String productName;
+
+    /**
+     * 规格型号
+     */
+    @TableField(value = "ggxh")
+    private String ggxh;
+
+    /**
+     * 批次号
+     */
+    @TableField(value = "batchNo")
+    private String batchNo;
+
+    /**
+     * 序列号
+     */
+    @TableField(value = "serialNo")
+    private String serialNo;
+
+    /**
+     * 生产日期
+     */
+    @TableField(value = "productionDate")
+    private String productionDate;
+
+    /**
+     * 失效日期
+     */
+    @TableField(value = "expireDate")
+    private String expireDate;
+
+    /**
+     * 生产厂家
+     */
+    @TableField(value = "manufactory")
+    private String manufactory;
+
+    /**
+     * 计量单位
+     */
+    @TableField(value = "measname")
+    private String measname;
+
+    /**
+     * 注册/备案凭证号
+     */
+    @TableField(value = "zczbhhzbapzbh")
+    private String zczbhhzbapzbh;
+
+    /**
+     * 供应商ID
+     */
+    @TableField(value = "supId")
+    private String supId;
+
+    /**
+     * 供应商名称
+     */
+    @TableField(value = "supName")
+    private String supName;
+
+    /**
+     * 创建人id
+     */
+    @TableField(value = "createUserId")
+    private Long createUserId;
+
+    /**
+     * 创建人姓名
+     */
+    @TableField(value = "createUserName")
+    private String createUserName;
+
+    /**
+     * 创建部门
+     */
+    @TableField(value = "createDeptCode")
+    private String createDeptCode;
+
+    /**
+     * 创建部门名称
+     */
+    @TableField(value = "createDeptName")
+    private String createDeptName;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime")
+    private LocalDateTime createTime;
+
+    /**
+     * 确认人id
+     */
+    @TableField(value = "confirmUserId")
+    private Long confirmUserId;
+
+    /**
+     * 确认人姓名
+     */
+    @TableField(value = "confirmUserName")
+    private String confirmUserName;
+
+    /**
+     * 确认部门
+     */
+    @TableField(value = "confirmDeptCode")
+    private String confirmDeptCode;
+
+    /**
+     * 确认部门名称
+     */
+    @TableField(value = "confirmDeptName")
+    private String confirmDeptName;
+
+    /**
+     * 确认时间
+     */
+    @TableField(value = "confirmTime")
+    private LocalDateTime confirmTime;
+
+    /**
+     * 确认备注
+     */
+    @TableField(value = "confirmRemark")
+    private String confirmRemark;
+
+    /**
+     * 维修内容
+     */
+    @TableField(value = "repairDescription")
+    private String repairDescription;
+
+
+    /**
+     * 报修图片
+     */
+    @TableField(value = "livePath")
+    private String livePath;
+
+
+    /**
+     * 维修后现场照片
+     */
+    @TableField(value = "serviceLivePath")
+    private String serviceLivePath;
+
+    /**
+     * 诊断照片
+     */
+    @TableField(value = "diagnosisLivePath")
+    private String diagnosisLivePath;
+
+
+    /**
+     * 报修人id
+     */
+    @TableField(value = "repairUserId")
+    private Long repairUserId;
+
+    /**
+     * 确认时间
+     */
+    @TableField(value = "updateTime")
+    private LocalDateTime updateTime;
+}

src/main/java/com/glxp/api/entity/dev/DeviceUpkeepDetailEntity.java

@@ -0,0 +1,192 @@
+package com.glxp.api.entity.dev;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDateTime;
+
+/**
+ * 巡检任务明细
+ *
+ * @TableName device_upkeep_detail
+ */
+@TableName(value = "device_upkeep_detail")
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+public class DeviceUpkeepDetailEntity {
+    /**
+     * 任务id
+     */
+    @TableField(value = "taskId")
+    private Long taskId;
+
+    /**
+     * 设备编码
+     */
+    @TableField(value = "deviceCode")
+    private String deviceCode;
+
+    /**
+     * 部门编码
+     */
+    @TableField(value = "deptCode")
+    private String deptCode;
+
+    /**
+     * 部门名称
+     */
+    @TableField(value = "deptName")
+    private String deptName;
+
+    /**
+     * 是否完成
+     */
+    @TableField(value = "finishFlag")
+    private Boolean finishFlag;
+
+    /**
+     * 产品id
+     */
+    @TableField(value = "productId")
+    private Long productId;
+
+    /**
+     * UDI码
+     */
+    @TableField(value = "udi")
+    private String udi;
+
+    /**
+     * DI码
+     */
+    @TableField(value = "nameCode")
+    private String nameCode;
+
+    /**
+     * 产品名称
+     */
+    @TableField(value = "productName")
+    private String productName;
+
+    /**
+     * 规格型号
+     */
+    @TableField(value = "ggxh")
+    private String ggxh;
+
+    /**
+     * 批次号
+     */
+    @TableField(value = "batchNo")
+    private String batchNo;
+
+    /**
+     * 序列号
+     */
+    @TableField(value = "serialNo")
+    private String serialNo;
+
+    /**
+     * 生产日期
+     */
+    @TableField(value = "productionDate")
+    private String productionDate;
+
+    /**
+     * 失效日期
+     */
+    @TableField(value = "expireDate")
+    private String expireDate;
+
+    /**
+     * 生产厂家
+     */
+    @TableField(value = "manufactory")
+    private String manufactory;
+
+    /**
+     * 计量单位
+     */
+    @TableField(value = "measname")
+    private String measname;
+
+    /**
+     * 注册/备案凭证号
+     */
+    @TableField(value = "zczbhhzbapzbh")
+    private String zczbhhzbapzbh;
+
+    /**
+     * 供应商ID
+     */
+    @TableField(value = "supId")
+    private String supId;
+
+    /**
+     * 供应商名称
+     */
+    @TableField(value = "supName")
+    private String supName;
+
+    /**
+     * 巡检项目数量
+     */
+    @TableField(value = "itemCount")
+    private Integer itemCount;
+
+    /**
+     * 完成项目数量
+     */
+    @TableField(value = "finishCount")
+    private Integer finishCount;
+
+    /**
+     * 异常项目数量
+     */
+    @TableField(value = "exceptionCount")
+    private Integer exceptionCount;
+
+    /**
+     * 完成时间
+     */
+    @TableField(value = "finishTime")
+    private LocalDateTime finishTime;
+
+    /**
+     * 维修单id
+     */
+//    @TableField(value = "repairId")
+//    private Long repairId;
+
+    /**
+     * 巡检建议
+     */
+    @TableField(value = "suggestion")
+    private String suggestion;
+    /**
+     * 现场照片
+     */
+    @TableField(value = "livePath")
+    private String livePath;
+    /**
+     * 正常标识
+     */
+    @TableField(value = "normalFlag")
+    private Boolean normalFlag;
+
+
+    /**
+     * 更改时间
+     */
+    @TableField(value = "updateTime")
+    private LocalDateTime updateTime;
+
+}

src/main/java/com/glxp/api/entity/dev/DeviceUpkeepDetailItemEntity.java

@@ -0,0 +1,110 @@
+package com.glxp.api.entity.dev;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDateTime;
+
+/**
+ * 设备保养项目
+ *
+ * @TableName device_upkeep_detail_item
+ */
+@TableName(value = "device_upkeep_detail_item")
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+public class DeviceUpkeepDetailItemEntity {
+    /**
+     * 任务id
+     */
+    @TableField(value = "taskId")
+    private Long taskId;
+
+    /**
+     * 设备编码
+     */
+    @TableField(value = "deviceCode")
+    private String deviceCode;
+
+    /**
+     * 项目编码
+     */
+    @TableField(value = "itemCode")
+    private String itemCode;
+
+    /**
+     * 项目名称
+     */
+    @TableField(value = "itemName")
+    private String itemName;
+
+    /**
+     * 项目内容
+     */
+    @TableField(value = "itemContent")
+    private String itemContent;
+
+    /**
+     * 正常标识
+     */
+    @TableField(value = "normalFlag")
+    private Boolean normalFlag;
+
+
+    /**
+     * 项目完成标识
+     */
+    @TableField(value = "finishFlag")
+    private Boolean finishFlag;
+
+
+    /**
+     * 项目完成时间
+     */
+    @TableField(value = "finishTime")
+    private LocalDateTime finishTime;
+
+    /**
+     * 保养建议
+     */
+    @TableField(value = "suggestion")
+    private String suggestion;
+
+    /**
+     * 保养人id
+     */
+    @TableField(value = "upkeepUserId")
+    private Long upkeepUserId;
+
+    /**
+     * 保养人姓名
+     */
+    @TableField(value = "upkeepUserName")
+    private String upkeepUserName;
+
+    /**
+     * 保养部门
+     */
+    @TableField(value = "upkeepDeptCode")
+    private String upkeepDeptCode;
+
+    /**
+     * 保养部门名称
+     */
+    @TableField(value = "upkeepDeptName")
+    private String upkeepDeptName;
+
+    /**
+     * 更改时间
+     */
+    @TableField(value = "updateTime")
+    private LocalDateTime updateTime;
+}

src/main/java/com/glxp/api/entity/dev/DeviceUpkeepEntity.java

@@ -0,0 +1,140 @@
+package com.glxp.api.entity.dev;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDateTime;
+
+/**
+ * 保养任务表
+ *
+ * @TableName device_upkeep
+ */
+@TableName(value = "device_upkeep")
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+public class DeviceUpkeepEntity {
+    /**
+     * 保养任务id
+     */
+    @TableId(value = "taskId")
+    private Long taskId;
+
+    /**
+     * 计划id
+     */
+    @TableField(value = "planId")
+    private Long planId;
+
+    /**
+     * 计划名称
+     */
+    @TableField(value = "planName")
+    private String planName;
+
+    /**
+     * 负责部门编码
+     */
+    @TableField(value = "chargeDeptCode")
+    private String chargeDeptCode;
+
+    /**
+     * 保养人id
+     */
+    @TableField(value = "upkeepUserId")
+    private Long upkeepUserId;
+
+    /**
+     * 保养人姓名
+     */
+    @TableField(value = "upkeepUserName")
+    private String upkeepUserName;
+
+    /**
+     * 保养人电话
+     */
+    @TableField(value = "upkeepUserPhone")
+    private String upkeepUserPhone;
+
+    /**
+     * 设备数量
+     */
+    @TableField(value = "deviceCount")
+    private Integer deviceCount;
+
+    /**
+     * 完成设备数量
+     */
+    @TableField(value = "finishCount")
+    private Integer finishCount;
+
+    /**
+     * 异常设备数量
+     */
+    @TableField(value = "exceptionCount")
+    private Integer exceptionCount;
+
+    /**
+     * 任务名称
+     */
+    @TableField(value = "name")
+    private String name;
+
+    /**
+     * 任务备注
+     */
+    @TableField(value = "remark")
+    private String remark;
+
+    /**
+     * 是否系统创建 1/true 是 0/false 否
+     */
+    @TableField(value = "sysFlag")
+    private Boolean sysFlag;
+
+    /**
+     * 是否已完成 1/true 是 0/false 否
+     */
+    @TableField(value = "finishFlag")
+    private Boolean finishFlag;
+
+    /**
+     * 完成时间
+     */
+    @TableField(value = "finishTime")
+    private LocalDateTime finishTime;
+
+    /**
+     * 创建时间  updateTime
+     */
+    @TableField(value = "createTime")
+    private LocalDateTime createTime;
+
+    /**
+     * 创建人id
+     */
+    @TableField(value = "createUserId")
+    private Long createUserId;
+
+    /**
+     * 创建人姓名
+     */
+    @TableField(value = "createUserName")
+    private String createUserName;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "updateTime")
+    private LocalDateTime updateTime;
+
+}

src/main/java/com/glxp/api/entity/sync/SyncDataSetEntity.java

@@ -69,6 +69,11 @@ public class SyncDataSetEntity {
     private int productCert;
 
     private int orderInvoice;       //发票信息
+    private int deviceInfo; //设备信息管理
+    private int deviceCheck;//巡检管理
+    private int deviceRepairApply;//报修管理
+    private int produceBusiness;//生产企业 PRODUCE_BUSINESS_DATA
+
 
 
 }

src/main/java/com/glxp/api/entity/thrsys/ThrManufacturerEntity.java

@@ -0,0 +1,76 @@
+package com.glxp.api.entity.thrsys;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 第三方往来单位类型
+ */
+@Data
+@TableName(value = "thr_manufacturer")
+public class ThrManufacturerEntity implements Serializable {
+    @TableId(value = "id", type = IdType.INPUT)
+    private Long id;
+
+    @TableField("unitId")
+    private String unitId;
+
+    @TableField("spell")
+    private String spell;
+
+    @TableField("addr")
+    private String addr;
+
+    @TableField("creditNo")
+    private String creditNo;
+
+    @TableField("contact")
+    private String contact;
+
+    @TableField("mobile")
+    private String mobile;
+
+    @TableField("thirdSysFk")
+    private String thirdSysFk;
+
+    @TableField("name")
+    private String name;
+
+    /**
+     * 创建人
+     */
+    @TableField("createUser")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @TableField("createTime")
+    private Date createTime;
+
+    /**
+     * 更新人
+     */
+    @TableField("updateUser")
+    private String updateUser;
+
+    /**
+     * 更新时间
+     */
+    @TableField("updateTime")
+    private Date updateTime;
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+    @TableField(exist = false)
+    private Boolean checked;
+}

src/main/java/com/glxp/api/enums/dev/DeviceChangeStatusEnum.java

@@ -0,0 +1,27 @@
+package com.glxp.api.enums.dev;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 设备变更状态
+ */
+@Getter
+@AllArgsConstructor
+public enum DeviceChangeStatusEnum {
+    TEMP("temp", "临时"),
+    DRAFT("draft", "草稿"),
+    WAIT_CONFIRM("wait_confirm", "待目标部门确认"),
+    REJECT_CONFIRM("reject_confirm", "目标部门拒绝"),
+    FINISH("finish", "已完成"),
+    // 只有type为change才可以取消
+    CANCEL("cancel", "已取消"),
+    ;
+
+
+    @EnumValue
+    private final String key;
+
+    private final String desc;
+}

src/main/java/com/glxp/api/enums/dev/DeviceChangeTypeEnum.java

@@ -0,0 +1,24 @@
+package com.glxp.api.enums.dev;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 设备变更类型
+ */
+@Getter
+@AllArgsConstructor
+public enum DeviceChangeTypeEnum {
+
+    ADD("add", "设备登记"),
+    CHANGE("change", "变更归属"),
+    DESTROY("destroy", "销毁/报废"),
+    ;
+
+
+    @EnumValue
+    private final String key;
+
+    private final String desc;
+}

src/main/java/com/glxp/api/enums/dev/DeviceRepairApplyDetailStatusEnum.java

@@ -0,0 +1,24 @@
+package com.glxp.api.enums.dev;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 报修单明细状态
+ */
+@Getter
+@AllArgsConstructor
+public enum DeviceRepairApplyDetailStatusEnum {
+
+    WAIT_DIAGNOSIS("wait_diagnosis", "待诊断"),
+//    WAIT_REPAIR("wait_repair", "待维修"),
+    REPAIRING("repairing", "维修中"),
+    FINISH("finish", "完成");
+
+
+    @EnumValue
+    private final String key;
+
+    private final String desc;
+}

src/main/java/com/glxp/api/enums/dev/DeviceRepairApplyStatusEnum.java

@@ -0,0 +1,24 @@
+package com.glxp.api.enums.dev;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 报修单状态
+ */
+@Getter
+@AllArgsConstructor
+public enum DeviceRepairApplyStatusEnum {
+
+    WAIT_PROCESS("wait_process", "待受理"),
+    PROCESSING("processing", "受理中"),
+//    REPAIRING("repairing", "维修中"),
+    FINISH("finish", "完成");
+
+
+    @EnumValue
+    private final String key;
+
+    private final String desc;
+}

src/main/java/com/glxp/api/enums/dev/DeviceStatusEnum.java

@@ -0,0 +1,34 @@
+package com.glxp.api.enums.dev;
+
+/**
+ * @author : zhangsan
+ * @date : 2024/5/6 0:28
+ * @modyified By :
+ */
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 设备状态
+ */
+@Getter
+@AllArgsConstructor
+public enum DeviceStatusEnum {
+
+    NORMAL("normal", "正常"),
+    CHANGE("change", "变更归属中"),
+    REPAIR_APPLY("repair_apply", "维修申请中"),
+    REPAIR("repair", "维修中"),
+    //    CHECK("check", "等待巡检"),
+    DESTROY("destroy", "销毁/报废"),
+    ;
+
+
+    @EnumValue
+    private final String key;
+
+    private final String desc;
+}
+

src/main/java/com/glxp/api/exception/JsonException.java

@@ -25,4 +25,9 @@ public class JsonException extends RuntimeException{
         super(message);
         this.code = code;
     }
+    public JsonException(String message) {
+        super(message);
+        this.code = ResultEnum.NOT_NETWORK.getCode();
+    }
+
 }

src/main/java/com/glxp/api/http/ErpBasicClient.java

@@ -6,15 +6,13 @@ import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.entity.thrsys.ThrManufacturerEntity;
 import com.glxp.api.entity.thrsys.ThrSystemBusApiEntity;
 import com.glxp.api.entity.thrsys.ThrSystemEntity;
 import com.glxp.api.http.req.UdiwmsBusTypeRequest;
 import com.glxp.api.http.req.UdiwmsUnitRequest;
 import com.glxp.api.req.basic.YbHcflDetailFilterRequest;
-import com.glxp.api.req.thrsys.FilterBasicThirdSysDetailRequest;
-import com.glxp.api.req.thrsys.FilterThrProductsRequest;
-import com.glxp.api.req.thrsys.ThrUnitMaintainFilterRequest;
-import com.glxp.api.req.thrsys.UdiwmsWarehouseRequest;
+import com.glxp.api.req.thrsys.*;
 import com.glxp.api.res.PageSimpleResponse;
 import com.glxp.api.res.chs.YbHcflEntityResponse;
 import com.glxp.api.res.thrsys.ThrCorpsResponse;
@@ -194,4 +192,28 @@ public class ErpBasicClient {
         }
     }
 
+    /**
+     * 获取往来单位
+     */
+    public BaseResponse<PageSimpleResponse<ThrManufacturerEntity>> getThrManu(ThrManuFilterRequest thrManuFilterRequest) {
+        UdiwmsUnitRequest udiwmsUnitRequest = new UdiwmsUnitRequest();
+        BeanUtils.copyProperties(thrManuFilterRequest, udiwmsUnitRequest);
+        udiwmsUnitRequest.setUnitId(thrManuFilterRequest.getErpId());
+        ThrSystemEntity thrSystemEntity = basicThirdSysService.selectByThirdId(thrManuFilterRequest.getThirdSysFk());
+        try {
+            String url = thrSystemEntity.getThridUrl() + "/udiwms/erp/getManus";
+            String response = httpOkClient.uCloudPost(url, udiwmsUnitRequest, thrSystemEntity);
+            if (StrUtil.isBlank(response)) {
+                return ResultVOUtils.error(500, "连接第三方系统接口服务出错！");
+            }
+            BaseResponse<PageSimpleResponse<ThrManufacturerEntity>> baseResponse =
+                    JSONObject.parseObject(response, new TypeReference<BaseResponse<PageSimpleResponse<ThrManufacturerEntity>>>() {
+                    });
+            return baseResponse;
+        } catch (Exception e) {
+            log.error("获取生产企业接口异常", e);
+            return ResultVOUtils.error(500, "连接第三方系统接口服务出错！");
+        }
+    }
+
 }

src/main/java/com/glxp/api/req/basic/BasicDataRequest.java

@@ -1,10 +1,10 @@
 package com.glxp.api.req.basic;
 
+import com.glxp.api.entity.dev.DeviceInfoEntity;
 import com.glxp.api.entity.inv.DeviceInspectTaskEntity;
 import com.glxp.api.req.system.DeleteCompanyFileRequest;
 import com.glxp.api.req.system.DeleteRequest;
 import lombok.Data;
-import org.springframework.validation.BindingResult;
 
 @Data
 public class BasicDataRequest {
@@ -28,6 +28,8 @@ public class BasicDataRequest {
     private DeviceInspectTaskEntity deviceInspectTaskEntity;
 
 
+    private DeviceInfoEntity deleteDeviceInfoEntity;
+
     private String key;
 
 }

src/main/java/com/glxp/api/req/dev/DeviceCheckDetailItemFinishParam.java

@@ -0,0 +1,33 @@
+package com.glxp.api.req.dev;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class DeviceCheckDetailItemFinishParam {
+
+    @NotNull(message = "任务单标识不能为空")
+    private Long taskId;
+
+    @NotBlank(message = "设备标识不能为空")
+    private String deviceCode;
+
+    @NotNull(message = "项目标识不能为空")
+    private String itemCode;
+
+    @NotNull(message = "请标记巡检状态")
+    private Boolean normalFlag;
+
+    @NotBlank(message = "巡检意见不能为空")
+    private String suggestion;
+
+
+}

src/main/java/com/glxp/api/req/dev/DeviceCheckDetailItemQuery.java

@@ -0,0 +1,23 @@
+package com.glxp.api.req.dev;
+
+import com.glxp.api.util.page.ListPageRequest;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+@Data
+public class DeviceCheckDetailItemQuery extends ListPageRequest {
+
+    /**
+     * 任务单标识
+     */
+    private Long taskId;
+
+    /**
+     * 设备标识
+     */
+    @NotBlank(message = "设备标识不能为空")
+    private String deviceCode;
+
+
+}

src/main/java/com/glxp/api/req/dev/DeviceCheckDetailMiniQuery.java

@@ -0,0 +1,28 @@
+package com.glxp.api.req.dev;
+
+import com.glxp.api.util.page.ListPageRequest;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+@Data
+public class DeviceCheckDetailMiniQuery extends ListPageRequest {
+
+    /**
+     * 部门编码
+     */
+    @NotBlank(message = "缺少部门编码")
+    private String deptCode;
+
+    /**
+     * 模糊设备码和UDI
+     */
+    private String deviceCodeAndUdi;
+
+    /**
+     * 是否完成
+     */
+    private Boolean finishFlag;
+
+
+}

src/main/java/com/glxp/api/req/dev/DeviceCheckDetailParam.java

@@ -0,0 +1,35 @@
+package com.glxp.api.req.dev;
+
+import com.glxp.api.entity.dev.DeviceCheckDetailItemEntity;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+@Data
+public class DeviceCheckDetailParam {
+
+    @NotNull(message = "任务单标识不能为空")
+    private Long taskId;
+
+    @NotBlank(message = "设备编码不能为空")
+    private String deviceCode;
+
+    /**
+     * 巡检建议
+     */
+    private String suggestion;
+
+    /**
+     * 现场照片
+     */
+    private String livePath;
+    /**
+     * 正常标识
+     */
+    private Boolean normalFlag;
+
+    private List<DeviceCheckDetailItemEntity> detailItemEntities;
+
+}

src/main/java/com/glxp/api/req/dev/DeviceCheckDetailQuery.java

@@ -0,0 +1,17 @@
+package com.glxp.api.req.dev;
+
+import com.glxp.api.util.page.ListPageRequest;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+public class DeviceCheckDetailQuery extends ListPageRequest {
+
+    @NotNull(message = "任务单标识不能为空")
+    private Long taskId;
+
+    private String deviceCode;
+
+
+}

src/main/java/com/glxp/api/req/dev/DeviceCheckDetailRepairParam.java

@@ -0,0 +1,32 @@
+package com.glxp.api.req.dev;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+@Data
+public class DeviceCheckDetailRepairParam {
+
+    @NotNull(message = "任务单标识不能为空")
+    private Long taskId;
+
+    @NotBlank(message = "设备编码不能为空")
+    private String deviceCode;
+
+    @NotBlank(message = "问题描述不能为空")
+    String description;
+
+    @NotBlank(message = "诊断信息不能为空")
+    String diagnosisInfo;
+
+    @NotNull(message = "请选择维修方式")
+    Boolean innerFlag;
+
+    @NotBlank(message = "维修人姓名不能为空")
+    String repairUserName;
+
+    @NotBlank(message = "维修人电话不能为空")
+    String repairUserPhone;
+
+}

src/main/java/com/glxp/api/req/dev/DeviceCheckItemDictParam.java

@@ -0,0 +1,56 @@
+package com.glxp.api.req.dev;
+
+import com.glxp.api.entity.auth.AuthAdmin;
+import com.glxp.api.entity.dev.DeviceCheckItemDictEntity;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Pattern;
+import java.time.LocalDateTime;
+
+@Data
+public class DeviceCheckItemDictParam {
+
+    /**
+     * 项目编码
+     */
+    @NotBlank(message = "项目编码不能为空")
+    @Pattern(regexp = "^[A-Za-z0-9]{1,20}$", message = "项目编码应该在1~20字之间且只能包含字母和数字")
+    private String code;
+
+    /**
+     * 项目名称
+     */
+    @NotBlank(message = "项目名称不能为空")
+    @Length(min = 1, max = 100, message = "项目名称应该在1~100字之间")
+    private String name;
+
+    /**
+     * 项目内容
+     */
+    @NotBlank(message = "项目内容不能为空")
+    private String content;
+
+    /**
+     * 项目类型
+     * @param user
+     * @return
+     */
+    private Integer type;
+
+    public DeviceCheckItemDictEntity getEntity(AuthAdmin user) {
+
+        DeviceCheckItemDictEntity build = DeviceCheckItemDictEntity.builder()
+                .code(code)
+                .name(name)
+                .content(content)
+                .type(type)
+                .createUserId(user.getCustomerId())
+                .createUserName(user.getEmployeeName())
+                .createTime(LocalDateTime.now())
+                .build();
+        return build;
+    }
+
+}

src/main/java/com/glxp/api/req/dev/DeviceCheckItemDictQuery.java

@@ -0,0 +1,19 @@
+package com.glxp.api.req.dev;
+
+import com.glxp.api.util.page.ListPageRequest;
+import lombok.Data;
+
+@Data
+public class DeviceCheckItemDictQuery extends ListPageRequest {
+
+    /**
+     * 项目编码
+     */
+    private String code;
+
+    /**
+     * 项目名称
+     */
+    private String name;
+
+}

src/main/java/com/glxp/api/req/dev/DeviceCheckQuery.java

@@ -0,0 +1,13 @@
+package com.glxp.api.req.dev;
+
+import com.glxp.api.util.page.ListPageRequest;
+import lombok.Data;
+
+@Data
+public class DeviceCheckQuery extends ListPageRequest {
+
+    String taskId;
+    String chargeDeptCode;
+    Boolean finishFlag;
+
+}

src/main/java/com/glxp/api/req/dev/DeviceInfoDetailByDeptCodeQuery.java

@@ -0,0 +1,61 @@
+package com.glxp.api.req.dev;
+
+import com.glxp.api.enums.dev.DeviceStatusEnum;
+import com.glxp.api.util.page.ListPageRequest;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+@Data
+public class DeviceInfoDetailByDeptCodeQuery extends ListPageRequest {
+    /**
+     * 部门编码
+     */
+    @NotBlank(message = "缺少部门编码")
+    private String deptCode;
+
+    /**
+     * 设备状态
+     */
+    private DeviceStatusEnum status;
+
+    /**
+     * 设备编码
+     */
+    private String deviceCode;
+
+    /**
+     * 最小销售标识
+     */
+    private String nameCode;
+
+
+    /**
+     * 设备名称
+     */
+    private String productName;
+
+    /**
+     * 生产企业
+     */
+    private String manufactory;
+
+    /**
+     * 注册/备案号
+     */
+    private String zczbhhzbapzbh;
+
+    private String productId;
+
+    private Boolean checkLock;
+    /**
+     * 计划id
+     */
+    private Long planId;
+
+    /**
+     * 模版ID
+     */
+
+    private Integer labelId;
+}

src/main/java/com/glxp/api/req/dev/DeviceInfoDetailQuery.java

@@ -0,0 +1,71 @@
+package com.glxp.api.req.dev;
+
+import com.glxp.api.enums.dev.DeviceStatusEnum;
+import com.glxp.api.util.page.ListPageRequest;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+@Data
+public class DeviceInfoDetailQuery extends ListPageRequest {
+
+
+    @NotNull(message = "缺少必要参数")
+    private DeviceStatusEnum status;
+
+//    @NotNull(message = "缺少必要参数")
+    private Boolean checkLock;
+
+    /**
+     * 部门编码
+     */
+    @NotBlank(message = "缺少必要参数")
+    private String deptCode;
+
+    /**
+     * 设备id
+     */
+//    @NotNull(message = "缺少必要参数")
+    private Long productId;
+
+    /**
+     * 设备名称
+     */
+    private String productName;
+
+    /**
+     * 设备编码
+     */
+    private String deviceCode;
+
+    /**
+     * 计划id
+     */
+    private Long planId;
+
+    /**
+     * 模版ID
+     */
+
+    private Integer labelId;
+
+
+    /**
+     * 最小销售标识
+     */
+    private String nameCode;
+
+
+    /**
+     * 生产企业
+     */
+    private String manufactory;
+
+    /**
+     * 注册/备案号
+     */
+    private String zczbhhzbapzbh;
+
+
+}

src/main/java/com/glxp/api/req/dev/DeviceInfoQuery.java

@@ -0,0 +1,28 @@
+package com.glxp.api.req.dev;
+
+import com.glxp.api.enums.dev.DeviceStatusEnum;
+import com.glxp.api.util.page.ListPageRequest;
+import lombok.Data;
+
+@Data
+public class DeviceInfoQuery extends ListPageRequest {
+
+    private DeviceStatusEnum status;
+
+    /**
+     * 设备编码
+     */
+    private String deviceCode;
+
+    /**
+     * 部门编码
+     */
+    private String deptCode;
+
+    /**
+     * 设备名称
+     */
+    private String productName;
+
+
+}

src/main/java/com/glxp/api/req/dev/DevicePlanDetailGroupQuery.java

@@ -0,0 +1,18 @@
+package com.glxp.api.req.dev;
+
+import com.glxp.api.util.page.ListPageRequest;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class DevicePlanDetailGroupQuery extends ListPageRequest {
+
+    @NotNull(message = "计划标识不能为空")
+    Long planId;
+
+}

src/main/java/com/glxp/api/req/dev/DevicePlanDetailItemParam.java

@@ -0,0 +1,84 @@
+package com.glxp.api.req.dev;
+
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.glxp.api.entity.dev.DeviceCheckItemDictEntity;
+import com.glxp.api.entity.dev.DevicePlanDetailEntity;
+import com.glxp.api.entity.dev.DevicePlanDetailItemEntity;
+import com.glxp.api.exception.JsonException;
+import com.glxp.api.service.dev.DeviceCheckItemDictService;
+import com.glxp.api.service.dev.DevicePlanDetailService;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+@Data
+public class DevicePlanDetailItemParam {
+
+    /**
+     * 计划id
+     */
+    @NotNull(message = "计划标识不能为空")
+    Long planId;
+
+    Long productId;
+
+    /**
+     * 设备编码
+     */
+    String deviceCode;
+
+
+    @NotEmpty(message = "巡检项目不能为空")
+    Set<String> itemCodes;
+
+
+    public void valid(DevicePlanDetailService devicePlanDetailService) {
+        DevicePlanDetailEntity one = devicePlanDetailService.getOne(Wrappers.lambdaQuery(DevicePlanDetailEntity.class)
+                .eq(DevicePlanDetailEntity::getPlanId, planId)
+                .eq(DevicePlanDetailEntity::getProductId, productId)
+                .eq(StrUtil.isNotBlank(deviceCode), DevicePlanDetailEntity::getDeviceCode, deviceCode)
+                .last("limit 1")
+        );
+        if (one == null) {
+            throw new JsonException("未找到该计划中的设备,无法操作");
+        }
+    }
+
+    public List<DevicePlanDetailItemEntity> getEntity(DeviceCheckItemDictService deviceCheckItemDictService) {
+        List<DeviceCheckItemDictEntity> list = deviceCheckItemDictService.listByIds(itemCodes);
+        if (CollectionUtil.isEmpty(list)) {
+            throw new JsonException("所有项目编码都不存在，疑似非法操作");
+        }
+        if (list.size() != itemCodes.size()) {
+            Map<String, List<DeviceCheckItemDictEntity>> collect = list.stream().collect(Collectors.groupingBy(DeviceCheckItemDictEntity::getCode));
+            itemCodes.forEach(i -> {
+                boolean b = collect.containsKey(i);
+                if (!b) {
+                    throw new JsonException(String.format("项目编码[%s]不存在", i));
+                }
+            });
+        }
+        List<DevicePlanDetailItemEntity> entityList = new ArrayList<>();
+        list.forEach(i -> {
+            DevicePlanDetailItemEntity build = DevicePlanDetailItemEntity.builder()
+                    .planId(planId)
+                    .productId(productId)
+                    .deviceCode(StrUtil.blankToDefault(deviceCode, ""))
+                    .itemCode(i.getCode())
+                    .name(i.getName())
+                    .content(i.getContent())
+                    .build();
+            entityList.add(build);
+        });
+        return entityList;
+    }
+
+}

src/main/java/com/glxp/api/req/dev/DevicePlanDetailItemQuery.java

@@ -0,0 +1,26 @@
+package com.glxp.api.req.dev;
+
+import com.glxp.api.util.page.ListPageRequest;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * 巡检设备计划
+ * data: 2023/11/15
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class DevicePlanDetailItemQuery extends ListPageRequest {
+
+    @NotNull(message = "计划标识不能为空")
+    Long planId;
+
+    Long productId;
+    @NotNull(message = "设备标识不能为空")
+    String deviceCode;
+
+}

src/main/java/com/glxp/api/req/dev/DevicePlanDetailParam.java

@@ -0,0 +1,56 @@
+package com.glxp.api.req.dev;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.glxp.api.entity.dev.DeviceInfoEntity;
+import com.glxp.api.entity.dev.DevicePlanDetailEntity;
+import com.glxp.api.entity.dev.DevicePlanEntity;
+import com.glxp.api.exception.JsonException;
+import com.glxp.api.service.dev.DeviceInfoService;
+import com.glxp.api.service.dev.DevicePlanService;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+@Data
+public class DevicePlanDetailParam {
+
+    /**
+     * 计划id
+     */
+//    @NotNull(message = "计划标识不能为空")
+    Long planId;
+
+    @NotEmpty(message = "请选择至少一个设备")
+    Set<String> deviceCodes;
+
+    DevicePlanParam devicePlanParam;
+
+    public boolean valid(DevicePlanService devicePlanService) {
+        DevicePlanEntity entity = devicePlanService.getById(planId);
+        if (entity == null) {
+            return false;
+        }
+        return true;
+    }
+
+    public List<DevicePlanDetailEntity> getEntity(DeviceInfoService deviceInfoService) {
+        List<DeviceInfoEntity> deviceList = deviceInfoService.listByIds(deviceCodes);
+        if (CollectionUtil.isEmpty(deviceList)) {
+            throw new JsonException("未找到设备，疑似非法操作");
+        }
+        List<DevicePlanDetailEntity> list = deviceList.stream().map(d -> {
+
+            DevicePlanDetailEntity build = DevicePlanDetailEntity.builder()
+                    .planId(planId)
+                    .deviceCode(d.getDeviceCode())
+                    .productId(d.getProductId())
+                    .build();
+            return build;
+        }).collect(Collectors.toList());
+        return list;
+    }
+
+}

src/main/java/com/glxp/api/req/dev/DevicePlanDetailQuery.java

@@ -0,0 +1,25 @@
+package com.glxp.api.req.dev;
+
+import com.glxp.api.util.page.ListPageRequest;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class DevicePlanDetailQuery extends ListPageRequest {
+
+    @NotNull(message = "计划标识不能为空")
+    Long planId;
+
+    Long productId;
+
+    /**
+     * 设备编码
+     */
+    String deviceCode;
+
+}

src/main/java/com/glxp/api/req/dev/DevicePlanParam.java

@@ -0,0 +1,98 @@
+package com.glxp.api.req.dev;
+
+import com.glxp.api.entity.auth.AuthAdmin;
+import com.glxp.api.entity.auth.DeptEntity;
+import com.glxp.api.entity.dev.DevicePlanEntity;
+import com.glxp.api.exception.JsonException;
+import com.glxp.api.service.auth.DeptService;
+import com.glxp.api.util.SnowflakeUtil;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+@Data
+public class DevicePlanParam {
+
+    /**
+     * 计划id,修改时使用
+     */
+    Long planId;
+
+    /**
+     * 计划名称
+     */
+    @NotBlank(message = "计划名称不能为空")
+    @Length(min = 1, max = 100, message = "计划名称应该在1~100字之间")
+    String name;
+
+    /**
+     * 负责部门
+     */
+    @NotBlank(message = "负责部门不能为空")
+    String chargeDeptCode;
+
+    /**
+     * 开始日期
+     */
+    @NotNull(message = "计划开始日期不能为空")
+    private LocalDate startDate;
+
+    /**
+     * 结束日期
+     */
+    @NotNull(message = "计划结束日期不能为空")
+    private LocalDate endDate;
+
+    /**
+     * 频率(天)
+     */
+    @NotNull(message = "频率不能为空")
+    private Integer frequency;
+
+    /**
+     * 计划单据状态
+     */
+    private Integer status;
+
+    /**
+     * 备注
+     */
+    @Length(max = 500, message = "备注最多500字")
+    private String remark;
+
+    public void valid(DeptService deptService) {
+        DeptEntity dept = deptService.selectByCode(chargeDeptCode);
+        if (dept == null) {
+            throw new JsonException("负责部门不存在，疑似非法操作");
+        }
+        if (startDate.isAfter(endDate)) {
+            throw new JsonException("计划开始日期不能在计划结束日期之后");
+        }
+        if (!endDate.isAfter(LocalDate.now())) {
+            throw new JsonException("计划结束日期要在今天之后");
+        }
+    }
+
+    public DevicePlanEntity getEntity(AuthAdmin user) {
+        boolean isUpdate = (planId != null);
+        DevicePlanEntity build = DevicePlanEntity.builder()
+                .planId(!isUpdate ? SnowflakeUtil.getId() : planId)
+                .name(name)
+                .chargeDeptCode(chargeDeptCode)
+                .startDate(startDate)
+                .endDate(endDate)
+                .frequency(frequency)
+                .status(status == null ? 1 : status)
+                .remark(remark)
+                .build();
+        if (!isUpdate) {
+            build.setCreateUserId(user.getId()).setCreateUserName(user.getEmployeeName()).setCreateTime(LocalDateTime.now());
+        }
+        return build;
+    }
+
+}

src/main/java/com/glxp/api/req/dev/DevicePlanQuery.java

@@ -0,0 +1,16 @@
+package com.glxp.api.req.dev;
+
+import com.glxp.api.util.page.ListPageRequest;
+import lombok.Data;
+
+@Data
+public class DevicePlanQuery extends ListPageRequest {
+
+    String name;
+
+    /**
+     * 负责部门
+     */
+    String chargeDeptCode;
+
+}

src/main/java/com/glxp/api/req/dev/DeviceRepairApplyAddParam.java

@@ -0,0 +1,109 @@
+package com.glxp.api.req.dev;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.glxp.api.entity.auth.AuthAdmin;
+import com.glxp.api.entity.dev.DeviceInfoEntity;
+import com.glxp.api.entity.dev.DeviceRepairApplyDetailEntity;
+import com.glxp.api.entity.dev.DeviceRepairApplyEntity;
+import com.glxp.api.enums.dev.DeviceRepairApplyDetailStatusEnum;
+import com.glxp.api.enums.dev.DeviceRepairApplyStatusEnum;
+import com.glxp.api.enums.dev.DeviceStatusEnum;
+import com.glxp.api.exception.JsonException;
+import com.glxp.api.service.dev.DeviceInfoService;
+import com.glxp.api.util.SnowflakeUtil;
+import com.glxp.api.vo.dev.DeviceInfoVo;
+import lombok.Data;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+@Data
+public class DeviceRepairApplyAddParam {
+
+    /**
+     * 报修人联系方式
+     */
+    @NotBlank(message = "报修人联系方式不能为空")
+    String applyUserPhone;
+
+    @Valid
+    @NotEmpty(message = "请选择至少一个设备进行报修")
+    Set<ApplyDetail> details;
+
+    @Data
+    public static class ApplyDetail {
+
+        /**
+         * 设备编码
+         */
+        @NotBlank(message = "设备编码不能为空")
+        String deviceCode;
+
+        /**
+         * 问题描述
+         */
+        @NotBlank(message = "问题描述不能为空")
+        String description;
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            ApplyDetail that = (ApplyDetail) o;
+            return Objects.equals(deviceCode, that.deviceCode);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(deviceCode);
+        }
+    }
+
+    public void valid() {
+    }
+
+
+    public DeviceRepairApplyEntity getEntity(AuthAdmin user) {
+        return DeviceRepairApplyEntity
+                .builder()
+                .id(SnowflakeUtil.getId())
+                .status(DeviceRepairApplyStatusEnum.WAIT_PROCESS)
+                .applyDeptCode(user.getLocDeptCode())
+                .applyDeptName(user.getDeptName())
+                .applyUserId(user.getId())
+                .applyUserName(user.getEmployeeName())
+                .applyUserPhone(this.applyUserPhone)
+                .applyTime(LocalDateTime.now())
+                .deviceCount(details.size())
+                .finishCount(0)
+                .updateTime(LocalDateTime.now())
+                .build();
+    }
+
+    public List<DeviceRepairApplyDetailEntity> getDetailEntityList(Long applyId, DeviceInfoService deviceInfoService, AuthAdmin user) {
+        List<DeviceInfoVo> list = deviceInfoService.listVoByCodes(details.stream().map(ApplyDetail::getDeviceCode).collect(Collectors.toList()), user.getLocDeptCode(), DeviceStatusEnum.NORMAL);
+        if (list.size() != details.size()) {
+            throw new JsonException("设备信息不匹配，疑似非法操作");
+        }
+        Map<String, List<DeviceInfoEntity>> deviceMap = list.stream().collect(Collectors.groupingBy(DeviceInfoEntity::getDeviceCode));
+        return details.stream().map(d -> {
+            DeviceInfoEntity info = deviceMap.get(d.getDeviceCode()).get(0);
+            DeviceRepairApplyDetailEntity build = DeviceRepairApplyDetailEntity.builder()
+                    .applyId(applyId)
+                    .description(d.getDescription())
+                    .status(DeviceRepairApplyDetailStatusEnum.WAIT_DIAGNOSIS)
+                    .build();
+            BeanUtil.copyProperties(info, build,"status");
+            return build;
+        }).collect(Collectors.toList());
+
+    }
+
+}

src/main/java/com/glxp/api/req/dev/DeviceRepairApplyConfirmParam.java

@@ -0,0 +1,21 @@
+package com.glxp.api.req.dev;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+@Data
+public class DeviceRepairApplyConfirmParam {
+
+    @NotNull(message = "报修单标识不能为空")
+    Long applyId;
+
+    /**
+     * 报修人联系方式
+     */
+    @NotBlank(message = "受理人联系方式不能为空")
+    String confirmUserPhone;
+
+
+}

src/main/java/com/glxp/api/req/dev/DeviceRepairApplyDetailDiagnosisParam.java

@@ -0,0 +1,55 @@
+package com.glxp.api.req.dev;
+
+import cn.hutool.core.util.StrUtil;
+import com.glxp.api.exception.JsonException;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+@Data
+public class DeviceRepairApplyDetailDiagnosisParam {
+
+    @NotNull(message = "报修单标识不能为空")
+    Long applyId;
+
+    @NotBlank(message = "设备标识不能为空")
+    String deviceCode;
+
+    @NotNull(message = "请选择是否维修")
+    Boolean repairFlag;
+
+    @NotBlank(message = "诊断信息不能为空")
+    String diagnosisInfo;
+
+    Boolean innerFlag;
+
+    String repairUserName;
+
+    String repairDeptCode;
+
+    String repairUserPhone;
+
+    public void valid() {
+        if (repairFlag) {
+            if (innerFlag == null) {
+                throw new JsonException("请选择维修方式");
+            }
+            if (StrUtil.isBlank(repairDeptCode)) {
+                throw new JsonException("维修部门不能为空");
+            }
+            if (StrUtil.isBlank(repairUserName)) {
+                throw new JsonException("维修人姓名不能为空");
+            }
+            if (StrUtil.isBlank(repairUserPhone)) {
+                throw new JsonException("维修人电话不能为空");
+            }
+        } else {
+            innerFlag = null;
+            repairUserName = null;
+            repairUserPhone = null;
+            repairDeptCode = null;
+        }
+    }
+
+}

src/main/java/com/glxp/api/req/dev/DeviceRepairApplyDetailMiniQuery.java

@@ -0,0 +1,28 @@
+package com.glxp.api.req.dev;
+
+import com.glxp.api.util.page.ListPageRequest;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+@Data
+public class DeviceRepairApplyDetailMiniQuery extends ListPageRequest {
+
+    /**
+     * 部门编码
+     */
+    @NotBlank(message = "缺少部门编码")
+    private String deptCode;
+
+    /**
+     * 模糊设备码和UDI
+     */
+    private String deviceCodeAndUdi;
+
+    /**
+     * 状态  待诊断、待维修、维修中、完成',
+     */
+    private String status;
+
+
+}

src/main/java/com/glxp/api/req/dev/DeviceRepairApplyDetailQuery.java

@@ -0,0 +1,15 @@
+package com.glxp.api.req.dev;
+
+import com.glxp.api.util.page.ListPageRequest;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+public class DeviceRepairApplyDetailQuery extends ListPageRequest {
+
+    @NotNull(message = "保修单标识不能为空")
+    Long applyId;
+
+
+}

src/main/java/com/glxp/api/req/dev/DeviceRepairApplyHallQuery.java

@@ -0,0 +1,18 @@
+package com.glxp.api.req.dev;
+
+import com.glxp.api.util.page.ListPageRequest;
+import lombok.Data;
+
+@Data
+public class DeviceRepairApplyHallQuery extends ListPageRequest {
+
+    Long applyId;
+
+    /**
+     * 申请部门
+     */
+    String applyDeptCode;
+
+    Integer isFinish;
+
+}

src/main/java/com/glxp/api/req/dev/DeviceRepairApplyListByIdAndCodeQuery.java

@@ -0,0 +1,21 @@
+package com.glxp.api.req.dev;
+
+import com.glxp.api.util.page.ListPageRequest;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+@Data
+public class DeviceRepairApplyListByIdAndCodeQuery extends ListPageRequest {
+
+    @NotNull(message = "报修单标识不能为空")
+    Long applyId;
+
+    /**
+     * 报修人联系方式
+     */
+    @NotBlank(message = "设备标识不可以为空")
+    String deviceCode;
+
+}

src/main/java/com/glxp/api/req/dev/DeviceRepairApplyQuery.java

@@ -0,0 +1,40 @@
+package com.glxp.api.req.dev;
+
+import com.glxp.api.enums.dev.DeviceRepairApplyStatusEnum;
+import com.glxp.api.util.page.ListPageRequest;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class DeviceRepairApplyQuery extends ListPageRequest {
+
+    Long applyId;
+
+    /**
+     * 报修单状态
+     */
+    DeviceRepairApplyStatusEnum status;
+
+    /**
+     * 申请部门
+     */
+    String applyDeptCode;
+
+    /**
+     * 确认人
+     */
+    Long confirmUserId;
+
+    /**
+     * 受理信息
+     */
+    String acceptInfo;
+    /**
+     * 报修信息
+     */
+    String repairInfo;
+
+    List<DeviceRepairApplyStatusEnum> statuss;
+
+}

src/main/java/com/glxp/api/req/dev/DeviceRepairQuery.java

@@ -0,0 +1,25 @@
+package com.glxp.api.req.dev;
+
+import com.glxp.api.util.page.ListPageRequest;
+import lombok.Data;
+
+@Data
+public class DeviceRepairQuery extends ListPageRequest {
+
+    /**
+     * 完成状态
+     */
+    Boolean isFinish;
+
+    /**
+     * 设备编码
+     */
+    String deviceCode;
+
+
+    /**
+     * 创建人
+     */
+    Long createUserId;
+
+}

src/main/java/com/glxp/api/req/dev/DeviceUpkeepDetailItemFinishParam.java

@@ -0,0 +1,33 @@
+package com.glxp.api.req.dev;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class DeviceUpkeepDetailItemFinishParam {
+
+    @NotNull(message = "任务单标识不能为空")
+    private Long taskId;
+
+    @NotBlank(message = "设备标识不能为空")
+    private String deviceCode;
+
+    @NotNull(message = "项目标识不能为空")
+    private String itemCode;
+
+    @NotNull(message = "请标记巡检状态")
+    private Boolean normalFlag;
+
+    @NotBlank(message = "巡检意见不能为空")
+    private String suggestion;
+
+
+}

src/main/java/com/glxp/api/req/dev/DeviceUpkeepDetailItemQuery.java

@@ -0,0 +1,21 @@
+package com.glxp.api.req.dev;
+
+import com.glxp.api.util.page.ListPageRequest;
+import lombok.Data;
+
+@Data
+public class DeviceUpkeepDetailItemQuery extends ListPageRequest {
+
+    /**
+     * 任务单标识
+     */
+    private Long taskId;
+
+    /**
+     * 设备标识
+     */
+//    @NotBlank(message = "设备标识不能为空")
+    private String deviceCode;
+
+
+}

src/main/java/com/glxp/api/req/dev/DeviceUpkeepDetailParam.java

@@ -0,0 +1,35 @@
+package com.glxp.api.req.dev;
+
+import com.glxp.api.entity.dev.DeviceUpkeepDetailItemEntity;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+@Data
+public class DeviceUpkeepDetailParam {
+
+    @NotNull(message = "任务单标识不能为空")
+    private Long taskId;
+
+    @NotBlank(message = "设备编码不能为空")
+    private String deviceCode;
+
+    /**
+     * 保养建议
+     */
+    private String suggestion;
+
+    /**
+     * 现场照片
+     */
+    private String livePath;
+    /**
+     * 正常标识
+     */
+    private Boolean normalFlag;
+
+    private List<DeviceUpkeepDetailItemEntity> detailItemEntities;
+
+}