提交

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

@@ -29,7 +29,9 @@ public enum AlgorithmResponseEnum {
     DATA_LOSE ("A00510","未找到设备与主用户信息"),
     REPEAT_SHARE ("A00511","设备已分享完成,请勿再次分享"),
     DEVICE_LOSE("A00512","设备id缺失"),
-    CHIRLDREN_EXIST("A00513","工程下存在项目,不能删除");
+    CHIRLDREN_EXIST("A00513","工程下存在项目,不能删除"),
+    CHIRLDREN2_EXIST("A00514","项目下存在设备,不能删除");
+
     ;
 
 

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

@@ -2,8 +2,10 @@ package com.njcn.csdevice.pojo.param;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.validation.constraints.NotNull;
+import java.util.List;
 
 /**
  * Description:
@@ -34,5 +36,9 @@ public class AppProjectAuditParm {
     private String status;
 
     private String description;
+    @ApiModelProperty(value = "拓扑图文件")
+    private MultipartFile[] files;
 
+    @ApiModelProperty(value="拓扑图模版id集合")
+    private List<String> topoIds;
 }

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

@@ -0,0 +1,29 @@
+package com.njcn.csdevice.pojo.param;
+
+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 lombok.NoArgsConstructor;
+
+/**
+ * 
+ * Description:
+ * Date: 2023/7/31  9:24【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Data
+@NoArgsConstructor
+public class CsMarketDataParam {
+
+
+    private String userId;
+
+
+    private String engineerId;
+
+
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsMarketData.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 io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 
+ * Description:
+ * Date: 2023/7/31  9:24【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Data
+@NoArgsConstructor
+@TableName(value = "cs_market_data")
+public class CsMarketData {
+    @TableId(value = "id", type = IdType.ASSIGN_UUID)
+    private String id;
+
+    /**
+     * 用户id
+     */
+    @TableField(value = "user_id")
+    private String userId;
+
+    /**
+     * 工程id
+     */
+    @TableField(value = "engineer_id")
+    private String engineerId;
+
+    public static final String COL_ID = "id";
+
+    public static final String COL_USER_ID = "user_id";
+
+    public static final String COL_ENGINEER_ID = "engineer_id";
+}

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

@@ -0,0 +1,34 @@
+package com.njcn.csdevice.pojo.vo;
+
+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 lombok.NoArgsConstructor;
+
+/**
+ * 
+ * Description:
+ * Date: 2023/7/31  9:24【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Data
+@NoArgsConstructor
+public class CsMarketDataVO {
+    private String id;
+
+    /**
+     * 用户id
+     */
+    private String userId;
+
+    /**
+     * 工程id
+     */
+    private String engineerId;
+
+   private String engineerName;
+}