Merge remote-tracking branch 'origin/develop_dl' into develop_dl

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/OrgUsrMapper.xml

@@ -119,6 +119,7 @@
             u.amos_org_id amosOrgId,
             u.biz_org_code bizOrgCode,
             u.parent_id parentId,
+            u.person_status personStatus,
             (select biz_org_name from cb_org_usr where sequence_nbr = u.parent_id) as companyName,
             g.*
             FROM
@@ -188,6 +189,9 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="map.personStatus != null and map.personStatus != ''">
+                AND u.person_status = #{map.personStatus}
+            </if>
             GROUP BY
             u.sequence_nbr ,
             u.biz_org_name ,

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java

@@ -614,6 +614,12 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 			map.put("peopleType", peopleType);
 		}
 
+		String personStatus = "";
+		if(req.containsKey("personStatus")) {
+			personStatus = req.get("personStatus").toString();
+			map.put("personStatus", personStatus);
+		}
+
 		req.remove("pageSize");
 		req.remove("pageNum");
 		req.remove("parentId");
@@ -623,6 +629,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		req.remove("peopleType");
 		req.remove("bizOrgName");
 		req.remove("fireManagementPost");
+		req.remove("personStatus");
 		map.put("fieldsValue", req);
 		map.put("fields", alertFormServiceImpl.queryListByFormId(OrgPersonEnum.人员.getCode()));
 		pageBean.setTotal(this.baseMapper.selectPersonListCount(map));

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/FireResourceSupervisionController.java

@@ -27,7 +27,7 @@ public class FireResourceSupervisionController extends BaseController {
     private IFireResourceSupervisionService iFireResourceSupervisionService;
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(httpMethod = "GET", value = "消防系统、检测部件、消防车辆统计信息查询", notes = "聚合接口: 消防系统、检测部件、消防车辆统计信息查询")
+    @ApiOperation(httpMethod = "GET", value = "消防系统、监测部件、消防车辆统计信息查询", notes = "聚合接口: 消防系统、监测部件、消防车辆统计信息查询")
     @RequestMapping(value = "/stats", method = RequestMethod.GET)
     public ResponseModel<Object> stats() {
         ReginParams reginParams = getSelectedOrgInfo();

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificSerivceImpl.java

@@ -1968,7 +1968,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
             try {
                 if(e.get("weExpiry") != null) {
                     int year =  Integer.parseInt(e.get("weExpiry").toString());
-                    Date productDate = DateUtils.dateParse(e.get("product").toString(),"yyyy-MM-dd'T'HH:mm");
+                    Date productDate = DateUtils.dateParse(e.get("product").toString(),DateUtils.DATE_TIME_PATTERN);
                     Calendar calendar = Calendar.getInstance();
                     calendar.setTime(productDate);
                     calendar.add(Calendar.YEAR, year);

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/RiskSourceServiceImpl.java

@@ -111,7 +111,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
             EquipmentSpecificIndex equipmentSpeIndex = equipmentSpecificIndexMapper.selectOne(queryWrapper);
             equipAlarm.setKey(indexKey);
             equipAlarm.setValue(equipmentSpeIndex.getValue());
-            equipAlarm.setAlarmContent(equipmentSpeIndex.getEquipmentName() + equipmentSpeIndex.getEquipmentIndexName());
+            equipAlarm.setAlarmContent(equipmentSpeIndex.getEquipmentSpecificName() + equipmentSpeIndex.getEquipmentIndexName());
             equipAlarm.setAlarmDate(equipmentSpeIndex.getUpdateDate());
 
 

amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml

@@ -5909,8 +5909,9 @@
             from
             cb_water_resource
             <where>
+                (resource_type = 'industryPool' or resource_type = 'pool')
                 <if test="bizOrgCode != null and bizOrgCode != ''">
-                    biz_org_code like concat(#{bizOrgCode}, '%')
+                   AND biz_org_code like concat(#{bizOrgCode}, '%')
                 </if>
             </where>
             ) AS total,
@@ -5920,6 +5921,7 @@
             cb_water_resource
             <where>
                 water_status = '2'
+                AND (resource_type = 'industryPool' or resource_type = 'pool')
                 <if test="bizOrgCode != null and bizOrgCode != ''">
                     AND biz_org_code like concat(#{bizOrgCode}, '%')
                 </if>
@@ -5931,6 +5933,7 @@
             cb_water_resource
             <where>
                 water_status = '1'
+                AND (resource_type = 'industryPool' or resource_type = 'pool')
                 <if test="bizOrgCode != null and bizOrgCode != ''">
                     AND biz_org_code like concat(#{bizOrgCode}, '%')
                 </if>
@@ -6086,8 +6089,8 @@
             spe.`code`,
             spe.`iot_code` iotCode,
             cate.`name` AS category_name,
-            find_in_set(spe.id,(select  point_in_scene from  wl_source_scene  where source_id=#{systemId}))	 is_bound
-
+            find_in_set(spe.id,(select  point_in_scene from  wl_source_scene  where source_id=#{systemId}))	 is_bound,
+            spe.equip_status equipStatus
         FROM
             wl_equipment_specific AS spe
                 LEFT JOIN wl_equipment_detail AS det ON spe.equipment_detail_id = det.id

amos-boot-system-jcs/src/main/resources/db/changelog/jcs-1.0.0.0.xml

@@ -3906,4 +3906,16 @@
         </sql>
     </changeSet>
 
+    <changeSet author="ltw" id="2023-08-14">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="cb_org_usr" columnName="person_status"/>
+            </not>
+        </preConditions>
+        <comment>cb_org_usr add column</comment>
+        <sql>
+            alter table `cb_org_usr` add column `person_status` varchar(20) NULL DEFAULT '0' COMMENT '人员红黄绿码，0是绿码，1是黄码，2是黄码'
+        </sql>
+    </changeSet>
+
 </databaseChangeLog>