Merge branch 'cache'

# Conflicts:
#	src/main/java/com/sooka/sponest/lawenforcement/record/service/impl/LawenforcementRecordServiceImpl.java

lawenforcement-ui/package.json

@@ -46,8 +46,6 @@
     "element-ui": "2.15.6",
     "file-saver": "2.0.5",
     "fuse.js": "6.4.3",
-    "highcharts": "^11.1.0",
-    "highcharts-vue": "^1.4.3",
     "highlight.js": "9.18.5",
     "js-beautify": "1.13.0",
     "js-cookie": "3.0.1",

lawenforcement-ui/src/views/components/eventdept/frist.vue

@@ -1,123 +1,123 @@
-<template>
-  <highcharts :options="chartOptions" :callback="myCallback"
-              style="height:370px;margin-top:30px;"></highcharts>
-</template>
-<script>
-import {Chart} from "highcharts-vue";
-import request from "@/utils/request";
+<!--<template>-->
+<!--  <highcharts :options="chartOptions" :callback="myCallback"-->
+<!--              style="height:370px;margin-top:30px;"></highcharts>-->
+<!--</template>-->
+<!--<script>-->
+<!--import {Chart} from "highcharts-vue";-->
+<!--import request from "@/utils/request";-->
 
-export default {
-  name: 'extend-graphDemo-highchartsColumn',
-  components: {
-    highcharts: Chart
-  },
-  data() {
-    return {
-      chartOptions: {
-        chart: {
-          type: 'column'
-        },
-        title: {
-          text: '县 (市、区) 事件统计'
-        },
-        subtitle: {
-          text: ' '
-        },
-        xAxis: {
-          categories: [],
-          crosshair: true
-        },
-        yAxis: {
-          min: 0,
-          title: {
-            enabled: false,
-          }
-        },
-        tooltip: {
-          // head + 每个 point + footer 拼接成完整的 table
-          headerFormat: '<span style="font-size:10px">{point.key}</span><table>',
-          pointFormat: '<tr><td style="color:{series.color};padding:0">{series.name}: </td>' +
-            '<td style="padding:0"><b>{point.y}</b></td></tr>',
-          footerFormat: '</table>',
-          shared: true,
-          useHTML: true
-        },
-        plotOptions: {
-          column: {
-            borderWidth: 0
-          }
-        },
-        credits: {
-          enabled: false
-        },
-        series: [{
+<!--export default {-->
+<!--  name: 'extend-graphDemo-highchartsColumn',-->
+<!--  components: {-->
+<!--    highcharts: Chart-->
+<!--  },-->
+<!--  data() {-->
+<!--    return {-->
+<!--      chartOptions: {-->
+<!--        chart: {-->
+<!--          type: 'column'-->
+<!--        },-->
+<!--        title: {-->
+<!--          text: '县 (市、区) 事件统计'-->
+<!--        },-->
+<!--        subtitle: {-->
+<!--          text: ' '-->
+<!--        },-->
+<!--        xAxis: {-->
+<!--          categories: [],-->
+<!--          crosshair: true-->
+<!--        },-->
+<!--        yAxis: {-->
+<!--          min: 0,-->
+<!--          title: {-->
+<!--            enabled: false,-->
+<!--          }-->
+<!--        },-->
+<!--        tooltip: {-->
+<!--          // head + 每个 point + footer 拼接成完整的 table-->
+<!--          headerFormat: '<span style="font-size:10px">{point.key}</span><table>',-->
+<!--          pointFormat: '<tr><td style="color:{series.color};padding:0">{series.name}: </td>' +-->
+<!--            '<td style="padding:0"><b>{point.y}</b></td></tr>',-->
+<!--          footerFormat: '</table>',-->
+<!--          shared: true,-->
+<!--          useHTML: true-->
+<!--        },-->
+<!--        plotOptions: {-->
+<!--          column: {-->
+<!--            borderWidth: 0-->
+<!--          }-->
+<!--        },-->
+<!--        credits: {-->
+<!--          enabled: false-->
+<!--        },-->
+<!--        series: [{-->
 
-          name: '上报',
-          data: []
-        }, {
-          name: '确认',
-          data: []
-        }, {
-          name: '签收',
-          data: []
-        }, {
-          name: '办结',
-          data: []
-        }, {
-          name: '归档',
-          data: []
-        }],
-        lang: {
-          downloadJPEG: "下载jpg图片",
-          downloadPDF: "下载PDF文件",
-          downloadPNG: "下载PNG图片",
-          downloadSVG: false,
+<!--          name: '上报',-->
+<!--          data: []-->
+<!--        }, {-->
+<!--          name: '确认',-->
+<!--          data: []-->
+<!--        }, {-->
+<!--          name: '签收',-->
+<!--          data: []-->
+<!--        }, {-->
+<!--          name: '办结',-->
+<!--          data: []-->
+<!--        }, {-->
+<!--          name: '归档',-->
+<!--          data: []-->
+<!--        }],-->
+<!--        lang: {-->
+<!--          downloadJPEG: "下载jpg图片",-->
+<!--          downloadPDF: "下载PDF文件",-->
+<!--          downloadPNG: "下载PNG图片",-->
+<!--          downloadSVG: false,-->
 
-        },
-        exporting: {
-          enabled: false,
-          filename: "区县统计图",
-          buttons: {
-            contextButton: {
-              menuItems: [
-                "downloadPNG",
-                "downloadJPEG",
-                "downloadPDF"
-              ],
-            },
-          },
-        },
-      },
-    }
-  },
-  mounted() {
-    this.geteventdept()
-  },
+<!--        },-->
+<!--        exporting: {-->
+<!--          enabled: false,-->
+<!--          filename: "区县统计图",-->
+<!--          buttons: {-->
+<!--            contextButton: {-->
+<!--              menuItems: [-->
+<!--                "downloadPNG",-->
+<!--                "downloadJPEG",-->
+<!--                "downloadPDF"-->
+<!--              ],-->
+<!--            },-->
+<!--          },-->
+<!--        },-->
+<!--      },-->
+<!--    }-->
+<!--  },-->
+<!--  mounted() {-->
+<!--    this.geteventdept()-->
+<!--  },-->
 
-  methods: {
-    myCallback() {
-      // console.log("this is callback function");
-    },
-    geteventdept() {
-      request({
-        url: 'center-event/index/countyList',
-        method: 'get',
-        // params: query
-      }).then((res) => {
-        if (res.code === 200) {
-          for (let i = 0; i < res.data.length; i++) {
-            // debugger
-            this.chartOptions.xAxis.categories.push(res.data[i].name);
-            this.chartOptions.series[0].data.push(res.data[i].sb)
-            this.chartOptions.series[1].data.push(res.data[i].qr)
-            this.chartOptions.series[2].data.push(res.data[i].qs)
-            this.chartOptions.series[3].data.push(res.data[i].bj)
-            this.chartOptions.series[4].data.push(res.data[i].gd)
-          }
-        }
-        console.log(res)
-      })
-    }
-  }
-}
-</script>
+<!--  methods: {-->
+<!--    myCallback() {-->
+<!--      // console.log("this is callback function");-->
+<!--    },-->
+<!--    geteventdept() {-->
+<!--      request({-->
+<!--        url: 'center-event/index/countyList',-->
+<!--        method: 'get',-->
+<!--        // params: query-->
+<!--      }).then((res) => {-->
+<!--        if (res.code === 200) {-->
+<!--          for (let i = 0; i < res.data.length; i++) {-->
+<!--            // debugger-->
+<!--            this.chartOptions.xAxis.categories.push(res.data[i].name);-->
+<!--            this.chartOptions.series[0].data.push(res.data[i].sb)-->
+<!--            this.chartOptions.series[1].data.push(res.data[i].qr)-->
+<!--            this.chartOptions.series[2].data.push(res.data[i].qs)-->
+<!--            this.chartOptions.series[3].data.push(res.data[i].bj)-->
+<!--            this.chartOptions.series[4].data.push(res.data[i].gd)-->
+<!--          }-->
+<!--        }-->
+<!--        console.log(res)-->
+<!--      })-->
+<!--    }-->
+<!--  }-->
+<!--}-->
+<!--</script>-->

