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

amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/src/main/java/com/yeejoin/amos/supervision/common/enums/WorkFlowBranchEnum.java

@@ -10,11 +10,9 @@ import java.util.Map;
  */
 
 public enum WorkFlowBranchEnum {
-
-    DAILY("日常检查", "company", "daily", "daily"),
-    SPECIAL_C("专项检查", "company", "special", "special"),
-    SPECIAL_E("专项检查", "external", "special-daily", "special"),
-    SUPERVISED_DW("单位级审核", "department", "special-daily", "supervised");
+    DAILY("日常检查", "company-external", "daily", "daily"),
+    SPECIAL("专项检查", "company-external", "special", "special"),
+    SUPERVISED_DW("单位级审核", "department", "special-daily", "supervised");  
 
     /**
      * 名称，描述

amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/src/main/java/com/yeejoin/amos/supervision/core/common/dto/DangerDto.java

@@ -63,7 +63,7 @@ public class DangerDto implements Serializable {
     /**
      * 整改期限
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    //@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date reformLimitDate;
 
 

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/resources/mapper/AlertCalledMapper.xml

@@ -554,6 +554,8 @@
 				a.region_code LIKE CONCAT('%', #{item}, '%')
 			</foreach>
 		</if>
+		order by a.call_time desc
+
 	</select>
 
 

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

@@ -180,7 +180,7 @@ public class EquipmentDetailController extends AbstractBaseController {
         // 编辑同步redis装备iotcode数据
         syncDataService.saveOrUpdateEquipIotCodeRedisData(null);
         if (syncSwitch) {
-            equipmentSpecificSerivce.equipSpecificDataSync(equipmentId);
+            equipmentSpecificSerivce.equipSpecificDataSync(date.getEquipmentSpecific().getId());
         }
         EquipmentDetailController controllerProxy = SpringUtils.getBean(EquipmentDetailController.class);
         controllerProxy.refreshCount(vo.getBizOrgCode());
@@ -291,7 +291,7 @@ public class EquipmentDetailController extends AbstractBaseController {
         // 编辑同步redis装备iotcode数据
         syncDataService.saveOrUpdateEquipIotCodeRedisData(null);
         if (syncSwitch) {
-            equipmentSpecificSerivce.equipSpecificDataSync(bean.getEquipmentId());
+            equipmentSpecificSerivce.equipSpecificDataSync(equipmentSpecific.getId());
         }
         // 刷新缓存，新的单位和之前的单位都刷新
         EquipmentDetailController controllerProxy = SpringUtils.getBean(EquipmentDetailController.class);

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

@@ -185,7 +185,8 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
                 LocalDateTime createDate = (LocalDateTime) x.get("createDate");
                 x.put("createDate", Date.from(createDate.atZone(ZoneId.systemDefault()).toInstant()));
                 x.put("handleType", ConfirmAlamEnum.getTypeByCode(String.valueOf(x.get("handleType"))));
-                x.put("fireEquipmentName", x.get("fireEquipmentName"));
+                // 冗余统一跑马灯显示字段取值
+                x.put("equipmentSpecificIndexName", x.get("fireEquipmentSpecificIndexName"));
             }
         }
         return resultPage;

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/service/impl/LatentDangerServiceImpl.java

@@ -1981,7 +1981,7 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
                 // 登录人为整改责任人
                 pageParam.put("reformLeaderId", jcsUserId);
                 // 登录人单位
-                pageParam.put("bizOrgCode", person.get("bizOrgCode").toString().substring(0, 6));
+                pageParam.put("bizOrgCode", person.get("bizOrgCode").toString().substring(0, 12));
                 // 登录人为治理人
                 pageParam.put("governUserId", jcsUserId);
             }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/HiddenDangerServiceImpl.java

@@ -10,6 +10,7 @@ import com.google.common.collect.Lists;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.excel.DataSources;
 import com.yeejoin.amos.boot.biz.common.excel.ExcelUtil;
+import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.supervision.business.dao.mapper.HiddenDangerMapper;
 import com.yeejoin.amos.supervision.business.dao.repository.ICheckInputDao;
@@ -40,6 +41,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 import org.typroject.tyboot.core.foundation.utils.Bean;
+import org.typroject.tyboot.core.foundation.utils.DateUtil;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.exception.instance.DataNotFound;
 
@@ -172,6 +174,7 @@ public class HiddenDangerServiceImpl implements IHiddenDangerService {
             r.setInputItemName(hiddenDangerDto != null ? hiddenDangerDto.getInputItemName() : "");
             r.setDangerTypeName(hiddenDangerDto != null ? hiddenDangerDto.getDangerTypeName() : "");
             r.setDangerType(hiddenDangerDto != null ? hiddenDangerDto.getDangerType() : "");
+            r.setReformLimitDate(DateUtils.longStr2Date(DateUtils.date2LongStr(r.getReformLimitDate())));
         });
         return dangerDtoIPage;
     }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/PlanServiceImpl.java

@@ -292,7 +292,7 @@ public class PlanServiceImpl implements IPlanService {
         List<Map<String, String>> enumList = WorkFlowBranchEnum.getEnumList();
         if (!ObjectUtils.isEmpty(enumList)){
             List<Map<String, String>> list = enumList.stream().filter(map ->
-                    (dangerCheckTypeLevel.equals(map.get("dangerCheckTypeLevel")) && map.get("checkType").contains(checkType)
+                    (dangerCheckTypeLevel.contains(map.get("dangerCheckTypeLevel")) && map.get("checkType").contains(checkType)
             )).collect(Collectors.toList());
 
             if (!ObjectUtils.isEmpty(list)) {

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/AlertCalledServiceImpl.java

@@ -336,7 +336,7 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
                 }
                 list.add(alertHandlerInfoDto);
             }
-            map.put("agReturnVisit",dispatchPaper.getFeedbackTime());
+            map.put("agReturnVisit",dispatchPaper.getFeedbackFinishTime()); // 修复BUG 3439 by kongfm
         } else {
             for(String s:str) {
                 AlertHandlerInfoDto alertHandlerInfoDto = new AlertHandlerInfoDto();

amos-boot-system-equip/src/main/resources/changelog/init/view_all.sql

@@ -3103,80 +3103,149 @@ GROUP BY
 	-- ----------------------------
 -- View structure for v_fire_cafs_fightingsys_equip_count
 -- ----------------------------
-DROP VIEW
-IF EXISTS `v_fire_cafs_fightingsys_equip_count`;
+DROP VIEW IF EXISTS `v_fire_cafs_fightingsys_equip_count`;
 CREATE ALGORITHM = UNDEFINED DEFINER = `root`@`%` SQL SECURITY DEFINER VIEW `v_fire_cafs_fightingsys_equip_count` AS
 SELECT
-	SUM(
-		CASE
-		WHEN temp.`value` = 'true' THEN
-			1
-		ELSE
-			0
-		END
-	) AS total,
-	temp.fieldlabel,
-	temp.fieldname
+	sum(
+		(
+			CASE
+			WHEN (`temp`.`value` = 'true') THEN
+				1
+			ELSE
+				0
+			END
+		)
+	) AS `total`,
+	`temp`.`fieldlabel` AS `fieldlabel`,
+	`temp`.`fieldname` AS `fieldname`
 FROM
 	(
 		SELECT
-			CASE
-		WHEN esi.equipment_index_key LIKE '%Run' THEN
-			'Run'
-		WHEN esi.equipment_index_key LIKE '%Stop' THEN
-			'Stop'
-		WHEN esi.equipment_index_key LIKE '%Open' THEN
-			'Open'
-		WHEN esi.equipment_index_key LIKE '%Close' THEN
-			'Close'
-		WHEN esi.equipment_index_key LIKE '%Fault' THEN
-			'Fault'
-		WHEN esi.equipment_index_key LIKE '%RemoteControl' THEN
-			'RemoteControl'
-		WHEN esi.equipment_index_key LIKE '%Alarm' THEN
-			'Alarm'
-		WHEN esi.equipment_index_key LIKE '%Abnormal' THEN
-			'Abnormal'
-		END AS fieldname,
-		CASE
-	WHEN esi.equipment_index_key LIKE '%Run' THEN
-		'运行'
-	WHEN esi.equipment_index_key LIKE '%Stop' THEN
-		'停止'
-	WHEN esi.equipment_index_key LIKE '%Open' THEN
-		'开到位'
-	WHEN esi.equipment_index_key LIKE '%Close' THEN
-		'关到位'
-	WHEN esi.equipment_index_key LIKE '%Fault' THEN
-		'故障'
-	WHEN esi.equipment_index_key LIKE '%RemoteControl' THEN
-		'远方'
-	WHEN esi.equipment_index_key LIKE '%Alarm' THEN
-		'告警'
-	WHEN esi.equipment_index_key LIKE '%Abnormal' THEN
-		'异常'
-	END AS fieldlabel,
-	esi.`value`
-FROM
-	wl_equipment_specific_index esi
-LEFT JOIN wl_equipment_specific es ON es.id = esi.equipment_specific_id
-LEFT JOIN f_fire_fighting_system fs ON find_in_set(`fs`.`id`, `es`.`system_id`)
-WHERE
-	fs.`code` = '029026401813010000000023'
-AND (
-	esi.equipment_index_key LIKE '%Run'
-	OR esi.equipment_index_key LIKE '%Stop'
-	OR esi.equipment_index_key LIKE '%Open'
-OR esi.equipment_index_key LIKE '%Close'
-OR esi.equipment_index_key LIKE '%Fault'
-OR esi.equipment_index_key LIKE '%RemoteControl'
-OR esi.equipment_index_key LIKE '%Alarm'
-OR esi.equipment_index_key LIKE '%Abnormal'
-)
-	) temp
+			(
+				CASE
+				WHEN (
+					`esi`.`equipment_index_key` LIKE '%Run'
+				) THEN
+					'Run'
+				WHEN (
+					`esi`.`equipment_index_key` LIKE '%Stop'
+				) THEN
+					'Stop'
+				WHEN (
+					`esi`.`equipment_index_key` LIKE '%_Open'
+				) THEN
+					'Open'
+				WHEN (
+					`esi`.`equipment_index_key` LIKE '%Close'
+				) THEN
+					'Close'
+				WHEN (
+					`esi`.`equipment_index_key` LIKE '%Fault'
+				) THEN
+					'Fault'
+				WHEN (
+					`esi`.`equipment_index_key` LIKE '%_RemoteControl'
+				) THEN
+					'RemoteControl'
+				WHEN (
+					`esi`.`equipment_index_key` LIKE '%Alarm'
+				) THEN
+					'Alarm'
+				WHEN (
+					`esi`.`equipment_index_key` LIKE '%Abnormal'
+				) THEN
+					'Abnormal'
+				END
+			) AS `fieldname`,
+			(
+				CASE
+				WHEN (
+					`esi`.`equipment_index_key` LIKE '%Run'
+				) THEN
+					'运行'
+				WHEN (
+					`esi`.`equipment_index_key` LIKE '%Stop'
+				) THEN
+					'停止'
+				WHEN (
+					`esi`.`equipment_index_key` LIKE '%_Open'
+				) THEN
+					'开到位'
+				WHEN (
+					`esi`.`equipment_index_key` LIKE '%Close'
+				) THEN
+					'关到位'
+				WHEN (
+					`esi`.`equipment_index_key` LIKE '%Fault'
+				) THEN
+					'故障'
+				WHEN (
+					`esi`.`equipment_index_key` LIKE '%_RemoteControl'
+				) THEN
+					'远方'
+				WHEN (
+					`esi`.`equipment_index_key` LIKE '%Alarm'
+				) THEN
+					'告警'
+				WHEN (
+					`esi`.`equipment_index_key` LIKE '%Abnormal'
+				) THEN
+					'异常'
+				END
+			) AS `fieldlabel`,
+			`esi`.`value` AS `value`
+		FROM
+			(
+				(
+					`wl_equipment_specific_index` `esi`
+					LEFT JOIN `wl_equipment_specific` `es` ON (
+						(
+							`es`.`id` = `esi`.`equipment_specific_id`
+						)
+					)
+				)
+				LEFT JOIN `f_fire_fighting_system` `fs` ON (
+					(
+						0 <> find_in_set(`fs`.`id`, `es`.`system_id`)
+					)
+				)
+			)
+		WHERE
+			(
+				(
+					`fs`.`code` = '029026401813010000000023'
+				)
+				AND (
+					(
+						`esi`.`equipment_index_key` LIKE '%Run'
+					)
+					OR (
+						`esi`.`equipment_index_key` LIKE '%Stop'
+					)
+					OR (
+						`esi`.`equipment_index_key` LIKE '%_Open'
+					)
+					OR (
+						`esi`.`equipment_index_key` LIKE '%Close'
+					)
+					OR (
+						`esi`.`equipment_index_key` LIKE '%Fault'
+					)
+					OR (
+						`esi`.`equipment_index_key` LIKE '%_RemoteControl'
+					)
+					OR (
+						`esi`.`equipment_index_key` LIKE '%Alarm'
+					)
+					OR (
+						`esi`.`equipment_index_key` LIKE '%Abnormal'
+					)
+				)
+			)
+	) `temp`
 GROUP BY
-	temp.fieldlabel,
-	temp.fieldname;
+	`temp`.`fieldlabel`,
+	`temp`.`fieldname`;
 	-- ----------------------------
 -- View structure for v_person_plan_task
 -- ----------------------------

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

@@ -199,16 +199,17 @@
         AS fireEquipmentPointValue,
         wlesal.type AS type,
         wlesal.create_date AS createDate,
-        wlesal.location AS warehouseStructureName,
+        CONCAT_WS(' ', wles.position,wled.area) AS warehouseStructureName, /*告警列表拼接详细地址*/
         (select
         group_concat(fet.`name`)
         from f_equipment_fire_equipment as fefe
         left join f_equipment as fet on fet.id = fefe.equipment_id
         where fefe.fire_equipment_id = wlesal.equipment_specific_id
-        ) as equipmentName
+        ) as equipmentName,
+        wlesal.equipment_specific_name as equipmentSpecificName,
+        wles.position
         FROM wl_equipment_specific_alarm_log wlesal
         LEFT JOIN wl_equipment_specific wles ON wlesal.equipment_specific_id = wles.id
-        left join wl_stock_detail as wsd on wsd.equipment_specific_id = wlesal.equipment_specific_id
         LEFT JOIN wl_equipment_detail wled ON wles.equipment_detail_id = wled.id
         LEFT JOIN wl_equipment we ON wled.equipment_id = we.id
         ) d

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

@@ -807,7 +807,7 @@
         LEFT JOIN wl_area a ON a.id = es.area_id
         <where>
             <if test="equipmentId != null">
-                ed.equipment_id = #{equipmentId}
+                es.id = #{equipmentId}
             </if>
         </where>
     </select>