ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/MonitorQualifyResult.java

@@ -103,7 +103,7 @@

    //检查指标，正常返回true
    public static boolean checkError(MonitorQualifyResult.QualifyResult result) {
        return result.getError() != null && !result.getError();
        return result!=null && result.getError() != null && !result.getError();
    }

    public static MonitorQualifyResultVO getVO(MonitorQualifyResult result) {

 ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java

@@ -183,20 +183,26 @@
    private void getCheckScore(CheckScore checkScore, Calendar calendar) {
        // 0.省厅月度 1.省厅季度 2.市局月度 3.市局季度 4.公安部月度 5.公安部季度
        switch (checkScore.getExamineTag()) {
            case 0, 2 ,4:
            case 0, 2, 4:
                checkScore.setEndDate(calendar.getTime());
                calendar.set(Calendar.DAY_OF_MONTH, 1);
                checkScore.setStartDate(calendar.getTime());
                if(checkScore.getExamineTag() == 0) checkScore.setExamineTag(Integer.valueOf(CheckConstants.Examine_Tag_Province+""));
                if(checkScore.getExamineTag() == 2) checkScore.setExamineTag(Integer.valueOf(CheckConstants.Examine_Tag_County+""));
                if(checkScore.getExamineTag() == 4) checkScore.setExamineTag(Integer.valueOf(CheckConstants.Examine_Tag_Dept+""));
                if (checkScore.getExamineTag() == 0)
                    checkScore.setExamineTag(Integer.valueOf(CheckConstants.Examine_Tag_Province + ""));
                if (checkScore.getExamineTag() == 2)
                    checkScore.setExamineTag(Integer.valueOf(CheckConstants.Examine_Tag_County + ""));
                if (checkScore.getExamineTag() == 4)
                    checkScore.setExamineTag(Integer.valueOf(CheckConstants.Examine_Tag_Dept + ""));
                break;
            case 1, 3, 5:
                checkScore.setStartDate(DateUtils.getQuarterStart(calendar).getTime());
                checkScore.setEndDate(DateUtils.getQuarterEnd(calendar).getTime());
                if(checkScore.getExamineTag() == 1) checkScore.setExamineTag(Integer.valueOf(CheckConstants.Examine_Tag_Province+""));
                if(checkScore.getExamineTag() == 3) checkScore.setExamineTag(Integer.valueOf(CheckConstants.Examine_Tag_County+""));
                if(checkScore.getExamineTag() == 5) checkScore.setExamineTag(Integer.valueOf(CheckConstants.Examine_Tag_Dept+""));
                if (checkScore.getExamineTag() == 1)
                    checkScore.setExamineTag(Integer.valueOf(CheckConstants.Examine_Tag_Province + ""));
                if (checkScore.getExamineTag() == 3)
                    checkScore.setExamineTag(Integer.valueOf(CheckConstants.Examine_Tag_County + ""));
                if (checkScore.getExamineTag() == 5)
                    checkScore.setExamineTag(Integer.valueOf(CheckConstants.Examine_Tag_Dept + ""));
                break;
        }
    }
@@ -305,15 +311,15 @@
    @Override
    public void exportIndex(HttpServletResponse response, CheckResultExportDTO exportDTO) throws IOException {
        //没有标签默认全导
        if(CollectionUtils.isEmpty(exportDTO.getExamineTags())){
            exportDTO.setExamineTags(Arrays.asList(0,1,2));
        if (CollectionUtils.isEmpty(exportDTO.getExamineTags())) {
            exportDTO.setExamineTags(Arrays.asList(0, 1, 2));
        }
        /** 导三张sheet */
        //车辆
        List<CheckIndexCar> checkIndexCars = new ArrayList<>();
        //车辆和人脸没有公安部
        for (Integer examineTag : exportDTO.getExamineTags()) {
            if(examineTag ==2) continue;
            if (examineTag == 2) continue;
            CheckIndexCar checkIndexCar = new CheckIndexCar();
//        checkIndexCar.setDate(date);
            checkIndexCar.setQuarter(exportDTO.getQuarter());
@@ -361,7 +367,7 @@
        //人脸
        List<CheckIndexFace> checkIndexFaces = new ArrayList<>();
        for (Integer examineTag : exportDTO.getExamineTags()) {
            if(examineTag ==2) continue;
            if (examineTag == 2) continue;
            CheckIndexFace checkIndexFace = new CheckIndexFace();
//        checkIndexFace.setDate(date);
            checkIndexFace.setQuarter(exportDTO.getQuarter());
@@ -540,13 +546,21 @@
        Map<String, Map<String, Object>> resultMap = new HashMap<>();
        for (AreaDeptEnum value : AreaDeptEnum.values()) {
            Map<String, Object> map = new HashMap<>();
            map.put("score", 0);
            map.put("video", 0);
            map.put("car", 0);
            map.put("face", 0);
            resultMap.put(value.getName(), map);
        }
        //填充各个区县数据
        for (CheckScore checkScore : dashboard) {
            Map<String, Object> map = new HashMap<>();
            map.put("score", checkScore.getScore().setScale(1,RoundingMode.HALF_UP));
            if (CheckConstants.Rule_Category_Video.equals(checkScore.getExamineCategory())) {
                map.put("video", checkScore.getScore().setScale(1, RoundingMode.HALF_UP));
            } else if (CheckConstants.Rule_Category_Car.equals(checkScore.getExamineCategory())) {
                map.put("car", checkScore.getScore().setScale(1, RoundingMode.HALF_UP));
            } else if (CheckConstants.Rule_Category_Face.equals(checkScore.getExamineCategory())) {
                map.put("face", checkScore.getScore().setScale(1, RoundingMode.HALF_UP));
            }
            resultMap.put(checkScore.getDeptName(), map);
        }
        return resultMap;

 ycl-server/src/main/resources/application-prod.yml

@@ -7,7 +7,7 @@
  # 版权年份
  copyrightYear: 2024
  # 文件路径 示例（ Windows配置D:/zgyw/uploadPath，Linux配置 /home/zgyw/uploadPath）
  profile: /home/zgyw/uploadPath
  profile: /opt/zgyw/uploadPath
  # 获取ip地址开关
  addressEnabled: false
  # 验证码类型 math 数字计算 char 字符验证
@@ -110,11 +110,11 @@
request:
  retry: 4 # 最大重试次数
  youYunDomain: http://51.92.65.56 # 优云地址
  haiKangDomain: 51.92.65.48 # 海康地址
#  haiKangDomain: 51.92.65.48 # 海康地址
youYun:
  tenantId: e10adc3949ba59abbe56e057f20f88dd
  email: yunwei
  passwd: Yesc@123
  email: yunwei-app
  passwd: Admin@123
  apikey: 72fcfd6825304f7fa0453134de620f3a
  accesskey: fc9503a521544e76a8e69b912a2f177bc6362b19


 ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml

@@ -207,7 +207,7 @@
    </select>

    <select id="dashboard" resultType="com.ycl.platform.domain.entity.CheckScore">
        select avg(s.score) as score,d.area as deptName from t_check_score s
        select score,d.area as deptName,s.examine_category from t_check_score s
        left join sys_dept d on s.dept_id = d.dept_id
        <where>
            s.create_time between #{startTime} and #{endTime}
@@ -221,7 +221,6 @@
                AND s.examine_tag = 2
            </if>
        </where>
        GROUP BY s.dept_id
        ORDER BY s.create_time DESC
    </select>