lawenforcement-ui/src/views/components/eventdept/highcharts.js

@@ -1,12 +1,12 @@
-import Highcharts from 'highcharts';
-import exporting from 'highcharts/modules/exporting';
-import highchartsMore from 'highcharts/highcharts-more';
-import highcharts3d from 'highcharts/highcharts-3d';
-import highchartsHeatmap from 'highcharts/modules/heatmap';
+// import Highcharts from 'highcharts';
+// import exporting from 'highcharts/modules/exporting';
+// import highchartsMore from 'highcharts/highcharts-more';
+// import highcharts3d from 'highcharts/highcharts-3d';
+// import highchartsHeatmap from 'highcharts/modules/heatmap';
 
-exporting(Highcharts);
-highchartsMore(Highcharts);
-highcharts3d(Highcharts);
-highchartsHeatmap(Highcharts);
+// exporting(Highcharts);
+// highchartsMore(Highcharts);
+// highcharts3d(Highcharts);
+// highchartsHeatmap(Highcharts);
 
-export default Highcharts;
+// export default Highcharts;

lawenforcement-ui/src/views/components/eventdept/scecond.vue

@@ -1,3 +1,4 @@
+<!--
 <template>
   <highcharts :options="chartOptions" :callback="myCallback"
               style="height:280px;margin-top:30px;"></highcharts>
