微调

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

@@ -1,13 +1,10 @@
 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 lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 
  * Description:
@@ -56,38 +53,6 @@ public class CsEquipmentDeliveryVO extends BaseEntity {
     @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;
 
     /**
      * 合同号
@@ -95,18 +60,12 @@ public class CsEquipmentDeliveryVO extends BaseEntity {
     @ApiModelProperty(value="合同号")
     private String cntractNo;
 
-    /**
-     * 营销经理
-     */
-    @ApiModelProperty(value="营销经理")
-    private String salesManager;
-
     /**
      * 状态(0:删除 1:未注册 2:注册 3:接入)
      */
     private Integer status;
 
-    @ApiModelProperty(value="装置出厂方式")
+    @ApiModelProperty(value="装置接入方式")
     private String devAccessMethod ;
 
     @ApiModelProperty(value="设备运行状态(0:删除 1:离线 2:在线)")
@@ -117,4 +76,11 @@ public class CsEquipmentDeliveryVO extends BaseEntity {
 
     @ApiModelProperty(value="二维码路径")
     private String qrPath ;
+
+    @ApiModelProperty(value="设备模块个数")
+    private Integer moduleNumber ;
+
+    @ApiModelProperty(value="设备当前流程状态")
+    private Integer process ;
+
 }

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java

@@ -103,7 +103,7 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
         BeanUtils.copyProperties (csEquipmentDeliveryAddParm,csEquipmentDeliveryPo);
         csEquipmentDeliveryPo.setStatus ("1");
         csEquipmentDeliveryPo.setRunStatus(1);
-        csEquipmentDeliveryPo.setProcess(1);
+        csEquipmentDeliveryPo.setProcess(2);
         //生成二维码文件
         String qr = this.createQr(csEquipmentDeliveryAddParm.getNdid());
         csEquipmentDeliveryPo.setQrPath(qr);