企业自主管理-历史案件调整

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DeviceAjController.java

@@ -1,21 +0,0 @@
-package com.usky.fire.controller.web;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-
-/**
- * <p>
- * 设备案件 前端控制器
- * </p>
- *
- * @author JCB
- * @since 2022-11-04
- */
-@Controller
-@RequestMapping("/deviceAj")
-public class DeviceAjController {
-
-}
-

service-fire/service-fire-biz/src/main/java/com/usky/fire/mapper/DeviceAjMapper.java

@@ -1,16 +0,0 @@
-package com.usky.fire.mapper;
-
-import com.usky.fire.domain.DeviceAj;
-import com.usky.common.mybatis.core.CrudMapper;
-
-/**
- * <p>
- * 设备案件 Mapper 接口
- * </p>
- *
- * @author JCB
- * @since 2022-11-04
- */
-public interface DeviceAjMapper extends CrudMapper<DeviceAj> {
-
-}

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/DeviceAjService.java

@@ -1,16 +0,0 @@
-package com.usky.fire.service;
-
-import com.usky.fire.domain.DeviceAj;
-import com.usky.common.mybatis.core.CrudService;
-
-/**
- * <p>
- * 设备案件 服务类
- * </p>
- *
- * @author JCB
- * @since 2022-11-04
- */
-public interface DeviceAjService extends CrudService<DeviceAj> {
-
-}

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/DemCaseServiceImpl.java

@@ -1,5 +1,6 @@
 package com.usky.fire.service.impl;
 
+import com.alibaba.nacos.shaded.io.grpc.netty.shaded.io.netty.channel.DefaultFileRegion;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
@@ -40,9 +41,6 @@ public class DemCaseServiceImpl extends AbstractCrudService<DemCaseMapper, DemCa
     @Autowired
     private BaseDeviceStatusService baseDeviceStatusService;
 
