bug修改

src/main/java/com/zhgd/mybatis/DataScopeInterceptor.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.baomidou.mybatisplus.extension.parser.JsqlParserSupport;
 import com.baomidou.mybatisplus.extension.plugins.inner.InnerInterceptor;
 import com.zhgd.annotation.DataScope;
+import com.zhgd.xmgl.constant.Cts;
 import com.zhgd.xmgl.security.util.SecurityUtils;
 import com.zhgd.xmgl.util.EnvironmentUtil;
 import com.zhgd.xmgl.util.LogMdcUtil;
@@ -46,14 +47,14 @@ public class DataScopeInterceptor extends JsqlParserSupport implements InnerInte
         if (parameter instanceof Map) {
             for (Object val : ((Map<?, ?>) parameter).values()) {
                 if (val instanceof String) {
-                    if (val.equals("ignoreDataScope")) {
+                    if (val.equals(Cts.IGNORE_DATA_SCOPE)) {
                         return true;
                     }
                 }
             }
         }
         if (parameter instanceof String) {
-            return parameter.equals("ignoreDataScope");
+            return parameter.equals(Cts.IGNORE_DATA_SCOPE);
         }
         return false;
     }

src/main/java/com/zhgd/xmgl/constant/Cts.java

@@ -60,4 +60,5 @@ public interface Cts {
     String HK_SYNC_AUTH_SUCCESS_KEY = "hkSyncAuthSuccess:";
     String TL_HK_SYNC_ID = "tl_hk_sync_id";
     String TL_IS_NOMAL_INTERFACE = "isNormalInterface";
+    String IGNORE_DATA_SCOPE = "ignoreDataScope";
 }

src/main/java/com/zhgd/xmgl/modules/video/controller/AiAnalyseHardWareAlarmRecordController.java

@@ -23,10 +23,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.*;
@@ -45,11 +42,10 @@ import java.util.stream.Collectors;
 @Slf4j
 @Api(tags = "AI分析硬件设备报警记录")
 public class AiAnalyseHardWareAlarmRecordController {
-    @Autowired
-    private IAiAnalyseHardWareAlarmRecordService aiAnalyseHardWareAlarmRecordService;
-
     @Autowired
     ISystemUserService systemUserService;
+    @Autowired
+    private IAiAnalyseHardWareAlarmRecordService aiAnalyseHardWareAlarmRecordService;
 
     /**
      * 分页列表查询
@@ -131,7 +127,7 @@ public class AiAnalyseHardWareAlarmRecordController {
         } else {
             boolean ok = aiAnalyseHardWareAlarmRecordService.removeById(id);
             if (ok) {
-                result.success("删除成功!");
+                Result.success("删除成功!");
             }
         }
 
@@ -308,11 +304,14 @@ public class AiAnalyseHardWareAlarmRecordController {
     }
 
     @OperLog(operModul = "AI分析硬件设备报警记录管理", operType = "查询", operDesc = "设置误报忽略或已处置")
-    @ApiOperation(value = "设置误报忽略不删除", notes = "设置误报忽略不删除", httpMethod = "POST")
+    @ApiOperation(value = "设置误报忽略或已处置", notes = "设置误报忽略或已处置", httpMethod = "POST")
     @PostMapping(value = "/setFalsePositive")
     public Result setFalsePositive(@RequestBody AiAnalyseHardWareAlarmRecord taskProgressMaterialRel) {
         aiAnalyseHardWareAlarmRecordService.setFalsePositive(taskProgressMaterialRel);
         return Result.ok();
     }
 
+
+
+
 }

src/main/java/com/zhgd/xmgl/modules/video/mapper/AiAnalyseHardWareAlarmRecordMapper.java

@@ -13,6 +13,7 @@ import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -63,4 +64,12 @@ public interface AiAnalyseHardWareAlarmRecordMapper extends BaseMapper<AiAnalyse
 
     int batchInsert(@Param("list") List<AiAnalyseHardWareAlarmRecord> list);
 
+    /**
+     * 查询项目子账号的可查看企业的最新一条ai记录
+     *
+     * @param map
+     * @return
+     *
+     */
+    AiAnalyseHardWareAlarmRecord getAllocateNewestRecord(HashMap<String, Object> map);
 }

src/main/java/com/zhgd/xmgl/modules/video/mapper/xml/AiAnalyseHardWareAlarmRecordMapper.xml

@@ -577,4 +577,18 @@
              #{item.handleDone,jdbcType=INTEGER})
         </foreach>
     </insert>
