[修复]新增两江执法推送

zfjg-api/zfjg-api-manage/src/main/java/com/zfjg/manage/api/dto/enforce/job/EnforceJobFireRoomDTO.java

@@ -0,0 +1,16 @@
+package com.zfjg.manage.api.dto.enforce.job;
+
+import lombok.Data;
+
+/**
+ * @author xxd
+ * @version 1.0
+ */
+@Data
+public class EnforceJobFireRoomDTO {
+    private Long id;
+
+    private String staticNoticeResult;
+
+    private String enforceObjId;
+}

zfjg-api/zfjg-api-manage/src/main/java/com/zfjg/manage/api/dto/other/ArchitectureDTO.java

@@ -1,5 +1,7 @@
 package com.zfjg.manage.api.dto.other;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -12,6 +14,7 @@ import lombok.experimental.Accessors;
 public class ArchitectureDTO {
 
     @ApiModelProperty("id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
     @ApiModelProperty("社会单位id(管理单位id)")
     private Long socialUnitId;

zfjg-api/zfjg-api-manage/src/main/java/com/zfjg/manage/api/vo/other/ArchitectureVO.java

@@ -1,5 +1,7 @@
 package com.zfjg.manage.api.vo.other;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -12,6 +14,7 @@ import lombok.experimental.Accessors;
 public class ArchitectureVO {
 
     @ApiModelProperty("建组ID")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     @ApiModelProperty("建筑名称")

zfjg-modules/zfjg-manage/src/main/java/com/zfjg/manage/controller/api/ApiController.java

@@ -21,6 +21,7 @@ import com.zfjg.manage.service.api.ApiService;
 import com.zfjg.manage.service.enforce.obj.IEnforceObjService;
 import com.zfjg.manage.service.enforce.obj.IEnforceObjTagService;
 import com.zfjg.manage.service.impl.random.TaskGenerateService;
+import com.zfjg.manage.sync.remote.ILjZfjgSyncDataService;
 import com.zfjg.system.api.RemoteUserService;
 import com.zfjg.system.api.domain.SysUser;
 import com.zfjg.system.api.model.LoginUser;
@@ -60,6 +61,9 @@ public class ApiController extends BaseController {
     @Autowired
     private EnforceObjTagMapper enforceObjTagMapper;
 
+    @Autowired
+    private ILjZfjgSyncDataService ljZfjgSyncDataService;
+
     @GetMapping("test")
     public void test() {
 
@@ -84,18 +88,16 @@ public class ApiController extends BaseController {
     @GetMapping("getInfoByToken")
     public AjaxResult getInfoByToken(String token) {
         LoginUser loginUser = AuthUtil.getLoginUser(token);
-        if (loginUser == null || loginUser.getUserid()<1){
+        if (loginUser == null || loginUser.getUserid() < 1) {
             return AjaxResult.error("token失效！");
         }
 
         R<LoginUser> userResult = remoteUserService.getUserInfo(loginUser.getUsername(), SecurityConstants.INNER);
-        if (StringUtils.isNull(userResult) || StringUtils.isNull(userResult.getData()))
-        {
+        if (StringUtils.isNull(userResult) || StringUtils.isNull(userResult.getData())) {
             return AjaxResult.error("token失效！");
         }
 
-        if (R.FAIL == userResult.getCode())
-        {
+        if (R.FAIL == userResult.getCode()) {
             return AjaxResult.error("token失效！");
         }
 
@@ -104,13 +106,13 @@ public class ApiController extends BaseController {
         UserInfoUrl userInfoUrl = new UserInfoUrl();
         userInfoUrl.setRealName(sysUser.getDeptName());
         userInfoUrl.setIdCardNo(sysUser.getDept().getCreditCode());
-        if (StringUtils.isEmpty(sysUser.getPhonenumber())){
+        if (StringUtils.isEmpty(sysUser.getPhonenumber())) {
             sysUser.setPhonenumber("02367315119");
         }
         userInfoUrl.setTel(sysUser.getPhonenumber());
         AjaxResult ajax = AjaxResult.success();
-        ajax.put("success",true);
-        return ajax.put("data",userInfoUrl);
+        ajax.put("success", true);
+        return ajax.put("data", userInfoUrl);
     }
 
     /**
@@ -139,4 +141,9 @@ public class ApiController extends BaseController {
         taskGenerateService.generateEnforceJob(taskId);
     }
 
+    @GetMapping("/fire/room/test")
+    public void updateFireRoomTest() {
+        ljZfjgSyncDataService.updateFireRoom();
+    }
+
 }

zfjg-modules/zfjg-manage/src/main/java/com/zfjg/manage/mapper/enforce/job/EnforceJobMapper.java

@@ -19,7 +19,7 @@ import java.util.Set;
 
 /**
  * 检查任务Mapper接口
- * 
+ *
  * @author mxkj
  * @date 2022-12-06
  */
@@ -32,6 +32,7 @@ public interface EnforceJobMapper extends BaseMapper<EnforceJob> {
 
     /**
      * 查询简表图片数量
+     *
      * @param id
      * @return
      */
@@ -39,6 +40,7 @@ public interface EnforceJobMapper extends BaseMapper<EnforceJob> {
 
     /**
      * 查询繁表图片数量
+     *
      * @param id
      * @return
      */
@@ -48,6 +50,7 @@ public interface EnforceJobMapper extends BaseMapper<EnforceJob> {
 
     /**
      * 任务数量
+     *
      * @param params params
      * @return Integer
      */
@@ -63,6 +66,7 @@ public interface EnforceJobMapper extends BaseMapper<EnforceJob> {
 
     /**
      * 全覆盖 update
+     *
      * @param record
      * @return
      */
@@ -70,6 +74,7 @@ public interface EnforceJobMapper extends BaseMapper<EnforceJob> {
 
     /**
      * job
+     *
      * @param id id
      * @return EnforceJob
      */
@@ -98,50 +103,54 @@ public interface EnforceJobMapper extends BaseMapper<EnforceJob> {
 
     /**
      * 任务分组？？
+     *
      * @param startDate startDate
-     * @param endDate endDate
-     * @param status status
-     * @param result result
-     * @return List<Map<String, Object>>
+     * @param endDate   endDate
+     * @param status    status
+     * @param result    result
+     * @return List<Map < String, Object>>
      */
     List<Map<String, Object>> countJobGroup(@Param("startDate") Date startDate,
                                             @Param("endDate") Date endDate,
                                             @Param("status") String status,
-                                            @Param("result")String result,
+                                            @Param("result") String result,
                                             @Param("enforceOrgIds") List<String> enforceOrgIds,
                                             @Param("jobTypes") List<String> jobTypes,
                                             @Param("immediatelyFileId") Boolean immediatelyFileId,
-                                            @Param("deadlineFileId")Boolean deadlineFileId);
+                                            @Param("deadlineFileId") Boolean deadlineFileId);
 
     /**
      * 根据单位一级标签进行查询任务分布
-     * @param startDate startDate
-     * @param endDate endDate
+     *
+     * @param startDate     startDate
+     * @param endDate       endDate
      * @param enforceOrgIds enforceOrgIds
-     * @param jobType jobType
-     * @return List<Map<String, Object>>
+     * @param jobType       jobType
+     * @return List<Map < String, Object>>
      */
     List<Map<String, Object>> jobTag(@Param("startDate") Date startDate,
-                                     @Param("endDate")Date endDate,
-                                     @Param("enforceOrgIds")List<String> enforceOrgIds,
-                                     @Param("jobType")String jobType);
+                                     @Param("endDate") Date endDate,
+                                     @Param("enforceOrgIds") List<String> enforceOrgIds,
+                                     @Param("jobType") String jobType);
 
     /**
      * 任务总数
-     * @param startDate startDate
-     * @param endDate endDate
+     *
+     * @param startDate     startDate
+     * @param endDate       endDate
      * @param enforceOrgIds enforceOrgIds
-     * @param jobTypes jobTypes
-     * @return List<Map<String, Object>>
+     * @param jobTypes      jobTypes
+     * @return List<Map < String, Object>>
      */
-    List<JobByTimeDto>jobByTime(@Param("startDate")Date startDate,
-                                @Param("endDate")Date endDate,
-                                @Param("enforceOrgIds")List<String> enforceOrgIds,
-                                @Param("jobTypes")List<String> jobTypes,
-                                @Param("enforceResult")String enforceResult);
+    List<JobByTimeDto> jobByTime(@Param("startDate") Date startDate,
+                                 @Param("endDate") Date endDate,
+                                 @Param("enforceOrgIds") List<String> enforceOrgIds,
+                                 @Param("jobTypes") List<String> jobTypes,
+                                 @Param("enforceResult") String enforceResult);
 
     /**
      * batchUpdateApproveStatus
+     *
      * @param jobIds jobIds
      */
     void batchUpdateApproveStatus(@Param("jobIds") List<Long> jobIds);
@@ -153,6 +162,7 @@ public interface EnforceJobMapper extends BaseMapper<EnforceJob> {
 
     /**
      * app端举报检查的接口
+     *
      * @param enforceJobQuery
      * @return
      */
@@ -160,12 +170,14 @@ public interface EnforceJobMapper extends BaseMapper<EnforceJob> {
 
     /**
      * 消息一键已读
+     *
      * @param uid uid
      */
     void readAllMessage(@Param("uid") String uid);
 
     /**
      * pc专项检查
+     *
      * @param enforceJobQuery
      * @return
      */
@@ -173,6 +185,7 @@ public interface EnforceJobMapper extends BaseMapper<EnforceJob> {
 
     /**
      * 导出日常检查所有数据
+     *
      * @param query
      * @return
      */
@@ -180,13 +193,15 @@ public interface EnforceJobMapper extends BaseMapper<EnforceJob> {
 
     /**
      * 导出专项检查所有数据
+     *
      * @param query
      * @return
      */
     List<EnforceJobSpecial> getExportSpecialJob(EnforceJobQuery query);
 
     /**
-     *导出任务复查所有数据
+     * 导出任务复查所有数据
+     *
      * @param query
      * @return
      */
@@ -194,6 +209,7 @@ public interface EnforceJobMapper extends BaseMapper<EnforceJob> {
 
     /**
      * 所有权限用户查消息
+     *
      * @param enforceJobQuery enforceJobQuery
      * @return List<EnforceJobDTO>
      */
@@ -216,6 +232,7 @@ public interface EnforceJobMapper extends BaseMapper<EnforceJob> {
 
     /**
      * 获取当前执法人员待执行任务坐标
+     *
      * @return
      */
     List<EnforceJobDTO> getPositionList(@Param("uid") String uid);
@@ -231,8 +248,8 @@ public interface EnforceJobMapper extends BaseMapper<EnforceJob> {
     /**
      * 更具单位规模查询满足条件的总数
      */
-    List<Map<String, Long>> getCountByOrgId(@Param("orgId")String orgId,
-                                              @Param("objIds") List<String> objIds);
+    List<Map<String, Long>> getCountByOrgId(@Param("orgId") String orgId,
+                                            @Param("objIds") List<String> objIds);
 
     List<EnforceJobDTO> noAuthList(EnforceJobQuery enforceJobQuery);
 

zfjg-modules/zfjg-manage/src/main/java/com/zfjg/manage/mapper/enforce/obj/EnforceObjMapper.java

@@ -3,6 +3,7 @@ package com.zfjg.manage.mapper.enforce.obj;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zfjg.manage.api.domain.enforce.obj.EnforceObj;
 import com.zfjg.manage.api.domain.enforce.obj.EnforceObjExport;
+import com.zfjg.manage.api.dto.enforce.job.EnforceJobFireRoomDTO;
 import com.zfjg.manage.api.repository.enforce.obj.EnforceObjRepositoryDTO;
 import com.zfjg.manage.api.search.enforce.obj.EnforceObjSearch;
 import org.apache.ibatis.annotations.Mapper;
@@ -118,5 +119,7 @@ public interface EnforceObjMapper extends BaseMapper<EnforceObj> {
 
     @Select("SELECT * FROM `enforce_obj` where enforce_org_id = #{enforceOrgId}")
     List<EnforceObj> selectByOrgId(@Param("enforceOrgId") String needPushDataOrgId);
+
+    List<EnforceJobFireRoomDTO> getEnforceJobFireRoom();
 }
 

zfjg-modules/zfjg-manage/src/main/java/com/zfjg/manage/service/enforce/job/IEnforceJobServiceExtend.java

@@ -1,6 +1,9 @@
 package com.zfjg.manage.service.enforce.job;
 
 import com.alibaba.fastjson.JSONObject;
+import com.zfjg.manage.api.dto.enforce.job.EnforceJobFireRoomDTO;
+
+import java.util.List;
 
 /**
  * 执法对象扩展功能
@@ -18,6 +21,7 @@ public interface IEnforceJobServiceExtend {
 
     /**
      * 获取机构信息记录
+     *
      * @param creditCode 信用代码
      * @return JSON数据
      */

zfjg-modules/zfjg-manage/src/main/java/com/zfjg/manage/service/enforce/obj/IEnforceObjServiceExtend.java

@@ -1,6 +1,9 @@
 package com.zfjg.manage.service.enforce.obj;
 
 import com.alibaba.fastjson.JSONObject;
+import com.zfjg.manage.api.dto.enforce.job.EnforceJobFireRoomDTO;
+
+import java.util.List;
 
 /**
  * 执法对象扩展功能
@@ -22,4 +25,12 @@ public interface IEnforceObjServiceExtend {
      * @return JSON数据
      */
     JSONObject maintenanceRecordByCreditCode(String creditCode, Integer current, Integer size);
+
+
+    /**
+     * 获取所有不合格消防控制室信息
+     *
+     * @return
+     */
+    List<EnforceJobFireRoomDTO> enforceJobFireRoomList();
 }

zfjg-modules/zfjg-manage/src/main/java/com/zfjg/manage/service/impl/enforce/message/SendMessageServiceImpl.java

@@ -155,13 +155,13 @@ public class SendMessageServiceImpl implements ISendMessageService {
         if (!templateDTO.isPresent()) {
             throw new ServiceException("所发短信的模板不存在，请检查", 400);
         }
-        if ("CHECK".equals(dto.getMessageType())) {
-            Optional<EnforceMessageTemplateDTO> noticeTemplateDto = enforceMessageTemplateService.findByEnforceOrgIdAndMessageType(dto.getEnforceOrgId(), "NOTICE");
-            if (!templateDTO.isPresent()) {
-                throw new ServiceException("所发告知书的模板不存在，请检查", 400);
-            }
-            templateDTO.get().setIsPdfOpen(noticeTemplateDto.get().getIsPdfOpen());
-        }
+//        if ("CHECK".equals(dto.getMessageType())) {
+//            Optional<EnforceMessageTemplateDTO> noticeTemplateDto = enforceMessageTemplateService.findByEnforceOrgIdAndMessageType(dto.getEnforceOrgId(), "NOTICE");
+//            if (!templateDTO.isPresent()) {
+//                throw new ServiceException("所发告知书的模板不存在，请检查", 400);
+//            }
+//            templateDTO.get().setIsPdfOpen(noticeTemplateDto.get().getIsPdfOpen());
+//        }
         if (MessageTypeEnum.ILLEGAL.getValue().equals(dto.getMessageType()) || MessageTypeEnum.ILLEGAL_PUNISH.getValue().equals(dto.getMessageType())) {
             IllegalOccupy illegalOccupy = illegalOccupyMapper.getIllegalOccupy(dto.getEnforceJobId());
             dto.setIllegalPlate(illegalOccupy.getLicensePlateNum());

zfjg-modules/zfjg-manage/src/main/java/com/zfjg/manage/service/impl/enforce/obj/EnforceObjServiceImpl.java

@@ -24,6 +24,7 @@ import com.zfjg.manage.api.domain.enforce.job.EnforceJob;
 import com.zfjg.manage.api.domain.enforce.job.EnforceJobNodeItem;
 import com.zfjg.manage.api.domain.enforce.obj.*;
 import com.zfjg.manage.api.dto.enforce.job.EnforceJobDTO;
+import com.zfjg.manage.api.dto.enforce.job.EnforceJobFireRoomDTO;
 import com.zfjg.manage.api.dto.enforce.obj.*;
 import com.zfjg.manage.api.dto.enforce.template.EnforceTemplateDTO;
 import com.zfjg.manage.api.repository.enforce.obj.EnforceObjRepositoryDTO;
@@ -1017,4 +1018,9 @@ public class EnforceObjServiceImpl extends ServiceImpl<EnforceObjMapper, Enforce
                 .body();
         return JSON.parseObject(response);
     }
+
+    @Override
+    public List<EnforceJobFireRoomDTO> enforceJobFireRoomList() {
+        return this.baseMapper.getEnforceJobFireRoom();
+    }
 }

zfjg-modules/zfjg-manage/src/main/java/com/zfjg/manage/sync/remote/DefaultLjZfjgSyncDataService.java

@@ -1,8 +1,11 @@
 package com.zfjg.manage.sync.remote;
 
 import cn.hutool.core.map.MapUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.ReflectUtil;
+import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.zfjg.common.core.enums.JobTypeEnum;
 import com.zfjg.common.core.exception.ServiceException;
@@ -11,10 +14,12 @@ import com.zfjg.manage.api.domain.device.Device;
 import com.zfjg.manage.api.domain.enforce.job.EnforceJob;
 import com.zfjg.manage.api.domain.enforce.job.EnforceJobReport;
 import com.zfjg.manage.api.domain.enforce.obj.EnforceObj;
+import com.zfjg.manage.api.domain.enforce.obj.EnforceObjArchitecture;
 import com.zfjg.manage.api.domain.enforce.obj.EnforceObjTag;
 import com.zfjg.manage.api.domain.enforce.obj.Tag;
 import com.zfjg.manage.api.domain.enforce.video.EnforceVideo;
 import com.zfjg.manage.api.domain.random.RandomTaskNotify;
+import com.zfjg.manage.api.dto.enforce.job.EnforceJobFireRoomDTO;
 import com.zfjg.manage.api.sync.EnforceJobSyncReport;
 import com.zfjg.manage.api.sync.EnforceVideoSync;
 import com.zfjg.manage.config.Constant;
@@ -22,9 +27,7 @@ import com.zfjg.manage.service.approve.IEnforceApproveTempleteService;
 import com.zfjg.manage.service.device.IDeviceService;
 import com.zfjg.manage.service.enforce.job.IEnforceJobReportService;
 import com.zfjg.manage.service.enforce.job.IEnforceJobService;
-import com.zfjg.manage.service.enforce.obj.IEnforceObjService;
-import com.zfjg.manage.service.enforce.obj.IEnforceObjTagService;
-import com.zfjg.manage.service.enforce.obj.ITagService;
+import com.zfjg.manage.service.enforce.obj.*;
 import com.zfjg.manage.service.enforce.video.IEnforceVideoService;
 import com.zfjg.manage.service.random.IRandomTaskNotifyService;
 import lombok.RequiredArgsConstructor;
@@ -39,10 +42,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 
 import java.io.Serializable;
-import java.util.Arrays;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
+import java.util.*;
+import java.util.stream.Collectors;
 
 @Slf4j
 @RequiredArgsConstructor
@@ -57,6 +58,7 @@ public class DefaultLjZfjgSyncDataService implements ILjZfjgSyncDataService {
     private Boolean enabled;
     private final RestTemplate restTemplate;
     private final IEnforceObjService enforceObjService;
+    private final IEnforceObjServiceExtend enforceObjServiceExtend;
     private final IDeviceService deviceService;
     private final ITagService tagService;
     private final IEnforceObjTagService enforceObjTagService;
@@ -65,6 +67,7 @@ public class DefaultLjZfjgSyncDataService implements ILjZfjgSyncDataService {
     private final IRandomTaskNotifyService randomTaskNotifyService;
     private final IEnforceJobService enforceJobService;
     private final IEnforceJobReportService enforceJobReportService;
+    private final IEnforceObjArchitectureService enforceObjArchitectureService;
 
     /**
      * 更新执法设备
@@ -299,6 +302,35 @@ public class DefaultLjZfjgSyncDataService implements ILjZfjgSyncDataService {
         }
     }
 
+    @Override
+    public void updateFireRoom() {
+        if (!enabled) {
+            log.info("未开启消控室接口");
+            return;
+        }
+        List<EnforceJobFireRoomDTO> enforceJobFireRoomDTOS = enforceObjServiceExtend.enforceJobFireRoomList();
+        if (enforceJobFireRoomDTOS.isEmpty()) {
+            log.info("未找到不合格的消控室");
+            return;
+        }
+        List<String> ids = enforceJobFireRoomDTOS.stream().map(EnforceJobFireRoomDTO::getEnforceObjId).collect(Collectors.toList());
+
+        List<EnforceObjArchitecture> enforceObjArchitectures = enforceObjArchitectureService.list(new LambdaQueryWrapper<EnforceObjArchitecture>().in(EnforceObjArchitecture::getEnforceObjId, ids));
+        if (ObjectUtil.isEmpty(enforceObjArchitectures)) {
+            log.info("未找到消控室一件事儿建筑信息");
+            return;
+        }
+
+        List<String> remoteArchitectureIds = enforceObjArchitectures.stream().map(EnforceObjArchitecture::getArchitectureId).collect(Collectors.toList());
+        for (String remoteArchitectureId : remoteArchitectureIds) {
+            String response = HttpUtil.createPost("http://127.0.0.1:9212/base/task/" + remoteArchitectureId + "/fireRoom?describe=消控室隐患上报")
+                    .execute()
+                    .sync()
+                    .body();
+            log.info("执行消控室建筑推送: {}", response);
+        }
+
+    }
 
     private HttpHeaders auth(HttpHeaders requestHeaders) {
         requestHeaders.set("Content-type", "application/json; charset=utf-8");

zfjg-modules/zfjg-manage/src/main/java/com/zfjg/manage/sync/remote/ILjZfjgSyncDataService.java

@@ -7,56 +7,70 @@ public interface ILjZfjgSyncDataService {
 
     /**
      * 更新执法设备
+     *
      * @param obj
      */
     void updateDevice(Map<String, Object> obj);
 
     /**
      * 更新执法审批模板
+     *
      * @param obj
      */
     void updateEnforceApproveTemplate(Map<String, Object> obj);
 
     /**
      * 更新执法任务
+     *
      * @param obj
      */
     void updateEnforceJob(Map<String, Object> obj);
 
     /**
      * 更新举报投诉
+     *
      * @param obj
      */
     void updateEnforceJobReport(Map<String, Object> obj);
 
     /**
      * 更新执法对象
+     *
      * @param obj
      */
     void updateEnforceObj(Map<String, Object> obj);
 
     /**
      * 更新执法标签
+     *
      * @param obj
      */
     void updateEnforceObjTag(Map<String, Object> obj);
 
     /**
      * 更新执法音视频
+     *
      * @param obj
      */
     void updateEnforceVideo(Map<String, Object> obj);
 
     /**
      * 更新双随机通知记录
+     *
      * @param obj
      */
     void updateRandomTaskNotify(Map<String, Object> obj);
 
     /**
      * 更新标签
+     *
      * @param obj
      */
     void updateTag(Map<String, Object> obj);
 
+
+    /**
+     * 消控室一件事
+     */
+    void updateFireRoom();
 }

zfjg-modules/zfjg-manage/src/main/java/com/zfjg/manage/task/job/EnforceJobTask.java

@@ -26,6 +26,7 @@ import com.zfjg.manage.service.enforce.job.IEnforceJobService;
 import com.zfjg.manage.service.enforce.message.IEnforceMessageReceiverService;
 import com.zfjg.manage.service.enforce.message.IEnforceMessageTemplateService;
 import com.zfjg.manage.service.enforce.message.ISendMessageService;
+import com.zfjg.manage.sync.remote.ILjZfjgSyncDataService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -68,6 +69,8 @@ public class EnforceJobTask {
     private IEnforceJobReportService enforceJobReportService;
     @Autowired
     private IHolidayCacheService holidayCacheService;
+    @Autowired
+    private ILjZfjgSyncDataService ljZfjgSyncDataService;
 
     private static DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
 
@@ -109,6 +112,12 @@ public class EnforceJobTask {
         }
     }
 
+    @Scheduled(cron = "0 20 0 * * ?")
+    public void updateFireRoom() {
+        log.info("每日执行消控室一件事儿");
+        ljZfjgSyncDataService.updateFireRoom();
+    }
+
     // 每天早上九点发送短信通知
     @Scheduled(cron = "0 0 9 * * ?")
     public void sendMessage() throws ParseException {

zfjg-modules/zfjg-manage/src/main/resources/mapper/enforce/job/EnforceJobMapper.xml

@@ -82,7 +82,8 @@
         e.is_effect,
         e.time_out,
         e.item_sum,
-        e.deadline_time
+        e.deadline_time,
+        e.create_time
         from enforce_job e
         left join sys_user u on find_in_set(u.uid, e.executor_ids)
         left join sys_dept d on u.dept_id = d.dept_id
@@ -1776,6 +1777,7 @@
     <select id="getRealJobById" resultType="com.zfjg.manage.api.domain.enforce.job.EnforceJob">
         select * from enforce_job where id = #{id}
     </select>
+
     <update id="updateNull">
         update enforce_job set forward_time = #{forwardTime},approve_user_id = #{approveUserId},approve_user_name = #{approveUserName}
         where id = #{id}

zfjg-modules/zfjg-manage/src/main/resources/mapper/enforce/obj/EnforceObjMapper.xml

@@ -279,4 +279,12 @@
     AND a.is_deleted = 0
     AND a.extract_num = 0
     </select>
+    <select id="getEnforceJobFireRoom" resultType="com.zfjg.manage.api.dto.enforce.job.EnforceJobFireRoomDTO">
+        SELECT DISTINCT enforce_obj_id
+        FROM enforce_job_node_item
+        WHERE TO_DAYS(NOW()) - TO_DAYS(update_time) <![CDATA[ <= ]]> 1
+          AND enforce_obj_class = '消防控制室'
+          AND check_result = 2
+    </select>
+
 </mapper>