Merge remote-tracking branch 'origin/develop_dl_plan6' into develop_dl_plan6

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/WaterResourceDto.java

@@ -5,7 +5,6 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.module.common.api.excel.CommonExplicitConstraint;
 import com.yeejoin.amos.boot.module.common.api.excel.ExplicitConstraint;
 import io.swagger.annotations.ApiModel;
@@ -13,10 +12,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springframework.format.annotation.DateTimeFormat;
-import org.springframework.util.ObjectUtils;
 
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/WaterResourceMapper.java

@@ -2,10 +2,7 @@ package com.yeejoin.amos.boot.module.common.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.module.common.api.dto.RequestData;
-import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceDto;
-import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceTypeDto;
-import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceZhDto;
+import com.yeejoin.amos.boot.module.common.api.dto.*;
 import com.yeejoin.amos.boot.module.common.api.entity.WaterResource;
 import org.apache.ibatis.annotations.Param;
 
@@ -21,7 +18,7 @@ import java.util.Map;
  */
 public interface WaterResourceMapper extends BaseMapper<WaterResource> {
 
-    List<WaterResourceDto> exportToExcel(@Param("isDelete")Boolean isDelete,@Param("name")String name, @Param("resourceType")String resourceType, @Param("bizOrgCode")String bizOrgCode);
+    List<WaterResourceForExportDto> exportToExcel(@Param("isDelete")Boolean isDelete, @Param("name")String name, @Param("resourceType")String resourceType, @Param("bizOrgCode")String bizOrgCode);
 
 
     /***

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/WaterResourceMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.common.api.mapper.WaterResourceMapper">
     <!--BUG 2919 消防水源导出没有设施定义 分类名称 设施编码 维保周期 by kongfm 2021-09-16   -->
-    <select id="exportToExcel" resultType="com.yeejoin.amos.boot.module.common.api.dto.WaterResourceDto">
+    <select id="exportToExcel" resultType="com.yeejoin.amos.boot.module.common.api.dto.WaterResourceForExportDto">
         select r.name,
                r.address,
                r.resource_type_name,
@@ -10,8 +10,8 @@
                r.belong_fighting_system,
                r.management_unit,
                r.maintenance_unit,
-               r.build_date,
-               r.enable_date,
+               date_format(r.build_date, '%Y-%m-%d') AS buildDate,
+               date_format(r.enable_date, '%Y-%m-%d') AS enableDate,
                r.orientation_img,
                r.reality_img,
                r.contact_user,

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/WaterResourceServiceImpl.java

@@ -10,14 +10,7 @@ import com.yeejoin.amos.boot.biz.common.constants.BizConstant;
 import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
 import com.yeejoin.amos.boot.biz.common.utils.EnumsUtils;
 import com.yeejoin.amos.boot.biz.common.utils.Menu;
-import com.yeejoin.amos.boot.module.common.api.dto.RequestData;
-import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceCraneDto;
-import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceDto;
-import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceHydrantDto;
-import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceNaturalDto;
-import com.yeejoin.amos.boot.module.common.api.dto.WaterResourcePoolDto;
-import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceTypeDto;
-import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceZhDto;
+import com.yeejoin.amos.boot.module.common.api.dto.*;
 import com.yeejoin.amos.boot.module.common.api.entity.WaterResource;
 import com.yeejoin.amos.boot.module.common.api.entity.WaterResourceCrane;
 import com.yeejoin.amos.boot.module.common.api.entity.WaterResourceHydrant;
@@ -200,8 +193,8 @@ public class WaterResourceServiceImpl extends BaseService<WaterResourceDto, Wate
     /**
      * 导出列表
      */
-    public List<WaterResourceDto> exportToExcel(Boolean isDelete, String name,
-                                                String resourceType,String bizOrgCode ) {
+    public List<WaterResourceForExportDto> exportToExcel(Boolean isDelete, String name,
+                                                         String resourceType, String bizOrgCode ) {
     	if ("null".equals(name)) {
     		name = null;
 		}

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/ConfigureController.java

@@ -191,8 +191,10 @@ public class ConfigureController extends AbstractBaseController {
             records.forEach(item -> {
                 String prefix = null;
                 String suffix = null;
-                String iotCode = item.get("iot_code").toString();
-                if (iotCode.length() > 8) {
+                String iotCode = null;
+                if (!ObjectUtils.isEmpty(item.get("iot_code"))) {
+                    iotCode = item.get("iot_code").toString();
+                    if (iotCode.length() > 8) {
                     prefix = iotCode.substring(0, 8);
                     suffix = iotCode.substring(8);
                 } else {
@@ -223,7 +225,13 @@ public class ConfigureController extends AbstractBaseController {
                         e.printStackTrace();
                     }
                 }
+            }else {
+                    item.put("carState", "无");
+                    item.put("count", 0);
+                    item.put("carStateDate", "--");
+                }
             });
+
         }
         return CommonResponseUtil.success(fireCarInfoByWL);
     }

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/ExcelServiceImpl.java

@@ -4,6 +4,7 @@ import java.io.InputStream;
 import java.lang.reflect.Field;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.time.LocalDate;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
@@ -12,11 +13,14 @@ import javax.servlet.http.HttpServletResponse;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.spire.ms.System.Collections.Specialized.CollectionsUtil;
 import com.yeejoin.amos.boot.module.common.api.dto.*;
 import com.yeejoin.amos.boot.module.common.api.excel.ExplicitConstraint;
 import com.yeejoin.amos.boot.module.common.api.mapper.OrgUsrMapper;
 import com.yeejoin.amos.boot.module.jcs.api.dto.SignDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.SinStaticDto;
+import io.github.classgraph.json.JSONUtils;
+import io.micrometer.core.instrument.util.JsonUtils;
 import org.apache.commons.beanutils.ConvertUtils;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;
@@ -256,7 +260,7 @@ public class ExcelServiceImpl {
 						WaterResourceDto.class, dataSourcesImpl, false);
 				break;
 			}
-			List<WaterResourceDto> waterResourceDtoList = null;
+			List<WaterResourceForExportDto> waterResourceDtoList = null;
 			if(par.size()>0) {
 				waterResourceDtoList = waterResourceServiceImpl.exportToExcel(true,par.containsKey("name")?par.get("name").toString():null,
 						par.containsKey("resourceType")?par.get("resourceType").toString():null,par.containsKey("bizOrgCode")?par.get("bizOrgCode").toString():null);
@@ -264,7 +268,7 @@ public class ExcelServiceImpl {
 				waterResourceDtoList = waterResourceServiceImpl.exportToExcel(true,null,null,par.containsKey("bizOrgCode")?par.get("bizOrgCode").toString():null);
 			}
 			ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), waterResourceDtoList,
-					WaterResourceDto.class, dataSourcesImpl, false);
+					WaterResourceForExportDto.class, dataSourcesImpl, false);
 			break;
 		case "HKQ":
 			List<AircraftDto> aircraftDtoList = null;