@@ -113,3 +114,4 @@ export default {
   }
 }
 </script>
+-->

src/main/java/com/sooka/sponest/lawenforcement/record/controller/LawenforcementRecordController.java

@@ -47,7 +47,6 @@ public class LawenforcementRecordController extends BaseController {
     public AjaxResult insertEnforceLawInfoByList(@RequestBody JSONArray records){
         //判断数据是否为空
         if(records.isEmpty()){
-            log.error("平台数据为空：==> {}", records);
             return AjaxResult.error("数据为空");
         }
         return toAjax(lawenforcementRecordService.insertEnforceLawInfoByList(records));
@@ -61,7 +60,6 @@ public class LawenforcementRecordController extends BaseController {
     public TableDataInfo list(LawenforcementRecord lawenforcementRecord) {
         startPage();
         List<LawenforcementRecord> list = lawenforcementRecordService.selectLawenforcementRecordList(lawenforcementRecord);
-        log.info("查询设备列表：==》{}", list);
         return getDataTable(list);
     }
 

src/main/java/com/sooka/sponest/lawenforcement/record/domain/LawenforcementRecord.java

@@ -26,7 +26,6 @@ public class LawenforcementRecord{
      * 任务ID
      */
     private String id;
-    private String personCode;
 
     /**
      * 任务类型
@@ -270,6 +269,8 @@ public class LawenforcementRecord{
     //执法主办人执法证号
     private String mainPerson;
 
+    private String personCode;
+
     //执法人集合
     private List<LawenforcementUser> personList;
 

src/main/java/com/sooka/sponest/lawenforcement/record/service/impl/LawenforcementRecordServiceImpl.java

@@ -55,6 +55,13 @@ public class LawenforcementRecordServiceImpl extends BaseServiceImpl implements
     @Autowired
     private LawenforcementUserMapper userMapper;
 
+    private final static String DAI_ZHI_FA = "lawenforcement_type_1";
+    private final static String ZHI_FA_WAN_CHENG = "lawenforcement_type_2";
+    private final static String ZHI_FA_ZHONG = "lawenforcement_type_6";
+    private final static String ZHI_FA_YI_CHANG = "lawenforcement_type_3";
+    private final static String ER_CI_ZHI_FA = "lawenforcement_type_4";
+    private final static String ER_CI_ZHI_FA_WAN_CHENG = "lawenforcement_type_5";
+
 
     /**
      * 对接省平台数据
@@ -115,7 +122,7 @@ public class LawenforcementRecordServiceImpl extends BaseServiceImpl implements
         record.setCreatorName(SecurityUtils.getLoginUser().getSysUser().getNickName());
         record.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId().toString());
         record.setDeptName(SecurityUtils.getLoginUser().getSysUser().getDeptNames());
-        record.setRecordStatus("lawenforcement_type_1");
+        record.setRecordStatus(DAI_ZHI_FA);
         record.setCreateTime(String.valueOf(System.currentTimeMillis()));
         record.setIsLast(0);
         return recordMapper.insertLawenforcementRecord(record);
@@ -160,14 +167,16 @@ public class LawenforcementRecordServiceImpl extends BaseServiceImpl implements
      */
     @Override
     public int addRecordLog(LawenforcementBindDeviceBO record) {
+        //查询人员id
         if (null == record.getUserId() || record.getUserId().isEmpty()) {
             record.setUserId(SecurityUtils.getLoginUser().getSysUser().getUserId().toString());
         }
+        //查询执法编号
         Map<String, Object> userCodeByUserId = userMapper.getUserCodeByUserId(record.getUserId());
         record.setPersonCode(MapUtils.getString(userCodeByUserId, "personCode"));
 
         //检查当前绑定设备的执法人是否为主办人
-        Map<String, Object> isMainPerson = recordMapper.getIsMainPerson(record);
+//        Map<String, Object> isMainPerson = recordMapper.getIsMainPerson(record);
         //将设备与人员绑定
         int i = recordMapper.bindDeviceToPerson(record);
 
@@ -254,10 +263,10 @@ public class LawenforcementRecordServiceImpl extends BaseServiceImpl implements
         record.setPersonCode(MapUtils.getString(userCodeByUserId, "personCode"));
 
         //检查当前绑定设备的执法人是否为主办人
-        Map<String, Object> isMainPerson = recordMapper.getIsMainPerson(record);
+//        Map<String, Object> isMainPerson = recordMapper.getIsMainPerson(record);
 //        if ("1".equals(MapUtils.getString(isMainPerson, "mainPerson"))) {
-        //设置任务完成状态
-        recordMapper.updateRecordStatus(record);
+            //设置任务完成状态
+            recordMapper.updateRecordStatus(record);
 //        }
 
         //设置任务结束时间
@@ -278,7 +287,31 @@ public class LawenforcementRecordServiceImpl extends BaseServiceImpl implements
         }
         Map<String, Object> userCodeByUserId = userMapper.getUserCodeByUserId(record.getCreatorId());
         record.setPersonCode(MapUtils.getString(userCodeByUserId, "personCode"));
+        //查询任务集合
         List<LawenforcementRecord> recordList = recordMapper.getRecordList(record);
+        //处理工单状态
+        recordList.forEach(data->{
+            if(StringUtils.isNotEmpty(record.getRecordStatus())){
+                //查询带执法
+                if(DAI_ZHI_FA.equals(record.getRecordStatus())){
+                    //查询结果中可能存在已经进行中的任务;需要修改为带执法状态
+                    if(ZHI_FA_ZHONG.equals(data.getRecordStatus())){
+                        data.setRecordStatus(DAI_ZHI_FA);
+                    }else if(ER_CI_ZHI_FA.equals(data.getRecordStatus())){
+                        data.setRecordStatus(ZHI_FA_YI_CHANG);
+                    }
+                //查询执法进行中
+                }else if(ZHI_FA_ZHONG.equals(record.getRecordStatus())){
+                    if(ZHI_FA_WAN_CHENG.equals(data.getRecordStatus())){
+                        data.setRecordStatus(ZHI_FA_ZHONG);
+                    }else if(ER_CI_ZHI_FA_WAN_CHENG.equals(data.getRecordStatus())){
+                        data.setRecordStatus(ER_CI_ZHI_FA);
+                    }
+
+                }
+                //查询执法完成  不需要处理
+            }
+        });
         return recordList;
     }
 

src/main/resources/mapper/lawenforcement/LawenforcementRecordMapper.xml

@@ -568,8 +568,10 @@
     </update>
 
     <select id="getRecordList" parameterType="LawenforcementRecord" resultMap="LawenforcementRecordResult">
-        select lr.* from lawenforcement_record lr
-        left join lawenforcement_person lp on lr.id = lp.record_id
+        select lr.* from
+        lawenforcement_record lr
+        LEFT JOIN lawenforcement_person lp on lr.id = lp.record_id
+        LEFT JOIN lawenforcement_record_log lrl on lr.id = lrl.record_id and lp.person_code = lrl.person_code
         <where>
             <if test="jobName != null and jobName != ''">
                 and job_name LIKE concat('%', #{jobName}, '%')
@@ -579,17 +581,17 @@
             </if>
             <if test="recordStatus != null and recordStatus != ''">
                 <if test="recordStatus == 'lawenforcement_type_1'">
-                    and lr.record_status in ('lawenforcement_type_1', 'lawenforcement_type_3')
+                    AND lp.person_code = #{personCode} and start_time is null and lr.record_status not in ('lawenforcement_type_2','lawenforcement_type_5')
                 </if>
                 <if test="recordStatus == 'lawenforcement_type_6'">
+                    AND lp.person_code = #{personCode} AND lrl.end_time is null and lrl.start_time is not null
                     and lr.record_status in ('lawenforcement_type_4','lawenforcement_type_6')
                 </if>
                 <if test="recordStatus == 'lawenforcement_type_2'">
-                    and lr.record_status in ('lawenforcement_type_2','lawenforcement_type_5')
+                    AND lp.person_code = #{personCode} AND lrl.end_time is not null
                 </if>
             </if>
         </where>
-
     </select>
 
     <select id="getDeptIdByDeptName" parameterType="LawenforcementPersonDetailVO" resultType="map">