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

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/QRCodeUtil.java

@@ -122,4 +122,45 @@ public class QRCodeUtil {
         }
         return null;
     }
+
+    /**
+     * 根据二维码信息，生成二维码图片 用户excel，word等导出图片  可自定义图片大小
+     *
+     * @param content
+     * @return
+     */
+    public static byte[] generateQRCodeImageByteData(String content, int size) {
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        try {
+            Hashtable<EncodeHintType, Object> hints = new Hashtable<EncodeHintType, Object>();
+            hints.put(EncodeHintType.ERROR_CORRECTION, ErrorCorrectionLevel.H);
+            hints.put(EncodeHintType.CHARACTER_SET, CHARSET);
+            hints.put(EncodeHintType.MARGIN, 1);
+            BitMatrix bitMatrix = new MultiFormatWriter().encode(
+                    content
+                    , BarcodeFormat.QR_CODE
+                    , size
+                    , size,
+                    hints);
+            int width = bitMatrix.getWidth();
+            int height = bitMatrix.getHeight();
+            BufferedImage image = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
+            for (int x = 0; x < width; x++) {
+                for (int y = 0; y < height; y++) {
+                    image.setRGB(x, y, bitMatrix.get(x, y) ? 0xFF000000 : 0xFFFFFFFF);
+                }
+            }
+            ImageIO.write(image, "png", out);
+            return out.toByteArray();
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            try {
+                out.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        return null;
+    }
 }

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/java/com/yeejoin/amos/boot/module/tzs/api/dto/WechatMyTaskDto.java

@@ -134,4 +134,10 @@ public class WechatMyTaskDto {
 
     @ApiModelProperty(value = "处置结果")
     private String actionResult;
+
+    @ApiModelProperty(value = "经度")
+    private String longitude;
+
+    @ApiModelProperty(value = "纬度")
+    private String latitude;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/service/IElevatorService.java

@@ -16,4 +16,11 @@ public interface IElevatorService extends IService<Elevator> {
      * @return
      */
     Elevator selectByAlertId(Long alertId);
+
+    /**
+     * 根据电梯id 生成电梯二维码
+     * @param elevatorId
+     * @return
+     */
+    String saveElevatorQrCode(Long elevatorId);
 }

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-api/amos-boot-module-tzs-api/src/main/resources/mapper/DispatchTaskMapper.xml

@@ -62,7 +62,9 @@
 			p.feedback_uname as feedbackUname,
 			p.feedback_finish_time as dealTime,
 			p.deal_org_name as dealOrg,
-			p.deal_user as dealUser
+			p.deal_user as dealUser,
+			e.longitude as longitude,
+			e.latitude as latitude
 			from tz_dispatch_task t
 			LEFT JOIN tz_alert_called a on a.sequence_nbr = t.alert_id
 			LEFT JOIN tcb_elevator e on e.sequence_nbr = a.equipment_id

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgPersonController.java

@@ -84,6 +84,9 @@ public class OrgPersonController {
     public ResponseModel<?> updateByIdOrgUsr(HttpServletRequest request, @RequestBody OrgPersonDto OrgPersonVo,
                                              @PathVariable Long id) throws Exception {
         OrgPersonVo.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_PERSON);
+        /*同步修改关联账号用户名 chenzhao*/
+        AgencyUserModel amosUser = Privilege.agencyUserClient.queryByUserId(OrgPersonVo.getAmosOrgId()).getResult();
+        OrgPersonVo.setAmosOrgCode(amosUser.getRealName());
         iOrgUsrService.updateByIdOrgPerson(OrgPersonVo, id);
         return ResponseHelper.buildResponse(null);
     }

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

@@ -93,6 +93,11 @@ public class FireStationServiceImpl extends BaseService<FireStationDto, FireStat
      * 新增
      ***/
     public FireStationDto add(FireStationDto model) {
+        /*bug 3072 微型消防站，新增页面多次点击保存报主键重复错误 2021-10-13 chenzhao */
+        if (model.getSequenceNbr() != null){
+            Update(model);
+        }
+        /*bug 3072 微型消防站，新增页面多次点击保存报主键重复错误 2021-10-13 chenzhao */
 
         if (model.getBizCompanyId() != null) {
             OrgUsr orgUsr = orgUsrMapper.selectById(model.getBizCompanyId());

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

@@ -293,24 +293,6 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
                 alertCalledObjsDto.setAlertCalled(alertCalled);
                 alertCalledObjsDto.setAlertFormValue(alertFormValuelist);
                 //警情报送
-                AlertSubmitted alertSubmitted = new AlertSubmitted();
-                alertSubmitted.setAlertCalledId(alertCalled.getSequenceNbr());
-                alertSubmitted.setBusinessType(alertCalled.getAlarmType());
-                alertSubmitted.setBusinessTypeCode(alertCalled.getAlarmTypeCode());
-                alertSubmitted.setSubmissionTime(new Date());
-                // 获取接警情况模板
-                List<Template> templateList =
-                        templateMapper.selectList(new LambdaQueryWrapper<Template>().eq(Template::getFormat, false).like(Template::getTypeCode,
-                                DutyInfoEnum.接警情况.getKey() + "-"));
-                Map<String, Template> templateMap = templateList.stream().collect(Collectors.toMap(Template::getTypeCode,
-                        Function.identity()));
-                //增加非空判断 cz 2021-10-08
-                    if ( alertCalled.getAlertTypeCode() != null) {
-                        String tempContent =
-                                templateMap.get(DutyInfoEnum.接警情况.getKey() + "-" +  alertCalled.getAlertTypeCode()).getContent();
-                        alertSubmitted.setSubmissionContent(replaceTemplate(tempContent,  Bean.BeantoMap(alertCalled)));
-                    };
-                alertSubmittedService.save(alertSubmitted);
                 //调用规则
                 ruleAlertCalledService.fireAlertCalledRule(alertCalledObjsDto);
                 //通知实战指挥页面发送mqtt 默认发送 String 类型 0, 新警情 1 警情状态变化
@@ -465,7 +447,7 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
     }
 
     @Override
-    public Map<String, Object> selectAlertCalledKeyValueLabelById(Long id) {
+    public Map<String, Object>  selectAlertCalledKeyValueLabelById(Long id) {
 
         // 警情基本信息
         AlertCalled alertCalled = this.getById(id);

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

@@ -83,6 +83,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import java.util.*;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import static com.yeejoin.amos.latentdanger.business.util.RandomUtil.buildOrderNo;
 import static org.typroject.tyboot.core.foundation.context.RequestContext.getProduct;
@@ -273,11 +274,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 +982,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 +1256,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 {
@@ -1799,16 +1801,32 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
             }
         }
 
-        if (!ValidationUtil.isEmpty(pageParam.get("dangerState"))) {
-            List<String> state = Lists.newArrayList(((String) pageParam.get("dangerState")).split(","));
-            pageParam.put("dangerState", state);
+        if (!ValidationUtil.isEmpty(pageParam.get("dangerState")) || pageParam.get("dangerState") == "") {
+            if (ValidationUtil.isEmpty(pageParam.get("dangerState"))) {
+                pageParam.put("dangerState", null);
+            } else {
+                List<String> state = Lists.newArrayList(((String) pageParam.get("dangerState")).split(","));
+                pageParam.put("dangerState", state);
+            }
         }
         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-supervision-biz/src/main/java/com/yeejoin/amos/supervision/schedule/LatentDanerScheduled.java

@@ -19,7 +19,7 @@ public class LatentDanerScheduled {
      * 每1分钟执行一次：查询逾期的隐患，修改状态
      */
 
-    @Scheduled(cron = "0 0/1 * * * ?")
+//    @Scheduled(cron = "0 0/1 * * * ?")
     public void updateDangerStateOfOvertime() {
         iLatentDangerService.updateDangerStateOfOvertime();
     }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/task/PlanTaskJob.java

+package com.yeejoin.amos.supervision.task;
+
+import com.yeejoin.amos.supervision.business.service.intfc.IPlanTaskService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author DELL
+ */
+@Component
+@EnableScheduling
+public class PlanTaskJob {
+
+
+    @Autowired
+    private IPlanTaskService planTaskService;
+
+    /**
+     * 定时查询任务状态
+     */
+    @Scheduled(cron = "${jobs.cron}")
+    public void scheduleJob() {
+        planTaskService.taskExecution(null);
+    }
+}

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

@@ -309,6 +309,12 @@ public class DispatchTaskController extends BaseController {
 					if("action_result".equals(t.getFieldCode())) {
 						//	处置结果
 						temp.setActionResult(value);
+					} else if("main_feedback_result".equals(t.getFieldCode())) {
+						// 维修结果
+						temp.setRemark(value);
+					} else if("feedback_result".equals(t.getFieldCode())) {
+						// 维修结果
+						temp.setFeedbackResult(value);
 					}
 				});
                 imgMap = sourceFileService.getAttachments(temp.getPaperId());

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

@@ -145,7 +145,7 @@ public class ElevatorController extends BaseController {
      * @param sequenceNbr sequenceNbr
      * @return 返回结果
      */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/{sequenceNbr}", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
     public ResponseModel<com.yeejoin.amos.boot.module.tzs.api.dto.ElevatorDto> selectById(@PathVariable Long sequenceNbr) {
@@ -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/controller/WechatController.java

@@ -615,6 +615,12 @@ public class WechatController extends BaseController {
 					if("action_result".equals(t.getFieldCode())) {
 						//	处置结果
 						temp.setActionResult(value);
+					}  else if("main_feedback_result".equals(t.getFieldCode())) {
+						// 维修结果
+						temp.setRemark(value);
+					} else if("feedback_result".equals(t.getFieldCode())) {
+						// 维修结果
+						temp.setFeedbackResult(value);
 					}
 				});
                 imgMap = sourceFileService.getAttachments(temp.getPaperId());

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

@@ -42,7 +42,10 @@ import com.yeejoin.amos.boot.module.tzs.api.service.IRescueStationService;
 import com.yeejoin.amos.boot.module.tzs.api.service.IUseUnitService;
 import com.yeejoin.amos.boot.module.tzs.biz.controller.WechatController;
 import com.yeejoin.amos.boot.module.tzs.biz.utils.BeanDtoVoUtils;
+import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import com.yeejoin.amos.feign.systemctl.Systemctl;
+import com.yeejoin.amos.feign.systemctl.model.SmsRecordModel;
 import org.apache.commons.lang3.StringUtils;
 import org.eclipse.paho.client.mqttv3.MqttException;
 import org.slf4j.Logger;
@@ -551,6 +554,12 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
                     if("action_result".equals(t.getFieldCode())) {
                         //	处置结果
                         temp.setActionResult(value);
+                    } else if("main_feedback_result".equals(t.getFieldCode())) {
+                        // 维修结果
+                        temp.setRemark(value);
+                    } else if("feedback_result".equals(t.getFieldCode())) {
+                        // 维修结果
+                        temp.setFeedbackResult(value);
                     }
                 });
                 imgMap = sourceFileService.getAttachments(temp.getPaperId());
@@ -580,7 +589,6 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
             data.put("first","电梯困人任务已派遣，请尽快前往救援!");
             data.put("keyword1",alertCalled.getAddress());
             data.put("keyword2", DateUtils.date2LongStr(dispatchTaskDto.getDispatchTime()));
-            data.put("keyword3", alertCalled.getEmergencyCall());
             data.put("remark", "请在收到任务后30分钟内到达人员被困位置进行救援！");
             temp.setData(data);
         } else if(AlertStageEnums.GZWX.getId().equals(dispatchTaskDto.getAlertCode())) {
@@ -597,6 +605,13 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
         } else if(AlertStageEnums.TSZX.getId().equals(dispatchTaskDto.getAlertCode())) {
             temp.setTemplateId(TS_TEMPID);
             temp.setUrl(TS_URL+ "?id=" + dispatchTaskDto.getSequenceNbr());
+            data.put("first","投诉建议任务已派遣，请尽快前往救援!");
+            data.put("keyword1","投诉建议");
+            data.put("keyword2", "投诉建议");
+            data.put("keyword3", alertCalled.getEmergencyPerson());
+            data.put("keyword4", alertCalled.getEmergencyCall());
+            data.put("keyword5", DateUtils.date2LongStr(dispatchTaskDto.getDispatchTime()));
+            data.put("remark", "任务已派遣，请尽快前往处置！");
             temp.setData(data);
         }
         return temp;
@@ -761,6 +776,12 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
                     if("action_result".equals(t.getFieldCode())) {
                         //	处置结果
                         temp.setActionResult(value);
+                    } else if("main_feedback_result".equals(t.getFieldCode())) {
+                        // 维修结果
+                        temp.setRemark(value);
+                    } else if("feedback_result".equals(t.getFieldCode())) {
+                        // 维修结果
+                        temp.setFeedbackResult(value);
                     }
                 });
                 errorImgMap = sourceFileService.getAttachments(temp.getSequenceNbr());
@@ -888,12 +909,22 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
                     rescueProcessServiceImpl.updateByAlertId(rescueProcessDto);
                 }
             }
