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

@@ -189,10 +189,11 @@
                 AND g.peopleType = #{map.peopleType}
             </if>
             <if test="map.fireManagementPost != null">
-                AND locate(#{map.fireManagementPost}, g.fireManagementPost)
-<!--                <foreach item="item" index="index"  collection="map.fireManagementPost" open="(" separator="," close=")">-->
-<!--                    #{item}-->
-<!--                </foreach>-->
+--                 AND locate(#{map.fireManagementPost}, g.fireManagementPost)
+                AND g.fireManagementPost IN
+                <foreach item="item" index="index"  collection="map.fireManagementPost" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
             </if>
             <if test="map.personStatus != null and map.personStatus != ''">
                 AND u.person_status = #{map.personStatus}

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

@@ -3638,7 +3638,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 					break;
 				case "peopleType":
 					contentVo.setLabel(u.getDescribe());
-					contentVo.setValue(peopleInfoDto.getFirefighters().getPeopleType());
+					contentVo.setValue(peopleInfoDto.getFirefighters().getPeopleType().equals("1601") ? "驻站消防员" :"运维人员");
 					contentVo.setType("text");
 					break;
 				case "mobilePhone":
@@ -3648,7 +3648,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 					break;
 				case "gender":
 					contentVo.setLabel(u.getDescribe());
-					contentVo.setValue(peopleInfoDto.getFirefighters().getGender());
+					contentVo.setValue(peopleInfoDto.getFirefighters().getGender().equals("346") ? "男" : "女" );
 					contentVo.setType("text");
 					break;
 				case "certificatesType":

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

@@ -195,7 +195,7 @@ public class SupervisionVideoServiceImpl extends ServiceImpl<SupervisionVideoMap
                     item.put("update_time", false);
                 }
                 //稳压泵当前状态   无告警并且启动时长小于5分钟为正常
-                item.put("stateDesc", Integer.parseInt(String.valueOf(item.get("isAlarm"))) == 0 && time ? PressurePumpRelateEnum.PIPE_PRESSURE_NORMAL_STATUS.getValue() : PressurePumpRelateEnum.PIPE_PRESSURE_ABNORMAL_STATUS.getValue());
+//                item.put("stateDesc", Integer.parseInt(String.valueOf(item.get("isAlarm"))) == 0 && time ? PressurePumpRelateEnum.PIPE_PRESSURE_NORMAL_STATUS.getValue() : PressurePumpRelateEnum.PIPE_PRESSURE_ABNORMAL_STATUS.getValue());
             }
 
             // 获取redis稳压泵缓存数据，默认JSON配置最近4小时
@@ -226,7 +226,15 @@ public class SupervisionVideoServiceImpl extends ServiceImpl<SupervisionVideoMap
                 return item;
             }).collect(Collectors.toList());
             List<Map<String, Object>> records = pressurePumpInfo.getRecords();
-            records.sort((t1, t2) -> t1.get("stateDesc").toString().compareTo(t2.get("stateDesc").toString()));
+            records.sort((t1, t2) -> {
+                if(t1.get("update_time") instanceof Boolean) {
+                    return  -1;
+                } else if (t2.get("update_time") instanceof Boolean) {
+                    return  -1;
+                } else {
+                   return Long.valueOf(t1.get("update_time").toString()).compareTo(Long.valueOf(t2.get("update_time").toString()));
+                }
+            });
             pressurePumpInfo.setRecords(records);
         }
         return pressurePumpInfo;

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

@@ -3012,13 +3012,11 @@
         concat_ws( '-', ws.full_name, ed.area ) area,
         es.iot_code,
         es.id,
-        es.code,
-        IFNULL( sum( `status` ), 0 ) AS isAlarm
+        es.code
         FROM
         wl_equipment_specific es
         LEFT JOIN wl_equipment_detail ed ON es.equipment_detail_id = ed.id
         LEFT JOIN wl_warehouse_structure ws ON ws.id = es.warehouse_structure_id
-        LEFT JOIN wl_equipment_specific_alarm esa ON esa.equipment_specific_id = es.id
         WHERE
         ed.`code` LIKE '92010800%'
         AND es.iot_code IS NOT NULL