Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-api/amos-boot-module-latentdanger-api/src/main/java/com/yeejoin/amos/latentdanger/common/enums/LatentDangerState.java

@@ -55,27 +55,27 @@ public interface LatentDangerState {
         /**
          * 提交整改资料
          */
-        提交整改资料("提交整改资料", "governFileSubmit", "governChargerConfirm","", "2"),
+        提交整改资料("提交整改资料", "governFileSubmit", "governChargerConfirm","", "3"),
         /**
          * 整改检查组长确认
          */
-        整改检查组长确认("整改检查组长确认", "governLeaderConfirm", "governChargerConfirm","governFileSubmit", "3"),
+        整改检查组长确认("整改检查组长确认", "governLeaderConfirm", "governChargerConfirm","governFileSubmit", "4"),
         /**
          * 整改检查负责人确认
          */
-        整改检查负责人确认("整改检查负责人确认", "governChargerConfirm", "governLeadershipConfirm","governFileSubmit", "3"),
+        整改检查负责人确认("整改检查负责人确认", "governChargerConfirm", "governLeadershipConfirm","governFileSubmit", "4"),
         /**
          * 整改检查分管领导确认(根据计划类型不同，分管领导确认完流程不同)
          */
-        整改检查分管领导确认("整改检查分管领导确认", "governLeadershipConfirm", "governLeaderReviewConfirm","governFileSubmit", "3"),
+        整改检查分管领导确认("整改检查分管领导确认", "governLeadershipConfirm", "governLeaderReviewConfirm","governFileSubmit", "4"),
         /**
          * 整改检查组长复查确认
          */
-        整改检查组长复查确认("整改检查组长复查确认", "governLeaderReviewConfirm", "governSecondReviewConfirm","governFileSubmit", "3"),
+        整改检查组长复查确认("整改检查组长复查确认", "governLeaderReviewConfirm", "governSecondReviewConfirm","governFileSubmit", "4"),
         /**
          * 整改二次审核确认
          */
-        整改二次审核确认("整改二次审核确认", "governSecondReviewConfirm", "endOfGovernance","governFileSubmit", "3"),
+        整改二次审核确认("整改二次审核确认", "governSecondReviewConfirm", "endOfGovernance","governFileSubmit", "4"),
         /**
          * 整改完毕
          */

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

@@ -261,7 +261,7 @@
 
 	<select id="getTodayEmergencyCount" resultType="java.util.Map">
 		SELECT
-		COUNT(tz.alarm_type_code = '960') as sleepyTncidentTotal,
+		sum(case when tz.alarm_type_code = '960' then 1 else 0 end) as sleepyTncidentTotal,
 		sum(
 		CASE
 		WHEN
@@ -412,9 +412,10 @@
 		AND field_code IN ('injured_num', 'die_num')
 		and tz_alert_form_value.is_delete=0
 		group by alert_called_id
-		)
+		) and alarm_type_code = '960' and is_delete=0
 		) tzs left join tcb_elevator te  on tzs.equipment_id = te.sequence_nbr
 		where 1=1
+
 		and tzs.call_time >= (select current_date())
 		and (select date_add(current_date(), interval 1 day))  >= tzs.call_time
 		<if test="regionCode != null and regionCode != ''">

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/dao/mapper/LatentDangerMapper.java

@@ -29,7 +29,7 @@ public interface LatentDangerMapper extends BaseMapper<LatentDanger> {
 
     LatentDangerBo getByInstanceId(String instanceId);
 
-    List<LatentDangerBo> listOfOvertime();
+    List<LatentDangerBo> listOfOvertime(@Param("dangerStateList") List<String> dangerStateList);
 
     Integer countNotFinishByFlowId(String flowId);
 
@@ -79,5 +79,5 @@ public interface LatentDangerMapper extends BaseMapper<LatentDanger> {
      * @param paramMap
      * @return
      */
-    IPage<LatentDanger> selectPageByParam(Page<LatentDanger> page, @Param("paramMap") Map<String, Object> paramMap);
+    IPage<LatentDanger> selectPageByParam(@Param("page") Page<LatentDanger> page, @Param("paramMap") Map<String, Object> paramMap);
 }

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

@@ -273,11 +273,11 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
 //            LatentDangerPatrolBo patrolBo = latentDangerPatrolMapper.getByDangerId(latentDanger.getId());
 //            sendMessage(latentDanger, LatentDangerExecuteTypeEnum.填写隐患完成, patrolBo,
 //                    "巡检隐患排查与治理", this.getNextExecuteUsers(latentDanger.getInstanceId()), userRealName, departmentName);
-            try {
-                webMqttComponent.publish(dangerTopic, "");
-            } catch (Exception e) {
-                logger.error("巡检隐患提交数字换流站页面推送失败-----------" + e.getMessage());
-            }
+//            try {
+//                webMqttComponent.publish(dangerTopic, "");
+//            } catch (Exception e) {
+//                logger.error("巡检隐患提交数字换流站页面推送失败-----------" + e.getMessage());
+//            }
 
             dangerList.add(latentDanger);
         }
