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

data-ui/src/api/centerdata_emergency1/log.js

@@ -42,3 +42,10 @@ export function delLog(busLogId) {
     method: 'delete'
   })
 }
+
+export function checkLog(busLogId) {
+  return request({
+    url: '/sooka-sponest-center-data/log/checkLog/' + busLogId,
+    method: 'put'
+  })
+}

data-ui/src/views/data/digitalemergency1/log/index.vue

@@ -120,17 +120,17 @@
       <!--v-hasPermi="['system:log:edit']"-->
       <!--&gt;修改</el-button>-->
       <!--</el-col>-->
-      <!--<el-col :span="1.5">-->
-      <!--<el-button-->
-      <!--type="danger"-->
-      <!--plain-->
-      <!--icon="el-icon-delete"-->
-      <!--size="mini"-->
-      <!--:disabled="multiple"-->
-      <!--@click="handleDelete"-->
-      <!--v-hasPermi="['system:log:remove']"-->
-      <!--&gt;删除</el-button>-->
-      <!--</el-col>-->
+      <el-col :span="1.5">
+        <el-button
+        type="success"
+        plain
+        icon="el-icon-edit"
+        size="mini"
+        :disabled="multiple"
+        @click="handleDelete"
+        v-hasPermi="['system:log:edit']"
+        >审核通过</el-button>
+      </el-col>
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -158,11 +158,6 @@
           <dict-tag :options="dict.type.log_source" :value="scope.row.logSource"/>
         </template>
       </el-table-column>
-      <el-table-column label="巡更点名称" align="center" prop="busPatrolstationName">
-
-      </el-table-column>
-
-
       <el-table-column label="记录时间" align="center">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{mi}:{s}') }}</span>
@@ -183,6 +178,12 @@
           <dict-tag :options="dict.type.risk_status" :value="scope.row.riskStatus"/>
         </template>
       </el-table-column>
+      <el-table-column label="审核状态" align="center" prop="isCheckStatus">
+        <template slot-scope="scope">
+          <label v-show="scope.row.isCheckStatus == '0'" style="color: #ff0000">待审核</label>
+          <label v-show="scope.row.isCheckStatus == '1'" style="color: #00ff00">已通过</label>
+        </template>
+      </el-table-column>
       <!--<el-table-column label="经度" align="center" prop="longitude" />-->
       <!--<el-table-column label="纬度" align="center" prop="latitude" />-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -194,7 +195,7 @@
                      icon="list-icon-sj iconfont icon-chakan"
                      @click="handleInspection(scope.row)"
                      v-hasPermi="['system:log:edit']"
-          >巡检记录
+          >巡检明细
           </el-button>
 
 
@@ -260,7 +261,7 @@
 </template>
 
 <script>
