bug修复

src/main/java/com/zhgd/xmgl/config/FaceRunner.java

@@ -55,14 +55,14 @@ public class FaceRunner implements CommandLineRunner {
             int errorCode = faceEngine.activeOnline(appId, sdkKey);
 
             if (errorCode != ErrorInfo.MOK.getValue() && errorCode != ErrorInfo.MERR_ASF_ALREADY_ACTIVATED.getValue()) {
-                log.info("引擎激活失败,errorCode:" + errorCode);
+                log.error("引擎激活失败,errorCode:" + errorCode);
             }
 
 
             ActiveFileInfo activeFileInfo = new ActiveFileInfo();
             errorCode = faceEngine.getActiveFileInfo(activeFileInfo);
             if (errorCode != ErrorInfo.MOK.getValue() && errorCode != ErrorInfo.MERR_ASF_ALREADY_ACTIVATED.getValue()) {
-                log.info("获取激活文件信息失败");
+                log.error("获取激活文件信息失败");
             }
 
             //引擎配置
@@ -85,7 +85,7 @@ public class FaceRunner implements CommandLineRunner {
             errorCode = faceEngine.init(engineConfiguration);
 
             if (errorCode != ErrorInfo.MOK.getValue()) {
-                log.info("初始化引擎失败");
+                log.error("初始化引擎失败");
             }
         }
     }

src/main/java/com/zhgd/xmgl/modules/environment/entity/RainAlarm.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -73,4 +74,8 @@ public class RainAlarm implements Serializable {
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private java.util.Date updateDate;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "设备名字")
+    private java.lang.String devName;
 }

src/main/java/com/zhgd/xmgl/modules/environment/entity/RainRecord.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -121,4 +122,7 @@ public class RainRecord implements Serializable {
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private java.util.Date updateDate;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "设备名字")
+    private java.lang.String devName;
 }

src/main/java/com/zhgd/xmgl/modules/environment/mapper/RainAlarmMapper.java

@@ -1,8 +1,15 @@
 package com.zhgd.xmgl.modules.environment.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
 import com.zhgd.xmgl.modules.environment.entity.RainAlarm;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * @Description: 雨量监测报警记录
@@ -13,4 +20,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 @Mapper
 public interface RainAlarmMapper extends BaseMapper<RainAlarm> {
 
+    IPage<RainAlarm> queryList(Page<RainAlarm> page, @Param(Constants.WRAPPER) QueryWrapper<RainAlarm> queryWrapper);
+
+    List<RainAlarm> queryList(@Param(Constants.WRAPPER) QueryWrapper<RainAlarm> queryWrapper);
 }

src/main/java/com/zhgd/xmgl/modules/environment/mapper/RainRecordMapper.java

@@ -1,8 +1,15 @@
 package com.zhgd.xmgl.modules.environment.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
 import com.zhgd.xmgl.modules.environment.entity.RainRecord;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * @Description: 雨量监测记录
@@ -13,4 +20,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 @Mapper
 public interface RainRecordMapper extends BaseMapper<RainRecord> {
 
+    IPage<RainRecord> queryList(Page<RainRecord> page, @Param(Constants.WRAPPER) QueryWrapper<RainRecord> queryWrapper);
+
+    List<RainRecord> queryList(@Param(Constants.WRAPPER) QueryWrapper<RainRecord> queryWrapper);
 }

src/main/java/com/zhgd/xmgl/modules/environment/mapper/xml/RainAlarmMapper.xml

@@ -1,4 +1,10 @@
 <?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.zhgd.xmgl.modules.environment.mapper.RainAlarmMapper">
+    <select id="queryList" resultType="com.zhgd.xmgl.modules.environment.entity.RainAlarm">
+        select t.*,rd.dev_name
+        from rain_alarm t
+        join rain_dev rd on rd.dev_sn = t.dev_sn
+        ${ew.customSqlSegment}
+    </select>
 </mapper>

src/main/java/com/zhgd/xmgl/modules/environment/mapper/xml/RainRecordMapper.xml

@@ -1,4 +1,10 @@
 <?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.zhgd.xmgl.modules.environment.mapper.RainRecordMapper">
+    <select id="queryList" resultType="com.zhgd.xmgl.modules.environment.entity.RainRecord">
+        select t.*,rd.dev_name
+        from rain_record t
+        join rain_dev rd on rd.dev_sn = t.dev_sn
+        ${ew.customSqlSegment}
+    </select>
 </mapper>

src/main/java/com/zhgd/xmgl/modules/environment/service/impl/RainAlarmServiceImpl.java

@@ -40,7 +40,7 @@ public class RainAlarmServiceImpl extends ServiceImpl<RainAlarmMapper, RainAlarm
     public IPage<RainAlarm> queryPageList(HashMap<String, Object> param) {
         QueryWrapper<RainAlarm> queryWrapper = getQueryWrapper(param);
         Page<RainAlarm> page = PageUtil.getPage(param);
-        IPage<RainAlarm> pageList = this.page(page, queryWrapper);
+        IPage<RainAlarm> pageList = baseMapper.queryList(page, queryWrapper);
         pageList.setRecords(dealList(pageList.getRecords()));
         return pageList;
     }