@@ -981,7 +981,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
             dangerState = "taskDispatch,governFileSubmit,governLeaderConfirm,governChargerConfirm," +
                     "governLeadershipConfirm,governLeaderReviewConfirm,governSecondReviewConfirm";
         }
-        List<LatentDangerBo> overtimeList = latentDangerMapper.listOfOvertime();
+        List<String> dangerStateList = Lists.newArrayList(dangerState.split(","));
+        List<LatentDangerBo> overtimeList = latentDangerMapper.listOfOvertime(dangerStateList);
         LambdaQueryWrapper<LatentDanger> queryWrapper = new LambdaQueryWrapper<>();
 //        queryWrapper
         List<LatentDanger> overtimeDangerList = this.baseMapper.selectList(queryWrapper);
@@ -1254,8 +1255,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
             if (("supervised".equals(planType) &&
                     LatentDangerState.SupervisionDangerStateEnum.整改检查分管领导确认.getCode().equals(currentDangerState))
                     || LatentDangerState.SupervisionDangerStateEnum.整改二次审核确认.getCode().equals(currentDangerState)) {
-                latentDanger.setDangerState(LatentDangerState.SupervisionDangerStateEnum.整改完毕.getCode());
-                latentDanger.setDangerStateName(LatentDangerState.SupervisionDangerStateEnum.整改完毕.getName());
+                nextState = LatentDangerState.SupervisionDangerStateEnum.整改完毕.getCode();
+                nextStateName = LatentDangerState.SupervisionDangerStateEnum.整改完毕.getName();
             }
             executeResultMsg = currentStateEnum.getName() + ExecuteTypeEnum.通过.getName();
         } else {
@@ -1806,9 +1807,21 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
         if (!ValidationUtil.isEmpty(dangerIdList)) {
             pageParam.put("dangerIds", dangerIdList);
         }
+        Page page = new Page();
+        if (pageParam.get("current") instanceof String && pageParam.get("size") instanceof String) {
+            int current = Integer.valueOf((String) pageParam.get("current"));
+            int size = Integer.valueOf((String) pageParam.get("current"));
+            page.setCurrent(current);
+            page.setSize(size);
+        } else {
+            page.setCurrent((Integer)(pageParam.get("current")));
+            page.setSize((Integer)(pageParam.get("size")));
+        }
+        if (ValidationUtil.isEmpty(pageParam.get("order"))) {
+            pageParam.put("order", "1");
+        }
 
-        IPage<LatentDanger> iPage = this.baseMapper.selectPageByParam(new Page(((Integer) pageParam.get("current")).longValue(),
-                ((Integer) pageParam.get("size")).longValue()), (Map<String, Object>) pageParam);
+        IPage<LatentDanger> iPage = this.baseMapper.selectPageByParam(page, (Map<String, Object>) pageParam);
         Map<String, Object> buildingAbsolutePositionMap = new HashMap<>();
         if (!ValidationUtil.isEmpty(iPage.getRecords())) {
             try {

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/core/async/AsyncTask.java

@@ -4,6 +4,8 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+import com.yeejoin.amos.feign.systemctl.Systemctl;
+import com.yeejoin.amos.feign.systemctl.model.MessageModel;
 import com.yeejoin.amos.latentdanger.business.param.JPushTypeEnum;
 import com.yeejoin.amos.latentdanger.business.param.PushMsgParam;
 import com.yeejoin.amos.latentdanger.business.util.Toke;
@@ -92,7 +94,10 @@ public class AsyncTask {
         if (pointName != null) {
             body += "关联检查点：" + pointName + TAB;
         }
-        saveAndSendMsg(orgCode, informerList, msgTypeEnum.getTitle(), body, msgTypeEnum.getMsgType(), riskFactorId, null, "");
+        MessageModel messageModel = new MessageModel();
+        messageModel.setBody(body);
+//        Systemctl.messageClient.create(messageModel);
+//        saveAndSendMsg(orgCode, informerList, msgTypeEnum.getTitle(), body, msgTypeEnum.getMsgType(), riskFactorId, null, "");
     }
 
     private void saveAndSendMsg(String orgCode, String informerList,

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/ElevatorController.java

@@ -395,7 +395,7 @@ public class ElevatorController extends BaseController {
         IPage<Elevator> elevatorPage = new Page<>();
         Integer count =  elevatorService.count();
 
-        for(int i = 0; i <= (ValidationUtil.isEmpty(num) ? count : num); i ++ ) {
+        for(int i = 0; i <= (ValidationUtil.isEmpty(num) ? count%500 : num); ++i  ) {
             elevatorPage.setCurrent(i);
             elevatorPage.setSize(500);
             elevatorPage =  elevatorService.page(elevatorPage);

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

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.tzs.biz.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.module.tzs.api.dto.EsElevatorDto;
 import com.yeejoin.amos.boot.module.tzs.api.entity.AlertCalled;
 import com.yeejoin.amos.boot.module.tzs.api.entity.Elevator;
@@ -16,10 +17,14 @@ import org.springframework.data.elasticsearch.core.SearchHit;
 import org.springframework.data.elasticsearch.core.SearchHits;
 import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder;
 import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.foundation.utils.Bean;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 
+import java.util.ArrayList;
+import java.util.Date;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  *
@@ -64,17 +69,7 @@ public class ESElevatorServiceImpl {
     public EsElevator saveEsElevatorToES(Elevator elevator)
     {
 		EsElevator esElevator = new EsElevator();
-		esElevator.setSequenceNbr(elevator.getSequenceNbr());
-        esElevator.setProvince(elevator.getProvince());
-        esElevator.setAddress(elevator.getAddress());
-        esElevator.setCity(elevator.getCity());
-        esElevator.setDistrict(elevator.getDistrict());
-        esElevator.setLatitude(elevator.getLatitude());
-        esElevator.setLongitude(elevator.getLongitude());
-        esElevator.setRegisterCode(elevator.getRegisterCode());
-        esElevator.setRegionCode(elevator.getRegionCode());
-        esElevator.setRescueCode(elevator.getRescueCode());
-
+        Bean.toPo(elevator,esElevator);
 		esElavtorRepository.save(esElevator);
     	return esElevator;
     }
@@ -93,6 +88,7 @@ public class ESElevatorServiceImpl {
         String address = elevatorDto.getAddress();
         String regionCode = elevatorDto.getRegionCode();
         String alertId = elevatorDto.getAlertId();
+        Long equipmentId = elevatorDto.getSequenceNbr();
 
         /**
          * 通用匹配规则，条件构建
@@ -102,31 +98,33 @@ public class ESElevatorServiceImpl {
         BoolQueryBuilder qb0 = QueryBuilders.boolQuery();
         LambdaQueryWrapper<AlertCalled> queryWrapper = new LambdaQueryWrapper();
 
-        if(!ValidationUtil.isEmpty(alarmTypeCode)) {
+        if(!ValidationUtil.isEmpty(alarmTypeCode) && !"all".equals(alarmTypeCode)) {
             queryWrapper.eq(AlertCalled::getAlarmTypeCode,alarmTypeCode);
         }
         AlertCalled alertCalled = null;
         List<AlertCalled> alertCalleds = null;
-//        if(!ValidationUtil.isEmpty(alertId)) {
-//            alertCalled = iAlertCalledService.getById(elevatorDto.getAlertId());
-//            BoolQueryBuilder qb4 = QueryBuilders.boolQuery();
-//            qb4.must(QueryBuilders.termQuery("sequenceNbr",  alertCalled.getEquipmentId()));
-//            boolMust.must(qb4);
-//        } else {
-//            if(elevatorDto.getIsToday() != null && elevatorDto.getIsToday()) {
-//                queryWrapper.ge(AlertCalled::getCallTime, DateUtils.stampToDate(System.currentTimeMillis(),DateUtils.DATE_PATTERN));
-//                queryWrapper.le(AlertCalled::getCallTime, DateUtils.stampToDate(DateUtils.dateAddDays(new Date(),1).getTime(),DateUtils.DATE_PATTERN));
-//            }
-//            alertCalleds  = iAlertCalledService.list(queryWrapper);
-//            List<Long> stringList = new ArrayList<>();
-//            for (AlertCalled al: alertCalleds
-//            ) {
-//                stringList.add(al.getEquipmentId());
-//            }
-//            List<Long> listL = stringList.stream().distinct().collect(Collectors.toList());
-//            qb0.should(QueryBuilders.termsQuery("sequenceNbr",  listL.toArray()));
-//            boolMust.must(qb0);
-//        }
+        if(!ValidationUtil.isEmpty(alertId)) {
+            alertCalled = iAlertCalledService.getById(elevatorDto.getAlertId());
+            BoolQueryBuilder qb4 = QueryBuilders.boolQuery();
+            qb4.must(QueryBuilders.termQuery("sequenceNbr",  alertCalled.getEquipmentId()));
+            boolMust.must(qb4);
+        } else {
+            if(!ValidationUtil.isEmpty(alarmTypeCode)) {
+                if(elevatorDto.getIsToday() != null && elevatorDto.getIsToday()) {
+                    queryWrapper.ge(AlertCalled::getCallTime, DateUtils.stampToDate(System.currentTimeMillis(),DateUtils.DATE_PATTERN));
+                    queryWrapper.le(AlertCalled::getCallTime, DateUtils.stampToDate(DateUtils.dateAddDays(new Date(),1).getTime(),DateUtils.DATE_PATTERN));
+                }
+                alertCalleds  = iAlertCalledService.list(queryWrapper);
+                List<Long> stringList = new ArrayList<>();
+                for (AlertCalled al: alertCalleds
+                ) {
+                    stringList.add(al.getEquipmentId());
+                }
+                List<Long> listL = stringList.stream().distinct().collect(Collectors.toList());
+                qb0.should(QueryBuilders.termsQuery("sequenceNbr",  listL.toArray()));
+                boolMust.must(qb0);
+            }
+        }
 
 
         if(!ValidationUtil.isEmpty(address)) {
@@ -143,6 +141,12 @@ public class ESElevatorServiceImpl {
             boolMust.must(qb2);
         }
 
+        if(!ValidationUtil.isEmpty(equipmentId)) {
+            BoolQueryBuilder qb3= QueryBuilders.boolQuery().
+                    filter(QueryBuilders. termQuery("sequenceNbr", equipmentId));
+            boolMust.must(qb3);
+        }
+
         // 创建查询构造器
         NativeSearchQueryBuilder queryBuilder = new NativeSearchQueryBuilder()
                 // 分页
@@ -161,20 +165,21 @@ public class ESElevatorServiceImpl {
             {
                 JSONObject jsonObject = (JSONObject) JSONObject.toJSON(searchHit.getContent());
                 EsElevatorDto esElevatorDto =JSONObject.toJavaObject(jsonObject, EsElevatorDto.class);
-                list.add(esElevatorDto);
-//                if(null != alertCalleds) {
-//                    for (AlertCalled al: alertCalleds
-//                    ) {
-//                        if(al.getEquipmentId().equals(esElevatorDto.getSequenceNbr())) {
-//                            esElevatorDto.setHappenTime(al.getCallTime());
-//                            esElevatorDto.setAlertId(String.valueOf(al.getSequenceNbr()));
-//                            esElevatorDto.setAlarmTypeCode(al.getAlarmTypeCode());
-//                            esElevatorDto.setType(al.getAlertStage());
-//                            list.add(esElevatorDto);
-//                            break;
-//                        }
-//                    }
-//                }
+                if(null != alertCalleds) {
+                    for (AlertCalled al: alertCalleds
+                    ) {
+                        if(al.getEquipmentId().equals(esElevatorDto.getSequenceNbr())) {
+                            esElevatorDto.setHappenTime(al.getCallTime());
+                            esElevatorDto.setAlertId(String.valueOf(al.getSequenceNbr()));
+                            esElevatorDto.setAlarmTypeCode(al.getAlarmTypeCode());
+                            esElevatorDto.setType(al.getAlertStage());
+                            list.add(esElevatorDto);
+                            break;
+                        }
+                    }
+                } else {
+                    list.add(esElevatorDto);
+                }
             }
         }
         catch (Exception e)

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

@@ -1573,6 +1573,34 @@
             ALTER TABLE `cb_fire_experts` add residence_detail_val varchar(255) COMMENT '现居住地详细地址';
         </sql>
     </changeSet>
+	<changeSet id="2021-10-13" author="chenhao-1">
+		<preConditions onFail="MARK_RAN">
+            <tableExists tableName="cb_dynamic_form_group" />
+            <primaryKeyExists primaryKeyName="sequence_nbr" tableName="cb_dynamic_form_group"/>
+        </preConditions>
+        <comment>add data cb_dynamic_form_group</comment>
+			<sql>
+				INSERT INTO cb_dynamic_form_group (`sequence_nbr`, `group_name`, `group_code`, `parent_id`, `group_config`, `org_code`, `sort`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`) VALUES ('132828674815', '值班消防', 'dutyFireFighting', '0', NULL, '10', '1', NULL, NULL, '2021-09-28 10:34:05', '\0');
+			</sql>
+	</changeSet>
+	
+	<changeSet id="2021-10-13" author="chenhao-2">
+		<preConditions onFail="MARK_RAN">
+            <tableExists tableName="cb_dynamic_form_column" />
+            <primaryKeyExists primaryKeyName="sequence_nbr" tableName="cb_dynamic_form_column"/>
+        </preConditions>
+        <comment>add data cb_dynamic_form_column</comment>
+			<sql>
+			INSERT INTO cb_dynamic_form_column (`sequence_nbr`, `field_code`, `field_name`, `field_type`, `group_id`, `query_strategy`, `not_null`, `block`, `group_code`, `column_config`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `remark`, `sort`, `org_code`) VALUES ('132828674812067', 'userId', '用户id', 'input', '132828674815', 'eq', '\0', '\0', 'dutyFireFighting', NULL, NULL, NULL, '2021-09-28 10:34:05', '\0', NULL, NULL, NULL);
+			INSERT INTO cb_dynamic_form_column (`sequence_nbr`, `field_code`, `field_name`, `field_type`, `group_id`, `query_strategy`, `not_null`, `block`, `group_code`, `column_config`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `remark`, `sort`, `org_code`) VALUES ('132828674812068', 'userName', '用户名称', 'input', '132828674815', 'like', '\0', '\0', 'dutyFireFighting', NULL, NULL, NULL, '2021-09-28 10:34:05', '\0', NULL, NULL, NULL);
+			INSERT INTO cb_dynamic_form_column (`sequence_nbr`, `field_code`, `field_name`, `field_type`, `group_id`, `query_strategy`, `not_null`, `block`, `group_code`, `column_config`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `remark`, `sort`, `org_code`) VALUES ('132828674812071', 'postType', '岗位id', 'input', '132828674815', 'eq', '\0', '\0', 'dutyFireFighting', NULL, NULL, NULL, '2021-09-28 10:34:05', '\0', NULL, NULL, NULL);
+			INSERT INTO cb_dynamic_form_column (`sequence_nbr`, `field_code`, `field_name`, `field_type`, `group_id`, `query_strategy`, `not_null`, `block`, `group_code`, `column_config`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `remark`, `sort`, `org_code`) VALUES ('132828674812072', 'postTypeName', '岗位名称', 'input', '132828674815', 'like', '\0', '\0', 'dutyFireFighting', NULL, NULL, NULL, '2021-09-28 10:34:05', '\0', NULL, NULL, NULL);
+			INSERT INTO cb_dynamic_form_column (`sequence_nbr`, `field_code`, `field_name`, `field_type`, `group_id`, `query_strategy`, `not_null`, `block`, `group_code`, `column_config`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `remark`, `sort`, `org_code`) VALUES ('132828674812073', 'fireFighting', '微型消防站', 'input', '132828674815', 'like', '\0', '\0', 'dutyFireFighting', NULL, NULL, NULL, '2021-09-28 10:34:05', '\0', NULL, NULL, NULL);
+			INSERT INTO cb_dynamic_form_column (`sequence_nbr`, `field_code`, `field_name`, `field_type`, `group_id`, `query_strategy`, `not_null`, `block`, `group_code`, `column_config`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `remark`, `sort`, `org_code`) VALUES ('132828674812074', 'fireFightingId', '微型消防站Id', 'input', '132828674815', 'eq', '\0', '\0', 'dutyFireFighting', NULL, NULL, NULL, '2021-09-28 10:34:05', '\0', NULL, NULL, NULL);
+			INSERT INTO cb_dynamic_form_column (`sequence_nbr`, `field_code`, `field_name`, `field_type`, `group_id`, `query_strategy`, `not_null`, `block`, `group_code`, `column_config`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `remark`, `sort`, `org_code`) VALUES ('132828674812075', 'teamId', '单位名称id', 'input', '132828674815', 'eq', '\0', '\0', 'dutyFireFighting', NULL, NULL, NULL, '2021-09-28 10:34:05', '\0', NULL, NULL, NULL);
+			INSERT INTO cb_dynamic_form_column (`sequence_nbr`, `field_code`, `field_name`, `field_type`, `group_id`, `query_strategy`, `not_null`, `block`, `group_code`, `column_config`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `remark`, `sort`, `org_code`) VALUES ('132828674812076', 'teamName', '单位名称', 'input', '132828674815', 'like', '\0', '\0', 'dutyFireFighting', NULL, NULL, NULL, '2021-09-28 10:34:05', '\0', NULL, NULL, NULL);
+			</sql>
+	</changeSet>
 
 
     <changeSet id="2021-10-09" author="tw01">

amos-boot-system-latentdanger/src/main/resources/application-dev.properties

@@ -8,6 +8,7 @@ eureka.instance.lease-expiration-duration-in-seconds=10
 eureka.instance.lease-renewal-interval-in-seconds=5
 eureka.instance.metadata-map.management.context-path=${server.servlet.context-path}/actuator
 eureka.instance.status-page-url-path=/actuator/info
+eureka.instance.metadata-map.management.api-docs=http://localhost:${server.port}${server.servlet.context-path}/doc.html
 
 ribbon.eureka.enabled = true
 ribbon.ConnectTimeout = 5000

amos-boot-system-latentdanger/src/main/resources/db/changelog/latent-danger-1.0.0.xml

@@ -6,4 +6,13 @@
         xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
         http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd">
 
+    <changeSet id="20211013-1" author="tb">
+        <preConditions>
+            <columnExists tableName="p_latent_danger" columnName="biz_info" />
+        </preConditions>
+        <comment>修改业务信息字段biz_info字段类型为text</comment>
+        <sql>
+            ALTER TABLE p_latent_danger MODIFY COLUMN biz_info text DEFAULT NULL COMMENT '业务信息'
+        </sql>
+    </changeSet>
 </databaseChangeLog>
\ No newline at end of file

amos-boot-system-latentdanger/src/main/resources/db/mapper/LatentDangerMapper.xml

@@ -254,6 +254,22 @@
         select * from p_latent_danger where deleted = 0 and instance_id = #{instanceId} and danger_state = 3 limit 1
     </select>
 
+    <select id="listOfOvertime"
+            resultType="com.yeejoin.amos.latentdanger.business.entity.mybatis.extend.LatentDangerBo">
+        select *
+        from p_latent_danger
+        where now() > reform_limit_date
+        and overtime_state = 0
+        and deleted = 0
+        <if test="dangerStateList != null and dangerStateList.size() > 0">
+            and danger_state in
+            <foreach collection="dangerStateList" item="dangerState" open="(" separator="," close=")">
+                #{dangerState}
+            </foreach>
+        </if>
+
+    </select>
+
     <select id="listByMap" resultType="com.yeejoin.amos.latentdanger.business.entity.mybatis.extend.LatentDangerBo">
         select
           a.*
@@ -350,10 +366,6 @@
         </where>
     </select>
 
-    <select id="listOfOvertime" resultType="com.yeejoin.amos.latentdanger.business.entity.mybatis.extend.LatentDangerBo">
-        select * from p_latent_danger where now()>reform_limit_date and overtime_state = 0 and deleted = 0 and danger_state in (2,3,4)
-    </select>
-
     <select id="countNotFinishByFlowId" resultType="java.lang.Integer">
         select
             count(1)

pom.xml

@@ -207,7 +207,7 @@
 		<dependency>
 			<groupId>com.yeejoin</groupId>
 			<artifactId>amos-feign-systemctl</artifactId>
-			<version>1.6.3-SNAPSHOT</version>
+			<version>1.6.4-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>io.swagger</groupId>