-  import {listLog, getLog, delLog, addLog, updateLog} from "@/api/centerdata_emergency1/log";
+import {listLog, getLog, delLog, addLog, updateLog, checkLog} from "@/api/centerdata_emergency1/log";
 
   export default {
     name: "Log",
@@ -428,19 +429,23 @@
       /** 删除按钮操作 */
       handleDelete(row) {
         const busLogIds = row.busLogId || this.ids;
-        this.$modal.confirm('是否确认删除日志编号为"' + busLogIds + '"的数据项？').then(function () {
+        checkLog(busLogIds).then(res=>{
+          this.getList();
+          this.$modal.msgSuccess("审核成功");
+        });
+        /*this.$modal.confirm('是否确认删除日志编号为"' + busLogIds + '"的数据项？').then(function () {
           return delLog(busLogIds);
         }).then(() => {
           this.getList();
           this.$modal.msgSuccess("删除成功");
         }).catch(() => {
-        });
+        });*/
       },
       /** 导出按钮操作 */
       handleExport() {
         this.queryParams.beginTime = this.dateRange[0];
         this.queryParams.endTime = this.dateRange[1];
-        this.download('system/log/export', {
+        this.download('sooka-sponest-center-data/log/export', {
           ...this.queryParams
         }, `log_${new Date().getTime()}.xlsx`)
       }

src/main/java/com/sooka/sponest/data/digitalemergency/controller/EmergencyBigDataController.java

@@ -62,7 +62,7 @@ public class EmergencyBigDataController extends BaseController {
     }
 
     /**
-     * 获取行业高危行业分布
+     * 获取行业高危行业分析
      *
      * @return
      */

src/main/java/com/sooka/sponest/data/emergency/appmin/index/service/impl/AppIndexServiceImpl.java

@@ -67,10 +67,10 @@ public class AppIndexServiceImpl extends BaseService implements AppIndexService
             managerMainVO.setParams(vo.getParams());
             //找出已过期和即将到期的巡检项目
             List late_inspection_list = managerMainMapper.getMainInspections(managerMainVO);
-            Map map = new HashMap();
-            map.put("late_inspection_list",late_inspection_list);
+//            Map map = new HashMap();
+//            map.put("late_inspection_list",late_inspection_list);
 
-            return AjaxResult.success(map);
+            return AjaxResult.success(late_inspection_list);
         }catch (Exception e) {
             e.printStackTrace();
             return AjaxResult.error("错误");

src/main/java/com/sooka/sponest/data/emergency/appmin/xunjian/controller/AppXunjianController.java

@@ -1,15 +1,16 @@
 package com.sooka.sponest.data.emergency.appmin.xunjian.controller;
 
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.utils.SpringUtils;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.sooka.sponest.data.emergency.appmin.xunjian.domain.AppFctzsVO;
 import com.sooka.sponest.data.emergency.appmin.xunjian.domain.AppXunjianInspectionVO;
 import com.sooka.sponest.data.emergency.appmin.xunjian.domain.AppXunjianVO;
 import com.sooka.sponest.data.emergency.appmin.xunjian.domain.AppZgtzsVO;
 import com.sooka.sponest.data.emergency.appmin.xunjian.service.AppXunjianService;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.sooka.sponest.message.api.RemoteMessageService;
+import com.sooka.sponest.message.api.domain.MessageVo;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 
@@ -25,6 +26,11 @@ public class AppXunjianController {
         return AjaxResult.success(appXunjianService.getXunjianItems(vo));
     }
 
+    /**
+     * 巡查上报
+     * @param vo
+     * @return
+     */
     @PostMapping("submitXunjian")
     public AjaxResult submitXunjian(@RequestBody AppXunjianVO vo) {
         return appXunjianService.submitXunjian(vo);
@@ -74,21 +80,51 @@ public class AppXunjianController {
     }
 
 
-    @RequestMapping("saveZGTZS")
+    /**
+     * 整改通知书
+     * @param vo
+     * @return
+     */
+    @PostMapping("saveZGTZS")
     public AjaxResult saveZGTZS(@RequestBody AppZgtzsVO vo) {
         return appXunjianService.saveZGTZS(vo);
     }
 
+    @GetMapping("saveZGTZS")
+    public R saveZGTZS(String tel) {
+        MessageVo messageVo = new MessageVo();
+        messageVo.setPhone(tel);
+        messageVo.setStr("有安全隐患需要处理请查收");
+        messageVo.setEventCode("");
+        messageVo.setEventName("");
+        return SpringUtils.getBean(RemoteMessageService.class).sendMessage(messageVo);
+    }
+
+    /**
+     * 复查通知书
+     * @param vo
+     * @return
+     */
     @RequestMapping("saveFCTZS")
     public AjaxResult saveFCTZS(@RequestBody AppFctzsVO vo) {
         return appXunjianService.saveFCTZS(vo);
     }
 
+    /**
+     * 复查通知详情
+     * @param vo
+     * @return
+     */
     @RequestMapping("getFCTZSdetail")
     public AjaxResult getFCTZSdetail(@RequestBody AppFctzsVO vo) {
         return appXunjianService.getFCTZSdetail(vo);
     }
 
+    /**
+     * 整改完成
+     * @param vo
+     * @return
+     */
     @PostMapping("changeInspection")
     public AjaxResult changeInspection(@RequestBody AppXunjianInspectionVO vo) {
         return appXunjianService.changeInspection(vo);

src/main/java/com/sooka/sponest/data/emergency/appmin/xunjian/service/impl/AppXunjianServiceImpl.java

@@ -134,6 +134,7 @@ public class AppXunjianServiceImpl extends BaseServiceImpl implements AppXunjian
         //是否有限期整改的
         Boolean haveXQZG = false;//限期整改
         Boolean haveLCLG = false;//立查立改
+
         String pictures_local_path = remoteConfigService.remotegetConfigKey("appUrl").getData();
         Date createTime = new Date();
         try {
@@ -170,20 +171,22 @@ public class AppXunjianServiceImpl extends BaseServiceImpl implements AppXunjian
                 List list = (List) map.get(key);
                 List content = (List) list.get(1);
                 ObjectMapper mapper = new ObjectMapper();
-                List<ListDataBO> pojos = mapper.convertValue(content, new TypeReference<List<ListDataBO>>() {
-                });
+                //将一个对象（  content  ）转换为一个指定类型的集合（  List<ListDataBO>  ）
+                List<ListDataBO> pojos = mapper.convertValue(content, new TypeReference<List<ListDataBO>>() {});
 
                 for (int i = 0; i < pojos.size(); i++) {
                     ListDataBO listDataBO = pojos.get(i);
                     //循环插入巡检表
                     TBusInspection tBusInspection = new TBusInspection();
                     String busInspectionId = UUID.fastUUID().toString();
+                    //默认-无需整改
                     tBusInspection.setRiskStatus("risk_status_3");
                     tBusInspection.setIsPass("Y");
                     tBusInspection.setCreateTime(createTime);
 
                     if (listDataBO.getChecked() == false) {
                         tBusLog.setIsRisk("1");
+                        //待整改
                         tBusInspection.setRiskStatus("risk_status_0");
                         tBusInspection.setIsPass("N");
                         tBusInspection.setItemsType(listDataBO.getItemsType());
@@ -194,6 +197,7 @@ public class AppXunjianServiceImpl extends BaseServiceImpl implements AppXunjian
                         tBusTrack.setBusInspectionId(busInspectionId);
                         tBusTrack.setDeptId(sysUser.getSysUser().getDeptId());
                         tBusTrack.setUserId(sysUser.getSysUser().getUserId());
+                        //待整改
                         tBusTrack.setRiskStatus("risk_status_0");
                         tBusTrack.setBusTrackContent(listDataBO.getBusTrackContent());
                         tBusTrack.setCreateTime(createTime);
@@ -201,12 +205,14 @@ public class AppXunjianServiceImpl extends BaseServiceImpl implements AppXunjian
                         //如果是立查立改，就再放一个完成的进度 - 巡检表状态标识为已整改
                         if (listDataBO.getItemsType().equals("items_type_0")) {
                             haveLCLG = true;
+                            //已整改
                             tBusInspection.setRiskStatus("risk_status_2");
                             tBusTrack.setRiskStatus("risk_status_2");
                             tBusTrack.setCreateTime(new Date(new Date().getTime()+1000));
                             tBusTrack.setBusTrackId(UUID.fastUUID().toString());
                             tBusTrackMapper.insertTBusTrack(tBusTrack);
                         } else {
+                            //待整改
                             tBusLog.setRiskStatus("risk_status_0");
                             haveXQZG = true;
                         }
@@ -252,6 +258,7 @@ public class AppXunjianServiceImpl extends BaseServiceImpl implements AppXunjian
                 tBusLog.setRiskStatus("risk_status_2");
             }
 
+            tBusLog.setIsCheckStatus("0");
             tBusLogMapper.insertTBusLog(tBusLog);
 
             //写业务部门表

src/main/java/com/sooka/sponest/data/emergency/controller/TBusLogController.java

@@ -96,4 +96,15 @@ public class TBusLogController extends BaseController
     {
         return toAjax(tBusLogService.deleteTBusLogByBusLogIds(busLogIds));
     }
+
+    /**
+     * 删除日志
+     */
+    @RequiresPermissions("system:log:edit")
+    @Log(title = "日志", businessType = BusinessType.UPDATE)
+    @PutMapping("/checkLog/{busLogIds}")
+    public AjaxResult checkLog(@PathVariable String[] busLogIds)
+    {
+        return toAjax(tBusLogService.checkTBusLogByBusLogIds(busLogIds));
+    }
 }

src/main/java/com/sooka/sponest/data/emergency/domain/TBusLog.java

@@ -16,50 +16,69 @@ import java.util.Date;
  */
 @Getter
 @Setter
-public class TBusLog extends BaseBusinessEntity
-{
+public class TBusLog extends BaseBusinessEntity {
     private static final long serialVersionUID = 1L;
 
-    /** 日志ID */
+    /**
+     * 日志ID
+     */
     private String busLogId;
 
-    /** 日志类型 */
+    /**
+     * 日志类型
+     */
     private String busLogType;
 
     @Excel(name = "日志类型")
     private String busLogTypeValue;
 
-    /** 来源 */
+    /**
+     * 来源
+     */
     private String logSource;
     @Excel(name = "来源")
     private String logSourceValue;
 
-    /** 隐患 */
+    /**
+     * 隐患
+     */
     private String isRisk;
     @Excel(name = "隐患")
     private String isRiskValue;
 
-    /** 企业ID */
+    /**
+     * 企业ID
+     */
     private String busEnterpriseId;
 
-    /** 企业名称 */
+    /**
+     * 企业名称
+     */
     @Excel(name = "企业名称")
     private String busEnterpriseName;
 
-    /** 状态 */
+    /**
+     * 状态
+     */
     private String riskStatus;
 
     @Excel(name = "状态")
     private String riskStatusValue;
-    /** 经度 */
+    /**
+     * 经度
+     */
     @Excel(name = "经度")
     private String longitude;
 
-    /** 纬度 */
+    /**
+     * 纬度
+     */
     @Excel(name = "纬度")
     private String latitude;
 
-    /** 巡检人 */
+    /**
+     * 巡检人
+     */
     @Excel(name = "巡检人")
     private String createBy;
 
@@ -75,4 +94,13 @@ public class TBusLog extends BaseBusinessEntity
 
     private String busPatrolstationName;
 
+    /**
+     * 审核状态 0未审核 1已审核
+     */
+    private String isCheckStatus;
+    /**
+     * 审核意见: 备用字段
+     */
+    private String checkDetail;
+
 }

src/main/java/com/sooka/sponest/data/emergency/domain/vo/ExportVo.java

@@ -17,13 +17,13 @@ public class ExportVo {
     @Excel(name = "日志类型")
     private String busLogTypeValue;
 
-    /** 企业所属街道 */
-    @Excel(name = "企业所属街道")
-    private String jdName;
-
-    /** 企业所属社区 */
-    @Excel(name = "企业所属社区")
-    private String sqName;
+//    /** 企业所属街道 */
+//    @Excel(name = "企业所属街道")
+//    private String jdName;
+//
+//    /** 企业所属社区 */
+//    @Excel(name = "企业所属社区")
+//    private String sqName;
 
     /** 巡检人 */
     @Excel(name = "巡检人")
@@ -71,9 +71,9 @@ public class ExportVo {
     @Excel(name = "主要负责人电话")
     private String mainPersonPhone;
 
-    /** 巡检记录 */
-    @Excel(name = "巡检记录")
-    private List<TBusInspection> tBusInspectionList;
+//    /** 巡检记录 */
+//    @Excel(name = "巡检记录")
+//    private List<TBusInspection> tBusInspectionList;
 
 
 }

src/main/java/com/sooka/sponest/data/emergency/mapper/TBusLogMapper.java

@@ -63,4 +63,6 @@ public interface TBusLogMapper
      * @return 结果
      */
     public int deleteTBusLogByBusLogIds(String[] busLogIds);
+
+    int checkTBusLogByBusLogIds(String[] busLogIds);
 }

src/main/java/com/sooka/sponest/data/emergency/remoteapi/fallback/center/mobile/RemoteSystemBaseServiceFallbackFactory.java

@@ -33,11 +33,11 @@ public class RemoteSystemBaseServiceFallbackFactory implements FallbackFactory<R
 
         return new RemoteSystemBaseService() {
 
-            @Override
-            public TableDataInfo selectList()
-            {
-                return null;
-            }
+//            @Override
+//            public TableDataInfo selectList()
+//            {
+//                return null;
+//            }
 
 
             @Override
@@ -53,17 +53,17 @@ public class RemoteSystemBaseServiceFallbackFactory implements FallbackFactory<R
             }
 
 
-            @Override
-            public AjaxResult getInfoApp(Long noticeId)
-            {
-                return null;
-            }
-
-            @Override
-            public AjaxResult getConfigKey(String configKey)
-            {
-                return null;
-            }
+//            @Override
+//            public AjaxResult getInfoApp(Long noticeId)
+//            {
+//                return null;
+//            }
+//
+//            @Override
+//            public AjaxResult getConfigKey(String configKey)
+//            {
+//                return null;
+//            }
 
             @Override
             public R<SysUser> selectById(@PathVariable("userId") Long userId)
@@ -82,17 +82,17 @@ public class RemoteSystemBaseServiceFallbackFactory implements FallbackFactory<R
                 return null;
             }
 
-            @Override
-            public R<String> selectConfigKey(@PathVariable("configKey") String configKey)
-            {
-                return null;
-            }
-
-            @Override
-            public R<LoginUser> getUserInfo(String username, String source)
-            {
-                return R.fail("获取用户失败:" + throwable.getMessage());
-            }
+//            @Override
+//            public R<String> selectConfigKey(@PathVariable("configKey") String configKey)
+//            {
+//                return null;
+//            }
+
+//            @Override
+//            public R<LoginUser> getUserInfo(String username, String source)
+//            {
+//                return R.fail("获取用户失败:" + throwable.getMessage());
+//            }
 
         };
     }

src/main/java/com/sooka/sponest/data/emergency/remoteapi/service/center/data/RemoteSystemBaseService.java

@@ -1,12 +1,10 @@
 package com.sooka.sponest.data.emergency.remoteapi.service.center.data;
 
-import com.ruoyi.common.core.constant.SecurityConstants;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.system.api.domain.SysDept;
 import com.ruoyi.system.api.domain.SysUser;
-import com.ruoyi.system.api.model.LoginUser;
 import com.sooka.sponest.data.emergency.remoteapi.fallback.center.mobile.ModulesServiceNameContants;
 import com.sooka.sponest.data.emergency.remoteapi.fallback.center.mobile.RemoteSystemBaseServiceFallbackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -21,14 +19,6 @@ import java.util.List;
 )
 public interface RemoteSystemBaseService {
 
-    /**
-     * 查询轮播图列表(无参)
-     * @author pengyu
-     * @date 2023/2/22 14:45
-     * @return com.ruoyi.common.core.web.page.TableDataInfo
-     **/
-    @RequestMapping("/retaion/selectList")
-    public TableDataInfo selectList();
 
     //根据参数键名查询参数值
     @GetMapping("/configKey/{configKey}")
@@ -44,13 +34,6 @@ public interface RemoteSystemBaseService {
     @GetMapping("/notice/noticeList")
     public TableDataInfo noticlist(@RequestParam(value = "pageNum") Integer pageNum, @RequestParam(value = "pageSize") Integer pageSize);
 
-    //根据通知公告编号获取详细信息（App）
-    @RequestMapping("/notice/getInfoApp")
-    public AjaxResult getInfoApp(@RequestParam(value = "noticeId") Long noticeId);
-
-    //根据参数键名查询参数值
-    @GetMapping(value = "/config/configKey/{configKey}")
-    public AjaxResult getConfigKey(@PathVariable(value = "configKey") String configKey);
 
     //根据用户编号获取详细信息远程接口
     @RequestMapping(value = "/user/selectById/{userId}")
@@ -58,32 +41,11 @@ public interface RemoteSystemBaseService {
 
     //根据用户获取用户列表
     @PostMapping(value = "/user/userFeginlist")
-    public R<List<SysUser>> userFeginlist(@RequestBody SysUser user) ;
+    public R<List<SysUser>> userFeginlist(@RequestBody SysUser user);
 
     //根据部门编号获取详细信息
     @RequestMapping("/dept/selectDeptById/{deptId}")
     public R<SysDept> selectDeptById(@PathVariable("deptId") Long deptId);
 
-    /**
-     * 根据参数键名查询参数值
-     * @Version 1.0
-     * @return
-     * @author wang_xy
-     * @since 2023/2/22 14:30
-     */
-    @RequestMapping("/config/selectConfigKey/{configKey}")
-    public R<String> selectConfigKey(@PathVariable("configKey") String configKey);
-
-
-    /**
-     * 获取当前用户信息
-     *
-     * @return
-     * @Version 1.0
-     * @author wang_xy
-     * @since 2023/2/22 8:43
-     */
-    @GetMapping("/user/info/{username}")
-    public R<LoginUser> getUserInfo(@PathVariable("username") String username, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
 }

src/main/java/com/sooka/sponest/data/emergency/service/ITBusLogService.java

@@ -69,4 +69,6 @@ public interface ITBusLogService
      * @return 结果
      */
     public int deleteTBusLogByBusLogId(String busLogId);
+
+    int checkTBusLogByBusLogIds(String[] busLogIds);
 }

src/main/java/com/sooka/sponest/data/emergency/service/impl/TBusLogServiceImpl.java

@@ -57,6 +57,7 @@ public class TBusLogServiceImpl extends BaseServiceImpl implements ITBusLogServi
     @DataScope(deptAlias = "d")
     public List<ExportVo> selectTBusLogInspectionList(TBusLog tBusLog)
     {
+        setSookaDataBase(tBusLog);
         return tBusLogMapper.selectTBusLogInspectionList(tBusLog);
     }
 
@@ -107,4 +108,10 @@ public class TBusLogServiceImpl extends BaseServiceImpl implements ITBusLogServi
     {
         return tBusLogMapper.deleteTBusLogByBusLogId(busLogId);
     }
+
+    @Override
+    public int checkTBusLogByBusLogIds(String[] busLogIds)
+    {
+        return tBusLogMapper.checkTBusLogByBusLogIds(busLogIds);
+    }
 }

src/main/java/com/sooka/sponest/data/emergency/service/impl/TBusTrackServiceImpl.java

@@ -1,6 +1,8 @@
 package com.sooka.sponest.data.emergency.service.impl;
 
 import com.ruoyi.common.core.utils.DateUtils;
+import com.ruoyi.common.core.utils.uuid.UUID;
+import com.ruoyi.common.security.utils.SecurityUtils;
 import com.sooka.sponest.data.emergency.domain.TBusTrack;
 import com.sooka.sponest.data.emergency.mapper.TBusTrackMapper;
 import com.sooka.sponest.data.emergency.service.ITBusTrackService;
@@ -54,6 +56,8 @@ public class TBusTrackServiceImpl implements ITBusTrackService
     @Override
     public int insertTBusTrack(TBusTrack tBusTrack)
     {
+        tBusTrack.setBusTrackId(UUID.fastUUID().toString());
+        tBusTrack.setUserId(SecurityUtils.getUserId());
         tBusTrack.setCreateTime(DateUtils.getNowDate());
         return tBusTrackMapper.insertTBusTrack(tBusTrack);
     }

src/main/resources/mapper/digitalemergency/EmergencyBigDataMapper.xml

@@ -15,21 +15,11 @@
     </select>
 
     <select id="selectIndustryHighList" parameterType="TBasicEnterindesmapCount" resultType="java.util.Map">
-        SELECT a.inspection_name AS name,
-               COUNT(DISTINCT f.enterprise_id) AS value
-        FROM
-            centerdata_t_emergency_inspectiontype a
-            LEFT JOIN centerdata_t_emergency_inspectiontype b
-        ON a.id = b.parent_id
-            LEFT JOIN centerdata_t_emergency_inspectionitem c ON b.id = c.imspectiontype_id
-            LEFT JOIN centerdata_t_emergency_enterindesmap d ON d.inspectiontype_id = c.id
-            LEFT JOIN centerdata_t_emergency_enterprise e ON e.id = d.enterprise_id
-            LEFT JOIN onest_event.centerevent_t_emergency_danger f ON f.enterprise_id = e.id AND (SELECT COUNT(h.enterprise_id) FROM  ${database_event}.centerevent_t_emergency_danger h)>  (SELECT config_value FROM ${database_system}.sys_config WHERE config_key='high.risk')
-            LEFT JOIN ${database_system}.sys_dept z ON e.dept_id = z.dept_id
-        WHERE
-            a.`level` = 1 ${params.dataScope}
-        GROUP BY
-            a.inspection_name
+        SELECT dept.dept_name AS `name`,COUNT(ente.dept_id) AS `value` FROM `t_bus_inspection` insp
+        LEFT JOIN t_bus_log log on insp.bus_log_id = log.bus_log_id
+        LEFT JOIN centerdata_t_emergency_enterprise ente ON log.bus_enterprise_id = ente.id
+        LEFT JOIN ${database_system}.sys_dept dept ON dept.dept_id = ente.dept_id
+        WHERE insp.is_pass = 'N' AND ente.dept_id is not null GROUP BY ente.dept_id
     </select>
 
     <select id="selectPersonnelList" resultType="java.util.Map">
@@ -240,15 +230,14 @@
         count desc
     </select>
 
-    <select id="getBigDataPatrolPoints" resultType="java.util.LinkedHashMap" parameterType="CenterdataTEmergencyTeam">
+    <select id="getBigDataPatrolPoints" resultType="java.util.LinkedHashMap">
         SELECT
-            b.name AS `name`,
-            count( a.id ) AS `value`
-        FROM
-            centerdata_t_emergency_patrolpoint a
-                left join centerdata_t_emergency_enterprise b on a.enterprise_id = b.id
-        GROUP BY
-            a.enterprise_id limit 10
+        '逾期' AS `name`,COUNT(*) AS `value`
+        FROM centerdata_t_emergency_patrolpoint WHERE DATE_ADD(patrol_lasttime, INTERVAL patrol_cycle DAY) &lt; NOW()
+        UNION ALL
+        SELECT
+        '预警' AS `name`,COUNT(*) AS `value`
+        FROM centerdata_t_emergency_patrolpoint WHERE DATE_ADD(patrol_lasttime, INTERVAL alert_day DAY) &lt; NOW()
     </select>
 
     <select id="getBigDataInspectionAnalysis" resultType="java.util.Map">

src/main/resources/mapper/emergency/system/TBusInspectionMapper.xml

@@ -47,6 +47,7 @@
             <if test="riskStatus != null  and riskStatus != ''">and i.risk_status = #{riskStatus}</if>
             <!-- 数据范围过滤 -->
             ${params.dataScope}
+            group by i.bus_inspection_id
             order by i.create_time desc
         </where>
 

src/main/resources/mapper/emergency/system/TBusLogMapper.xml

@@ -22,6 +22,8 @@
         <result property="logSourceValue" column="log_source_value"/>
         <result property="isRiskValue" column="is_risk_value"/>
         <result property="riskStatusValue" column="risk_status_value"/>
+        <result property="isCheckStatus" column="is_check_status"/>
+        <result property="checkDetail" column="check_detail"/>
     </resultMap>
 
     <resultMap type="ExportVo" id="TBusLogInResult">
@@ -62,6 +64,8 @@
     <sql id="selectTBusLogVo">
         select bus_log_id,
         bus_log_type,
+        is_check_status,
+        check_detail,
         (select dict_label from ${database_system}.sys_dict_data where dict_value=bus_log_type) bus_log_type_value,
         log_source,
         (select dict_label from ${database_system}.sys_dict_data where dict_value=log_source) log_source_value,
@@ -77,6 +81,8 @@
     <select id="selectTBusLogList" parameterType="TBusLog" resultMap="TBusLogResult">
         select g.bus_log_id,
         g.bus_log_type,
+        g.is_check_status,
+        g.check_detail,
         (select dict_label from ${database_system}.sys_dict_data where dict_value=g.bus_log_type) bus_log_type_value,
         log_source,
         (select dict_label from ${database_system}.sys_dict_data where dict_value=g.log_source) log_source_value,
@@ -115,6 +121,7 @@
             </if>
             <!-- 数据范围过滤 -->
             ${params.dataScope}
+            group by g.bus_log_id
             order by g.create_time desc
         </where>
 
@@ -123,16 +130,17 @@
     <select id="selectTBusLogInspectionList" parameterType="TBusLog" resultMap="TBusLogInResult">
         SELECT
             g.bus_log_type,
-            ( SELECT dict_label FROM sys_dict_data WHERE dict_value = g.bus_log_type ) bus_log_type_value,
-            (select dept_name from sys_dept where dept_id=d.parent_id) jd_name,
-            d.dept_name sq_name,
+            ( SELECT dict_label FROM ${database_system}.sys_dict_data WHERE dict_value = g.bus_log_type ) bus_log_type_value,
+            (select dept_name from ${database_system}.sys_dept where dept_id=d.parent_id) jd_name,
+            g.is_check_status,
+            g.check_detail,d.dept_name sq_name,
             u.nick_name user_name,
             g.is_risk,
             ( CASE g.is_risk WHEN 1 THEN '有' ELSE '无' END ) is_risk_value,
             g.log_source,
-            ( SELECT dict_label FROM sys_dict_data WHERE dict_value = g.log_source ) log_source_value,
+            ( SELECT dict_label FROM ${database_system}.sys_dict_data WHERE dict_value = g.log_source ) log_source_value,
             g.risk_status,
-            ( SELECT dict_label FROM sys_dict_data WHERE dict_value = g.risk_status ) risk_status_value,
+            ( SELECT dict_label FROM ${database_system}.sys_dict_data WHERE dict_value = g.risk_status ) risk_status_value,
             b.time_limit,
             b.lat_time,
             b.is_pass,
@@ -147,8 +155,8 @@
             t_bus_log g
             LEFT JOIN t_bus_inspection b ON g.bus_log_id = b.bus_log_id
             LEFT JOIN t_bus_enterprise c ON g.bus_enterprise_id = c.bus_enterprise_id
-            LEFT JOIN sys_dept d ON d.dept_id = c.dept_id
-            LEFT JOIN sys_user u ON u.user_id = g.create_by
+            LEFT JOIN ${database_system}.sys_dept d ON d.dept_id = c.dept_id
+            LEFT JOIN ${database_system}.sys_user u ON u.user_id = g.create_by
         <where>
             <if test="busEnterpriseName != null  and busEnterpriseName != ''">and g.bus_enterprise_name like concat('%',
                 #{busEnterpriseName}, '%')
@@ -185,6 +193,8 @@
             <if test="createBy != null">create_by,</if>
             <if test="busPatrolstationId != null">bus_patrolstation_id,</if>
             <if test="busPatrolstationName != null">bus_patrolstation_name,</if>
+            <if test="isCheckStatus != null">is_check_status,</if>
+            <if test="checkDetail != null">check_detail,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="busLogId != null">#{busLogId},</if>
@@ -200,6 +210,8 @@
             <if test="createBy != null">#{createBy},</if>
             <if test="busPatrolstationId != null">#{busPatrolstationId},</if>
             <if test="busPatrolstationName != null">#{busPatrolstationName},</if>
+            <if test="isCheckStatus != null">#{isCheckStatus},</if>
+            <if test="checkDetail != null">#{checkDetail},</if>
         </trim>
     </insert>
 
@@ -217,6 +229,8 @@
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="busPatrolstationId != null">bus_patrolstationId = #{busPatrolstationId},</if>
             <if test="busPatrolstationName != null">bus_patrolstation_name = #{busPatrolstationName},</if>
+            <if test="isCheckStatus != null">is_check_status = #{isCheckStatus},</if>
+            <if test="checkDetail != null">check_detail = #{checkDetail},</if>
         </trim>
         where bus_log_id = #{busLogId}
     </update>
@@ -231,4 +245,11 @@
             #{busLogId}
         </foreach>
     </delete>
+
+    <update id="checkTBusLogByBusLogIds" parameterType="String">
+        update t_bus_log set is_check_status = '1' where bus_log_id in
+        <foreach item="busLogId" collection="array" open="(" separator="," close=")">
+            #{busLogId}
+        </foreach>
+    </update>
 </mapper>

src/main/resources/mapper/emergency/system/TBusTrackMapper.xml

@@ -36,6 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="riskStatus != null  and riskStatus != ''"> and risk_status = #{riskStatus}</if>
             <if test="busTrackContent != null  and busTrackContent != ''"> and bus_track_content = #{busTrackContent}</if>
         </where>
+        order by t.create_time desc
     </select>
 
     <select id="selectTBusTrackByBusTrackId" parameterType="String" resultMap="TBusTrackResult">