-    @Autowired
-    private DeviceAjService deviceAjService;
-
     @Override
     public CommonPage<DemCase> caseList(String streetTown, String companyName, String deviceType, Integer id, Integer pageNum, Integer pageSize) {
         IPage<DemCase> page = new Page<>(pageNum, pageSize);
@@ -50,6 +48,7 @@ public class DemCaseServiceImpl extends AbstractCrudService<DemCaseMapper, DemCa
         queryWrapper.eq(StringUtils.isNotBlank(deviceType), DemCase::getDeviceType, deviceType)
                 .eq(StringUtils.isNotBlank(streetTown), DemCase::getStreet, streetTown)
                 .eq(StringUtils.isNotBlank(companyName), DemCase::getDutyGroup, companyName)
+                .eq(id!=0&&id!=null,DemCase::getId,id)
                 .orderByDesc(DemCase::getId);
         page = this.page(page, queryWrapper);
         return new CommonPage<>(page.getRecords(), page.getTotal(), pageSize, pageNum);
@@ -116,10 +115,10 @@ public class DemCaseServiceImpl extends AbstractCrudService<DemCaseMapper, DemCa
 
     @Override
     public Integer caseCount1(String streetTown, String companyId, Integer caseFlag) {
-        LambdaQueryWrapper<DeviceAj> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.eq(StringUtils.isNotBlank(streetTown), DeviceAj::getStreet, streetTown)
-                .eq(caseFlag != null, DeviceAj::getAjFlag, caseFlag);
-        int count = deviceAjService.count(queryWrapper);
+        LambdaQueryWrapper<DemCase> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(StringUtils.isNotBlank(streetTown), DemCase::getStreet, streetTown)
+                .eq(caseFlag != null, DemCase::getCaseFlag, caseFlag);
+        int count = this.count(queryWrapper);
         return count;
     }
 

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/DeviceAjServiceImpl.java

@@ -1,20 +0,0 @@
-package com.usky.fire.service.impl;
-
-import com.usky.fire.domain.DeviceAj;
-import com.usky.fire.mapper.DeviceAjMapper;
-import com.usky.fire.service.DeviceAjService;
-import com.usky.common.mybatis.core.AbstractCrudService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 设备案件 服务实现类
- * </p>
- *
- * @author JCB
- * @since 2022-11-04
- */
-@Service
-public class DeviceAjServiceImpl extends AbstractCrudService<DeviceAjMapper, DeviceAj> implements DeviceAjService {
-
-}

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/mqtt/mh/MhStrategy.java

@@ -2,16 +2,17 @@ package com.usky.fire.service.mqtt.mh;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.usky.common.core.util.JsonUtils;
+import com.usky.fire.domain.DemCase;
 import com.usky.fire.domain.Device;
-import com.usky.fire.domain.DeviceAj;
 import com.usky.fire.domain.DeviceAlert;
 import com.usky.fire.domain.DeviceInfo;
-import com.usky.fire.service.DeviceAjService;
+import com.usky.fire.service.DemCaseService;
 import com.usky.fire.service.DeviceAlertService;
 import com.usky.fire.service.DeviceInfoService;
 import com.usky.fire.service.DeviceService;
 import com.usky.fire.service.enums.TopListener;
 import com.usky.fire.service.mqtt.MqttStrategy;
+import com.usky.fire.service.vo.DeviceAj;
 import com.usky.fire.service.vo.MqttBaseVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -32,7 +33,7 @@ public class MhStrategy implements MqttStrategy {
     @Autowired
     private DeviceAlertService deviceAlertService;
     @Autowired
-    private DeviceAjService deviceAjService;
+    private DemCaseService demCaseService;
 
     @Override
     public String disposeMessage(MqttBaseVO mqttBaseVO) {
@@ -52,7 +53,26 @@ public class MhStrategy implements MqttStrategy {
             deviceAlertService.save(deviceAlert);
         } else if (TopListener.DEVICE_AJ.getCode().equals(topic)) {
             DeviceAj deviceAj = JsonUtils.fromJson(payload, DeviceAj.class);
-            deviceAjService.saveOrUpdate(deviceAj);
+            DemCase demCase = new DemCase();
+            demCase.setId(deviceAj.getId());
+            demCase.setCreateTime(deviceAj.getCreateTime());
+            demCase.setCaseDescribe(deviceAj.getAjDescribe());
+            demCase.setStreet(deviceAj.getStreet());
+            demCase.setAddress(deviceAj.getAddress());
+            demCase.setGrid(deviceAj.getGrid());
+            demCase.setCaseDescribe(deviceAj.getAjDescribe());
+            demCase.setDutyGroup(deviceAj.getDutyGroup());
+            demCase.setCaseFlag(deviceAj.getAjFlag());
+            demCase.setEndTime(deviceAj.getEndTime());
+            demCase.setEnclosure(deviceAj.getEnclosure());
+            demCase.setImage(deviceAj.getImage());
+            demCase.setDeviceCode(deviceAj.getDeviceCode());
+            demCase.setDeviceType(deviceAj.getDeviceType());
+            demCase.setDisposePerson(deviceAj.getDisposePerson());
+            demCase.setDisposePhone(deviceAj.getDisposePhone());
+            demCase.setChargePerson(deviceAj.getChargePerson());
+            demCase.setChargePhone(deviceAj.getChargePhone());
+            demCaseService.saveOrUpdate(demCase);
         }
         return null;
     }

service-fire/service-fire-biz/src/main/java/com/usky/fire/domain/DeviceAj.java → service-fire/service-fire-biz/src/main/java/com/usky/fire/service/vo/DeviceAj.java

@@ -1,4 +1,4 @@
-package com.usky.fire.domain;
+package com.usky.fire.service.vo;
 
 import java.time.LocalDateTime;
 import java.io.Serializable;

service-fire/service-fire-biz/src/main/resources/mapper/fire/DeviceAjMapper.xml

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.fire.mapper.DeviceAjMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DeviceAj">
-        <id column="id" property="id" />
-        <result column="create_time" property="createTime" />
-        <result column="aj_type" property="ajType" />
-        <result column="street" property="street" />
-        <result column="address" property="address" />
-        <result column="grid" property="grid" />
-        <result column="aj_describe" property="ajDescribe" />
-        <result column="duty_group" property="dutyGroup" />
-        <result column="aj_flag" property="ajFlag" />
-        <result column="end_time" property="endTime" />
-        <result column="enclosure" property="enclosure" />
-        <result column="image" property="image" />
-        <result column="device_code" property="deviceCode" />
-        <result column="dispose_person" property="disposePerson" />
-        <result column="dispose_phone" property="disposePhone" />
-        <result column="charge_person" property="chargePerson" />
-        <result column="charge_phone" property="chargePhone" />
-        <result column="device_type" property="deviceType" />
-    </resultMap>
-
-</mapper>