Merge branch 'dev_upgrade' of 172.16.10.76:station/YeeAmosFireAutoSysRoot into upgrade

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/dao/entity/StationInfo.java

@@ -94,13 +94,19 @@ public class StationInfo extends BasicEntity{
      * 安全负责人
      */
     @Column(name="safety_charge_user_id")
-    private String safetyChargeUserId; 
+    private String safetyChargeUserId;
+
+    /**
+     * 队长
+     */
+    @Column(name="fire_captain_user_id")
+    private String fireCaptainUserId;
 
     /**
      * 创建人
      */
     @Column(name="create_by")
-    private String createBy; 
+    private String createBy;
 
     /**
      * 创建日期
@@ -149,6 +155,37 @@ public class StationInfo extends BasicEntity{
     @Column(name="safety_user_phone_num")
     private String safetyUserPhoneNum;
 
+
+    @Column(name="fire_captain_name")
+    private String fireCaptainName;
+
+    @Column(name="fire_captain_phone_num")
+    private String fireCaptainPhoneNum;
+
+    public String getFireCaptainUserId() {
+        return fireCaptainUserId;
+    }
+
+    public void setFireCaptainUserId(String fireCaptainUserId) {
+        this.fireCaptainUserId = fireCaptainUserId;
+    }
+
+    public String getFireCaptainName() {
+        return fireCaptainName;
+    }
+
+    public void setFireCaptainName(String fireCaptainName) {
+        this.fireCaptainName = fireCaptainName;
+    }
+
+    public String getFireCaptainPhoneNum() {
+        return fireCaptainPhoneNum;
+    }
+
+    public void setFireCaptainPhoneNum(String fireCaptainPhoneNum) {
+        this.fireCaptainPhoneNum = fireCaptainPhoneNum;
+    }
+
     public String getCreateUserPhoneNum() {
         return createUserPhoneNum;
     }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/StationMaintenServiceImp.java

@@ -20,32 +20,46 @@ public class StationMaintenServiceImp implements IStationMaintenService {
 
     @Override
     public void save(StationInfo stationInfo){
-
-        // 状态为启用（0）下只能修改换流站名称
-        if(stationInfo.getId() == 0){
-            StringBuilder stringBuilder = new StringBuilder();
-            stringBuilder.append(stationInfo.getUseType());
-            stringBuilder.append(stationInfo.getRegionCode());
-            stringBuilder.append(stationInfo.getCode());
-            stationInfo.setStationCode(stringBuilder.toString());
-        }else{
+        StringBuilder stringBuilder = new StringBuilder();
+        Integer useType = stationInfo.getUseType();
+        String regionCode = stationInfo.getRegionCode();
+        String code = stationInfo.getCode();
+        if (regionCode == null || "".equals(regionCode) ){
             StationInfo station = detail();
-            // 判断状态是否切换
-            if(!station.getStatus().equals(stationInfo.getStatus())){
-                StringBuilder stringBuilder = new StringBuilder();
-
-                if(StringUtils.isEmpty(stationInfo.getRegionCode())){
-                    stringBuilder.append(station.getStationCode());
-                }else{
-                    stringBuilder.append(stationInfo.getUseType());
-                    stringBuilder.append(stationInfo.getRegionCode());
-                    stringBuilder.append(stationInfo.getCode());
-                }
-
-                stationInfo.setStationCode(stringBuilder.toString());
-            }
+            stationInfo.setStationCode(station.getStationCode());
+        }else {
+            stringBuilder.append(useType);
+            stringBuilder.append(regionCode);
+            stringBuilder.append(code);
+            stationInfo.setStationCode(stringBuilder.toString());
         }
 
+
+//        // 状态为启用（0）下只能修改换流站名称
+//        if(stationInfo.getId() == 0){
+//            StringBuilder stringBuilder = new StringBuilder();
+//            stringBuilder.append(stationInfo.getUseType());
+//            stringBuilder.append(stationInfo.getRegionCode());
+//            stringBuilder.append(stationInfo.getCode());
+//            stationInfo.setStationCode(stringBuilder.toString());
+//        }else{
+//            StationInfo station = detail();
+//            // 判断状态是否切换
+//            if(!station.getStatus().equals(stationInfo.getStatus())){
+//                StringBuilder stringBuilder = new StringBuilder();
+//
+//                if(StringUtils.isEmpty(stationInfo.getRegionCode())){
+//                    stringBuilder.append(station.getStationCode());
+//                }else{
+//                    stringBuilder.append(stationInfo.getUseType());
+//                    stringBuilder.append(stationInfo.getRegionCode());
+//                    stringBuilder.append(stationInfo.getCode());
+//                }
+//
+//                stationInfo.setStationCode(stringBuilder.toString());
+//            }
+//        }
+
         //保存
         iStationMaintenDao.save(stationInfo);
     }

YeeAmosFireAutoSysStart/src/main/resources/db/changelog/fas-2.0.1.xml

@@ -554,5 +554,18 @@
             ALTER TABLE `f_station_info` ADD COLUMN `safety_user_phone_num` varchar(20) NULL COMMENT '安全负责人联系方式';
         </sql>
     </changeSet>
+    <changeSet author="zjw" id="16062323232111">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="f_station_info" columnName="safety_user_phone_num" />
+            </not>
+        </preConditions>
+        <comment>修改f_station_info表结构</comment>
+        <sql>
+            ALTER TABLE `f_station_info` ADD COLUMN `fire_captain_name` varchar(20) NULL COMMENT '驻站消防队队长姓名';
+            ALTER TABLE `f_station_info` ADD COLUMN `fire_captain_phone_num` varchar(20) NULL COMMENT '驻站消防队队长电话';
+            ALTER TABLE `f_station_info` ADD COLUMN `fire_captain_user_id` varchar(20) NULL COMMENT '驻站消防队队长';
+        </sql>
+    </changeSet>
     
 </databaseChangeLog>
\ No newline at end of file

YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_equipment_specific.xml

@@ -49,7 +49,7 @@
         left join wl_equipment_detail as det on sto.equipment_detail_id = det.id
         left join wl_equipment as equ on det.equipment_id = equ.id
         left join wl_equipment_category as cate on equ.category_id = cate.id
-        left join f_equipment_manage as manage on spe.system_id = manage.SEQUENCE_NBR
+        left join f_fire_fighting_system as manage on spe.system_id = manage.SEQUENCE_NBR
         where sto.amount <![CDATA[>]]> 0
         <if test="name != null and name!='null' ">
             and det.name like CONCAT('%',#{name},'%' )

YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_fire_equip.xml

@@ -159,11 +159,12 @@
         SELECT
         det.`name` as  fireEquipmentName,
         spe.`code` as  fireEquipmentCode,
-        ein.name,
+        ein.name as eq_point_name,
         CASE ind.value WHEN 'true' THEN '是'
         WHEN 'false' THEN '否'
         ELSE ind.value END 'e_value',
-        ein.unit,
+        ein.unit as eq_point_unit,
+        sce.name as source_name,
         (
         SELECT
         group_concat(DISTINCT f.`name`)
@@ -173,12 +174,15 @@
         WHERE
         efe.fire_equipment_id = ind.equipment_specific_id
         ) equipmentName,
-        ind.update_date
+        ind.update_date as create_date
         FROM
         wl_equipment_specific_index as ind
         left join wl_equipment_specific as spe on  spe.id = ind.equipment_specific_id
         left join wl_equipment_detail as det on spe.equipment_detail_id = det.id
         left join wl_equipment_index as ein on ind.equipment_index_id = ein.id
+        left join wl_stock_detail as sto on  sto.qr_code = spe.qr_code
+        left join wl_warehouse_structure as str on sto.warehouse_structure_id = str.id
+        left join f_risk_source as sce on str.source_id = sce.id
         ) d
         WHERE
         1 = 1
@@ -189,9 +193,9 @@
             AND d.equipmentName LIKE '%${equipmentName}%'
         </if>
         <if test="startTime!=null">
-            AND d.update_date BETWEEN '${startTime}' AND '${endTime}'
+            AND d.create_date BETWEEN '${startTime}' AND '${endTime}'
         </if>
-        ORDER BY d.update_date desc
+        ORDER BY d.create_date desc
         LIMIT ${start},${length}
 
     </select>