-            // 发送任务单
-            WechatRelation temp = wechatRelationServiceImpl.getOne(new LambdaQueryWrapper<WechatRelation>().eq(WechatRelation::getPhone,dispatchTaskDto.getResponseUserTel()));
-            if(temp != null && temp.getOpenId() != null) {
-                dispatchTaskDto.setSequenceNbr(dispatchTask.getSequenceNbr());
-                WechatMessageDto dto = this.getWechatMessageDtoByDispatchTaskDto(dispatchTaskDto);
-                wechatService.sendWechatModelMessage(temp.getOpenId() ,  dto);
+            String infoCode = dispatchTaskDto.getDispatchInfoCode();
+            if(infoCode.indexOf("0") != -1 && StringUtils.isNotBlank(dispatchTaskDto.getResponseUserTel())) { // 下发了小程序
+                // 发送任务单
+                WechatRelation temp = wechatRelationServiceImpl.getOne(new LambdaQueryWrapper<WechatRelation>().eq(WechatRelation::getPhone,dispatchTaskDto.getResponseUserTel()));
+                if(temp != null && temp.getOpenId() != null) {
+                    dispatchTaskDto.setSequenceNbr(dispatchTask.getSequenceNbr());
+                    WechatMessageDto dto = this.getWechatMessageDtoByDispatchTaskDto(dispatchTaskDto);
+                    wechatService.sendWechatModelMessage(temp.getOpenId() ,  dto);
+                }
+            }
+            if(infoCode.indexOf("1") != -1 && StringUtils.isNotBlank(dispatchTaskDto.getResponseUserTel())) { // 下发了短信
+                /*HashMap<String, String>  params = new HashMap<>();
+                params.put("smsCode","SMS_JCS_0001");
+                params.put("mobile",dispatchTaskDto.getResponseUserTel());
+                params.put("address","测试传参短信通知");
+                FeignClientResult<SmsRecordModel> result = Systemctl.smsClient.sendCommonSms(params);*/
             }
             // mqtt 通知新派遣
             JSONObject jsonObject = new JSONObject();

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-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/ElevatorServiceImpl.java

 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.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.google.common.collect.Lists;
+import com.yeejoin.amos.boot.biz.common.utils.QRCodeUtil;
+import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.SourceFileServiceImpl;
 import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.ElevatorDto;
@@ -10,13 +13,22 @@ import com.yeejoin.amos.boot.module.tzs.api.dto.ElevatorWlInfoDto;
 import com.yeejoin.amos.boot.module.tzs.api.entity.Elevator;
 import com.yeejoin.amos.boot.module.tzs.api.mapper.ElevatorMapper;
 import com.yeejoin.amos.boot.module.tzs.api.service.IElevatorService;
+import com.yeejoin.amos.component.feign.model.FeignClientResult;
+import com.yeejoin.amos.feign.systemctl.Systemctl;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
 *  服务实现类
@@ -27,6 +39,9 @@ import java.util.List;
 @Service
 public class ElevatorServiceImpl extends BaseService<ElevatorDto, Elevator, ElevatorMapper> implements IElevatorService {
 
+
+    private final Logger logger = LogManager.getLogger(ElevatorServiceImpl.class);
+
     @Autowired
     SourceFileServiceImpl sourceFileService;
 
@@ -36,6 +51,7 @@ public class ElevatorServiceImpl extends BaseService<ElevatorDto, Elevator, Elev
     @Autowired
     ElevatorMapper elevatorMapper;
 
+
     /**
      * 保存电梯信息
      *
@@ -89,9 +105,17 @@ public class ElevatorServiceImpl extends BaseService<ElevatorDto, Elevator, Elev
      */
     public ElevatorDto selectBySeq(Long sequenceNbr) {
         ElevatorDto elevatorDto = this.queryBySeq(sequenceNbr);
-
+        Map<String, List<AttachmentDto>> attachment = sourceFileService.getAttachments(sequenceNbr);
         // 获取附件
-        elevatorDto.setAttachments(sourceFileService.getAttachments(sequenceNbr));
+        elevatorDto.setAttachments(attachment);
+        // 判断是否存在qrcode 如果不存在则生成qrcode
+        if(attachment.get("qrCode") == null) {
+            this.saveElevatorQrCode(sequenceNbr);
+            attachment = sourceFileService.getAttachments(sequenceNbr);
+            // 获取附件
+            elevatorDto.setAttachments(attachment);
+        }
+
         return elevatorDto;
     }
 
@@ -113,6 +137,41 @@ public class ElevatorServiceImpl extends BaseService<ElevatorDto, Elevator, Elev
         return elevator;
     }
 
+    @Override
+    public String saveElevatorQrCode(Long elevatorId) {
+        // 二维码生成规则
+        JSONObject qrString = new JSONObject();
+        Elevator elevator = this.getById(elevatorId);
+        if(elevator == null) {
+            throw new BadRequest("未找到电梯数据");
+        }
+        qrString.put("elevatorId",elevator.getSequenceNbr());
+        qrString.put("rescueCode",elevator.getRescueCode());
+        byte[] bytes = QRCodeUtil.generateQRCodeImageByteData(qrString.toJSONString(), 480);
+        MultipartFile file = new MockMultipartFile("elevator_" + elevator.getSequenceNbr() + ".png","elevator_" + elevator.getSequenceNbr() + ".png","application/octet-stream" ,bytes);
+        FeignClientResult<Map<String, String>> result =  Systemctl.fileStorageClient.updateCommonFile(file);
+        Map<String, String> map = result.getResult();
+        if(map.isEmpty()) {
+            logger.error("未生成二维码文件");
+            throw new BadRequest("未生成二维码文件");
+        }
+        String filePath = "";
+        for(Map.Entry<String,String> fileResult : map.entrySet()) {
+            filePath = fileResult.getKey();
+        }
+        // 保存qrCode
+        List<AttachmentDto> qrCode = new ArrayList<>();
+        AttachmentDto temp = new AttachmentDto();
+        temp.setName("elevator_" + elevator.getSequenceNbr() + ".png");
+        temp.setType("image");
+        temp.setUrl(filePath);
+        qrCode.add(temp);
+        Map<String, List<AttachmentDto>> attachmentMap = new HashMap<>();
+        attachmentMap.put("qrCode",qrCode);
+        sourceFileService.saveAttachments(elevatorId,attachmentMap);
+        return filePath;
+    }
+
 
     public List<ElevatorWlInfoDto> queryElevatorList(ElevatorWlInfoDto esElevatorDto) {
        return elevatorMapper.queryElevatorList(esElevatorDto.getAddress(),

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">
@@ -1682,6 +1710,24 @@
         </sql>
     </changeSet>
 
+    <changeSet author="chenzhao" id="2021-10-13">
+        <preConditions onFail="MARK_RAN">
+            <viewExists viewName="alert_today"/>
+        </preConditions>
+        <dropView viewName="alert_today"/>
+        <comment>delete alert_today</comment>
+    </changeSet>
+
+    <changeSet author="chenzhao" id="2021-10-13-2">
+        <createView  viewName="alert_today" replaceIfExists="true" >
+            select '今日接警' AS `title`,count(`jc_alert_called`.`alert_status`) AS `alert_count` from `jc_alert_called` where (to_days(`jc_alert_called`.`call_time`) = to_days(now())) union all
+            <![CDATA[select '已处警' AS `title`,count(`jc_alert_called`.`alert_status`) AS `alert_count` from `jc_alert_called`,jc_power_transfer where ((to_days(`jc_alert_called`.`call_time`) = to_days(now()) and jc_power_transfer.alert_called_id = jc_alert_called.sequence_nbr  ) and (`jc_alert_called`.`alert_stage` <> '警情接报')) union all]]>            select '未结案' AS `title`,count(`jc_alert_called`.`alert_status`) AS `alert_count` from `jc_alert_called` where (`jc_alert_called`.`alert_status` = 0) union all
+            select '已结案' AS `title`,count(`jc_alert_called`.`alert_status`) AS `alert_count` from `jc_alert_called` where ((year(`jc_alert_called`.`call_time`) = year(now())) and (`jc_alert_called`.`alert_status` = 1));
+        </createView>
+    </changeSet>
+
+
+
 
     <changeSet author="tw" id="2021-10-13-tw-01">
         <preConditions onFail="MARK_RAN">

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)
@@ -417,7 +429,7 @@
         INTERVAL 8 HOUR)), ld.reform_limit_date ) -- 截止日期到当天早上8:00:00分钟数
         AND ld.overtime_state = 0
         AND ld.deleted = 0
