移动代码

cs-device/cs-device-api/pom.xml

@@ -14,6 +14,28 @@
 
   <name>cs-device-api</name>
 
+  <dependencies>
+    <dependency>
+      <groupId>com.njcn</groupId>
+      <artifactId>common-core</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.njcn</groupId>
+      <artifactId>common-db</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.projectlombok</groupId>
+      <artifactId>lombok</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.njcn</groupId>
+      <artifactId>common-microservice</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.source>8</maven.compiler.source>

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/AppProjectFeignClient.java

@@ -0,0 +1,22 @@
+package com.njcn.csdevice.api;
+
+import com.njcn.common.pojo.constant.ServerInfo;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.csdevice.api.fallback.AppProjectClientFallbackFactory;
+import com.njcn.csdevice.pojo.po.AppProjectPO;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+/**
+ * @author xy
+ */
+@FeignClient(value = ServerInfo.CS_DEVICE_BOOT, path = "/project", fallbackFactory = AppProjectClientFallbackFactory.class,contextId = "approject")
+public interface AppProjectFeignClient {
+
+
+    @PostMapping("/queryProjectById")
+    HttpResult<List<AppProjectPO>> queryProjectById(@RequestParam("ids") List<String> ids);
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/CsDictFeignClient.java

@@ -0,0 +1,20 @@
+package com.njcn.csdevice.api;
+
+import com.njcn.csdevice.api.fallback.CsEdDataFeignClientFallbackFactory;
+import com.njcn.csdevice.pojo.dto.CsDictDTO;
+import com.njcn.common.pojo.constant.ServerInfo;
+import com.njcn.common.pojo.response.HttpResult;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * @author xy
+ */
+@FeignClient(value = ServerInfo.CS_DEVICE_BOOT, path = "/dict", fallbackFactory = CsEdDataFeignClientFallbackFactory.class,contextId = "edData")
+public interface CsDictFeignClient {
+
+    @PostMapping("/getOwnAndFatherData")
+    HttpResult<CsDictDTO> getOwnAndFatherData(@RequestParam("name")String name);
+
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/CsEdDataFeignClient.java

@@ -0,0 +1,25 @@
+package com.njcn.csdevice.api;
+
+import com.njcn.csdevice.api.fallback.CsEdDataFeignClientFallbackFactory;
+import com.njcn.csdevice.pojo.po.CsEdDataPO;
+import com.njcn.csdevice.pojo.vo.CsEdDataVO;
+import com.njcn.common.pojo.constant.ServerInfo;
+import com.njcn.common.pojo.response.HttpResult;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+/**
+ * @author xy
+ */
+@FeignClient(value = ServerInfo.CS_DEVICE_BOOT, path = "/edData", fallbackFactory = CsEdDataFeignClientFallbackFactory.class,contextId = "edData")
+public interface CsEdDataFeignClient {
+
+    @PostMapping("/findByDevTypeId")
+    HttpResult<CsEdDataVO> findByDevTypeId(@RequestParam("devType") String devType);
+
+    @PostMapping("/getAll")
+    HttpResult<List<CsEdDataPO>> getAll(@RequestParam("devType") String devType);
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/CsLineFeignClient.java

@@ -0,0 +1,22 @@
+package com.njcn.csdevice.api;
+
+import com.njcn.common.pojo.constant.ServerInfo;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.csdevice.api.fallback.CsLineClientFallbackFactory;
+import com.njcn.csdevice.pojo.po.CsLinePO;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+/**
+ * @author xy
+ */
+@FeignClient(value = ServerInfo.CS_DEVICE_BOOT, path = "/csline", fallbackFactory = CsLineClientFallbackFactory.class,contextId = "csline")
+public interface CsLineFeignClient {
+
+
+    @PostMapping("/queryLineById")
+    public HttpResult<List<CsLinePO>> queryLineById(@RequestParam("ids") List<String> ids );
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/DevModelFeignClient.java

@@ -0,0 +1,31 @@
+package com.njcn.csdevice.api;
+
+import com.njcn.csdevice.api.fallback.DevModelFeignClientFallbackFactory;
+import com.njcn.csdevice.pojo.param.CsDevModelAddParm;
+import com.njcn.csdevice.pojo.param.CsDevModelQueryListParm;
+import com.njcn.csdevice.pojo.po.CsDevModelPO;
+import com.njcn.csdevice.pojo.vo.CsDevModelPageVO;
+import com.njcn.common.pojo.constant.ServerInfo;
+import com.njcn.common.pojo.response.HttpResult;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * @author xy
+ */
+@FeignClient(value = ServerInfo.CS_DEVICE_BOOT, path = "/devmodel", fallbackFactory = DevModelFeignClientFallbackFactory.class,contextId = "devmodel")
+
+public interface DevModelFeignClient {
+
+    @PostMapping("/addDevModel")
+    HttpResult<CsDevModelPO> addDevModel(@RequestBody @Validated CsDevModelAddParm csDevModelAddParm);
+
+    @PostMapping("/queryDevModelOne")
+    HttpResult<CsDevModelPageVO> queryDevModelOne(@RequestBody CsDevModelQueryListParm csDevModelQueryListParm);
+
+    @PostMapping("/findModel")
+    HttpResult<CsDevModelPO> findModel(@RequestParam("devType") String devType, @RequestParam("version") String version, @RequestParam("time") String time);
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/EquipmentFeignClient.java

@@ -0,0 +1,27 @@
+package com.njcn.csdevice.api;
+
+import com.njcn.common.pojo.constant.ServerInfo;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.csdevice.api.fallback.EquipmentFeignClientFallbackFactory;
+import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO;
+import com.njcn.csdevice.pojo.vo.CsEquipmentDeliveryVO;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+/**
+ * @author xy
+ */
+@FeignClient(value = ServerInfo.CS_DEVICE_BOOT, path = "/EquipmentDelivery", fallbackFactory = EquipmentFeignClientFallbackFactory.class,contextId = "EquipmentDelivery")
+public interface EquipmentFeignClient {
+
+    @PostMapping("/queryEquipmentByndid")
+    HttpResult<CsEquipmentDeliveryVO> queryEquipmentByndid(@RequestParam("ndid") String ndid);
+
+    @PostMapping("/updateStatusBynDid")
+    HttpResult<Boolean> updateStatusBynDid(@RequestParam("nDId") String nDid,@RequestParam("status")  Integer status);
+    @PostMapping("/queryEquipmentById")
+    HttpResult<List<CsEquipmentDeliveryPO>> queryDeviceById(@RequestParam("ids") List<String> ids);
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/AppProjectClientFallbackFactory.java

@@ -0,0 +1,37 @@
+package com.njcn.csdevice.api.fallback;
+
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.csdevice.api.AppProjectFeignClient;
+import com.njcn.csdevice.pojo.po.AppProjectPO;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @author xy
+ */
+@Slf4j
+@Component
+public class AppProjectClientFallbackFactory implements FallbackFactory<AppProjectFeignClient> {
+    @Override
+    public AppProjectFeignClient create(Throwable cause) {
+        //判断抛出异常是否为解码器抛出的业务异常
+        Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
+        if (cause.getCause() instanceof BusinessException) {
+            BusinessException businessException = (BusinessException) cause.getCause();
+        }
+        Enum<?> finalExceptionEnum = exceptionEnum;
+        return new AppProjectFeignClient() {
+
+            @Override
+            public HttpResult<List<AppProjectPO>> queryProjectById(List<String> ids) {
+                log.error("{}异常，降级处理，异常为：{}","获取项目详情接口异常",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+        };
+    }
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/CsDictFeignClientFallbackFactory.java

@@ -0,0 +1,35 @@
+package com.njcn.csdevice.api.fallback;
+
+import com.njcn.csdevice.api.CsDictFeignClient;
+import com.njcn.csdevice.pojo.dto.CsDictDTO;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.common.pojo.response.HttpResult;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author xy
+ */
+@Slf4j
+@Component
+public class CsDictFeignClientFallbackFactory implements FallbackFactory<CsDictFeignClient> {
+    @Override
+    public CsDictFeignClient create(Throwable cause) {
+        //判断抛出异常是否为解码器抛出的业务异常
+        Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
+        if (cause.getCause() instanceof BusinessException) {
+            BusinessException businessException = (BusinessException) cause.getCause();
+        }
+        Enum<?> finalExceptionEnum = exceptionEnum;
+        return new CsDictFeignClient() {
+
+            @Override
+            public HttpResult<CsDictDTO> getOwnAndFatherData(String name) {
+                log.error("{}异常，降级处理，异常为：{}","获取指标自身和父级信息",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+        };
+    }
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/CsEdDataFeignClientFallbackFactory.java

@@ -0,0 +1,44 @@
+package com.njcn.csdevice.api.fallback;
+
+import com.njcn.csdevice.api.CsEdDataFeignClient;
+import com.njcn.csdevice.pojo.po.CsEdDataPO;
+import com.njcn.csdevice.pojo.vo.CsEdDataVO;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.common.pojo.response.HttpResult;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @author xy
+ */
+@Slf4j
+@Component
+public class CsEdDataFeignClientFallbackFactory implements FallbackFactory<CsEdDataFeignClient> {
+    @Override
+    public CsEdDataFeignClient create(Throwable cause) {
+        //判断抛出异常是否为解码器抛出的业务异常
+        Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
+        if (cause.getCause() instanceof BusinessException) {
+            BusinessException businessException = (BusinessException) cause.getCause();
+        }
+        Enum<?> finalExceptionEnum = exceptionEnum;
+        return new CsEdDataFeignClient() {
+
+            @Override
+            public HttpResult<CsEdDataVO> findByDevTypeId(String devType) {
+                log.error("{}异常，降级处理，异常为：{}","根据装置型号获取装置类型",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
+            @Override
+            public HttpResult<List<CsEdDataPO>> getAll(String devType) {
+                log.error("{}异常，降级处理，异常为：{}","根据装置型号获取装置类型",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+        };
+    }
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/CsLineClientFallbackFactory.java

@@ -0,0 +1,38 @@
+package com.njcn.csdevice.api.fallback;
+
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.csdevice.api.CsLineFeignClient;
+import com.njcn.csdevice.pojo.po.CsLinePO;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @author xy
+ */
+@Slf4j
+@Component
+public class CsLineClientFallbackFactory implements FallbackFactory<CsLineFeignClient> {
+    @Override
+    public CsLineFeignClient create(Throwable cause) {
+        //判断抛出异常是否为解码器抛出的业务异常
+        Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
+        if (cause.getCause() instanceof BusinessException) {
+            BusinessException businessException = (BusinessException) cause.getCause();
+        }
+        Enum<?> finalExceptionEnum = exceptionEnum;
+        return new CsLineFeignClient() {
+
+
+            @Override
+            public HttpResult<List<CsLinePO>> queryLineById(List<String> ids) {
+                log.error("{}异常，降级处理，异常为：{}","查询监测点详情异常",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+        };
+    }
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/DevModelFeignClientFallbackFactory.java

@@ -0,0 +1,55 @@
+package com.njcn.csdevice.api.fallback;
+
+import com.njcn.csdevice.api.DevModelFeignClient;
+import com.njcn.csdevice.pojo.param.CsDevModelAddParm;
+import com.njcn.csdevice.pojo.param.CsDevModelQueryListParm;
+import com.njcn.csdevice.pojo.po.CsDevModelPO;
+import com.njcn.csdevice.pojo.vo.CsDevModelPageVO;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.common.pojo.response.HttpResult;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+/**
+ * 类的介绍：
+ *
+ * @author xuyang
+ * @version 1.0.0
+ * @createTime 2023/4/10 20:09
+ */
+@Slf4j
+@Component
+public class DevModelFeignClientFallbackFactory implements FallbackFactory<DevModelFeignClient> {
+    @Override
+    public DevModelFeignClient create(Throwable cause) {
+        //判断抛出异常是否为解码器抛出的业务异常
+        Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
+        if (cause.getCause() instanceof BusinessException) {
+            BusinessException businessException = (BusinessException) cause.getCause();
+//            exceptionEnum = UserEnumUtil.getExceptionEnum(businessException.getResult());
+        }
+        Enum<?> finalExceptionEnum = exceptionEnum;
+        return new DevModelFeignClient() {
+
+            @Override
+            public HttpResult<CsDevModelPO> addDevModel(CsDevModelAddParm csDevModelAddParm) {
+                log.error("{}异常，降级处理，异常为：{}","新增装置模板版本信息",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
+            @Override
+            public HttpResult<CsDevModelPageVO> queryDevModelOne(CsDevModelQueryListParm csDevModelQueryListParm) {
+                log.error("{}异常，降级处理，异常为：{}","查询模板版本信息",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
+            @Override
+            public HttpResult<CsDevModelPO> findModel(String devType, String version, String time) {
+                log.error("{}异常，降级处理，异常为：{}","根据条件查询模板",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+        };
+    }
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/EquipmentFeignClientFallbackFactory.java

@@ -0,0 +1,51 @@
+package com.njcn.csdevice.api.fallback;
+
+import com.njcn.csdevice.api.EquipmentFeignClient;
+import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO;
+import com.njcn.csdevice.pojo.vo.CsEquipmentDeliveryVO;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.common.pojo.response.HttpResult;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @author xy
+ */
+@Slf4j
+@Component
+public class EquipmentFeignClientFallbackFactory implements FallbackFactory<EquipmentFeignClient> {
+    @Override
+    public EquipmentFeignClient create(Throwable cause) {
+        //判断抛出异常是否为解码器抛出的业务异常
+        Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
+        if (cause.getCause() instanceof BusinessException) {
+            BusinessException businessException = (BusinessException) cause.getCause();
+//            exceptionEnum = UserEnumUtil.getExceptionEnum(businessException.getResult());
+        }
+        Enum<?> finalExceptionEnum = exceptionEnum;
+        return new EquipmentFeignClient() {
+
+            @Override
+            public HttpResult<CsEquipmentDeliveryVO> queryEquipmentByndid(String ndid) {
+                log.error("{}异常，降级处理，异常为：{}","通过ndid查询出厂设备异常",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
+            @Override
+            public HttpResult<Boolean> updateStatusBynDid(String nDid, Integer status) {
+                log.error("{}异常，降级处理，异常为：{}","通过ndid修改装置的状态",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
+            @Override
+            public HttpResult<List<CsEquipmentDeliveryPO>> queryDeviceById(List<String> ids) {
+                log.error("{}异常，降级处理，异常为：{}","查询出厂设备详情",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+        };
+    }
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/constant/DataParam.java

@@ -0,0 +1,18 @@
+package com.njcn.csdevice.constant;
+
+
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * 常量类
+ * @author qijian
+ * @version 1.0.0
+ * @date 2022年11月11日 09:56
+ */
+public interface DataParam {
+    List<String> phases = Stream.of("A","B","C","T").collect(Collectors.toList());
+    List<String> statMethods = Stream.of("avg","max","min","cp95").collect(Collectors.toList());
+
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/enums/AlgorithmResponseEnum.java

@@ -0,0 +1,34 @@
+package com.njcn.csdevice.enums;
+
+import lombok.Getter;
+
+/**
+ * pqs
+ * Advacne枚举
+ * @author cdf
+ * @date 2021/6/21
+ */
+@Getter
+public enum AlgorithmResponseEnum {
+
+    /**
+     * A00500 ~ A01550 用于终端模块的枚举
+      */
+    PROJECT_COMMON_ERROR("A00500","同一用户下项目名不能相同"),
+    DICT_DATA_ERROR("A00501","暂无此字典表类型"),
+    NDID_ERROR("A00502","存在相同的ndid"),
+    DATA_ERROR("A00503","存在相同的数据"),
+    LINE_DATA_ERROR ("A00504","设备下监测点数据缺失"),
+
+    ;
+
+
+    private final String code;
+
+    private final String message;
+
+    AlgorithmResponseEnum(String code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/dto/CsDictDTO.java

@@ -0,0 +1,25 @@
+package com.njcn.csdevice.pojo.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 类的介绍：
+ *
+ * @author xuyang
+ * @version 1.0.0
+ * @createTime 2023/5/18 11:08
+ */
+@Data
+public class CsDictDTO implements Serializable {
+
+    private String id;
+
+    private String name;
+
+    private String fatherId;
+
+    private String fatherName;
+
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/AppLineTopologyDiagramAddParm.java

@@ -0,0 +1,35 @@
+package com.njcn.csdevice.pojo.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/3/27  10:18【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+
+
+@Data
+public class AppLineTopologyDiagramAddParm  {
+    /**
+     * 拓扑图Id
+     */
+    @ApiModelProperty(value="拓扑图Id")
+    @NotBlank(message="拓扑图Id不能为空！")
+    private String id;
+
+    /**
+     * 监测点ID
+     */
+    @ApiModelProperty(value="监测点ID")
+    @NotBlank(message="监测点ID不能为空！")
+    private String lineId;
+
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/AppLineTopologyDiagramAuditParm.java

@@ -0,0 +1,41 @@
+package com.njcn.csdevice.pojo.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/3/27  10:18【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+
+
+@Data
+public class AppLineTopologyDiagramAuditParm  {
+    /**
+     * 拓扑图Id
+     */
+    @ApiModelProperty(value="拓扑图Id")
+    @NotBlank(message="拓扑图Id不能为空！")
+    private String id;
+
+    /**
+     * 监测点ID
+     */
+    @ApiModelProperty(value="监测点ID")
+    @NotBlank(message="监测点ID不能为空！")
+    private String lineId;
+
+    /**
+     * 0：删除 1：正常
+     */
+    @ApiModelProperty(value="删除标志位")
+    private String status;
+
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/AppProjectAddParm.java

@@ -0,0 +1,56 @@
+package com.njcn.csdevice.pojo.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+
+/**
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2022/11/11  15:20【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Data
+public class AppProjectAddParm {
+
+
+    private String description;
+
+    @ApiModelProperty(value="项目名称")
+    @NotBlank(message="项目名称不能为空！")
+    private String name;
+
+    @NotBlank(message="工程id不能为空！")
+    private String engineeringId;
+
+
+    /**
+     * 地市Id
+     */
+    @ApiModelProperty(value="地市")
+    @NotBlank(message="地市不能为空！")
+    private String area;
+
+    /**
+     * 中心点经度
+     */
+    @ApiModelProperty(value="中心点经度")
+    private BigDecimal lng;
+
+    /**
+     * 中心点纬度
+     */
+    @ApiModelProperty(value="中心点纬度")
+    private BigDecimal lat;
+
+    @ApiModelProperty(value = "拓扑图文件")
+    @NotNull(message="拓扑图文件不能为空！")
+    private MultipartFile[] files;
+
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/AppProjectAuditParm.java

@@ -0,0 +1,38 @@
+package com.njcn.csdevice.pojo.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2022/11/11  15:20【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Data
+public class AppProjectAuditParm {
+
+    @NotNull(message="项目id不能为空！")
+    private String id;
+
+    @ApiModelProperty(value="项目名称")
+    private String name;
+
+
+
+    /**
+     * 地市Id
+     */
+    @ApiModelProperty(value="地市")
+    private String area;
+
+    @ApiModelProperty(value="0：删除 1：正常")
+    private String status;
+
+    private String description;
+
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/AppProjectQueryParm.java

@@ -0,0 +1,47 @@
+package com.njcn.csdevice.pojo.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+
+/**
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2022/11/11  15:20【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Data
+public class AppProjectQueryParm {
+
+    @NotNull(message="当前页不能为空！")
+    @Min(value = 1, message = "当前页不能为0")
+    @ApiModelProperty(value = "当前页",name = "currentPage",dataType ="Integer",required = true)
+    private Integer currentPage;
+    /**显示条数*/
+    @NotNull(message="显示条数不能为空！")
+    @ApiModelProperty(value = "显示条数",name = "pageSize",dataType ="Integer",required = true)
+    private Integer pageSize;
+
+    @ApiModelProperty(value="项目Id")
+    private String projectId;
+
+    @ApiModelProperty(value="工程id")
+    private String engineeringId;
+
+    @ApiModelProperty(value="起始时间")
+//    @NotNull(message="起始时间不能为空！")
+    private String startTime;
+
+    @ApiModelProperty(value="结束时间")
+//    @NotNull(message="结束时间不能为空！")
+    private String endTime;
+
+    @ApiModelProperty(value="模糊查询条件")
+    private String searchValue;
+
+
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/AppTopologyDiagramAddParm.java

@@ -0,0 +1,49 @@
+package com.njcn.csdevice.pojo.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/3/27  10:24【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+
+
+@Data
+public class AppTopologyDiagramAddParm  {
+
+
+    /**
+     * 拓扑图名称
+     */
+    @ApiModelProperty(value = "拓扑图名称")
+    @NotBlank(message="拓扑图名称不能为空！")
+    private String topologyDiagramName;
+
+    /**
+     * 项目Id
+     */
+    @ApiModelProperty(value = "项目Id")
+//    @NotBlank(message="项目Id不能为空！")
+    private String projectId;
+
+    /**
+     * 拓扑图文件
+     */
+    @ApiModelProperty(value = "拓扑图文件")
+    @NotNull(message="拓扑图文件不能为空！")
+    private MultipartFile file;
+
+
+
+
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/AppTopologyDiagramAuditParm.java

@@ -0,0 +1,48 @@
+package com.njcn.csdevice.pojo.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/3/27  10:24【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+
+@Data
+public class AppTopologyDiagramAuditParm {
+    @ApiModelProperty(value = "拓扑图id")
+    @NotBlank(message="拓扑图id不能为空！")
+    private String id;
+    /**
+     * 拓扑图名称
+     */
+    @ApiModelProperty(value = "拓扑图名称")
+    private String topologyDiagramName;
+
+    /**
+     * 项目Id
+     */
+    @ApiModelProperty(value = "项目Id")
+    private String projectId;
+
+    /**
+     * 拓扑图文件
+     */
+    @ApiModelProperty(value = "拓扑图文件")
+    private MultipartFile file;
+
+    @ApiModelProperty(value="0：删除 1：正常")
+    private String status;
+
+
+
+
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/AppTopologyDiagramQueryPageParm.java

@@ -0,0 +1,37 @@
+package com.njcn.csdevice.pojo.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+
+/**
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2022/11/11  15:20【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Data
+public class AppTopologyDiagramQueryPageParm {
+
+    @NotNull(message="当前页不能为空！")
+    @Min(value = 1, message = "当前页不能为0")
+    @ApiModelProperty(value = "当前页",name = "currentPage",dataType ="Integer",required = true)
+    private Integer currentPage;
+    /**显示条数*/
+    @NotNull(message="显示条数不能为空！")
+    @ApiModelProperty(value = "显示条数",name = "pageSize",dataType ="Integer",required = true)
+    private Integer pageSize;
+
+
+    @ApiModelProperty(value="拓扑图名称")
+    private String searchValue;
+
+
+    @ApiModelProperty(value="项目Id")
+    private String projectId;
+
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/AppTopologyDiagramQueryParm.java

@@ -0,0 +1,29 @@
+package com.njcn.csdevice.pojo.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2022/11/11  15:20【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Data
+public class AppTopologyDiagramQueryParm {
+
+
+
+    @ApiModelProperty(value="拓扑图Id")
+    private String id;
+
+    @ApiModelProperty(value="拓扑图名称")
+    private String name;
+
+
+    @ApiModelProperty(value="项目Id")
+    private String projectId;
+
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsDataEffectiveAddParm.java

@@ -0,0 +1,57 @@
+package com.njcn.csdevice.pojo.param;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.NotBlank;
+import java.util.Date;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/4/18  9:49【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+
+
+@ApiModel(value="装置数据有效性新增model")
+@Data
+public class CsDataEffectiveAddParm  {
+    /**
+     * 项目id
+     */
+    @ApiModelProperty(value="项目id")
+    @NotBlank(message="项目id不能为空！")
+    private String projectId;
+
+    /**
+     * 设备id
+     */
+    @ApiModelProperty(value="设备id")
+    @NotBlank(message="设备id不能为空！")
+    private String devId;
+
+    /**
+     * 注册时间
+     */
+    @ApiModelProperty(value="注册时间")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date registerTime;
+
+    /**
+     * 退役时间
+     */
+    @ApiModelProperty(value="退役时间")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date retireeTime;
+
+ 
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsDataEffectiveAuditParm.java

@@ -0,0 +1,62 @@
+package com.njcn.csdevice.pojo.param;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.NotBlank;
+import java.util.Date;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/4/18  9:49【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+
+
+@ApiModel(value="装置数据有效性修改model")
+@Data
+public class CsDataEffectiveAuditParm {
+
+
+    @ApiModelProperty(value = "id")
+    @NotBlank(message="id不能为空！")
+    private String id;
+    /**
+     * 项目id
+     */
+    @ApiModelProperty(value="项目id")
+    @NotBlank(message="项目id不能为空！")
+    private String projectId;
+
+    /**
+     * 设备id
+     */
+    @ApiModelProperty(value="设备id")
+    @NotBlank(message="设备id不能为空！")
+    private String devId;
+
+    /**
+     * 注册时间
+     */
+    @ApiModelProperty(value="注册时间")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date registerTime;
+
+    /**
+     * 退役时间
+     */
+    @ApiModelProperty(value="退役时间")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date retireeTime;
+
+ 
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsDataEffectiveQueryParm.java

@@ -0,0 +1,39 @@
+package com.njcn.csdevice.pojo.param;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/4/18  9:49【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+
+
+@ApiModel(value="装置数据查询有效性model")
+@Data
+public class CsDataEffectiveQueryParm {
+
+    @ApiModelProperty(value = "id")
+    private String id;
+    /**
+     * 项目id
+     */
+    @ApiModelProperty(value="项目id")
+    private String projectId;
+
+    /**
+     * 设备id
+     */
+    @ApiModelProperty(value="设备id")
+    private String devId;
+
+
+
+ 
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsDevModelAddParm.java

@@ -0,0 +1,56 @@
+package com.njcn.csdevice.pojo.param;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/4/10  11:28【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+
+
+@Data
+public class CsDevModelAddParm  {
+
+    /**
+     * 装置型号(字典数据)
+     */
+    @ApiModelProperty(value = "装置型号")
+    private String devType;
+
+
+    @ApiModelProperty(value = "模板名称")
+    private String name;
+
+    /**
+     * 版本号
+     */
+    @ApiModelProperty(value = "版本号")
+    private String versionNo;
+
+    /**
+     * 版本日期
+     */
+    @ApiModelProperty(value = "版本日期")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private LocalDateTime versionDate;
+
+    /**
+     * 装置模板文件路径
+     */
+    @ApiModelProperty(value = "装置模板文件路径")
+    private String filePath;
+
+    @ApiModelProperty(value = "系统软件表Id")
+    private String softInfoId;
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsDevModelAuditParm.java

@@ -0,0 +1,59 @@
+package com.njcn.csdevice.pojo.param;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/4/10  11:28【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+
+
+@Data
+public class CsDevModelAuditParm {
+    @NotNull(message="版本id不能为空！")
+    private String id;
+    /**
+     * 装置型号(字典数据)
+     */
+    @ApiModelProperty(value = "装置型号")
+    private String devType;
+    @ApiModelProperty(value = "模板名称")
+    private String name;
+    /**
+     * 版本号
+     */
+    @ApiModelProperty(value = "版本号")
+    private String versionNo;
+
+    /**
+     * 版本日期
+     */
+    @ApiModelProperty(value = "版本日期")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date versionDate;
+
+    /**
+     * 装置模板文件路径
+     */
+    @ApiModelProperty(value = "装置模板文件路径")
+    private String filePath;
+
+
+    @ApiModelProperty(value = "状态")
+    private String status;
+
+
+
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsDevModelQueryListParm.java

@@ -0,0 +1,57 @@
+package com.njcn.csdevice.pojo.param;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/4/7  11:29【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+
+
+@Data
+public class CsDevModelQueryListParm {
+
+
+    /**
+     * 装置型号(字典数据)
+     */
+    @ApiModelProperty(value = "装置模板型号")
+    private String devType;
+
+    @ApiModelProperty(value = "装置模板型号名称")
+    private String devName;
+    @ApiModelProperty(value = "模板名称")
+    private String name;
+
+    @ApiModelProperty(value = "版本号")
+    private String versionNo;
+//    /**
+//     * 版本日期
+//     */
+//    @ApiModelProperty(value = "版本日期")
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+//    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+//    private String versionStartDate;
+//
+//    @ApiModelProperty(value = "版本日期")
+//    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+//    private String versionEndDate;
+
+    @ApiModelProperty(value = "版本准确日期")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private String versionDate;
+
+
+
+
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsDevModelQueryParm.java

@@ -0,0 +1,59 @@
+package com.njcn.csdevice.pojo.param;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/4/7  11:29【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+
+
+@Data
+public class CsDevModelQueryParm {
+
+    @NotNull(message="当前页不能为空！")
+    @Min(value = 1, message = "当前页不能为0")
+    @ApiModelProperty(value = "当前页",name = "currentPage",dataType ="Integer",required = true)
+    private Integer currentPage;
+    /**显示条数*/
+    @NotNull(message="显示条数不能为空！")
+    @ApiModelProperty(value = "显示条数",name = "pageSize",dataType ="Integer",required = true)
+    private Integer pageSize;
+    /**
+     * 装置型号(字典数据)
+     */
+    @ApiModelProperty(value = "装置模板型号")
+    private String devType;
+    @ApiModelProperty(value = "装置模板型号名称")
+    private String devName;
+    @ApiModelProperty(value = "模板名称")
+    private String name;
+
+    /**
+     * 版本日期
+     */
+    @ApiModelProperty(value = "版本日期")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private String versionStartDate;
+
+    @ApiModelProperty(value = "版本日期")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private String versionEndDate;
+
+
+
+
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsDevModelRelationAddParm.java

@@ -0,0 +1,32 @@
+package com.njcn.csdevice.pojo.param;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/4/18  13:49【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@ApiModel(value="装置与模板表新增Model")
+@Data
+public class CsDevModelRelationAddParm  {
+
+
+    @ApiModelProperty(value="装置 id")
+    @NotNull(message="装置 id不能为空！")
+    private String devId;
+
+    @ApiModelProperty(value="模板 id")
+    @NotNull(message="模板 id不能为空！")
+    private String modelId;
+    
+
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsDevModelRelationAuidtParm.java

@@ -0,0 +1,32 @@
+package com.njcn.csdevice.pojo.param;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/4/18  13:49【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@ApiModel(value="装置与模板表修改Model")
+@Data
+public class CsDevModelRelationAuidtParm {
+    @NotBlank(message="id不能为空！")
+    @ApiModelProperty(value="id")
+    private String id;
+    @NotBlank(message="装置id不能为空！")
+    private String devId;
+
+    @ApiModelProperty(value="模板 id")
+    private String modelId;
+
+    @ApiModelProperty(value="状态(0：删除 1：正常)")
+    private String status;
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsDevModelRelationQueryParm.java

@@ -0,0 +1,28 @@
+package com.njcn.csdevice.pojo.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/4/18  13:49【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Data
+public class CsDevModelRelationQueryParm {
+
+    @ApiModelProperty(value="id")
+    private String id;
+    @ApiModelProperty(value="装置 id")
+    private String devId;
+
+    @ApiModelProperty(value="模板 id")
+    private String modelId;
+
+    @ApiModelProperty(value="状态(0：删除 1：正常)")
+    private String status;
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEdDataAddParm.java

@@ -0,0 +1,78 @@
+package com.njcn.csdevice.pojo.param;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/4/7  11:29【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+
+
+@Data
+public class CsEdDataAddParm  {
+
+
+    /**
+     * 装置型号(字典数据)
+     */
+    @ApiModelProperty(value = "装置型号")
+    @NotBlank(message="装置型号不能为空！")
+    private String devType;
+    @ApiModelProperty(value = "装置类型")
+    private String type;
+    /**
+     * 版本号
+     */
+    @ApiModelProperty(value = "版本号")
+    @NotBlank(message="版本号不能为空！")
+    private String versionNo;
+
+    /**
+     * 版本协议
+     */
+    @ApiModelProperty(value = "版本协议")
+    @NotBlank(message="版本协议不能为空！")
+    private String versionAgreement;
+
+    /**
+     * 版本日期
+     */
+    @ApiModelProperty(value = "版本日期")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date versionDate;
+
+    /**
+     * 描述
+     */
+    @ApiModelProperty(value = "描述")
+    private String description;
+
+    /**
+     * 版本类型
+     */
+    @ApiModelProperty(value = "版本类型")
+    @NotBlank(message="版本类型不能为空！")
+    private String versionType;
+
+    @ApiModelProperty(value = "crc信息")
+    private String crcInfo;
+
+    @ApiModelProperty(value = ".bin文件")
+    @NotNull(message="文件不能为空！")
+    private MultipartFile file;
+
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEdDataAuditParm.java

@@ -0,0 +1,74 @@
+package com.njcn.csdevice.pojo.param;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/4/7  11:29【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+
+
+@Data
+public class CsEdDataAuditParm {
+
+    @NotNull(message="版本id不能为空！")
+    private String id;
+    /**
+     * 装置型号(字典数据)
+     */
+    @ApiModelProperty(value = "装置型号")
+    private String devType;
+    @ApiModelProperty(value = "装置类型")
+    private String type;
+    /**
+     * 版本号
+     */
+    @ApiModelProperty(value = "版本号")
+    private String versionNo;
+
+    /**
+     * 版本协议
+     */
+    @ApiModelProperty(value = "版本协议")
+    private String versionAgreement;
+
+    /**
+     * 版本日期
+     */
+    @ApiModelProperty(value = "版本日期")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date versionDate;
+
+    /**
+     * 描述
+     */
+    @ApiModelProperty(value = "描述")
+    private String description;
+
+    /**
+     * 版本类型
+     */
+    @ApiModelProperty(value = "版本类型")
+    private String versionType;
+
+    @ApiModelProperty(value = "crc信息")
+    private String crcInfo;
+    @ApiModelProperty(value="0：删除 1：正常")
+    private String status;
+    @ApiModelProperty(value = ".bin文件")
+    private MultipartFile file;
+
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEdDataQueryParm.java

@@ -0,0 +1,58 @@
+package com.njcn.csdevice.pojo.param;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/4/7  11:29【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+
+
+@Data
+public class CsEdDataQueryParm {
+
+    @NotNull(message="当前页不能为空！")
+    @Min(value = 1, message = "当前页不能为0")
+    @ApiModelProperty(value = "当前页",name = "currentPage",dataType ="Integer",required = true)
+    private Integer currentPage;
+    /**显示条数*/
+    @NotNull(message="显示条数不能为空！")
+    @ApiModelProperty(value = "显示条数",name = "pageSize",dataType ="Integer",required = true)
+    private Integer pageSize;
+    /**
+     * 装置型号(字典数据)
+     */
+    @ApiModelProperty(value = "装置型号")
+    private String devType;
+    @ApiModelProperty(value = "装置名称")
+    private String devName;
+
+
+    /**
+     * 版本日期
+     */
+    @ApiModelProperty(value = "版本日期")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private String versionStartDate;
+
+    @ApiModelProperty(value = "版本日期")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private String versionendDate;
+
+
+
+
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEngineeringAddParm.java

@@ -0,0 +1,58 @@
+package com.njcn.csdevice.pojo.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/4/7  11:04【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+
+
+@Data
+public class CsEngineeringAddParm  {
+
+    /**
+     * 工程名称
+     */
+    @ApiModelProperty(value = "工程名称")
+    @NotBlank(message="工程名称不能为空！")
+    private String name;
+
+    /**
+     * 用户id
+     */
+    @ApiModelProperty(value = "用户id")
+    @NotBlank(message="用户id不能为空！")
+    private String userId;
+
+    /**
+     * 省
+     */
+    @ApiModelProperty(value = "省")
+    @NotBlank(message="省不能为空！")
+    private String province;
+
+    /**
+     * 市
+     */
+    @ApiModelProperty(value = "市")
+    @NotBlank(message="市不能为空！")
+    private String city;
+
+    /**
+     * 描述
+     */
+    @ApiModelProperty(value = "描述")
+    private String description;
+
+
+
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEngineeringAuditParm.java

@@ -0,0 +1,59 @@
+package com.njcn.csdevice.pojo.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/4/7  11:04【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+
+
+@Data
+public class CsEngineeringAuditParm {
+
+    @NotNull(message="版本id不能为空！")
+    private String id;
+    /**
+     * 工程名称
+     */
+    @ApiModelProperty(value = "工程名称")
+    private String name;
+
+    /**
+     * 用户id
+     */
+    @ApiModelProperty(value = "用户id")
+    private String userId;
+
+    /**
+     * 省
+     */
+    @ApiModelProperty(value = "省")
+    private String province;
+
+    /**
+     * 市
+     */
+    @ApiModelProperty(value = "市")
+    private String city;
+
+    /**
+     * 描述
+     */
+    @ApiModelProperty(value = "描述")
+    private String description;
+
+    @ApiModelProperty(value="0：删除 1：正常")
+    private String status;
+
+
+
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEngineeringQueryPageParm.java

@@ -0,0 +1,49 @@
+package com.njcn.csdevice.pojo.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+
+/**
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/4/10  19:47【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Data
+public class CsEngineeringQueryPageParm {
+
+    @NotNull(message="当前页不能为空！")
+    @Min(value = 1, message = "当前页不能为0")
+    @ApiModelProperty(value = "当前页",name = "currentPage",dataType ="Integer",required = true)
+    private Integer currentPage;
+    /**显示条数*/
+    @NotNull(message="显示条数不能为空！")
+    @ApiModelProperty(value = "显示条数",name = "pageSize",dataType ="Integer",required = true)
+    private Integer pageSize;
+    @ApiModelProperty(value = "工程名称")
+    private String name;
+
+    /**
+     * 用户id
+     */
+    @ApiModelProperty(value = "用户id")
+    private String userId;
+
+    /**
+     * 省
+     */
+    @ApiModelProperty(value = "省")
+    private String province;
+
+    /**
+     * 市
+     */
+    @ApiModelProperty(value = "市")
+    private String city;
+
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEngineeringQueryParm.java

@@ -0,0 +1,38 @@
+package com.njcn.csdevice.pojo.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/4/10  19:47【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Data
+public class CsEngineeringQueryParm {
+
+    @ApiModelProperty(value = "工程名称")
+    private String name;
+
+    /**
+     * 用户id
+     */
+    @ApiModelProperty(value = "用户id")
+    private String userId;
+
+    /**
+     * 省
+     */
+    @ApiModelProperty(value = "省")
+    private String province;
+
+    /**
+     * 市
+     */
+    @ApiModelProperty(value = "市")
+    private String city;
+
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEquipmentAlarmAddParm.java

@@ -0,0 +1,69 @@
+package com.njcn.csdevice.pojo.param;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.time.LocalDateTime;
+
+/**
+ * Description:
+ * Date: 2023/5/16  16:25【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Data
+public class CsEquipmentAlarmAddParm  {
+
+
+    /**
+     * 项目Id
+     */
+    @ApiModelProperty(value = "项目Id")
+    @NotBlank(message="项目Id不能为空！")
+    private String projectId;
+
+    /**
+     * 设备id
+     */
+    @ApiModelProperty(value = "设备id")
+    @NotBlank(message="设备id不能为空！")
+    private String equipmentId;
+
+    /**
+     * 告警信息
+     */
+    @ApiModelProperty(value = "告警信息")
+    private String alarmMsg;
+
+    /**
+     * 告警级别(字典表)
+     */
+    @ApiModelProperty(value = "告警级别")
+    @NotBlank(message="告警级别不能为空！")
+    private String alarmLevel;
+
+    /**
+     * 开始时间
+     */
+    @ApiModelProperty(value = "开始时间")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @NotNull(message="开始时间不能为空！")
+    private LocalDateTime startTime;
+
+    /**
+     * 结束时间
+     */
+    @ApiModelProperty(value = "结束时间")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @NotNull(message="结束时间不能为空！")
+    private LocalDateTime endTime;
+
+
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEquipmentAlarmPageParm.java

@@ -0,0 +1,66 @@
+package com.njcn.csdevice.pojo.param;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+import java.time.LocalDateTime;
+
+/**
+ * Description:
+ * Date: 2023/5/16  16:25【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Data
+public class CsEquipmentAlarmPageParm {
+    @NotNull(message="当前页不能为空！")
+    @Min(value = 1, message = "当前页不能为0")
+    @ApiModelProperty(value = "当前页",name = "currentPage",dataType ="Integer",required = true)
+    private Integer currentPage;
+    /**显示条数*/
+    @NotNull(message="显示条数不能为空！")
+    @ApiModelProperty(value = "显示条数",name = "pageSize",dataType ="Integer",required = true)
+    private Integer pageSize;
+
+    /**
+     * 项目Id
+     */
+    @ApiModelProperty(value = "项目Id")
+    private String projectId;
+
+    /**
+     * 设备id
+     */
+    @ApiModelProperty(value = "设备id")
+    private String equipmentId;
+
+
+    /**
+     * 告警级别(字典表)
+     */
+    @ApiModelProperty(value = "告警级别")
+    private String alarmLevel;
+
+    /**
+     * 开始时间
+     */
+    @ApiModelProperty(value = "开始时间")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private LocalDateTime startTime;
+
+    /**
+     * 结束时间
+     */
+    @ApiModelProperty(value = "结束时间")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private LocalDateTime endTime;
+
+
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEquipmentDeliveryAddParm.java

@@ -0,0 +1,119 @@
+package com.njcn.csdevice.pojo.param;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/3/30  16:23【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+
+@Data
+public class CsEquipmentDeliveryAddParm{
+
+
+    /**
+     * 装置名称
+     */
+    @ApiModelProperty(value="装置名称")
+    @NotBlank(message="装置名称不能为空！")
+    private String name;
+
+    /**
+     * 网关识别码
+     */
+    @ApiModelProperty(value="网关识别码")
+    @NotBlank(message="网关识别码不能为空！")
+    private String ndid;
+
+    /**
+     * 装置mac地址
+     */
+    @ApiModelProperty(value="装置mac地址")
+    @NotBlank(message="装置mac地址不能为空！")
+    private String mac;
+
+    /**
+     * 装置用途(治理、监测...)
+     */
+    @ApiModelProperty(value="装置用途")
+    @NotBlank(message="装置用途不能为空！")
+    private String devUse;
+
+//    /**
+//     * 装置类型(直连设备、网关设备)
+//     */
+//    @ApiModelProperty(value="装置类型")
+//    @NotBlank(message="装置类型不能为空！")
+//    private String devType;
+
+    /**
+     * 装置型号（pqs588、pqs680...）
+     */
+    @ApiModelProperty(value="装置型号")
+    @NotBlank(message="装置型号不能为空！")
+    private String devModel;
+
+    /**
+     * 装置程序版本
+     */
+    @ApiModelProperty(value="装置程序版本")
+    @NotBlank(message="装置程序版本不能为空！")
+    private String programVersion;
+
+    /**
+     * 调试人员
+     */
+    @ApiModelProperty(value="调试人员")
+    @NotBlank(message="调试人员不能为空！")
+    private String debugPerson;
+
+    /**
+     * 出厂日期
+     */
+    @ApiModelProperty(value="出厂日期")
+    @NotNull(message="出厂日期不能为空！")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date producteTime;
+
+    /**
+     * 检修日期
+     */
+    @ApiModelProperty(value="检修日期")
+    @NotNull(message="检修日期不能为空！")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date checkTime;
+
+    /**
+     * 调试日期
+     */
+    @ApiModelProperty(value="调试日期")
+    @NotNull(message="调试日期不能为空！")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date debugTime;
+
+    /**
+     * 合同号
+     */
+    @ApiModelProperty(value="合同号")
+    private String cntractNo;
+
+    /**
+     * 营销经理
+     */
+    @ApiModelProperty(value="营销经理")
+    private String salesManager;
+
+
+
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEquipmentDeliveryAuditParm.java

@@ -0,0 +1,111 @@
+package com.njcn.csdevice.pojo.param;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.util.Date;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/3/30  16:23【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+
+@Data
+public class CsEquipmentDeliveryAuditParm {
+
+    @ApiModelProperty(value = "id")
+    @NotBlank(message="id不能为空！")
+    private String id;
+    /**
+     * 装置名称
+     */
+    @ApiModelProperty(value="装置名称")
+    private String name;
+
+    /**
+     * 网关识别码
+     */
+    @ApiModelProperty(value="网关识别码")
+    private String ndid;
+
+    /**
+     * 装置mac地址
+     */
+    @ApiModelProperty(value="装置mac地址")
+    private String mac;
+
+    /**
+     * 装置用途(治理、监测...)
+     */
+    @ApiModelProperty(value="装置用途")
+    private String devUse;
+
+//    /**
+//     * 装置类型(直连设备、网关设备)
+//     */
+//    @ApiModelProperty(value="装置类型")
+//    private String devType;
+
+    /**
+     * 装置型号（pqs588、pqs680...）
+     */
+    @ApiModelProperty(value="装置型号")
+    private String devModel;
+
+    /**
+     * 装置程序版本
+     */
+    @ApiModelProperty(value="装置程序版本")
+    private String programVersion;
+
+    /**
+     * 调试人员
+     */
+    @ApiModelProperty(value="调试人员")
+    private String debugPerson;
+
+    /**
+     * 出厂日期
+     */
+    @ApiModelProperty(value="出厂日期")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date producteTime;
+
+    /**
+     * 检修日期
+     */
+    @ApiModelProperty(value="检修日期")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date checkTime;
+
+    /**
+     * 调试日期
+     */
+    @ApiModelProperty(value="调试日期")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date debugTime;
+
+    /**
+     * 合同号
+     */
+    @ApiModelProperty(value="合同号")
+    private String cntractNo;
+
+    /**
+     * 营销经理
+     */
+    @ApiModelProperty(value="营销经理")
+    private String salesManager;
+
+    @TableField(value = "status")
+    private String status;
+
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEquipmentDeliveryQueryParm.java

@@ -0,0 +1,106 @@
+package com.njcn.csdevice.pojo.param;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/3/30  16:23【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+
+@Data
+public class CsEquipmentDeliveryQueryParm {
+
+
+    /**
+     * 装置名称
+     */
+    @ApiModelProperty(value="装置名称")
+    private String name;
+
+    /**
+     * 网关识别码
+     */
+    @ApiModelProperty(value="网关识别码")
+    private String ndid;
+
+    /**
+     * 装置mac地址
+     */
+    @ApiModelProperty(value="装置mac地址")
+    private String mac;
+
+    /**
+     * 装置用途(治理、监测...)
+     */
+    @ApiModelProperty(value="装置用途")
+    private String devUse;
+
+//    /**
+//     * 装置类型(直连设备、网关设备)
+//     */
+//    @ApiModelProperty(value="装置类型")
+//    private String devType;
+
+    /**
+     * 装置型号（pqs588、pqs680...）
+     */
+    @ApiModelProperty(value="装置型号")
+    private String devModel;
+
+    /**
+     * 装置程序版本
+     */
+    @ApiModelProperty(value="装置程序版本")
+    private String programVersion;
+
+    /**
+     * 调试人员
+     */
+    @ApiModelProperty(value="调试人员")
+    private String debugPerson;
+
+    /**
+     * 出厂日期
+     */
+    @ApiModelProperty(value="出厂日期")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date producteTime;
+
+    /**
+     * 检修日期
+     */
+    @ApiModelProperty(value="检修日期")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date checkTime;
+
+    /**
+     * 调试日期
+     */
+    @ApiModelProperty(value="调试日期")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date debugTime;
+
+    /**
+     * 合同号
+     */
+    @ApiModelProperty(value="合同号")
+    private String cntractNo;
+
+    /**
+     * 营销经理
+     */
+    @ApiModelProperty(value="营销经理")
+    private String salesManager;
+
+
+
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEquipmentTransferAddParm.java

@@ -0,0 +1,46 @@
+package com.njcn.csdevice.pojo.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 
+ * Description:
+ * Date: 2023/5/17  15:40【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Data
+public class CsEquipmentTransferAddParm  {
+
+
+
+    @ApiModelProperty(value = "项目Id")
+    private String projectId;
+
+
+
+    @ApiModelProperty(value = "移交/恢复设备id集用，分割")
+    private String equipmentIds;
+
+    @ApiModelProperty(value = "发起人")
+    private String promoter;
+
+
+    @ApiModelProperty(value = "移交人")
+    private String transferor;
+
+    /**
+     * 事件类型（权限转移，数据恢复）
+     */
+    @ApiModelProperty(value = "事件类型")
+    private String eventType;
+
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+
+    
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/ProjectEquipmentQueryParm.java

@@ -0,0 +1,34 @@
+package com.njcn.csdevice.pojo.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+
+/**
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/4/3  11:06【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Data
+public class ProjectEquipmentQueryParm {
+
+    @NotNull(message="当前页不能为空！")
+    @Min(value = 1, message = "当前页不能为0")
+    @ApiModelProperty(value = "当前页",name = "currentPage",dataType ="Integer",required = true)
+    private Integer currentPage;
+    /**显示条数*/
+    @NotNull(message="显示条数不能为空！")
+    @ApiModelProperty(value = "显示条数",name = "pageSize",dataType ="Integer",required = true)
+    private Integer pageSize;
+
+    @ApiModelProperty(value="项目")
+    private String projectId;
+
+    @ApiModelProperty(value="项目类别")
+    private String projectType;
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/AppLineTopologyDiagramPO.java

@@ -0,0 +1,44 @@
+package com.njcn.csdevice.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.db.bo.BaseEntity;
+import lombok.Data;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/3/27  10:18【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+/**
+    * 项目拓扑图关系表
+    */
+@Data
+@TableName(value = "cs_line_topology_diagram")
+public class AppLineTopologyDiagramPO  extends BaseEntity {
+    /**
+     * 拓扑图Id
+     */
+    @TableId(value = "id", type = IdType.ASSIGN_UUID)
+    private String id;
+
+    /**
+     * 监测点ID
+     */
+    @TableField(value = "line_id")
+    private String lineId;
+
+    /**
+     * 0：删除 1：正常
+     */
+    @TableField(value = "status")
+    private String status;
+
+
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/AppProjectPO.java

@@ -0,0 +1,61 @@
+package com.njcn.csdevice.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.db.bo.BaseEntity;
+import lombok.Data;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/3/27  10:24【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+/**
+    * 项目表
+    */
+@Data
+@TableName(value = "cs_project")
+public class AppProjectPO  extends BaseEntity {
+    /**
+     * 项目Id
+     */
+    @TableId(value = "id", type = IdType.ASSIGN_UUID)
+    private String id;
+
+
+    /**
+     * 项目名称
+     */
+    @TableField(value = "name")
+    private String name;
+
+    @TableField(value = "engineering_id")
+    private String engineeringId;
+
+
+
+    /**
+     * 地市Id
+     */
+    @TableField(value = "area")
+    private String area;
+
+
+
+    /**
+     * 0：删除 1：正常
+     */
+    @TableField(value = "status")
+    private String status;
+
+    @TableField(value = "description")
+    private String description;
+
+
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/AppTopologyDiagramPO.java

@@ -0,0 +1,57 @@
+package com.njcn.csdevice.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.db.bo.BaseEntity;
+import lombok.Data;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/3/27  10:24【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+/**
+    * 项目拓扑图关系表
+    */
+@Data
+@TableName(value = "cs_topology_diagram")
+public class AppTopologyDiagramPO  extends BaseEntity {
+    /**
+     * 拓扑图Id
+     */
+    @TableId(value = "id", type = IdType.ASSIGN_UUID)
+    private String id;
+
+    /**
+     * 拓扑图名称
+     */
+    @TableField(value = "name")
+    private String name;
+
+
+    /**
+     * 项目Id
+     */
+    @TableField(value = "project_id")
+    private String projectId;
+
+    /**
+     * 拓扑图文件路径
+     */
+    @TableField(value = "file_path")
+    private String filePath;
+
+    /**
+     * 0：删除 1：正常
+     */
+    @TableField(value = "status")
+    private String status;
+
+
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsDataEffectivePO.java

@@ -0,0 +1,62 @@
+package com.njcn.csdevice.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.njcn.db.bo.BaseEntity;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/4/18  9:49【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+/**
+    * 装置数据有效性表
+    */
+@Data
+@TableName(value = "cs_data_effective")
+public class CsDataEffectivePO  extends BaseEntity {
+
+    @TableId(value = "id", type = IdType.ASSIGN_UUID)
+    private String id;
+
+    /**
+     * 项目id
+     */
+    @TableField(value = "project_id")
+    private String projectId;
+
+    /**
+     * 设备id
+     */
+    @TableField(value = "dev_id")
+    private String devId;
+
+    /**
+     * 注册时间
+     */
+    @TableField(value = "register_time")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date registerTime;
+
+    /**
+     * 退役时间
+     */
+    @TableField(value = "retiree_time")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date retireeTime;
+
+
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsDevModelPO.java

@@ -0,0 +1,72 @@
+package com.njcn.csdevice.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.db.bo.BaseEntity;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/4/10  11:28【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+/**
+    * 装置数据模板表
+    */
+@Data
+@TableName(value = "cs_dev_model")
+public class CsDevModelPO extends BaseEntity {
+    /**
+     * id
+     */
+    @TableId(value = "id",type = IdType.ASSIGN_UUID)
+    private String id;
+
+    /**
+     * 装置型号(字典数据)
+     */
+    @TableField(value = "dev_type")
+    private String devType;
+
+    /**
+     * 模板名称
+     */
+    @TableField(value = "name")
+    private String name;
+
+    /**
+     * 版本号
+     */
+    @TableField(value = "version_no")
+    private String versionNo;
+
+    /**
+     * 版本日期
+     */
+    @TableField(value = "version_date")
+    private LocalDateTime versionDate;
+
+    /**
+     * 装置模板文件路径
+     */
+    @TableField(value = "file_path")
+    private String filePath;
+
+
+    /**
+     * 状态(0：删除 1：正常)
+     */
+    @TableField(value = "status")
+    private String status;
+
+    @TableField(value = "soft_info_id")
+    private String softInfoId;
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsDevModelRelationPO.java

@@ -0,0 +1,41 @@
+package com.njcn.csdevice.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.db.bo.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/4/18  13:49【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Data
+@TableName(value = "cs_dev_model_relation")
+public class CsDevModelRelationPO  extends BaseEntity {
+    /**
+     * id
+     */
+    @TableId(value = "id",type = IdType.ASSIGN_UUID)
+    private String id;
+
+    @TableField(value = "dev_id")
+    private String devId;
+
+    @TableField(value = "model_id")
+    private String modelId;
+
+    /**
+     * 状态(0：删除 1：正常)
+     */
+    @TableField(value = "status")
+    @ApiModelProperty(value="状态(0：删除 1：正常)")
+    private String status;
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsDictPO.java

@@ -0,0 +1,60 @@
+package com.njcn.csdevice.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.db.bo.BaseEntity;
+import lombok.Data;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/4/3  14:53【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+/**
+    * 数据字典表
+    */
+@Data
+@TableName(value = "cs_dict")
+public class CsDictPO extends BaseEntity {
+    /**
+     * id
+     */
+    @TableId(value = "id")
+    private String id;
+
+    /**
+     * 父id
+     */
+    @TableField(value = "pid")
+    private String pid;
+
+    /**
+     * 名称
+     */
+    @TableField(value = "name")
+    private String name;
+
+    /**
+     * 别名
+     */
+    @TableField(value = "another_name")
+    private String anotherName;
+
+    /**
+     * 状态(0：删除 1：正常)
+     */
+    @TableField(value = "state")
+    private String state;
+
+    /**
+     * 排序
+     */
+    @TableField(value = "sort")
+    private Integer sort;
+
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsEdDataPO.java

@@ -0,0 +1,89 @@
+package com.njcn.csdevice.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.db.bo.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/4/7  11:29【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+
+/**
+ * 程序版本表
+ */
+@Data
+@TableName(value = "cs_ed_data")
+@EqualsAndHashCode(callSuper = true)
+public class CsEdDataPO extends BaseEntity {
+    /**
+     * id
+     */
+    @TableId(value = "id")
+    private String id;
+
+    /**
+     * 装置型号(字典数据)
+     */
+    @TableField(value = "dev_type")
+    private String devType;
+    /**
+     * 装置类型(直连设备、网关设备)
+     */
+    @TableField(value = "type")
+    private String type;
+    /**
+     * 版本号
+     */
+    @TableField(value = "version_no")
+    private String versionNo;
+
+    /**
+     * 版本协议
+     */
+    @TableField(value = "version_agreement")
+    private String versionAgreement;
+
+    /**
+     * 版本日期
+     */
+    @TableField(value = "version_date")
+    private Date versionDate;
+
+    /**
+     * 描述
+     */
+    @TableField(value = "description")
+    private String description;
+
+    /**
+     * 版本类型
+     */
+    @TableField(value = "version_type")
+    private String versionType;
+
+    /**
+     * 状态(0：删除 1：正常)
+     */
+    @TableField(value = "status")
+    private String status;
+
+    /**
+     * 程序版本文件路径
+     */
+    @TableField(value = "file_path")
+    private String filePath;
+
+
+
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsEngineeringPO.java

@@ -0,0 +1,68 @@
+package com.njcn.csdevice.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.db.bo.BaseEntity;
+import lombok.Data;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/4/7  11:04【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+/**
+    * 工程信息表
+    */
+@Data
+@TableName(value = "cs_engineering")
+public class CsEngineeringPO extends BaseEntity {
+    /**
+     * id
+     */
+    @TableId(value = "id", type = IdType.ASSIGN_UUID)
+    private String id;
+
+    /**
+     * 工程名称
+     */
+    @TableField(value = "name")
+    private String name;
+
+    /**
+     * 用户id
+     */
+    @TableField(value = "user_id")
+    private String userId;
+
+    /**
+     * 省
+     */
+    @TableField(value = "province")
+    private String province;
+
+    /**
+     * 市
+     */
+    @TableField(value = "city")
+    private String city;
+
+    /**
+     * 描述
+     */
+    @TableField(value = "description")
+    private String description;
+
+    /**
+     * 状态(0：删除 1：正常)
+     */
+    @TableField(value = "status")
+    private String status;
+
+
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsEquipmentAlarmPO.java

@@ -0,0 +1,97 @@
+package com.njcn.csdevice.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.db.bo.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * Description:
+ * Date: 2023/5/16  16:25【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Data
+@TableName(value = "cs_equipment_alarm")
+public class CsEquipmentAlarmPO extends BaseEntity {
+    /**
+     * id
+     */
+    @TableId(value = "id", type = IdType.ASSIGN_UUID)
+    @ApiModelProperty(value = "id")
+    private String id;
+
+    /**
+     * 项目Id
+     */
+    @TableField(value = "project_id")
+    private String projectId;
+
+    /**
+     * 设备id
+     */
+    @TableField(value = "equipment_id")
+    private String equipmentId;
+
+    /**
+     * 告警信息
+     */
+    @TableField(value = "alarm_msg")
+    private String alarmMsg;
+
+    /**
+     * 告警级别(字典表)
+     */
+    @TableField(value = "alarm_level")
+    private String alarmLevel;
+
+    /**
+     * 开始时间
+     */
+    @TableField(value = "start_time")
+    private LocalDateTime startTime;
+
+    /**
+     * 结束时间
+     */
+    @TableField(value = "end_time")
+    private LocalDateTime endTime;
+
+    /**
+     * 状态(0：删除 1：正常)
+     */
+    @TableField(value = "`status`")
+    private String status;
+
+
+
+    public static final String COL_ID = "id";
+
+    public static final String COL_PROJECT_ID = "project_id";
+
+    public static final String COL_EQUIPMENT_ID = "equipment_id";
+
+    public static final String COL_ALARM_MSG = "alarm_msg";
+
+    public static final String COL_ALARM_LEVEL = "alarm_level";
+
+    public static final String COL_START_TIME = "start_time";
+
+    public static final String COL_END_TIME = "end_time";
+
+    public static final String COL_STATUS = "status";
+
+    public static final String COL_CREATE_BY = "create_by";
+
+    public static final String COL_CREATE_TIME = "create_time";
+
+    public static final String COL_UPDATE_BY = "update_by";
+
+    public static final String COL_UPDATE_TIME = "update_time";
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsEquipmentDeliveryPO.java

@@ -0,0 +1,116 @@
+package com.njcn.csdevice.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.db.bo.BaseEntity;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/3/30  16:23【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+/**
+    * 设备出厂表
+    */
+@Data
+@TableName(value = "cs_equipment_delivery")
+public class CsEquipmentDeliveryPO extends BaseEntity {
+    /**
+     * id
+     */
+    @TableField(value = "id")
+    private String id;
+
+    /**
+     * 装置名称
+     */
+    @TableField(value = "name")
+    private String name;
+
+    /**
+     * 网关识别码
+     */
+    @TableField(value = "ndid")
+    private String ndid;
+
+    /**
+     * 装置mac地址
+     */
+    @TableField(value = "mac")
+    private String mac;
+
+    /**
+     * 装置用途(治理、监测...)
+     */
+    @TableField(value = "dev_use")
+    private String devUse;
+
+//    /**
+//     * 装置类型(直连设备、网关设备)
+//     */
+//    @TableField(value = "dev_type")
+//    private String devType;
+
+    /**
+     * 装置型号（pqs588、pqs680...）
+     */
+    @TableField(value = "dev_model")
+    private String devModel;
+
+    /**
+     * 装置程序版本
+     */
+    @TableField(value = "program_version")
+    private String programVersion;
+
+    /**
+     * 调试人员
+     */
+    @TableField(value = "debug_person")
+    private String debugPerson;
+
+    /**
+     * 出厂日期
+     */
+    @TableField(value = "producte_time")
+    private Date producteTime;
+
+    /**
+     * 检修日期
+     */
+    @TableField(value = "check_time")
+    private Date checkTime;
+
+    /**
+     * 调试日期
+     */
+    @TableField(value = "debug_time")
+    private Date debugTime;
+
+    /**
+     * 合同号
+     */
+    @TableField(value = "cntract_no")
+    private String cntractNo;
+
+    /**
+     * 营销经理
+     */
+    @TableField(value = "sales_manager")
+    private String salesManager;
+
+    /**
+     * 状态(0:删除 1:正常)
+     */
+    @TableField(value = "status")
+    private String status;
+
+
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsEquipmentTransferPO.java

@@ -0,0 +1,117 @@
+package com.njcn.csdevice.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 
+ * Description:
+ * Date: 2023/5/17  15:40【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Data
+@TableName(value = "cs_equipment_transfer")
+public class CsEquipmentTransferPO {
+    /**
+     * id
+     */
+    @TableId(value = "id", type = IdType.ASSIGN_UUID)
+    private String id;
+
+    /**
+     * 项目Id
+     */
+    @TableField(value = "project_id")
+    private String projectId;
+
+    /**
+     * 移交/恢复设备id集用，分割
+     */
+    @TableField(value = "equipment_ids")
+    private String equipmentIds;
+
+    /**
+     * 发起人
+     */
+    @TableField(value = "promoter")
+    private String promoter;
+
+    /**
+     * transferor
+     */
+    @TableField(value = "transferor")
+    private String transferor;
+
+    /**
+     * 事件类型（权限转移，数据恢复）
+     */
+    @TableField(value = "event_type")
+    private String eventType;
+
+    /**
+     * 备注
+     */
+    @TableField(value = "remark")
+    private String remark;
+
+    /**
+     * 状态(0:删除 1:未注册 2:注册 3:接入)
+     */
+    @TableField(value = "`status`")
+    private Integer status;
+
+    /**
+     * 创建用户
+     */
+    @TableField(value = "create_by")
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "create_time")
+    private Date createTime;
+
+    /**
+     * 更新用户
+     */
+    @TableField(value = "update_by")
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "update_time")
+    private Date updateTime;
+
+    public static final String COL_ID = "id";
+
+    public static final String COL_PROJECT_ID = "project_id";
+
+    public static final String COL_EQUIPMENT_IDS = "equipment_ids";
+
+    public static final String COL_PROMOTER = "promoter";
+
+    public static final String COL_TRANSFEROR = "transferor";
+
+    public static final String COL_EVENT_TYPE = "event_type";
+
+    public static final String COL_REMARK = "remark";
+
+    public static final String COL_STATUS = "status";
+
+    public static final String COL_CREATE_BY = "create_by";
+
+    public static final String COL_CREATE_TIME = "create_time";
+
+    public static final String COL_UPDATE_BY = "update_by";
+
+    public static final String COL_UPDATE_TIME = "update_time";
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsFilePathPO.java

@@ -0,0 +1,43 @@
+package com.njcn.csdevice.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/4/6  11:40【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+/**
+    * 文件路径表
+    */
+@Data
+@TableName(value = "cs_file_path")
+public class CsFilePathPO {
+    /**
+     * 关联数据id
+     */
+    @TableField(value = "id")
+    private String id;
+    /**
+     * 文件名
+     */
+    @TableField(value = "file_name")
+    private String fileName;
+    /**
+     * 文件路径
+     */
+    @TableField(value = "file_path")
+    private String filePath;
+
+    /**
+     * 状态(0：删除 1：正常)
+     */
+    @TableField(value = "status")
+    private String status;
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsLinePO.java

@@ -0,0 +1,72 @@
+package com.njcn.csdevice.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.math.BigDecimal;
+
+import com.njcn.db.bo.BaseEntity;
+import lombok.Data;
+
+/**
+ * 
+ * Description:
+ * Date: 2023/5/18  14:01【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Data
+@TableName(value = "cs_line")
+public class CsLinePO  extends BaseEntity {
+    /**
+     * 监测点id
+     */
+    @TableId(value = "line_id", type = IdType.ASSIGN_UUID)
+    private String lineId;
+
+    /**
+     * 装置id
+     */
+    @TableField(value = "dev_id")
+    private String devId;
+
+    /**
+     * 监测点名称
+     */
+    @TableField(value = "`name`")
+    private String name;
+
+    /**
+     * 字典表：安装位置（负载侧,电网侧, 输出侧）
+     */
+    @TableField(value = "`position`")
+    private String position;
+
+    /**
+     * 电压等级
+     */
+    @TableField(value = "vol_grade")
+    private String volGrade;
+
+    /**
+     * PT变比
+     */
+    @TableField(value = "pt_ratio")
+    private BigDecimal ptRatio;
+
+    /**
+     * CT变比
+     */
+    @TableField(value = "ct_ratio")
+    private BigDecimal ctRatio;
+
+    /**
+     * 状态(0：删除 1：正常)
+     */
+    @TableField(value = "`status`")
+    private Integer status;
+
+
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsProjectEquipmentPO.java

@@ -0,0 +1,46 @@
+package com.njcn.csdevice.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.db.bo.BaseEntity;
+import lombok.Data;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/4/3  10:24【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Data
+@TableName(value = "cs_project_equipment")
+public class CsProjectEquipmentPO  extends BaseEntity {
+    /**
+     * id
+     */
+    @TableId(value = "id")
+    private String id;
+
+    /**
+     * 项目Id
+     */
+    @TableField(value = "project_id")
+    private String projectId;
+
+    /**
+     * 设备id
+     */
+    @TableField(value = "equipment_id")
+    private String equipmentId;
+
+    /**
+     * 状态(0:删除 1:正常)
+     */
+    @TableField(value = "status")
+    private Integer status;
+
+
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/AppBaseInformationVO.java

@@ -0,0 +1,39 @@
+package com.njcn.csdevice.pojo.vo;
+
+import com.njcn.db.bo.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/4/3  19:17【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+
+
+@Data
+public class AppBaseInformationVO extends BaseEntity {
+    /**
+     * id
+     */
+    @ApiModelProperty(value = "id")
+    private String id;
+
+    /**
+     * 内容
+     */
+    @ApiModelProperty(value = "内容")
+    private String content;
+
+    /**
+     * 类型(字典数据)
+     */
+    @ApiModelProperty(value = "类型")
+    private String type;
+
+
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/AppProjectVO.java

@@ -0,0 +1,86 @@
+package com.njcn.csdevice.pojo.vo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/3/27  10:24【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+
+
+@Data
+public class AppProjectVO {
+    /**
+     * 项目Id
+     */
+    private String id;
+    /**
+     * 项目名称
+     */
+    private String name;
+
+    private String engineeringId;
+
+    private String engineeringName;
+
+    /**
+     * 用户名称
+     */
+    private String userName;
+
+
+    /**
+     * 区域名称
+     */
+    private String area;
+    /**
+     * 	拓扑图路径
+     */
+    private List<String> topologyDiagramPaths;
+
+    /**
+     * 中心点经度
+     */
+    private BigDecimal lng;
+
+    /**
+     * 中心点纬度
+     */
+    private BigDecimal lat;
+
+    /**
+     * 0：删除 1：正常
+     */
+    private String status;
+
+    /**
+     * 创建用户
+     */
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新用户
+     */
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    private String description;
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/AppTopologyDiagramVO.java

@@ -0,0 +1,56 @@
+package com.njcn.csdevice.pojo.vo;
+
+import com.njcn.db.bo.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/3/27  10:24【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+
+
+@Data
+public class AppTopologyDiagramVO extends BaseEntity {
+    /**
+     * 拓扑图Id
+     */
+    @ApiModelProperty(value = "拓扑图Id")
+    private String id;
+
+    /**
+     * 拓扑图名称
+     */
+    @ApiModelProperty(value = "拓扑图名称")
+    private String name;
+
+
+
+    /**
+     * 项目Id
+     */
+    @ApiModelProperty(value = "项目Id")
+    private String projectId;
+
+    @ApiModelProperty(value = "项目名称")
+    private String projectName;
+
+    /**
+     * 拓扑图文件路径
+     */
+    @ApiModelProperty(value = "拓扑图文件路径")
+    private String filePath;
+
+    /**
+     * 0：删除 1：正常
+     */
+    @ApiModelProperty(value = "status")
+    private String status;
+
+
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/CsDataEffectiveVO.java

@@ -0,0 +1,58 @@
+package com.njcn.csdevice.pojo.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.njcn.db.bo.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/4/18  9:49【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+
+
+@ApiModel(value="装置数据Modle")
+@Data
+public class CsDataEffectiveVO extends BaseEntity {
+
+    @ApiModelProperty(value = "id")
+    private String id;
+    /**
+     * 项目id
+     */
+    @ApiModelProperty(value="项目id")
+    private String projectId;
+
+    /**
+     * 设备id
+     */
+    @ApiModelProperty(value="设备id")
+    private String devId;
+
+    /**
+     * 注册时间
+     */
+    @ApiModelProperty(value="注册时间")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date registerTime;
+
+    /**
+     * 退役时间
+     */
+    @ApiModelProperty(value="退役时间")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date retireeTime;
+
+ 
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/CsDevModelPageVO.java

@@ -0,0 +1,67 @@
+package com.njcn.csdevice.pojo.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.njcn.db.bo.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/4/10  11:28【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+
+
+@Data
+public class CsDevModelPageVO extends BaseEntity {
+    /**
+     * id
+     */
+    @ApiModelProperty(value = "id")
+    private String id;
+
+    /**
+     * 设备型号(字典数据)
+     */
+    @ApiModelProperty(value = "设备模板型号id")
+    private String devType;
+    @ApiModelProperty(value = "设备模板型号id名称")
+    private String devName;
+    @ApiModelProperty(value = "模板名称")
+    private String name;
+
+    /**
+     * 版本号
+     */
+    @ApiModelProperty(value = "版本号")
+    private String versionNo;
+
+
+    /**
+     * 版本日期
+     */
+    @ApiModelProperty(value = "版本日期")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date versionDate;
+
+    /**
+     * 装置模板文件路径
+     */
+    @ApiModelProperty(value = "file_path")
+    private String filePath;
+
+
+    /**
+     * 状态(0：删除 1：正常)
+     */
+    @ApiModelProperty(value = "status")
+    private String status;
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/CsDevModelRelationVO.java

@@ -0,0 +1,37 @@
+package com.njcn.csdevice.pojo.vo;
+
+import com.njcn.db.bo.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/4/18  13:49【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@ApiModel(value="装置与模板表的对应Model")
+@Data
+public class CsDevModelRelationVO extends BaseEntity {
+    /**
+     * id
+     */
+    @ApiModelProperty(value="id")
+    private String id;
+
+    @ApiModelProperty(value="装置 id")
+    private String devId;
+
+    @ApiModelProperty(value="模板 id")
+    private String modelId;
+    
+    /**
+     * 状态(0：删除 1：正常)
+     */
+    @ApiModelProperty(value="状态(0：删除 1：正常)")
+    private String status;
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/CsDictVO.java

@@ -0,0 +1,56 @@
+package com.njcn.csdevice.pojo.vo;
+
+import com.njcn.db.bo.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/4/3  14:53【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+
+
+@Data
+public class CsDictVO extends BaseEntity {
+    /**
+     * id
+     */
+    @ApiModelProperty(value = "id")
+    private String id;
+
+    /**
+     * 父id
+     */
+    @ApiModelProperty(value = "父id")
+    private String pid;
+
+    /**
+     * 名称
+     */
+    @ApiModelProperty(value = "name")
+    private String name;
+
+    /**
+     * 别名
+     */
+    @ApiModelProperty(value = "another_name")
+    private String anotherName;
+
+    /**
+     * 状态(0：删除 1：正常)
+     */
+    @ApiModelProperty(value = "state")
+    private String state;
+
+    /**
+     * 排序
+     */
+    @ApiModelProperty(value = "sort")
+    private Integer sort;
+
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/CsEdDataVO.java

@@ -0,0 +1,81 @@
+package com.njcn.csdevice.pojo.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.njcn.db.bo.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/4/7  11:29【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+
+
+@Data
+public class CsEdDataVO  extends BaseEntity {
+
+    @ApiModelProperty(value = "id")
+    private String id;
+
+    /**
+     * 装置型号(字典数据)
+     */
+    @ApiModelProperty(value = "装置型号")
+    private String devType;
+    @ApiModelProperty(value = "装置名称")
+    private String devName;
+    @ApiModelProperty(value = "装置类型")
+    private String type;
+
+    /**
+     * 版本号
+     */
+    @ApiModelProperty(value = "版本号")
+    private String versionNo;
+
+    /**
+     * 版本协议
+     */
+    @ApiModelProperty(value = "版本协议")
+    private String versionAgreement;
+
+    /**
+     * 版本日期
+     */
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @ApiModelProperty(value = "版本日期")
+    private Date versionDate;
+
+    /**
+     * 描述
+     */
+    @ApiModelProperty(value = "描述")
+    private String description;
+
+    @ApiModelProperty(value = "状态")
+    private String status;
+
+    /**
+     * 版本类型
+     */
+    @ApiModelProperty(value = "版本类型")
+    private String versionType;
+
+    @ApiModelProperty(value = "crc信息")
+    private String crcInfo;
+
+    @ApiModelProperty(value = ".bin文件")
+    private String filePath;
+
+
+
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/CsEngineeringVO.java

@@ -0,0 +1,73 @@
+package com.njcn.csdevice.pojo.vo;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.db.bo.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/4/7  11:04【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+
+/**
+    * 工程信息表
+    */
+@Data
+@TableName(value = "cs_engineering")
+public class CsEngineeringVO extends BaseEntity {
+    /**
+     * id
+     */
+    @ApiModelProperty(value = "id")
+    private String id;
+
+    /**
+     * 工程名称
+     */
+    @ApiModelProperty(value = "工程名称")
+    private String name;
+
+    /**
+     * 用户id
+     */
+    @ApiModelProperty(value = "用户id")
+    private String userId;
+
+    /**
+     * 省
+     */
+    @ApiModelProperty(value = "省")
+    private String province;
+
+    @ApiModelProperty(value = "省名称")
+    private String provinceName;
+
+    /**
+     * 市
+     */
+    @ApiModelProperty(value = "市")
+    private String city;
+
+    @ApiModelProperty(value = "市名称")
+    private String cityName;
+
+    /**
+     * 描述
+     */
+    @ApiModelProperty(value = "描述")
+    private String description;
+
+    /**
+     * 状态(0：删除 1：正常)
+     */
+    @ApiModelProperty(value = "状态")
+    private String status;
+
+
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/CsEquipmentAlarmVO.java

@@ -0,0 +1,76 @@
+package com.njcn.csdevice.pojo.vo;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.njcn.db.bo.BaseEntity;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+/**
+ * Description:
+ * Date: 2023/5/16  16:25【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Data
+@TableName(value = "cs_equipment_alarm")
+public class CsEquipmentAlarmVO extends BaseEntity {
+    /**
+     * id
+     */
+    private String id;
+
+
+    /**
+     * 项目Id
+     */
+    private String projectId;
+    /**
+     * 项目名称
+     */
+    private String projectName;
+
+    /**
+     * 设备id
+     */
+    private String equipmentId;
+
+    /**
+     * 设备名称
+     */
+    private String equipmentName;
+
+    /**
+     * 告警信息
+     */
+    private String alarmMsg;
+
+    /**
+     * 告警级别(字典表)
+     */
+    private String alarmLevel;
+
+    /**
+     * 告警级别名称
+     */
+    private String alarmLevelName;
+
+    /**
+     * 开始时间
+     */
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private LocalDateTime startTime;
+
+    /**
+     * 结束时间
+     */
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private LocalDateTime endTime;
+
+
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/CsEquipmentDeliveryVO.java

@@ -0,0 +1,118 @@
+package com.njcn.csdevice.pojo.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.njcn.db.bo.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/3/30  16:23【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+
+
+@Data
+public class CsEquipmentDeliveryVO extends BaseEntity {
+    /**
+     * id
+     */
+    @ApiModelProperty(value = "id")
+    private String id;
+
+    /**
+     * 装置名称
+     */
+    @ApiModelProperty(value="装置名称")
+    private String name;
+
+    /**
+     * 网关识别码
+     */
+    @ApiModelProperty(value="网关识别码")
+    private String ndid;
+
+    /**
+     * 装置mac地址
+     */
+    @ApiModelProperty(value="装置mac地址")
+    private String mac;
+
+    /**
+     * 装置用途(治理、监测...)
+     */
+    @ApiModelProperty(value="装置用途")
+    private String devUse;
+
+//    /**
+//     * 装置类型(直连设备、网关设备)
+//     */
+//    @ApiModelProperty(value="装置类型")
+//    private String devType;
+
+    /**
+     * 装置型号（pqs588、pqs680...）
+     */
+    @ApiModelProperty(value="装置型号")
+    private String devModel;
+
+    /**
+     * 装置程序版本
+     */
+    @ApiModelProperty(value="装置程序版本")
+    private String programVersion;
+
+    /**
+     * 调试人员
+     */
+    @ApiModelProperty(value="调试人员")
+    private String debugPerson;
+
+    /**
+     * 出厂日期
+     */
+    @ApiModelProperty(value="出厂日期")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date producteTime;
+
+    /**
+     * 检修日期
+     */
+    @ApiModelProperty(value="检修日期")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date checkTime;
+
+    /**
+     * 调试日期
+     */
+    @ApiModelProperty(value="调试日期")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date debugTime;
+
+    /**
+     * 合同号
+     */
+    @ApiModelProperty(value="合同号")
+    private String cntractNo;
+
+    /**
+     * 营销经理
+     */
+    @ApiModelProperty(value="营销经理")
+    private String salesManager;
+
+    /**
+     * 状态(0:删除 1:正常)
+     */
+    @TableField(value = "status")
+    private Integer status;
+
+
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/CsEquipmentTransferVO.java

@@ -0,0 +1,62 @@
+package com.njcn.csdevice.pojo.vo;
+
+import com.njcn.db.bo.BaseEntity;
+import lombok.Data;
+
+/**
+ * 
+ * Description:
+ * Date: 2023/5/17  15:40【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Data
+public class CsEquipmentTransferVO extends BaseEntity {
+    /**
+     * id
+     */
+    private String id;
+
+    /**
+     * 项目Id
+     */
+    private String projectId;
+
+    private String projectName;
+
+    /**
+     * 移交/恢复设备id集用，分割
+     */
+    private String equipmentIds;
+
+    private String equipmentNames;
+
+
+    /**
+     * 发起人
+     */
+    private String promoter;
+
+    /**
+     * transferor
+     */
+    private String transferor;
+
+    /**
+     * 事件类型（权限转移，数据恢复）
+     */
+    private String eventType;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 状态(0:删除 1:未注册 2:注册 3:接入)
+     */
+    private Boolean status;
+
+
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/ProjectEquipmentVO.java

@@ -0,0 +1,47 @@
+package com.njcn.csdevice.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/3/30  16:23【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+
+
+@Data
+public class ProjectEquipmentVO  {
+
+    /**
+     * id
+     */
+    @ApiModelProperty(value = "工程id")
+    private String engineeringid;
+
+    /**
+     * 工程名称
+     */
+    @ApiModelProperty(value = "工程名称")
+    private String engineeringName;
+    @ApiModelProperty(value = "项目id")
+    private String projectId;
+
+    @ApiModelProperty(value = "项目名称")
+    private String projectName;
+
+    @ApiModelProperty(value = "项目类型")
+    private String projectType;
+
+    @ApiModelProperty(value = "设备id")
+    private String equipmentId;
+
+    @ApiModelProperty(value = "设备名称")
+    private String equipmentName;
+
+
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/utils/ReflectUtils.java

@@ -0,0 +1,128 @@
+package com.njcn.csdevice.utils;
+
+import org.apache.commons.lang3.StringUtils;
+import java.beans.PropertyDescriptor;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.Map;
+
+public class ReflectUtils {
+    /**
+     * 通过字段名从对象或对象的父类中得到字段的值
+     * @param object 对象实例
+     * @param fieldName 字段名
+     * @return 字段对应的值
+     * @throws Exception
+     */
+    public static Object getValue(Object object, String fieldName)  {
+        if (object == null) {
+            return null;
+        }
+        if (StringUtils.isBlank(fieldName)) {
+            return null;
+        }
+        Field field = null;
+        Class<?> clazz = object.getClass();
+        for (; clazz != Object.class; clazz = clazz.getSuperclass()) {
+            try {
+                field = clazz.getDeclaredField(fieldName);
+                field.setAccessible(true);
+                return field.get(object);
+            } catch (Exception e) {
+                //这里甚么都不要做！并且这里的异常必须这样写，不能抛出去。
+                //如果这里的异常打印或者往外抛，则就不会执行clazz = clazz.getSuperclass(),最后就不会进入到父类中了
+            }
+        }
+        return null;
+    }
+
+
+    /**
+     * 通过字段名从对象或对象的父类中得到字段的值（调用字典的get方法）
+     * @param object 对象实例
+     * @param fieldName 字段名
+     * @return 字段对应的值
+     * @throws Exception
+     */
+    public static Object getValueOfGet(Object object, String fieldName) throws Exception {
+        if (object == null) {
+            return null;
+        }
+        if (StringUtils.isBlank(fieldName)) {
+            return null;
+        }
+        Field field = null;
+        Class<?> clazz = object.getClass();
+        for (; clazz != Object.class; clazz = clazz.getSuperclass()) {
+            try {
+                field = clazz.getDeclaredField(fieldName);
+                field.setAccessible(true);
+
+                PropertyDescriptor pd = new PropertyDescriptor(field.getName(), clazz);
+                //获得get方法
+                Method getMethod = pd.getReadMethod();
+                //执行get方法返回一个Object
+                return getMethod.invoke(object);
+            } catch (Exception e) {
+                //这里甚么都不要做！并且这里的异常必须这样写，不能抛出去。
+                //如果这里的异常打印或者往外抛，则就不会执行clazz = clazz.getSuperclass(),最后就不会进入到父类中了
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * 通过字段名从对象或对象的父类中得到字段的值（调用字典的get方法，可以取出复杂的对象的值）
+     * @param object 对象实例
+     * @param fieldName 字段名
+     * @return 字段对应的值
+     * @throws Exception
+     */
+    public static Object getValueOfGetIncludeObjectFeild(Object object, String fieldName)
+            throws Exception {
+
+        if (object == null) {
+            return null;
+        }
+        if (StringUtils.isBlank(fieldName)) {
+            return null;
+        }
+
+        if(HashMap.class.equals(object.getClass())){
+            return ((Map)object).get(fieldName);
+        }
+
+        Field field = null;
+        Class<?> clazz = object.getClass();
+        for (; clazz != Object.class; clazz = clazz.getSuperclass()) {
+            try {
+                if (fieldName.contains(".")) {
+                    // 如：operatorUser.name、operatorUser.org.name，递归调用
+                    String[] splitFiledName = fieldName.split("\\.");
+                    return getValueOfGetIncludeObjectFeild(
+                            getValueOfGetIncludeObjectFeild(object, splitFiledName[0]),
+                            splitFiledName[1]);
+                }
+                field = clazz.getDeclaredField(fieldName);
+                field.setAccessible(true);
+
+                PropertyDescriptor pd = new PropertyDescriptor(field.getName(), clazz);
+                //获得get方法
+                Method getMethod = pd.getReadMethod();
+                //执行get方法返回一个Object
+                return getMethod.invoke(object);
+            } catch (Exception e) {
+                //这里甚么都不要做！并且这里的异常必须这样写，不能抛出去。
+                //如果这里的异常打印或者往外抛，则就不会执行clazz = clazz.getSuperclass(),最后就不会进入到父类中了
+            }
+        }
+
+        return null;
+    }
+
+
+
+
+}

cs-device/cs-device-boot/pom.xml

@@ -41,6 +41,23 @@
       <artifactId>common-db</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>com.njcn</groupId>
+      <artifactId>cs-device-api</artifactId>
+      <version>1.0.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.njcn</groupId>
+      <artifactId>common-oss</artifactId>
+      <version>1.0.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.njcn</groupId>
+      <artifactId>system-api</artifactId>
+      <version>${project.version}</version>
+    </dependency>
   </dependencies>
 
   <build>

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/CsDeviceBootApplication.java

@@ -1,4 +1,4 @@
-package com.njcn.device;
+package com.njcn.csdevice;
 
 import lombok.extern.slf4j.Slf4j;
 import org.mybatis.spring.annotation.MapperScan;

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/Equipment/CsEquipmentTransferPOController.java

@@ -0,0 +1,56 @@
+package com.njcn.csdevice.controller.Equipment;
+
+import com.njcn.csdevice.pojo.param.CsEquipmentTransferAddParm;
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.csdevice.service.CsEquipmentTransferPOService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+
+/**
+* (cs_equipment_transfer)表控制层
+*
+* @author xxxxx
+*/
+@Slf4j
+@RestController
+@RequestMapping("/EquipmentTransfer")
+@Api(tags = " 设备转移/恢复")
+@AllArgsConstructor
+public class CsEquipmentTransferPOController extends BaseController {
+
+    private final CsEquipmentTransferPOService csEquipmentTransferPOService;
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/addEquipmentTransfer")
+    @ApiOperation("新增设备转移申请")
+    @ApiImplicitParam(name = "csEquipmentTransferAddParm", value = "新增项目参数", required = true)
+    public HttpResult<Boolean> add(@RequestBody @Validated CsEquipmentTransferAddParm csEquipmentTransferAddParm){
+        String methodDescribe = getMethodDescribe("add");
+
+        Boolean flag = csEquipmentTransferPOService.add (csEquipmentTransferAddParm);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
+    }
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/passEquipmentTransfer")
+    @ApiOperation("设备转移申请通过")
+    @ApiImplicitParam(name = "ids", value = "设备转移申请id", required = true)
+    public HttpResult<Boolean> pass(@RequestParam("ids") List<String> ids){
+        String methodDescribe = getMethodDescribe("add");
+
+        Boolean flag = csEquipmentTransferPOService.pass (ids);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
+    }
+
+}

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/Equipment/DevModelController.java

@@ -0,0 +1,106 @@
+package com.njcn.csdevice.controller.Equipment;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.njcn.csdevice.pojo.param.CsDevModelAddParm;
+import com.njcn.csdevice.pojo.param.CsDevModelAuditParm;
+import com.njcn.csdevice.pojo.param.CsDevModelQueryListParm;
+import com.njcn.csdevice.pojo.param.CsDevModelQueryParm;
+import com.njcn.csdevice.pojo.po.CsDevModelPO;
+import com.njcn.csdevice.pojo.vo.CsDevModelPageVO;
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.csdevice.service.CsDevModelService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/3/27  15:31【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Slf4j
+@RestController
+@RequestMapping("/devmodel")
+@Api(tags = "设备模板")
+@AllArgsConstructor
+public class DevModelController extends BaseController {
+
+    private final CsDevModelService csDevModelService;
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/addDevModel")
+    @ApiOperation("新增设备模板")
+    @ApiImplicitParam(name = "csDevModelAddParm", value = "新增设备模板参数", required = true)
+    public HttpResult<CsDevModelPO> addDevModel(@RequestBody @Validated CsDevModelAddParm csDevModelAddParm){
+        String methodDescribe = getMethodDescribe("addDevModel");
+        CsDevModelPO flag = csDevModelService.addDevModel (csDevModelAddParm);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
+    }
+
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/AuditDevModel")
+    @ApiOperation("更新/删除出厂设备")
+    @ApiImplicitParam(name = "csDevModelAuditParm", value = "更新/删除设备模板参数", required = true)
+    public HttpResult<Boolean> AuditDevModel(@RequestBody @Validated CsDevModelAuditParm csDevModelAuditParm ){
+        String methodDescribe = getMethodDescribe("AuditDevModel");
+
+        Boolean flag = csDevModelService.AuditDevModel(csDevModelAuditParm);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
+    }
+
+
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/queryDevModelPage")
+    @ApiOperation("设备模板分页查询")
+    @ApiImplicitParam(name = "csDevModelQueryParm", value = "设备模板查询参数", required = true)
+    public HttpResult<IPage<CsDevModelPageVO>> queryDevModelPage(@RequestBody @Validated CsDevModelQueryParm csDevModelQueryParm ){
+        String methodDescribe = getMethodDescribe("queryDevModelPage");
+
+        IPage<CsDevModelPageVO> page  = csDevModelService.queryPage (csDevModelQueryParm);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, page, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/queryDevModelOne")
+    @ApiOperation("设备模板查询")
+    @ApiImplicitParam(name = "csDevModelQueryListParm", value = "设备模板信息", required = true)
+    public HttpResult<CsDevModelPageVO> queryDevModelOne(@RequestBody CsDevModelQueryListParm csDevModelQueryListParm){
+        String methodDescribe = getMethodDescribe("queryDevModelOne");
+
+        CsDevModelPageVO csDevModelPageVO  = csDevModelService.queryDevModelOne(csDevModelQueryListParm);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, csDevModelPageVO, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/findModel")
+    @ApiOperation("根据条件查询模板")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "devType", value = "装置类型", required = true),
+        @ApiImplicitParam(name = "version", value = "版本", required = true),
+        @ApiImplicitParam(name = "time", value = "时间", required = true)
+    })
+    public HttpResult<CsDevModelPO> findModel(@RequestParam("devType") String devType,@RequestParam("version") String version,@RequestParam("time") String time){
+        System.out.println(devType);
+        System.out.println(version);
+        System.out.println(time);
+        String methodDescribe = getMethodDescribe("findModel");
+        CsDevModelPO csDevModelPo  = csDevModelService.findModel(devType,version,time);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, csDevModelPo, methodDescribe);
+    }
+
+}

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/Equipment/DevModelRelationController.java

@@ -0,0 +1,85 @@
+package com.njcn.csdevice.controller.Equipment;
+
+
+import com.njcn.csdevice.pojo.param.CsDevModelRelationAddParm;
+import com.njcn.csdevice.pojo.param.CsDevModelRelationAuidtParm;
+import com.njcn.csdevice.pojo.param.CsDevModelRelationQueryParm;
+import com.njcn.csdevice.pojo.po.CsDevModelRelationPO;
+import com.njcn.csdevice.pojo.vo.CsDevModelRelationVO;
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.csdevice.service.CsDevModelRelationService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+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 java.util.List;
+
+/**
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/3/27  15:31【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Slf4j
+@RestController
+@RequestMapping("/devmodelRelation")
+@Api(tags = "设备模板关联")
+@AllArgsConstructor
+public class DevModelRelationController extends BaseController {
+
+    private final CsDevModelRelationService csDevModelRelationService;
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/addDevModelRelation")
+    @ApiOperation("绑定设备与模板")
+    @ApiImplicitParam(name = "addParm", value = "新增参数", required = true)
+    public HttpResult<CsDevModelRelationPO> addDevModelRelation(@RequestBody @Validated CsDevModelRelationAddParm addParm){
+        String methodDescribe = getMethodDescribe("addDevModelRelation");
+        CsDevModelRelationPO flag = csDevModelRelationService.addDevModelRelation (addParm);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
+    }
+
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/AuditDevModelRelation")
+    @ApiOperation("更新/删除出厂设备")
+    @ApiImplicitParam(name = "auditParm", value = "更新/删除参数", required = true)
+    public HttpResult<Boolean> AuditDevModelRelation(@RequestBody @Validated CsDevModelRelationAuidtParm auditParm ){
+        String methodDescribe = getMethodDescribe("AuditDevModelRelation");
+
+        Boolean flag = csDevModelRelationService.AuditDevModelRelation(auditParm);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
+    }
+
+
+
+
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/queryDevModelRelationList")
+    @ApiOperation("设备模板查询")
+    @ApiImplicitParam(name = "queryParm", value = "查询参数", required = true)
+    public HttpResult<List<CsDevModelRelationVO>> queryDevModelRelationList(@RequestBody CsDevModelRelationQueryParm queryParm){
+        String methodDescribe = getMethodDescribe("queryDevModelRelationList");
+
+        List<CsDevModelRelationVO> list  = csDevModelRelationService.queryDevModelRelation(queryParm);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+
+
+}

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/Equipment/EquipmentDeliveryController.java

@@ -0,0 +1,124 @@
+package com.njcn.csdevice.controller.Equipment;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.csdevice.pojo.param.CsEquipmentDeliveryAddParm;
+import com.njcn.csdevice.pojo.param.CsEquipmentDeliveryAuditParm;
+import com.njcn.csdevice.pojo.param.ProjectEquipmentQueryParm;
+import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO;
+import com.njcn.csdevice.pojo.vo.CsEquipmentDeliveryVO;
+import com.njcn.csdevice.pojo.vo.ProjectEquipmentVO;
+import com.njcn.csdevice.service.CsEquipmentDeliveryService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/3/27  15:31【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Slf4j
+@RestController
+@RequestMapping("/EquipmentDelivery")
+@Api(tags = " 出厂设备")
+@AllArgsConstructor
+public class EquipmentDeliveryController extends BaseController {
+
+    private final CsEquipmentDeliveryService csEquipmentDeliveryService;
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/addEquipmentDelivery")
+    @ApiOperation("新增出厂设备")
+    @ApiImplicitParam(name = "csEquipmentDeliveryAddParm", value = "新增项目参数", required = true)
+    public HttpResult<Boolean> addEquipmentDelivery(@RequestBody @Validated CsEquipmentDeliveryAddParm csEquipmentDeliveryAddParm){
+        String methodDescribe = getMethodDescribe("addEquipmentDelivery");
+
+        Boolean flag = csEquipmentDeliveryService.save (csEquipmentDeliveryAddParm);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
+    }
+
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/AuditEquipmentDelivery")
+    @ApiOperation("删除出厂设备")
+    public HttpResult<Boolean> AuditEquipmentDelivery(@RequestParam("id")String id ){
+        String methodDescribe = getMethodDescribe("AuditEquipmentDelivery");
+
+        Boolean flag = csEquipmentDeliveryService.AuditEquipmentDelivery(id);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/updateEquipmentDelivery")
+    @ApiOperation("修改出厂设备")
+    @ApiImplicitParam(name = "csEquipmentDeliveryAuditParm", value = "新增项目参数", required = true)
+    public HttpResult<Boolean> updateEquipmentDelivery(@RequestBody @Validated CsEquipmentDeliveryAuditParm csEquipmentDeliveryAuditParm ){
+        String methodDescribe = getMethodDescribe("updateEquipmentDelivery");
+
+        Boolean flag = csEquipmentDeliveryService.updateEquipmentDelivery(csEquipmentDeliveryAuditParm);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
+    }
+
+
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/queryEquipmentByndid")
+    @ApiOperation("通过ndid查询出厂设备")
+    @ApiImplicitParam(name = "ndid", value = "网关识别码", required = true)
+    public HttpResult<CsEquipmentDeliveryVO> queryEquipmentByndid(@RequestParam("ndid")String ndid){
+        String methodDescribe = getMethodDescribe("queryEquipmentByndid");
+
+         CsEquipmentDeliveryVO csEquipmentDeliveryVO  = csEquipmentDeliveryService.queryEquipmentByndid (ndid);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, csEquipmentDeliveryVO, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/queryEquipmentByProject")
+    @ApiOperation("通过项目查询出厂设备")
+    @ApiImplicitParam(name = "projectEquipmentQueryParm", value = "项目信息", required = true)
+    public HttpResult<IPage<ProjectEquipmentVO>> queryEquipmentByProject(@RequestBody ProjectEquipmentQueryParm projectEquipmentQueryParm){
+        String methodDescribe = getMethodDescribe("queryEquipmentByProject");
+
+        IPage<ProjectEquipmentVO> projectEquipmentVOS  = csEquipmentDeliveryService.queryEquipmentByProject(projectEquipmentQueryParm);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, projectEquipmentVOS, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/updateStatusBynDid")
+    @ApiOperation("根据网关id调整设备状态")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "nDId", value = "网关id", required = true),
+            @ApiImplicitParam(name = "status", value = "状态", required = true)
+    })
+    public HttpResult<Boolean> updateStatusBynDid(@RequestParam("nDId") String nDid,@RequestParam("status")  Integer status){
+        String methodDescribe = getMethodDescribe("updateStatusBynDid");
+        csEquipmentDeliveryService.updateStatusBynDid(nDid,status);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/queryProjectById")
+    @ApiOperation("设备查询通过id获取")
+    @ApiImplicitParam(name = "ids", value = "设备id集合", required = true)
+    public HttpResult<List<CsEquipmentDeliveryPO>> queryDeviceById(@RequestParam List<String> ids){
+        String methodDescribe = getMethodDescribe("queryDeviceById");
+        List<CsEquipmentDeliveryPO> csEquipmentDeliveryPOS = csEquipmentDeliveryService.listByIds(ids);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, csEquipmentDeliveryPOS, methodDescribe);
+    }
+
+}

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/data/DataEffectiveController.java

@@ -0,0 +1,80 @@
+package com.njcn.csdevice.controller.data;
+
+
+import com.njcn.csdevice.pojo.param.CsDataEffectiveAddParm;
+import com.njcn.csdevice.pojo.param.CsDataEffectiveAuditParm;
+import com.njcn.csdevice.pojo.param.CsDataEffectiveQueryParm;
+import com.njcn.csdevice.pojo.vo.AppBaseInformationVO;
+import com.njcn.csdevice.pojo.vo.CsDataEffectiveVO;
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.csdevice.service.CsDataEffectiveService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+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 java.util.List;
+
+/**
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/4/4  9:02【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Slf4j
+@RestController
+@RequestMapping("/dataEffective")
+@Api(tags = "数据有效性")
+@AllArgsConstructor
+public class DataEffectiveController extends BaseController {
+
+    private final CsDataEffectiveService csDataEffectiveService;
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/addDataEffective")
+    @ApiOperation("新增app数据有效性表")
+    @ApiImplicitParam(name = "csDataEffectiveAddParm", value = "新增app数据有效性表参数", required = true)
+    public HttpResult<Boolean> addDataEffective(@RequestBody @Validated CsDataEffectiveAddParm csDataEffectiveAddParm){
+        String methodDescribe = getMethodDescribe("addDataEffective");
+
+        boolean save = csDataEffectiveService.add (csDataEffectiveAddParm);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, save, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/auditDataEffective")
+    @ApiOperation("修改app数据有效性表")
+    @ApiImplicitParam(name = "auditParm", value = "修改app数据有效性表参数", required = true)
+    public HttpResult<Boolean> auditDataEffective(@RequestBody @Validated CsDataEffectiveAuditParm auditParm){
+        String methodDescribe = getMethodDescribe("auditDataEffective");
+
+        boolean save = csDataEffectiveService.auditDataEffective (auditParm);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, save, methodDescribe);
+    }
+
+
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/queryDataEffective")
+    @ApiOperation("查询app数据有效性表")
+    @ApiImplicitParam(name = "csDataEffectiveQueryParm", value = "查询app数据有效性表参数", required = true)
+    public HttpResult<List<CsDataEffectiveVO>> queryDataEffective(@RequestBody @Validated CsDataEffectiveQueryParm csDataEffectiveQueryParm ){
+        String methodDescribe = getMethodDescribe("queryDataEffective");
+        AppBaseInformationVO appBaseInformationVO = new AppBaseInformationVO();
+        List<CsDataEffectiveVO> list = csDataEffectiveService.queryDataEffective(csDataEffectiveQueryParm);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+}

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/line/CslineController.java

@@ -0,0 +1,48 @@
+package com.njcn.csdevice.controller.line;
+
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.csdevice.pojo.po.CsLinePO;
+import com.njcn.csdevice.service.CsLinePOService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * Description:
+ * Date: 2023/5/24  19:34【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Slf4j
+@RestController
+@RequestMapping("/csline")
+@Api(tags = "监测点")
+@AllArgsConstructor
+public class CslineController extends BaseController {
+
+    private final CsLinePOService csLinePOService;
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/queryLineById")
+    @ApiOperation("项目查询通过id获取")
+    @ApiImplicitParam(name = "ids", value = "项目id集合", required = true)
+    public HttpResult<List<CsLinePO>> queryLineById(@RequestParam List<String> ids){
+        String methodDescribe = getMethodDescribe("queryLineById");
+        List<CsLinePO> csLinePOS = csLinePOService.listByIds(ids);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, csLinePOS, methodDescribe);
+    }
+}

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/project/AppProjectController.java

@@ -0,0 +1,84 @@
+package com.njcn.csdevice.controller.project;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.csdevice.pojo.param.AppProjectAddParm;
+import com.njcn.csdevice.pojo.param.AppProjectAuditParm;
+import com.njcn.csdevice.pojo.param.AppProjectQueryParm;
+import com.njcn.csdevice.pojo.po.AppProjectPO;
+import com.njcn.csdevice.pojo.vo.AppProjectVO;
+import com.njcn.csdevice.service.AppProjectService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/3/27  10:54【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Slf4j
+@RestController
+@RequestMapping("/project")
+@Api(tags = " 项目管理")
+@AllArgsConstructor
+public class AppProjectController  extends BaseController {
+
+
+    private final AppProjectService appProjectService;
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/queryProject")
+    @ApiOperation("项目查询")
+    @ApiImplicitParam(name = "appProjectQueryParm", value = "项目查询参数", required = true)
+    public HttpResult<IPage<AppProjectVO>> queryProject(@Validated @RequestBody AppProjectQueryParm appProjectQueryParm){
+        String methodDescribe = getMethodDescribe("queryProject");
+
+        IPage<AppProjectVO> appProjectVOIPage  = appProjectService.queryProject (appProjectQueryParm);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, appProjectVOIPage, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/queryProjectById")
+    @ApiOperation("项目查询通过id获取")
+    @ApiImplicitParam(name = "ids", value = "项目id集合", required = true)
+    public HttpResult<List<AppProjectPO>> queryProjectById(@RequestParam List<String> ids){
+        String methodDescribe = getMethodDescribe("queryProject");
+        List<AppProjectPO> appProjectPOS = appProjectService.listByIds(ids);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, appProjectPOS, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/addAppProject")
+    @ApiOperation("新增项目")
+    public HttpResult<Boolean> addAppProject(@Validated  AppProjectAddParm appProjectAddParm){
+        String methodDescribe = getMethodDescribe("addAppProject");
+
+        Boolean flag = appProjectService.addAppProject(appProjectAddParm);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
+    }
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/auditAppProject")
+    @ApiOperation("修改/删除项目")
+    @ApiImplicitParam(name = "appProjectAuditParm", value = "修改项目参数", required = true)
+    public HttpResult<Boolean> auditAppProject(@Validated @RequestBody AppProjectAuditParm appProjectAuditParm){
+        String methodDescribe = getMethodDescribe("auditAppProject");
+
+        Boolean flag = appProjectService.AuditAppProject(appProjectAuditParm);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
+    }
+}

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/project/AppTopologyController.java

@@ -0,0 +1,90 @@
+package com.njcn.csdevice.controller.project;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.njcn.csdevice.pojo.param.AppTopologyDiagramAddParm;
+import com.njcn.csdevice.pojo.param.AppTopologyDiagramAuditParm;
+import com.njcn.csdevice.pojo.param.AppTopologyDiagramQueryPageParm;
+import com.njcn.csdevice.pojo.param.AppTopologyDiagramQueryParm;
+import com.njcn.csdevice.pojo.vo.AppTopologyDiagramVO;
+import com.njcn.csdevice.service.AppTopologyDiagramService;
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+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 java.util.List;
+
+/**
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/3/27  15:31【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Slf4j
+@RestController
+@RequestMapping("/topologyDiagram")
+@Api(tags = " 项目拓扑图")
+@AllArgsConstructor
+public class AppTopologyController extends BaseController {
+
+    private final AppTopologyDiagramService appTopologyDiagramService;
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/addAppTopologyDiagram")
+    @ApiOperation("新增拓扑图")
+//    @ApiImplicitParam(name = "appTopologyDiagramAddParm", value = "新增项目参数", required = true)
+    public HttpResult<Boolean> addAppTopologyDiagram(@Validated AppTopologyDiagramAddParm appTopologyDiagramAddParm){
+        String methodDescribe = getMethodDescribe("addAppTopologyDiagram");
+
+        Boolean flag = appTopologyDiagramService.addAppTopologyDiagram(appTopologyDiagramAddParm);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
+    }
+
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/AuditAppTopologyDiagram")
+    @ApiOperation("修改拓扑图")
+    public HttpResult<Boolean> AuditAppTopologyDiagram(@Validated AppTopologyDiagramAuditParm appTopologyDiagramAuditParm){
+        String methodDescribe = getMethodDescribe("addAppProject");
+
+        Boolean flag = appTopologyDiagramService.AuditAppTopologyDiagram(appTopologyDiagramAuditParm);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/queryAppTopologyDiagram")
+    @ApiOperation("查询拓扑图")
+    @ApiImplicitParam(name = "appTopologyDiagramQueryParm", value = "拓扑图查询参数", required = true)
+    public HttpResult<List<AppTopologyDiagramVO>> queryAppTopologyDiagram(@Validated @RequestBody AppTopologyDiagramQueryParm appTopologyDiagramQueryParm){
+        String methodDescribe = getMethodDescribe("queryAppTopologyDiagram");
+
+        List<AppTopologyDiagramVO> appTopologyDiagramVOList = appTopologyDiagramService.queryAppTopologyDiagram(appTopologyDiagramQueryParm);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, appTopologyDiagramVOList, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/queryTopologyDiagramPage")
+    @ApiOperation("查询拓扑图分页")
+    @ApiImplicitParam(name = "appTopologyDiagramQueryPageParm", value = "拓扑图查询参数", required = true)
+    public HttpResult<IPage<AppTopologyDiagramVO>> queryTopologyDiagramPage(@Validated @RequestBody AppTopologyDiagramQueryPageParm  appTopologyDiagramQueryPageParm){
+        String methodDescribe = getMethodDescribe("queryTopologyDiagramPage");
+
+        IPage<AppTopologyDiagramVO> appTopologyDiagramVOList = appTopologyDiagramService.queryTopologyDiagramPage(appTopologyDiagramQueryPageParm);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, appTopologyDiagramVOList, methodDescribe);
+    }
+
+}

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/project/CsEdDataController.java

@@ -0,0 +1,82 @@
+package com.njcn.csdevice.controller.project;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.njcn.csdevice.pojo.param.CsEdDataAddParm;
+import com.njcn.csdevice.pojo.param.CsEdDataAuditParm;
+import com.njcn.csdevice.pojo.param.CsEdDataQueryParm;
+import com.njcn.csdevice.pojo.vo.CsEdDataVO;
+import com.njcn.csdevice.service.CsEdDataService;
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/4/4  9:02【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Slf4j
+@RestController
+@RequestMapping("/edData")
+@Api(tags = "app版本信息")
+@AllArgsConstructor
+public class CsEdDataController extends BaseController {
+
+    private final CsEdDataService csEdDataService;
+
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/addEdData")
+    @ApiOperation("新增app版本信息")
+    public HttpResult<Boolean> addEdData(@Validated CsEdDataAddParm csEdDataAddParm){
+        String methodDescribe = getMethodDescribe("addEdData");
+
+        boolean save = csEdDataService.addEdData (csEdDataAddParm);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, save, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/auditEdData")
+    @ApiOperation("修改/删除app版本信息")
+    public HttpResult<Boolean> auditEdData(@Validated CsEdDataAuditParm csEdDataAuditParm){
+        String methodDescribe = getMethodDescribe("auditEdData");
+
+        Boolean flag = csEdDataService.auditEdData(csEdDataAuditParm);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/queryEdDataPage")
+    @ApiOperation("版本信息查询")
+    @ApiImplicitParam(name = "csEdDataQueryParm", value = "查询参数", required = true)
+    public HttpResult<IPage<CsEdDataVO>> queryEdDataPage(@Validated @RequestBody CsEdDataQueryParm csEdDataQueryParm){
+        String methodDescribe = getMethodDescribe("queryEdDataPage");
+
+        IPage<CsEdDataVO> page  = csEdDataService.queryEdDataPage (csEdDataQueryParm);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, page, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/findByDevTypeId")
+    @ApiOperation("根据装置型号获取装置类型")
+    @ApiImplicitParam(name = "devType", value = "装置型号", required = true)
+    public HttpResult<CsEdDataVO> findByDevTypeId(@Validated @RequestParam("devType") String devType){
+        String methodDescribe = getMethodDescribe("findByDevTypeId");
+        CsEdDataVO vo  = csEdDataService.findByDevTypeId(devType);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, vo, methodDescribe);
+    }
+
+}

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/project/EngineeringController.java

@@ -0,0 +1,90 @@
+package com.njcn.csdevice.controller.project;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.njcn.csdevice.pojo.param.CsEngineeringAddParm;
+import com.njcn.csdevice.pojo.param.CsEngineeringAuditParm;
+import com.njcn.csdevice.pojo.param.CsEngineeringQueryPageParm;
+import com.njcn.csdevice.pojo.param.CsEngineeringQueryParm;
+import com.njcn.csdevice.pojo.vo.CsEngineeringVO;
+import com.njcn.csdevice.service.CsEngineeringService;
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+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 java.util.List;
+
+/**
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/3/27  10:54【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Slf4j
+@RestController
+@RequestMapping("/engineering")
+@Api(tags = " 工程管理")
+@AllArgsConstructor
+public class EngineeringController extends BaseController {
+
+
+    private final CsEngineeringService csEngineeringService;
+
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/addEngineering")
+    @ApiOperation("新增工程")
+    @ApiImplicitParam(name = "csEngineeringAddParm", value = "新增工程参数", required = true)
+    public HttpResult<Boolean> addEngineering(@Validated @RequestBody CsEngineeringAddParm csEngineeringAddParm){
+        String methodDescribe = getMethodDescribe("addEngineering");
+
+        Boolean flag = csEngineeringService.addEngineering(csEngineeringAddParm);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
+    }
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/auditEngineering")
+    @ApiOperation("修改/删除工程")
+    @ApiImplicitParam(name = "csEngineeringAuditParm", value = "修改项目参数", required = true)
+    public HttpResult<Boolean> auditAppProject(@Validated @RequestBody CsEngineeringAuditParm csEngineeringAuditParm){
+        String methodDescribe = getMethodDescribe("auditEngineering");
+
+        Boolean flag = csEngineeringService.auditEngineering(csEngineeringAuditParm);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/queryEngineering")
+    @ApiOperation("查询工程列表")
+    @ApiImplicitParam(name = "csEngineeringQueryParm", value = "修改项目参数", required = true)
+    public HttpResult<List<CsEngineeringVO>> queryEngineering(@Validated @RequestBody CsEngineeringQueryParm csEngineeringQueryParm){
+        String methodDescribe = getMethodDescribe("queryEngineering");
+
+        List<CsEngineeringVO> csEngineeringVOList = csEngineeringService.queryEngineering(csEngineeringQueryParm);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, csEngineeringVOList, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/queryEngineeringPage")
+    @ApiOperation("分页查询工程列表")
+    @ApiImplicitParam(name = "csEngineeringQueryPageParm", value = "修改项目参数", required = true)
+    public HttpResult<IPage<CsEngineeringVO>> queryEngineeringPage(@Validated @RequestBody CsEngineeringQueryPageParm csEngineeringQueryPageParm){
+        String methodDescribe = getMethodDescribe("queryEngineeringPage");
+
+        IPage<CsEngineeringVO> page = csEngineeringService.queryEngineeringPage(csEngineeringQueryPageParm);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, page, methodDescribe);
+    }
+}

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/project/LineTopologyDiagramController.java

@@ -0,0 +1,67 @@
+package com.njcn.csdevice.controller.project;
+
+import com.njcn.csdevice.pojo.param.AppLineTopologyDiagramAddParm;
+import com.njcn.csdevice.pojo.param.AppLineTopologyDiagramAuditParm;
+import com.njcn.csdevice.pojo.po.AppLineTopologyDiagramPO;
+import com.njcn.csdevice.service.AppLineTopologyDiagramService;
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.validation.annotation.Validated;
+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;
+
+/**
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/3/30  9:02【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Slf4j
+@RestController
+@RequestMapping("/lineTopologyDiagram")
+@Api(tags = " 拓扑图-监测点")
+@AllArgsConstructor
+public class LineTopologyDiagramController extends BaseController {
+
+    private AppLineTopologyDiagramService appLineTopologyDiagramService;
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/addLineDiagram")
+    @ApiOperation("新增拓扑图-监测点绑定")
+    @ApiImplicitParam(name = "appLineTopologyDiagramAddParm", value = "新增拓扑图参数", required = true)
+    public HttpResult<Boolean> addLineDiagram(@RequestBody @Validated AppLineTopologyDiagramAddParm appLineTopologyDiagramAddParm){
+        String methodDescribe = getMethodDescribe("addLineDiagram");
+        AppLineTopologyDiagramPO appLineTopologyDiagramPO = new AppLineTopologyDiagramPO();
+        BeanUtils.copyProperties (appLineTopologyDiagramAddParm,appLineTopologyDiagramPO);
+        appLineTopologyDiagramPO.setStatus ("1");
+        Boolean flag = appLineTopologyDiagramService.save (appLineTopologyDiagramPO);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/auditLineDiagram")
+    @ApiOperation("修改/删除拓扑图-监测点绑定")
+    @ApiImplicitParam(name = "appLineTopologyDiagramAuditParm", value = "修改/删除拓扑图参数", required = true)
+    public HttpResult<Boolean> auditLineDiagram(@RequestBody@Validated AppLineTopologyDiagramAuditParm appLineTopologyDiagramAuditParm){
+        String methodDescribe = getMethodDescribe("auditLineDiagram");
+        AppLineTopologyDiagramPO appLineTopologyDiagramPO = new AppLineTopologyDiagramPO();
+        BeanUtils.copyProperties (appLineTopologyDiagramAuditParm,appLineTopologyDiagramPO);
+        Boolean flag = appLineTopologyDiagramService.update (appLineTopologyDiagramPO,null);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
+    }
+
+}

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/AppLineTopologyDiagramMapper.java

@@ -0,0 +1,16 @@
+package com.njcn.csdevice.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.csdevice.pojo.po.AppLineTopologyDiagramPO;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/3/27  10:18【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+public interface AppLineTopologyDiagramMapper extends BaseMapper<AppLineTopologyDiagramPO> {
+}

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/AppProjectMapper.java

@@ -0,0 +1,64 @@
+package com.njcn.csdevice.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.njcn.csdevice.pojo.param.AppProjectQueryParm;
+import com.njcn.csdevice.pojo.po.AppProjectPO;
+import com.njcn.csdevice.pojo.vo.AppProjectVO;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/3/27  10:24【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+public interface AppProjectMapper extends BaseMapper<AppProjectPO> {
+    @Select (
+            {"<script>",
+            "SELECT\n" +
+            "\ta.id id,\n" +
+            "\ta.`name` name,\n" +
+//            "\ta.user_id user_id,\n" +
+//            "\t\"username\" user_name,\n" +
+            "\ta.area area,\n" +
+//            "\tb.file_path topologyDiagramPath,\n" +
+//            "\ta.lng lng,\n" +
+//            "\ta.lat lat,\n" +
+              "\tc.name engineering_name,\n" +
+              "\ta.description description,\n"+
+             "\ta.engineering_id engineering_id,\n" +
+             "\ta.`status` STATUS,\n" +
+            "\ta.create_by create_by,\n" +
+            "\ta.create_time create_time,\n" +
+            "\ta.update_by update_by,\n" +
+            "\ta.update_time update_time\n" +
+            "FROM\n" +
+            "\tcs_project a\n" +
+            " LEFT JOIN cs_engineering c on a.engineering_id=c.id \n" +
+            "WHERE\n" +
+            "\t1 = 1 AND a.status=\"1\"\n" ,
+                    "<when test='temp.projectId!=null and temp.projectId!=\"\"'>",
+            "AND a.id = #{temp.projectId} "+
+                    "</when>",
+                    "<when test='temp.engineeringId!=null and temp.engineeringId!=\"\"'>",
+                    "AND a.engineering_id = #{temp.engineeringId} "+
+                            "</when>",
+                    "<when test='temp.endTime!=null and temp.endTime!=\"\"'>",
+                    "AND a.create_time &lt;= #{temp.endTime}" +
+                            "</when>",
+                    "<when test='temp.startTime!=null and temp.startTime!=\"\"'>",
+            "AND a.create_time &gt;= #{temp.startTime}" +
+                    "</when>",
+                    "<when test='temp.searchValue!=null and temp.searchValue!=\"\"'>",
+            "AND a.`name` like concat('%',#{temp.searchValue},'%')",
+                    "</when>",
+                    " order by a.create_time desc",
+                    "</script>"}
+                    )
+    Page<AppProjectVO> getPageVo(Page<AppProjectVO> returnpage, @Param("temp")AppProjectQueryParm appProjectQueryParm);
+}

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/AppTopologyDiagramMapper.java

@@ -0,0 +1,16 @@
+package com.njcn.csdevice.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.csdevice.pojo.po.AppTopologyDiagramPO;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/3/27  10:24【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+public interface AppTopologyDiagramMapper extends BaseMapper<AppTopologyDiagramPO> {
+}

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/CsDataEffectiveMapper.java

@@ -0,0 +1,16 @@
+package com.njcn.csdevice.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.csdevice.pojo.po.CsDataEffectivePO;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/4/18  9:49【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+public interface CsDataEffectiveMapper extends BaseMapper<CsDataEffectivePO> {
+}

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/CsDevModelMapper.java

@@ -0,0 +1,24 @@
+package com.njcn.csdevice.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.njcn.csdevice.pojo.param.CsDevModelQueryListParm;
+import com.njcn.csdevice.pojo.param.CsDevModelQueryParm;
+import com.njcn.csdevice.pojo.po.CsDevModelPO;
+import com.njcn.csdevice.pojo.vo.CsDevModelPageVO;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/4/10  11:28【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+public interface CsDevModelMapper extends BaseMapper<CsDevModelPO> {
+    Page<CsDevModelPageVO> getPage(Page<CsDevModelPageVO> returnpage,@Param("csDevModelQueryParm") CsDevModelQueryParm csDevModelQueryParm);
+
+    CsDevModelPageVO queryOne(@Param("csDevModelQueryListParm")CsDevModelQueryListParm csDevModelQueryListParm);
+}

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/CsDevModelRelationMapper.java

@@ -0,0 +1,16 @@
+package com.njcn.csdevice.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.csdevice.pojo.po.CsDevModelRelationPO;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/4/18  13:49【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+public interface CsDevModelRelationMapper extends BaseMapper<CsDevModelRelationPO> {
+}

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/CsDictMapper.java

@@ -0,0 +1,20 @@
+package com.njcn.csdevice.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.csdevice.pojo.dto.CsDictDTO;
+import com.njcn.csdevice.pojo.po.CsDictPO;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/4/3  14:53【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+public interface CsDictMapper extends BaseMapper<CsDictPO> {
+
+    CsDictDTO getOwnAndFatherData(@Param("name") String name);
+}

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/CsEdDataMapper.java

@@ -0,0 +1,20 @@
+package com.njcn.csdevice.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.njcn.csdevice.pojo.param.CsEdDataQueryParm;
+import com.njcn.csdevice.pojo.po.CsEdDataPO;
+import com.njcn.csdevice.pojo.vo.CsEdDataVO;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/4/7  11:29【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+public interface CsEdDataMapper extends BaseMapper<CsEdDataPO> {
+    Page<CsEdDataVO> getPage(Page<CsEdDataVO> returnpage,@Param("csEdDataQueryParm") CsEdDataQueryParm csEdDataQueryParm);
+}

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/CsEngineeringMapper.java

@@ -0,0 +1,16 @@
+package com.njcn.csdevice.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.csdevice.pojo.po.CsEngineeringPO;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/4/7  11:04【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+public interface CsEngineeringMapper extends BaseMapper<CsEngineeringPO> {
+}