+
+    <select id="getAllocateNewestRecord" resultMap="queryAiAnalyseHardWareAlarmPageListTwoRm">
+        SELECT a.*
+        FROM ai_analyse_hard_ware_alarm_record a
+        LEFT JOIN ai_analyse_hard_ware_record r on r.hardware_id=a.hardware_id
+        LEFT JOIN quality_region_to_ai_analyse_hard AS qrtaah ON qrtaah.ai_analyse_hard_ware_record_id = r.id
+        join quality_region_to_enterprise qrte  on qrte.quality_region_id=qrtaah.quality_region_id
+        WHERE qrte.enterprise_id in
+        <foreach collection="list" index="index" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+        order by a.create_time desc
+        limit 1
+    </select>
 </mapper>

src/main/java/com/zhgd/xmgl/modules/video/service/IAiAnalyseHardWareAlarmRecordService.java

@@ -65,4 +65,5 @@ public interface IAiAnalyseHardWareAlarmRecordService extends IService<AiAnalyse
 
     void setFalsePositive(AiAnalyseHardWareAlarmRecord taskProgressMaterialRel);
 
+
 }

src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java

@@ -47,6 +47,7 @@ import com.zhgd.xmgl.modules.video.mapper.WorkerInfoToAiAnalyseHardWareAlarmReco
 import com.zhgd.xmgl.modules.video.service.IAiAnalyseHardWareAlarmRecordService;
 import com.zhgd.xmgl.modules.worker.entity.WorkerInfo;
 import com.zhgd.xmgl.modules.worker.mapper.WorkerInfoMapper;
+import com.zhgd.xmgl.modules.worker.service.impl.UserEnterpriseServiceImpl;
 import com.zhgd.xmgl.modules.worker.service.impl.WorkerInfoServiceImpl;
 import com.zhgd.xmgl.modules.xz.entity.XzAiDeductRule;
 import com.zhgd.xmgl.modules.xz.entity.XzDeductScoreRecord;
@@ -121,6 +122,9 @@ public class AiAnalyseHardWareAlarmRecordServiceImpl extends ServiceImpl<AiAnaly
     private FileStorageService fileStorageService;
     @Resource
     private XzAiDeductRuleServiceImpl xzAiDeductRuleService;