-        <if test="dangerState != null and dangerState != ''" >
+        <if test="dangerState != null and dangerState != ''">
             AND ld.danger_state in (#{dangerState});
         </if>
 
@@ -960,7 +972,7 @@
                         #{id}
                     </foreach>
                 </if>
-                <if test="key == 'dangerState' and value != null">
+                <if test="key == 'dangerState' and value != null and !value.isEmpty()">
                     and a.danger_state IN
                     <foreach collection="value" item="state" open="(" separator="," close=")">
                         #{state}
@@ -981,7 +993,7 @@
                 <if test="key == 'reformType' and value != null and value != ''">
                     and a.reform_type = #{value}
                 </if>
-                <if test="key == 'structureIdList' and value != null">
+                <if test="key == 'structureIdList' and value != null and value != ''">
                     and a.structure_id in
                     <foreach collection="value" item="structureId" open="(" separator="," close=")">
                         #{structureId}

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

@@ -42,9 +42,7 @@ tzs.cti.secretkey=7bd29115-99ee-4f7d-1fb1-7c4719d5f43a
 tzs.cti.url=http://36.46.151.113:8000
 
 tzs.wechat.url=https://api.weixin.qq.com
-##wechatAPPID wx79aca5bb1cb4af92   uat-wx8918c1aaad956617
 tzs.wechat.appid=wx8918c1aaad956617
-##wechatSECRET f3a12323ba731d282c3d4698c27c3e97 uat-337c3d8f3e749140d4f9aedc8311033b
 tzs.wechat.secret=337c3d8f3e749140d4f9aedc8311033b
 
 ##wechatToken
@@ -52,12 +50,12 @@ tzs.wechat.token=yeejoin_2021
 ##wechatTicketUrl
 tzs.wechat.ticketurl=https://api.weixin.qq.com/cgi-bin/ticket/getticket?access_token=
 
-tzs.wechat.tempId.kr=Hlu43OOCVTESzOtkP4we1AUZJoPfquZl2_DEn6U66Z4
+tzs.wechat.tempId.kr=rjW8x9rRitIpa21Jekyx2nzBzpJy7tycssCXSN4YhWw
 tzs.wechat.url.kr=tzs.yeeamos.com/persondetail.html
-tzs.wechat.tempId.wx=rags-expfNSBB-h2WenuBI2c6pCEndH4uwTtOqlHqDM
+tzs.wechat.tempId.wx=ofBIZS8Bup9s0zKbrGa8BfhVhS18H_hyC_OYXuBN6hI
 tzs.wechat.url.wx=tzs.yeeamos.com/repairPersondetail.html
-tzs.wechat.tempId.ts=SLjmNJoCNLC3FBcYzWzR-u3el0kqXf8WMTmzw8dAQm4
-tzs.wechat.url.ts=tzs.yeeamos.com/persondetail.html
+tzs.wechat.tempId.ts=Kr7lcV8g4g_lgyW_RpwnNgw_HDxxRuVx759EoFWrIfU
+tzs.wechat.url.ts=tzs.yeeamos.com/taskComplaintDetail.html
 
 mqtt.topic.task.newtask=tzs-task-newtask
 

amos-boot-system-tzs/src/main/resources/application-qa.properties

 #DB properties:
-spring.datasource.url=jdbc:mysql://172.16.10.66:3306/safety-business-3.0.0?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+spring.datasource.url=jdbc:mysql://113.134.211.174:3306/xiy_amos_tzs_biz?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
 spring.datasource.username=root
-spring.datasource.password=root_123
\ No newline at end of file
+spring.datasource.password=Yeejoin@2020
+
+##eureka properties:
+eureka.client.service-url.defaultZone =http://113.134.211.174:10001/eureka/
+eureka.instance.prefer-ip-address=true
+management.endpoint.health.show-details=always
+management.endpoints.web.exposure.include=*
+eureka.instance.health-check-url=http://192.168.0.204:${server.port}${server.servlet.context-path}/actuator/health
+eureka.instance.metadata-map.management.context-path=${server.servlet.context-path}/actuator
+eureka.instance.status-page-url=http://192.168.0.204:${server.port}${server.servlet.context-path}/actuator/info
+eureka.instance.metadata-map.management.api-docs=http://192.168.0.204:${server.port}${server.servlet.context-path}/swagger-ui.html
+
+## ES properties:
+biz.elasticsearch.address=192.168.0.204
+spring.data.elasticsearch.cluster-name=elasticsearch
+spring.data.elasticsearch.cluster-nodes=${biz.elasticsearch.address}:9300
+spring.elasticsearch.rest.uris=http://${biz.elasticsearch.address}:9200
+
+## unit(h)
+alertcall.es.synchrony.time=48
+
+
+#redis properties:
+spring.redis.database=1
+spring.redis.host=113.134.211.174
+spring.redis.port=6379
+spring.redis.password=yeejoin@2020
+spring.redis.lettuce.pool.max-active=200
+spring.redis.lettuce.pool.max-wait=-1
+spring.redis.lettuce.pool.max-idle=10
+spring.redis.lettuce.pool.min-idle=0
+spring.redis.expire.time=300
+
+## emqx properties:
+emqx.clean-session=true
+emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
+emqx.broker=tcp://113.134.211.174:1883
+emqx.user-name=admin
+emqx.password=public
+
+tzs.cti.appkey=4e805006-3fef-ae43-3915-a153731007c4
+tzs.cti.secretkey=7bd29115-99ee-4f7d-1fb1-7c4719d5f43a
+tzs.cti.url=http://36.46.151.113:8000
+
+tzs.wechat.url=https://api.weixin.qq.com
+tzs.wechat.appid=wx79aca5bb1cb4af92
+tzs.wechat.secret=f3a12323ba731d282c3d4698c27c3e97
+
+##wechatToken
+tzs.wechat.token=yeejoin_2021
+##wechatTicketUrl
+tzs.wechat.ticketurl=https://api.weixin.qq.com/cgi-bin/ticket/getticket?access_token=
+
+tzs.wechat.tempId.kr=bxchKYhYW7aHbGKM2pVyR_yY2-bG4sRMNU3ZRQbMKYM
+tzs.wechat.url.kr=tzs.yeeamos.com/persondetail.html
+tzs.wechat.tempId.wx=rags-expfNSBB-h2WenuBI2c6pCEndH4uwTtOqlHqDM
+tzs.wechat.url.wx=tzs.yeeamos.com/repairPersondetail.html
+tzs.wechat.tempId.ts=rags-expfNSBB-h2WenuBI2c6pCEndH4uwTtOqlHqDM
+tzs.wechat.url.ts=tzs.yeeamos.com/taskComplaintDetail.html
+
+mqtt.topic.task.newtask=tzs-task-newtask
+
+mqtt.topic.task.personinfo=tzs-task-personinfo
+
+mqtt.topic.elevator.push=/tzs/tcb_elevator
+
+mqtt.topic.alertInfo.push=/tzs/tcb_alertInfo
+
+mqtt.topic.alertReport.push=/tzs/tcb_alertReport
+
+mqtt.topic.alertHeart.push=/tzs/tcb_alertHeart
+
+mqtt.topic.alertMatrix.push=/tzs/tcb_alertMatrix

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>