Merge branch 'develop_dl_plan6' of http://39.98.45.134:8090/moa/amos-boot-biz into develop_dl_plan6

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/SignMapper.xml

@@ -76,8 +76,8 @@
         )  s  group by date,bizOrgCode
     </select>
     <select id="queryPersonNum" resultType="java.lang.Integer">
-        select count(*) from cb_firefighters where fire_team_id in (
-            select sequence_nbr from cb_fire_team where biz_org_code  = #{bizOgrCode} and type_code = '116'
-            ) and  is_delete = 0 AND now()  > rec_date
+        select count(*) from cb_firefighters where biz_org_code  = #{bizOgrCode} AND people_type = '1601'
+           AND is_delete = 0 AND now()  > rec_date
+
     </select>
 </mapper>

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

@@ -5,6 +5,7 @@ import java.util.stream.Collectors;
 
 import javax.servlet.http.HttpServletRequest;
 
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -149,6 +150,10 @@ public class DynamicFormInstanceServiceImpl extends BaseService<DynamicFormInsta
     // 不存在值班数据则不查找 修改sql 方法去除 by kongfm 2021-09-14
     public IPage<Map<String, Object>> pageListNew(int current, int size, String groupCode, String beginDate, String endDate) {
         Map<String, String> params = this.getRequestParamMap();
+        if (!ObjectUtils.isEmpty(beginDate) && params.get("beginDate") == null) {
+            params.put("stratTime", beginDate);
+            params.put("endTime", endDate);
+        }
         List<DynamicFormColumn> columns = dynamicFormColumnService.list(new LambdaQueryWrapper<DynamicFormColumn>().eq(DynamicFormColumn::getGroupCode, groupCode));
         Map<String, Object> fieldCodes = Bean.listToMap(columns, "fieldCode", "queryStrategy", DynamicFormColumn.class);
         Page page = new Page(current, size);

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

@@ -241,15 +241,12 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi
 			//删除之前所在用户组
 			OrgUsrAgencyUser orgUsrAgencyUser = orgUsrAgencyUserMapper.selectOne(new QueryWrapper<OrgUsrAgencyUser>().eq("org_usr_id", id));
 			if (!ValidationUtil.isEmpty(orgUsrAgencyUser) && amosUser != null ) {
-
-				List<String> groupIdsList = peopleInfoDto.getOrgUsrAgencyUser().getDataDictionaryList().stream().map(DataDictionary::getCode).distinct().collect(Collectors.toList());
-				String groupIds = String.join(",", groupIdsList);
-				if (!"".equals(groupIds) && null != groupIds) {
-					String[] ids = groupIds.split(",");
-					for (String gId : ids) {
-						Long groupId = Long.valueOf(gId);
-						Privilege.groupUserClient.deleteGroupUser(groupId,amosUser.getUserId());
-					}
+				for (String s : orgUsrAgencyUser.getGroupIds().split(",")) {
+					QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
+					queryWrapper.eq("name", s);
+					queryWrapper.eq("type", "CB_USER_GROUP");
+					List<DataDictionary> list = iDataDictionaryService.list(queryWrapper);
+					Privilege.groupUserClient.deleteGroupUser(Long.valueOf(list.get(0).getCode()),amosUser.getUserId());
 				}
 			}
 			//同步更新或者创建平台用户
@@ -260,18 +257,23 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi
 					//删除cb_org_usr_agency_user中对应数据
 					if (!ValidationUtil.isEmpty(orgUsrAgencyUser)) {
 						orgUsrAgencyUserMapper.delete(new QueryWrapper<OrgUsrAgencyUser>().eq("org_usr_id", id));
+						Privilege.agencyUserClient.multDeleteUser(orgUsrAgencyUser.getAmosUserId());
 					}
 					//删除cb_org_usr相关字段
 					OrgUsr orgUsr1 = orgUsrMapper.queryBySequenceNbr(id.toString());
-					orgUsr1.setAmosOrgId("");
-					orgUsr1.setAmosOrgCode("");
-					orgUsrMapper.update(orgUsr1,new QueryWrapper<OrgUsr>().eq("sequence_nbr",id));
+					if(!ValidationUtil.isEmpty(orgUsr1)){
+						orgUsr1.setAmosOrgId("");
+						orgUsr1.setAmosOrgCode("");
+						orgUsrMapper.update(orgUsr1,new QueryWrapper<OrgUsr>().eq("sequence_nbr",id));
+					}
+
 					//删除cb_firefighters相关字段
 					Firefighters firefighters = firefightersMapper.selectOne(new QueryWrapper<Firefighters>().eq("org_usr_id", id));
-					firefighters.setAmosUserId("");
-					firefighters.setAmosName("");
-					firefightersMapper.update(firefighters,new QueryWrapper<Firefighters>().eq("org_usr_id", id));
-					Privilege.agencyUserClient.multDeleteUser(orgUsrAgencyUser.getAmosUserId());
+					if(!ValidationUtil.isEmpty(firefighters)){
+						firefighters.setAmosUserId("");
+						firefighters.setAmosName("");
+						firefightersMapper.update(firefighters,new QueryWrapper<Firefighters>().eq("org_usr_id", id));
+					}
 				} else {
 					map = orgUsrService.savePlatformUser(orgUsr,peopleInfoDto,"update");
 				}

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

@@ -3034,7 +3034,8 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		String roleNameString = String.join(",", roleNameList);
 		List<RoleModel> userRoleList = allRoleList.stream().filter(r -> roleNameString.contains(r.getRoleName()))
 				.collect(Collectors.toList());
-		String appCode = "";
+		List<String> collect = peopleInfoDto.getOrgUsrAgencyUser().getDataDictionaryList().stream().map(DataDictionary::getTypeDesc).collect(Collectors.toList());
+		String appCode = String.join(",", collect);
 		String[] appCodes = appCode.split(",");
 		Collections.addAll(appCodesSet, appCodes);
 		userRoleList.forEach(r -> {
@@ -3408,13 +3409,14 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		OrgUsrAgencyUser orgUsrAgencyUser = orgUsrAgencyUserMapper.selectOne(new QueryWrapper<OrgUsrAgencyUser>().eq("org_usr_id", id));
 		if (!ObjectUtils.isEmpty(orgUsrAgencyUser)) {
 			orgUsrAgencyUserMapper.delete(new QueryWrapper<OrgUsrAgencyUser>().eq("org_usr_id", id));
+			//同步平台删除用户
+			AgencyUserModel amosUser = Privilege.agencyUserClient.queryByUserId(orgUsrAgencyUser.getAmosUserId()).getResult();
+			if (!ObjectUtils.isEmpty(amosUser)) {
+				Privilege.agencyUserClient.multDeleteUser(orgUsrAgencyUser.getAmosUserId());
+			}
 		}
 
-		//同步平台删除用户
-		AgencyUserModel amosUser = Privilege.agencyUserClient.queryByUserId(orgUsrAgencyUser.getAmosUserId()).getResult();
-		if (!ObjectUtils.isEmpty(amosUser)) {
-			Privilege.agencyUserClient.multDeleteUser(orgUsrAgencyUser.getAmosUserId());
-		}
+
 		/* bug 2812 一次删除多条数据 传入类型修改为string 问题解决 2021-09-09 陈召 结束 */
 		try {
 			eSOrgUsrService.deleteById(id);

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

@@ -192,7 +192,7 @@ public class SupervisionConfigureController extends AbstractBaseController {
     @RequestMapping(value = "/fireAlarmLogPage", method = RequestMethod.GET)
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "消防报警列表分页查询", produces = "application/json;charset=UTF-8", notes = "消防报警列表分页查询")
-    public ResponseModel pageQuery(@RequestParam(required = false) String system, @RequestParam(required = false) String specificIndexKey, CommonPageable commonPageable) {
+    public ResponseModel pageQuery(@RequestParam(required = false) String code, @RequestParam(required = false) String typeCode, CommonPageable commonPageable) {
         if (commonPageable.getPageNumber() == 0) {
             commonPageable.setPageNumber(1);
         }
@@ -200,11 +200,11 @@ public class SupervisionConfigureController extends AbstractBaseController {
         List<CommonRequest> queryRequests = new ArrayList<>();
         CommonRequest request7 = new CommonRequest();
         request7.setName("system");
-        request7.setValue(StringUtil.isNotEmpty(system) ? StringUtils.trimToNull(system) : null);
+        request7.setValue(StringUtil.isNotEmpty(code) ? StringUtils.trimToNull(code) : null);
         queryRequests.add(request7);
         CommonRequest request8 = new CommonRequest();
         request8.setName("specificIndexKey");
-        request8.setValue(StringUtil.isNotEmpty(specificIndexKey) ? StringUtils.trimToNull(specificIndexKey) : null);
+        request8.setValue(StringUtil.isNotEmpty(typeCode) ? StringUtils.trimToNull(typeCode) : null);
         queryRequests.add(request8);
         if (!ValidationUtil.isEmpty(reginParams.getPersonIdentity())) {
             CommonRequest request13 = new CommonRequest();
@@ -268,10 +268,15 @@ public class SupervisionConfigureController extends AbstractBaseController {
             }
 
             String nowStrLong = DateUtils.getNowStrLong();
-            Date mounthDate = DateUtils.dateAddMonths(null, -1);
+            Date mounthDate = null;
+            try {
+                mounthDate = DateUtils.getCurrentMonthEndTime(new Date());
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
             Date halfHour = DateUtils.dateAddMinutes(null, -30);
             Date twoHour = DateUtils.dateAddHours(null, -2);
-            Date fourHour = DateUtils.dateAddHours(null, -3);
+            Date fourHour = DateUtils.dateAddHours(null, -4);
             String startDateStr = DateUtils.convertDateToString(mounthDate, DateUtils.DATE_TIME_PATTERN);
             String half = DateUtils.convertDateToString(halfHour, DateUtils.DATE_TIME_PATTERN);
             String two = DateUtils.convertDateToString(twoHour, DateUtils.DATE_TIME_PATTERN);
@@ -294,19 +299,22 @@ public class SupervisionConfigureController extends AbstractBaseController {
                 List<Map<String, String>> collect = listObject1.stream().filter(t -> (t.containsKey("FHS_PressurePump_Start") && t.get("FHS_PressurePump_Start").equals("true"))).collect(Collectors.toList());
                 int num = collect.size();
                 item.put("monthStartNum", num);
-            } else if (200 == halfHourEntity.getStatus()) {
+            }
+            if (200 == halfHourEntity.getStatus()) {
                 String json1 = JSON.toJSONString(halfHourEntity.getResult());
                 List<Map<String, String>> listObject1 = (List<Map<String, String>>) JSONArray.parse(json1);
                 List<Map<String, String>> collect = listObject1.stream().filter(t -> (t.containsKey("FHS_PressurePump_Start") && t.get("FHS_PressurePump_Start").equals("true"))).collect(Collectors.toList());
                 int num = collect.size();
                 item.put("halfHourStartNum", num);
-            } else if (200 == twoHourEntity.getStatus()) {
+            }
+            if (200 == twoHourEntity.getStatus()) {
                 String json1 = JSON.toJSONString(twoHourEntity.getResult());
                 List<Map<String, String>> listObject1 = (List<Map<String, String>>) JSONArray.parse(json1);
                 List<Map<String, String>> collect = listObject1.stream().filter(t -> (t.containsKey("FHS_PressurePump_Start") && t.get("FHS_PressurePump_Start").equals("true"))).collect(Collectors.toList());
                 int num = collect.size();
                 item.put("twoHourStartNum", num);
-            } else if (200 == fourHourEntity.getStatus()) {
+            }
+            if (200 == fourHourEntity.getStatus()) {
                 String json1 = JSON.toJSONString(fourHourEntity.getResult());
                 List<Map<String, String>> listObject1 = (List<Map<String, String>>) JSONArray.parse(json1);
                 List<Map<String, String>> collect = listObject1.stream().filter(t -> (t.containsKey("FHS_PressurePump_Start") && t.get("FHS_PressurePump_Start").equals("true"))).collect(Collectors.toList());
@@ -320,7 +328,11 @@ public class SupervisionConfigureController extends AbstractBaseController {
             boolean time = false;
             if (!ObjectUtils.isEmpty(stateMap) && stateMap.containsKey("update_date") && stateMap.containsKey("equipment_index_name")) {
                 item.put("update_time", String.valueOf(stateMap.get("update_date")).replaceAll("T", " "));
-                item.put("equipment_index_name", stateMap.get("equipment_index_name"));
+                if(!ObjectUtils.isEmpty(stateMap.get("value"))){
+                    item.put("equipment_index_name", stateMap.get("equipment_index_name"));
+                } else {
+                    item.put("equipment_index_name", "无信号");
+                }
                 if ("启动".equals(stateMap.get("equipment_index_name"))) {
                     long update_time = 0L;
                     try {
@@ -336,7 +348,7 @@ public class SupervisionConfigureController extends AbstractBaseController {
                     item.put("upTime", diffMinute);
                 }
             }
-            item.put("stateDesc", Integer.parseInt(String.valueOf(item.get("isAlarm"))) == 0 && time ? "正常" : "异常");
+            item.put("stateDesc", Integer.parseInt(String.valueOf(item.get("isAlarm"))) == 0 || time ? "正常" : "异常");
             return item;
         }).collect(Collectors.toList());
         List<Map<String, Object>> stateMap = fireFightingSystemMapper.queryStartAndStopBySpecificId(ids);

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

@@ -448,7 +448,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
                     nowValue,
                     nowValue.compareTo(minValue) < 0 ? "低于最低报警阈值" + minValue : "超过最高报警阈值" + maxValue
                     );
-            model.setTitle(equipmentSpecificIndex.getEquipmentSpecificName());
+            model.setTitle("模拟量提醒");
             model.setBody(bodyMain);
             model.setMsgType("FoamTankOrPipeNetwork");
             model.setSendTime(new Date());

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

@@ -8,6 +8,7 @@ import com.yeejoin.equipmanage.mapper.SupervisionVideoMapper;
 import com.yeejoin.equipmanage.service.ISupervisionVideoService;
 import com.yeejoin.equipmanage.service.IVideoService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -46,12 +47,14 @@ public class SupervisionVideoServiceImpl extends ServiceImpl<SupervisionVideoMap
         supervisionVideoMapper.delete(new QueryWrapper<SupervisionVideo>().eq("biz_org_code",bizOrgCode));
         List<SupervisionVideo> list = new ArrayList<>();
         String ids = map.get("ids");
-        for (String s : ids.split(",")) {
-            SupervisionVideo supervisionVideo = new SupervisionVideo();
-            supervisionVideo.setCameraId(s);
-            supervisionVideo.setBizOrgCode(bizOrgCode);
-            supervisionVideo.setId(Long.valueOf(String.valueOf(UUID.randomUUID().getLeastSignificantBits()).replace("-", "")));
-            list.add(supervisionVideo);
+        if(StringUtils.isNotEmpty(ids)){
+            for (String s : ids.split(",")) {
+                SupervisionVideo supervisionVideo = new SupervisionVideo();
+                supervisionVideo.setCameraId(s);
+                supervisionVideo.setBizOrgCode(bizOrgCode);
+                supervisionVideo.setId(Long.valueOf(String.valueOf(UUID.randomUUID().getLeastSignificantBits()).replace("-", "")));
+                list.add(supervisionVideo);
+            }
         }
         return saveBatch(list);
     }

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

@@ -1351,7 +1351,7 @@
                 find_in_set( #{param.system}, `wlesal`.`system_codes` )
             </if>
             <if test="param.fireEquipmentSpecificIndexKey != null and param.fireEquipmentSpecificIndexKey != ''">
-                AND wles.type = #{param.fireEquipmentSpecificIndexKey}
+                AND wlesal.type = #{param.fireEquipmentSpecificIndexKey}
             </if>
             <if test="param.bizOrgCode != null and param.bizOrgCode != ''">
                 AND wles.biz_org_code like concat (#{param.bizOrgCode},'%')
@@ -1391,7 +1391,7 @@
                             ) fireAlarm ON (((
                                                      date_format( `fireAlarm`.`create_date`, '%Y-%m-%d' ) = `weekUtil`.`click_date`
                                                  )
-                                AND ( `fireAlarm`.`equipment_specific_index_name` = '火警' )
+                                AND ( `fireAlarm`.`type` = 'FIREALARM' )
                                 )))
                     GROUP BY
                         `weekUtil`.`click_date`
@@ -1420,7 +1420,7 @@
                                 </where>
                             ) `breakdown` ON (((
                                                        `weekUtil`.`click_date` = date_format( `breakdown`.`create_date`, '%Y-%m-%d' ))
-                                AND ( `breakdown`.`equipment_specific_index_name` = '故障' ))))
+                                AND ( `breakdown`.`type` = 'BREAKDOWN' ))))
                     GROUP BY
                         `weekUtil`.`click_date`
                     ORDER BY
@@ -1449,7 +1449,7 @@
                             ) `shield` ON (((
                                                     date_format( `shield`.`create_date`, '%Y-%m-%d' ) = `weekUtil`.`click_date`
                                                 )
-                                AND ( `shield`.`equipment_specific_index_name` = '屏蔽' ))))
+                                AND ( `shield`.`type` = 'SHIELD' ))))
                     GROUP BY
                         `weekUtil`.`click_date`
                     ORDER BY