amos-boot-system-equip/src/main/resources/changelog/init/view_all.sql

@@ -7713,29 +7713,22 @@ ORDER BY
 DROP VIEW IF EXISTS `v_fire_check_num_shaoshan`;
 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`%` SQL SECURITY DEFINER VIEW `v_fire_check_num_shaoshan` AS
 SELECT
-	(
-	SELECT
-		ifnull( sum( `p_plan_task`.`point_num` ), 0 )
-	FROM
-		`p_plan_task`
-	WHERE
-		( to_days( `p_plan_task`.`begin_time` ) - to_days( curdate()) ) <= 0 AND ( to_days( `p_plan_task`.`end_time` ) - to_days( curdate()) ) >= 0
-	) AS `point_num`,
-	(
-	SELECT
-		ifnull( sum( `p_plan_task`.`point_num` ), 0 )
-	FROM
-		`p_plan_task`
-	WHERE
-		`p_plan_task`.`finish_status` = 3
-		AND ( to_days( `p_plan_task`.`begin_time` ) - to_days( curdate()) ) <= 0 AND ( to_days( `p_plan_task`.`end_time` ) - to_days( curdate()) ) >= 0
-	) AS `miss_num`,
-	(
-	SELECT
-		ifnull( sum( `p_plan_task`.`point_num` ), 0 )
+    ( SELECT ifnull( sum( `p_plan_task`.`point_num` ), 0 ) FROM `p_plan_task` WHERE `p_plan_task`.`check_date` LIKE concat( curdate(), '%' ) ) AS `point_num`,
+    (
+        SELECT
+            ifnull( sum( `p_plan_task`.`point_num` ), 0 )
+        FROM
+            `p_plan_task`
+        WHERE
+                `p_plan_task`.`finish_status` = 3
+          AND `p_plan_task`.`check_date` LIKE concat( curdate(), '%' )
+    ) AS `miss_num`,
+    (
+        SELECT
+            ifnull( sum( `p_plan_task`.`point_num` ), 0 )
+        FROM
+            `p_plan_task`
+        WHERE
+                `p_plan_task`.`finish_status` = 0
+          AND `p_plan_task`.`check_date` LIKE concat( curdate(), '%' )
+    ) AS `unfinish_num`;
\ No newline at end of file
-	FROM
-		`p_plan_task`
-	WHERE
-		( `p_plan_task`.`finish_status` = 0 )
-	AND ( to_days( `p_plan_task`.`begin_time` ) - to_days( curdate()) ) <= 0 AND ( to_days( `p_plan_task`.`end_time` ) - to_days( curdate()) ) >= 0
-	) AS `unfinish_num`;
\ No newline at end of file