@@ -48,11 +48,11 @@ public class RainAlarmServiceImpl extends ServiceImpl<RainAlarmMapper, RainAlarm
     @Override
     public List<RainAlarm> queryList(HashMap<String, Object> param) {
         QueryWrapper<RainAlarm> queryWrapper = getQueryWrapper(param);
-        return dealList(this.list(queryWrapper));
+        return dealList(baseMapper.queryList(queryWrapper));
     }
 
     private QueryWrapper<RainAlarm> getQueryWrapper(HashMap<String, Object> param) {
-        String alias = "";
+        String alias = "t.";
         QueryWrapper<RainAlarm> queryWrapper = QueryGenerator.initPageQueryWrapper(RainAlarm.class, param, alias);
         queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(RainAlarm::getId));
         return queryWrapper;

src/main/java/com/zhgd/xmgl/modules/environment/service/impl/RainRecordServiceImpl.java

@@ -40,7 +40,7 @@ public class RainRecordServiceImpl extends ServiceImpl<RainRecordMapper, RainRec
     public IPage<RainRecord> queryPageList(HashMap<String, Object> param) {
         QueryWrapper<RainRecord> queryWrapper = getQueryWrapper(param);
         Page<RainRecord> page = PageUtil.getPage(param);
-        IPage<RainRecord> pageList = this.page(page, queryWrapper);
+        IPage<RainRecord> pageList = baseMapper.queryList(page, queryWrapper);
         pageList.setRecords(dealList(pageList.getRecords()));
         return pageList;
     }
@@ -48,11 +48,11 @@ public class RainRecordServiceImpl extends ServiceImpl<RainRecordMapper, RainRec
     @Override
     public List<RainRecord> queryList(HashMap<String, Object> param) {
         QueryWrapper<RainRecord> queryWrapper = getQueryWrapper(param);
-        return dealList(this.list(queryWrapper));
+        return dealList(baseMapper.queryList(queryWrapper));
     }
 
     private QueryWrapper<RainRecord> getQueryWrapper(HashMap<String, Object> param) {
-        String alias = "";
+        String alias = "t.";
         QueryWrapper<RainRecord> queryWrapper = QueryGenerator.initPageQueryWrapper(RainRecord.class, param, alias);
         queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(RainRecord::getId));
         return queryWrapper;

src/main/java/com/zhgd/xmgl/modules/worker/service/impl/EnterpriseInfoServiceImpl.java

@@ -630,7 +630,7 @@ public class EnterpriseInfoServiceImpl extends ServiceImpl<EnterpriseInfoMapper,
 
     private double getTrainNotPassRadio(List<Long> enterpriseIds, String projectSn, String beginOfWeek) {
         QueryWrapper<ExamTrain> wrapper = QueryGenerator.initPageQueryWrapper(ExamTrain.class, new HashMap<>());
-        Set<Long> recordTrainIds = examTrainRecordService.list(new LambdaQueryWrapper<ExamTrainRecord>().le(ExamTrainRecord::getStartExamTime, beginOfWeek)).stream().map(e -> e.getTrainId()).collect(Collectors.toSet());
+        Set<Long> recordTrainIds = examTrainRecordService.list(new LambdaQueryWrapper<ExamTrainRecord>().ge(ExamTrainRecord::getStartExamTime, beginOfWeek)).stream().map(e -> e.getTrainId()).collect(Collectors.toSet());
         if (recordTrainIds.size() == 0) {
             return 0;
         }

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

@@ -58,7 +58,6 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.MapUtils;
-import org.apache.commons.math3.dfp.DfpField;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.web.bind.annotation.*;
@@ -453,13 +452,13 @@ public class XzRiskPredictionController {
         RiskTrendByMainEnterpriseVo o = new RiskTrendByMainEnterpriseVo();
         o.setSevereWeatherRate(severeWeatherRate);
         o.setTotalPersonnelRiskRate(0.0D);
-        long specialNotCount = inspectionRecords.stream().filter(r -> r.getStatus() != 6 && r.getStatus() != 5).count();
+        long specialNotCount = inspectionRecords.stream().filter(r -> r.getStatus() != 5 && r.getType() != null && r.getType() != 1).count();
-        long specialCount = inspectionRecords.stream().filter(r -> r.getStatus() != 6).count();
+        long specialCount = inspectionRecords.stream().filter(r -> r.getType() != null && r.getType() != 1).count();
         o.setTotalSpecialOperationsRiskRate(NumberUtils.div(specialNotCount, specialCount, 2));
         JSONObject ssJo = BeanUtil.toBean(securityQualityInspectionRecordController.getStatScore(projectSn), JSONObject.class);
-        o.setMonthlySafetyScoreRate(NumberUtils.div(ssJo.getDouble("total"), 100D, 2));
+        o.setMonthlySafetyScoreRate(NumberUtils.div(ssJo.getJSONObject("result").getDouble("total"), 100D, 2));
-        long inspectionCount = inspectionRecords.stream().filter(r -> r.getStatus() != 6).count();
+        long inspectionCount = inspectionRecords.stream().filter(r -> true).count();
-        long inspectionNotCount = inspectionRecords.stream().filter(r -> r.getStatus() != 6 && r.getStatus() != 5).count();
+        long inspectionNotCount = inspectionRecords.stream().filter(r -> r.getStatus() != 5).count();
         o.setUnclosedHiddenDangersRate(NumberUtils.div(inspectionNotCount, inspectionCount, 2));
         o.setArea(NumberUtils.percent(PolygonUtil.calRadioArea(1.0, 5, o.getSevereWeatherRate(), o.getUnclosedHiddenDangersRate(), o.getMonthlySafetyScoreRate(), o.getTotalSpecialOperationsRiskRate(), o.getTotalPersonnelRiskRate()), 2));
         return Result.success(o);