@@ -1479,7 +1479,7 @@
                                                    date_format( `other`.`create_date`, '%Y-%m-%d' ) = `weekUtil`.`click_date`
                                                )
                                 AND (
-                                               `other`.`equipment_specific_index_name` NOT IN ( '火警', '故障', '屏蔽' )))))
+                                               `other`.`equipment_specific_index_name` NOT IN ( 'SHIELD', 'BREAKDOWN', 'FIREALARM' )))))
                     GROUP BY
                         `weekUtil`.`click_date`
                     ORDER BY

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

@@ -2805,7 +2805,8 @@
     <select id="queryPressureNowStateBySpecificId" resultType="java.util.Map">
         SELECT
             i.update_date,
-            i.equipment_index_name
+            i.equipment_index_name,
+            value
         FROM
             wl_equipment_specific_index i
         WHERE
@@ -4640,7 +4641,7 @@
         )
         END
         ) AS levelAbs,
-        a.nowLevel,
+        IFNULL( a.nowLevel, '--' ) nowLevel,
         (
         CASE
 
@@ -4844,6 +4845,7 @@
                 GROUP BY
                     r.sequence_nbr
             ) a
+        ORDER BY levelStatus DESC
     </select>
 
     <select id="getPipeNetworkBySuper" resultType="java.util.Map">
@@ -4940,7 +4942,7 @@
     <select id="queryStartAndStopBySpecificId" resultType="java.util.Map">
         SELECT
         i.equipment_specific_id,
-        i.update_date,
+        DATE_FORMAT(i.update_date,'%Y-%m-%d %H:%i:%S') update_date,
         i.equipment_index_name
         FROM
         wl_equipment_specific_index i

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

@@ -3494,5 +3494,15 @@
             INSERT INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES (1803, 'waterTank', '消防水箱', 'XFSYLX', NULL, NULL, NULL, NULL, NULL, 0, 1);
         </sql>
     </changeSet>
+
+
+    <changeSet author="zs" id="202210191455-01">
+        <comment>修改字典值 </comment>
+        <sql>
+            update cb_data_dictionary set type_desc = 'studio_normalapp_3056965,AMOS_ADMIN' where sequence_nbr = 1800;
+            update cb_data_dictionary set type_desc = 'studio_normalapp_3056965' where sequence_nbr = 1801;
+            update cb_data_dictionary set type_desc = 'studio_normalapp_3056965' where sequence_nbr = 1802;
+        </sql>
+    </changeSet>
 </databaseChangeLog>