+    @Lazy
+    @Autowired
+    private UserEnterpriseServiceImpl userEnterpriseService;
 
     @Override
     public IPage<AiAnalyseHardWareAlarmRecord> queryAiAnalyseHardWareAlarmPageList(Map<String, Object> map) {

src/main/java/com/zhgd/xmgl/modules/worker/controller/EnterpriseBadRecordController.java

@@ -47,6 +47,7 @@ public class EnterpriseBadRecordController {
          Result<List<EnterpriseBadRecord>> result = new Result<List<EnterpriseBadRecord>>();
          QueryWrapper<EnterpriseBadRecord> queryWrapper=new QueryWrapper<>();
          queryWrapper.lambda().eq(EnterpriseBadRecord::getEnterpriseId, MapUtils.getString(map,"enterpriseId"));
+		 queryWrapper.lambda().orderByDesc(EnterpriseBadRecord::getAriseTime);
          List<EnterpriseBadRecord> pageList = enterpriseBadRecordService.list(queryWrapper);
          result.setSuccess(true);
          result.setResult(pageList);

src/main/java/com/zhgd/xmgl/modules/xz/controller/XzAgjtLiveScreenController.java

@@ -0,0 +1,86 @@
+package com.zhgd.xmgl.modules.xz.controller;
+
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zhgd.jeecg.common.api.vo.Result;
+import com.zhgd.jeecg.common.system.query.QueryGenerator;
+import com.zhgd.xmgl.constant.Cts;
+import com.zhgd.xmgl.modules.video.entity.AiAnalyseHardWareAlarmRecord;
+import com.zhgd.xmgl.modules.video.mapper.AiAnalyseHardWareAlarmRecordMapper;
+import com.zhgd.xmgl.modules.video.service.IAiAnalyseHardWareAlarmRecordService;
+import com.zhgd.xmgl.modules.worker.service.impl.UserEnterpriseServiceImpl;
+import com.zhgd.xmgl.modules.xz.emergency.entity.XzEmergencyRecord;
+import com.zhgd.xmgl.modules.xz.emergency.mapper.XzEmergencyRecordMapper;
+import com.zhgd.xmgl.security.util.SecurityUtils;
+import com.zhgd.xmgl.util.PageUtil;
+import com.zhgd.xmgl.util.RefUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.MapUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Objects;
+
+@RestController
+@RequestMapping(value = {"/xmgl/agjtLiveScreen"})
+@Slf4j
+@Api(tags = "星纵-现场大屏")
+public class XzAgjtLiveScreenController {
+    @Autowired
+    IAiAnalyseHardWareAlarmRecordService aiAnalyseHardWareAlarmRecordService;
+    @Lazy
+    @Autowired
+    AiAnalyseHardWareAlarmRecordMapper aiAnalyseHardWareAlarmRecordMapper;
+    @Lazy
+    @Autowired
+    private UserEnterpriseServiceImpl userEnterpriseService;
+    @Autowired
+    private XzEmergencyRecordMapper xzEmergencyRecordMapper;
+
+    @ApiOperation(value = "查询项目子账号的可查看企业的最新一条ai记录", notes = "查询项目子账号的可查看企业的最新一条ai记录", httpMethod = "GET")
+    @GetMapping(value = "/getAllocateNewestRecord")
+    public Result<AiAnalyseHardWareAlarmRecord> getAllocateNewestRecord() {
+        Integer accountType = SecurityUtils.getUser().getAccountType();
+        if (!Objects.equals(accountType, 6)) {
+            return Result.ok();
+        }
+        HashMap<String, Object> map = new HashMap<>(16);
+        List<String> enterpriseIds = userEnterpriseService.getEnterpriseIdsIfSubProject();
+        map.put("list", enterpriseIds);
+        map.put(Cts.IGNORE_DATA_SCOPE, Cts.IGNORE_DATA_SCOPE);
+        return Result.success(aiAnalyseHardWareAlarmRecordMapper.getAllocateNewestRecord(map));
+    }
+
+    @ApiOperation(value = "分页查询项目子账号的可查看企业的星纵-应急-处置台账信息记录", notes = "分页查询项目子账号的可查看企业的星纵-应急-处置台账信息记录", httpMethod = "GET")
+    @GetMapping(value = "/getXzEmergencyRecordPage")
+    public Result<IPage<XzEmergencyRecord>> getXzEmergencyRecordPage() {
+        HashMap<String, Object> paramMap = new HashMap<>(16);
+        String alias = "t.";
+        QueryWrapper<XzEmergencyRecord> queryWrapper = QueryGenerator.initPageQueryWrapper(XzEmergencyRecord.class, paramMap, alias);
+        String enterpriseId = MapUtils.getString(paramMap, "enterpriseId");
+        String alarmPersonName = MapUtils.getString(paramMap, "alarmPersonName");
+        String inDispositionStatus = MapUtils.getString(paramMap, "inDispositionStatus");
+        if (StrUtil.isNotBlank(enterpriseId)) {
+            queryWrapper.eq("ei.id", enterpriseId);
+        }
+        if (StrUtil.isNotBlank(alarmPersonName)) {
+            queryWrapper.like("wi.worker_name", alarmPersonName);
+        }
+        if (StrUtil.isNotBlank(inDispositionStatus)) {
+            queryWrapper.in(alias + "disposition_status", StrUtil.split(inDispositionStatus, ","));
+        }
+        queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(XzEmergencyRecord::getAlarmTime));
+        Page<XzEmergencyRecord> page = PageUtil.getPage(paramMap);
+        IPage<XzEmergencyRecord> pageList = xzEmergencyRecordMapper.queryList(page, queryWrapper);
+        return Result.success(pageList);
+    }
+}

src/main/java/com/zhgd/xmgl/modules/xz/emergency/service/impl/XzEmergencyRecordServiceImpl.java

@@ -98,7 +98,7 @@ public class XzEmergencyRecordServiceImpl extends ServiceImpl<XzEmergencyRecordM
         String inDispositionStatus = MapUtils.getString(paramMap, "inDispositionStatus");
         String projectSn = MapUtils.getString(paramMap, "projectSn");
         //项目子账号只能看到自己的负责的企业
-        querySelfEnterpriseIfSub(queryWrapper);
+        this.querySelfEnterpriseIfSub(queryWrapper);
         if (StrUtil.isNotBlank(enterpriseId)) {
             queryWrapper.eq("ei.id", enterpriseId);
         }

src/main/java/com/zhgd/xmgl/modules/xz/special/controller/CountApiController.java

@@ -25,10 +25,7 @@ import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
 
 @RestController
 @RequestMapping("/xmgl/xzSpecial")
@@ -155,7 +152,7 @@ public class CountApiController {
             type.setRunning(type.getNum() - type.getComplete());
             running += type.getRunning();
             complete += type.getComplete();
-            type.setRatio(NumberUtils.occupyRate(type.getNum(), sum, 2));
+            type.setRatio(Optional.ofNullable(NumberUtils.occupyRate(type.getNum(), sum, 2)).orElse(0D));
         }
         CountSpecialByFinalStatusVo rtVo = new CountSpecialByFinalStatusVo();
         CountSpecialByFinalStatusVo.Total total = new CountSpecialByFinalStatusVo.Total();