RFID设备扩展字段

src/main/java/com/xujie/sys/modules/pms/data/EamObjectData.java

@@ -324,6 +324,34 @@ public class EamObjectData extends QueryPage {
     private String modelNo;
     // 资产备注
     private String assetRemark;
+    // 车间
+    private String workshop;
+    // 联系方式
+    private String contactMethod;
+    // 保修开始时间
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date warrantyStartDate;
+    // 保修结束时间
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date warrantyEndDate;
+    // 是否已过保
+    private String warrantyExpiredFlag;
+    // 电压
+    private String voltage;
+    // 电流A
+    private String currentA;
+    // 功率KW
+    private String powerKw;
+    // 设备总尺寸：长*宽*高（m）
+    private String totalSize;
+    // 设备分体尺寸：长*宽*高（m）
+    private String splitSize;
+    // 设备总重量
+    private String totalWeight;
+    // 设备分体模块重量
+    private String splitModuleWeight;
 
     public String getDeptName() {
         return deptName;
@@ -357,6 +385,102 @@ public class EamObjectData extends QueryPage {
         this.assetRemark = assetRemark;
     }
 
+    public String getWorkshop() {
+        return workshop;
+    }
+
+    public void setWorkshop(String workshop) {
+        this.workshop = workshop;
+    }
+
+    public String getContactMethod() {
+        return contactMethod;
+    }
+
+    public void setContactMethod(String contactMethod) {
+        this.contactMethod = contactMethod;
+    }
+
+    public Date getWarrantyStartDate() {
+        return warrantyStartDate;
+    }
+
+    public void setWarrantyStartDate(Date warrantyStartDate) {
+        this.warrantyStartDate = warrantyStartDate;
+    }
+
+    public Date getWarrantyEndDate() {
+        return warrantyEndDate;
+    }
+
+    public void setWarrantyEndDate(Date warrantyEndDate) {
+        this.warrantyEndDate = warrantyEndDate;
+    }
+
+    public String getWarrantyExpiredFlag() {
+        return warrantyExpiredFlag;
+    }
+
+    public void setWarrantyExpiredFlag(String warrantyExpiredFlag) {
+        this.warrantyExpiredFlag = warrantyExpiredFlag;
+    }
+
+    public String getVoltage() {
+        return voltage;
+    }
+
+    public void setVoltage(String voltage) {
+        this.voltage = voltage;
+    }
+
+    public String getCurrentA() {
+        return currentA;
+    }
+
+    public void setCurrentA(String currentA) {
+        this.currentA = currentA;
+    }
+
+    public String getPowerKw() {
+        return powerKw;
+    }
+
+    public void setPowerKw(String powerKw) {
+        this.powerKw = powerKw;
+    }
+
+    public String getTotalSize() {
+        return totalSize;
+    }
+
+    public void setTotalSize(String totalSize) {
+        this.totalSize = totalSize;
+    }
+
+    public String getSplitSize() {
+        return splitSize;
+    }
+
+    public void setSplitSize(String splitSize) {
+        this.splitSize = splitSize;
+    }
+
+    public String getTotalWeight() {
+        return totalWeight;
+    }
+
+    public void setTotalWeight(String totalWeight) {
+        this.totalWeight = totalWeight;
+    }
+
+    public String getSplitModuleWeight() {
+        return splitModuleWeight;
+    }
+
+    public void setSplitModuleWeight(String splitModuleWeight) {
+        this.splitModuleWeight = splitModuleWeight;
+    }
+
     public String getDeptID() {
         return deptID;
     }

src/main/java/com/xujie/sys/modules/pms/service/Impl/EamObjectServiceImpl.java

@@ -81,6 +81,8 @@ public class EamObjectServiceImpl implements EamObjectService {
         inData.setCycleTimeSend(validatePositiveNumber(inData.getCycleTimeSend()));
         // 标准化校正字段
         this.normalizeCalibrationConfig(inData);
+        // 标准化RFID扩展字段
+        this.normalizeRfidConfig(inData);
         eamObjectMapper.insertEamObject(inData);
         // 存通知类型
         String[] split = inData.getMesType().split(",");
@@ -174,6 +176,8 @@ public class EamObjectServiceImpl implements EamObjectService {
         inData.setCycleTimeSend(validatePositiveNumber(inData.getCycleTimeSend()));
         // 标准化校正字段
         this.normalizeCalibrationConfig(inData);
+        // 标准化RFID扩展字段
+        this.normalizeRfidConfig(inData);
         eamObjectMapper.updateEamObject(inData);
         // 存通知类型
         // 清除设备的通知类型数据
@@ -489,5 +493,30 @@ public class EamObjectServiceImpl implements EamObjectService {
         }
     }
 
+    /**
+     * 标准化RFID扩展字段
+     * 1. 非RFID BU清空扩展字段
+     * 2. RFID BU规范是否过保标识(Y/N)
+     */
+    private void normalizeRfidConfig(EamObjectData inData) {
+        boolean isRfidBu = StringUtils.containsIgnoreCase(inData.getBuNo(), "RFID");
+        if (!isRfidBu) {
+            inData.setWorkshop("");
+            inData.setContactMethod("");
+            inData.setWarrantyStartDate(null);
+            inData.setWarrantyEndDate(null);
+            inData.setWarrantyExpiredFlag("N");
+            inData.setVoltage("");
+            inData.setCurrentA("");
+            inData.setPowerKw("");
+            inData.setTotalSize("");
+            inData.setSplitSize("");
+            inData.setTotalWeight("");
+            inData.setSplitModuleWeight("");
+            return;
+        }
+        inData.setWarrantyExpiredFlag("Y".equalsIgnoreCase(inData.getWarrantyExpiredFlag()) ? "Y" : "N");
+    }
+
 
 }

src/main/resources/mapper/pms/EamObjectMapper.xml

@@ -44,6 +44,18 @@
             eo.asset_no,
             eo.model_no as modelNo,
             eo.asset_remark,
+            eo.workshop,
+            es.Phone as contactMethod,
+            eo.warranty_start_date as warrantyStartDate,
+            eo.warranty_end_date as warrantyEndDate,
+            eo.warranty_expired_flag as warrantyExpiredFlag,
+            eo.voltage,
+            eo.current_a as currentA,
+            eo.power_kw as powerKw,
+            eo.total_size as totalSize,
+            eo.split_size as splitSize,
+            eo.total_weight as totalWeight,
+            eo.split_module_weight as splitModuleWeight,
             eo.standard_maintenance_duration,
             eo.time_out_maintenance_duration,
             eo.standard_response_duration,
@@ -132,9 +144,28 @@
             ClosedDate,
             ClosedBy,
             resourceID,
-            model_no as modelNo
-        FROM eam_object
-        where site = #{site} and bu_no = #{buNo} AND ObjectID = #{objectID}
+            model_no as modelNo,
+            (
+                SELECT TOP 1 s.Phone
+                FROM eam_supplier s
+                WHERE s.site = eo.site
+                  AND s.bu_no = eo.bu_no
+                  AND s.SupplierID = eo.SupplierID
+                  AND s.Active = 'Y'
+            ) as contactMethod,
+            workshop,
+            warranty_start_date as warrantyStartDate,
+            warranty_end_date as warrantyEndDate,
+            warranty_expired_flag as warrantyExpiredFlag,
+            voltage,
+            current_a as currentA,
+            power_kw as powerKw,
+            total_size as totalSize,
+            split_size as splitSize,
+            total_weight as totalWeight,
+            split_module_weight as splitModuleWeight
+        FROM eam_object eo
+        where eo.site = #{site} and eo.bu_no = #{buNo} AND eo.ObjectID = #{objectID}
     </select>
 
     <!--插入设备清单的数据-->
@@ -142,12 +173,14 @@
         insert into eam_object
         (Site, bu_no, ObjectID, ObjectDesc, LocationID, FamilyID, GroupID, SupplierID, ManufacturerID, SeqNo, PurchessDate,
          Active, CreateDate, CreateBy, resourceID, update_date, update_by, dept_id, asset_no, model_no, asset_remark, standard_maintenance_duration,
-         time_out_maintenance_duration, standard_response_duration, time_out_response_duration, cycle_time_send,
+         workshop, warranty_start_date, warranty_end_date, warranty_expired_flag, voltage, current_a, power_kw,
+         total_size, split_size, total_weight, split_module_weight, time_out_maintenance_duration, standard_response_duration, time_out_response_duration, cycle_time_send,
          public_facilities_flag, calibration_enable_flag, calibration_period)
         values
         (#{site}, #{buNo}, #{objectID}, #{objectDesc}, #{locationID}, #{familyID}, #{groupID}, #{supplierID}, #{manufacturerID}, #{seqNo}, #{purchessDate},
          #{active}, #{createDate}, #{createBy}, #{resourceID}, getDate(), #{updateBy}, #{deptID}, #{assetNo}, #{modelNo}, #{assetRemark}, #{standardMaintenanceDuration},
-         #{timeOutMaintenanceDuration}, #{standardResponseDuration}, #{timeOutResponseDuration}, #{cycleTimeSend}, #{publicFacilitiesFlag},
+         #{workshop}, #{warrantyStartDate}, #{warrantyEndDate}, #{warrantyExpiredFlag}, #{voltage}, #{currentA}, #{powerKw},
+         #{totalSize}, #{splitSize}, #{totalWeight}, #{splitModuleWeight}, #{timeOutMaintenanceDuration}, #{standardResponseDuration}, #{timeOutResponseDuration}, #{cycleTimeSend}, #{publicFacilitiesFlag},
          #{calibrationEnableFlag}, #{calibrationPeriod,jdbcType=INTEGER})
     </insert>
 
@@ -172,6 +205,17 @@
             asset_no = #{assetNo},
             model_no = #{modelNo},
             asset_remark = #{assetRemark},
+            workshop = #{workshop},
+            warranty_start_date = #{warrantyStartDate},
+            warranty_end_date = #{warrantyEndDate},
+            warranty_expired_flag = #{warrantyExpiredFlag},
+            voltage = #{voltage},
+            current_a = #{currentA},
+            power_kw = #{powerKw},
+            total_size = #{totalSize},
+            split_size = #{splitSize},
+            total_weight = #{totalWeight},
+            split_module_weight = #{splitModuleWeight},
             standard_maintenance_duration = #{standardMaintenanceDuration},
             time_out_maintenance_duration = #{timeOutMaintenanceDuration},
             standard_response_duration = #{standardResponseDuration},