modify:删除多余功能

HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service-api/hzinfo-inspect-service-api/pom.xml

@@ -17,7 +17,7 @@
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>easyexcel</artifactId>
-            <version>3.3.2</version>
+            <version>2.2.6</version>
         </dependency>
     </dependencies>
 </project>

HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service-api/hzinfo-inspect-service-api/src/main/java/org/springblade/hzinfo_inspect/duty/entity/DutyGroupGeneratingCapacityEntity.java

@@ -1,71 +0,0 @@
-package org.springblade.hzinfo_inspect.duty.entity;
-
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.springblade.core.mp.base.BaseEntity;
-import org.springblade.core.tool.utils.DateUtil;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.io.Serializable;
-import java.sql.Time;
-
-/**
- * <p>
- * 班组发电量
- * </p>
- *
- * @author lx
- * @since 2022-02-24
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("hzims_duty_group_generating_capacity")
-@ApiModel(value = "DutyGroupGeneratingCapacityEntity对象", description = "班组发电量")
-public class DutyGroupGeneratingCapacityEntity extends BaseEntity implements Serializable {
-
-	private static final long serialVersionUID = 1L;
-
-
-	@ApiModelProperty(value = "站点ID")
-	@TableField("DUTY_DEPT")
-	private Long dutyDept;
-
-	@ApiModelProperty(value = "年月")
-	@TableField("DATE_TIME")
-	private String dateTime;
-
-	@ApiModelProperty(value = "班组ID")
-	@TableField("GROUP_ID")
-	private Long groupId;
-
-	@ApiModelProperty(value = "设备Code")
-	@TableField("EM_CODE")
-	private String emCode;
-
-	@DateTimeFormat(pattern = DateUtil.PATTERN_TIME)
-	@JsonFormat(pattern = DateUtil.PATTERN_TIME)
-	@ApiModelProperty(value = "开始时间")
-	@TableField("START_TIME")
-	private Time startTime;
-
-	@DateTimeFormat(pattern = DateUtil.PATTERN_TIME)
-	@JsonFormat(pattern = DateUtil.PATTERN_TIME)
-	@ApiModelProperty(value = "开始时间")
-	@TableField("END_TIME")
-	private Time endTime;
-
-	@ApiModelProperty(value = "发电量")
-	@TableField("GENERATING_CAPACITY")
-	private float generatingCapacity;
-
-    @ApiModelProperty(value = "租户ID")
-    private String tenantId;
-}

HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/pom.xml

@@ -142,7 +142,7 @@
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>easyexcel</artifactId>
-            <version>3.3.2</version>
+            <version>2.2.6</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.poi</groupId>
@@ -151,15 +151,21 @@
             </exclusions>
         </dependency>
         <dependency>
+            <groupId>cn.afterturn</groupId>
+            <artifactId>easypoi-base</artifactId>
+            <version>3.3.0</version>
+            <scope>compile</scope>
+            <exclusions>
+                <exclusion>
                     <groupId>org.apache.poi</groupId>
                     <artifactId>poi-ooxml-schemas</artifactId>
-            <version>4.1.2</version>
+                </exclusion>
-            <scope>compile</scope>
+            </exclusions>
         </dependency>
         <dependency>
-            <groupId>cn.afterturn</groupId>
+            <groupId>org.apache.poi</groupId>
-            <artifactId>easypoi-base</artifactId>
+            <artifactId>poi-ooxml-schemas</artifactId>
-            <version>4.4.0</version>
+            <version>3.17</version>
         </dependency>
     </dependencies>
 

HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/mapper/DutyGroupGeneratingCapacityMapper.java

@@ -1,16 +0,0 @@
-package org.springblade.hzinfo_inspect.duty.mapper;
-
-import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper;
-import org.springblade.hzinfo_inspect.duty.entity.DutyGroupGeneratingCapacityEntity;
-
-/**
- * <p>
- * 班组发电量 Mapper 接口
- * </p>
- *
- * @author lx
- * @since 2022-02-24
- */
-public interface DutyGroupGeneratingCapacityMapper extends UserDataScopeBaseMapper<DutyGroupGeneratingCapacityEntity> {
-
-}

HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/mapper/DutyGroupGeneratingCapacityMapper.xml

@@ -1,30 +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="org.springblade.hzinfo_inspect.duty.mapper.DutyGroupGeneratingCapacityMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="org.springblade.hzinfo_inspect.duty.entity.DutyGroupGeneratingCapacityEntity">
-        <id column="ID" property="id" />
-        <result column="DUTY_DEPT" property="dutyDept" />
-        <result column="DATE_TIME" property="dateTime" />
-        <result column="GROUP_ID" property="groupId" />
-        <result column="EM_CODE" property="emCode" />
-        <result column="START_TIME" property="startTime" />
-        <result column="END_TIME" property="endTime" />
-        <result column="GENERATING_CAPACITY" property="generatingCapacity" />
-        <result column="TENANT_ID" property="tenantId" />
-        <result column="CREATE_TIME" property="createTime" />
-        <result column="UPDATE_TIME" property="updateTime" />
-        <result column="CREATE_USER" property="createUser" />
-        <result column="UPDATE_USER" property="updateUser" />
-        <result column="IS_DELETED" property="isDeleted" />
-        <result column="STATUS" property="status" />
-        <result column="CREATE_DEPT" property="createDept" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        ID, STATION_ID, DATE_TIME, GROUP_ID,EM_CODE, START_TIME, END_TIME, GENERATING_CAPACITY, TENANT_ID, CREATE_TIME, UPDATE_TIME, CREATE_USER, UPDATE_USER, IS_DELETED, STATUS, CREATE_DEPT
-    </sql>
-
-</mapper>

HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/service/impl/ImsDutyMainPersonServiceImpl.java

@@ -22,19 +22,6 @@ import java.util.List;
 @Service
 @Slf4j
 public class ImsDutyMainPersonServiceImpl extends ServiceImpl<ImsDutyMainPersonMapper, ImsDutyMainPersonEntity> implements IImsDutyMainPersonService {
-	@Autowired
-	private ImsDutyGroupPMapper imsDutyGroupPMapper;
-	@Autowired
-	private IImsDutyMainTemplateService iImsDutyMainTemplateService;
-	@Autowired
-	private ImsDutyGroupMapper dutyGroupMapper;
-	@Autowired
-	private ImsDutyRecMapper imsDutyRecMapper;
-	@Autowired
-	private IImsDutyGroupPService imsDutyGroupPService;
-	@Autowired
-	private DutyGroupGeneratingCapacityMapper groupGeneratingCapacityMapper;
-
 
 	@Override
 	public void doSaveBasch(List<ImsDutyMainPersonEntity> list) {

HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/service/impl/ImsDutyMainServiceImpl.java

@@ -66,8 +66,6 @@ public class ImsDutyMainServiceImpl extends ServiceImpl<ImsDutyMainMapper, ImsDu
     private IImsDutyGroupPService imsDutyGroupPService;
     @Autowired
     private IImsDutyClassService iImsDutyClassService;
-    @Resource
-    private DutyGroupGeneratingCapacityMapper groupGeneratingCapacityMapper;
     @Autowired
     private IUserClient userClient;
 
@@ -1094,17 +1092,6 @@ public class ImsDutyMainServiceImpl extends ServiceImpl<ImsDutyMainMapper, ImsDu
                     dutyMainInfoVo.setManagerName(managerUser.getRealName());
                     dutyMainInfoVo.setManagerPhone(managerUser.getPhone());
                 }
-
-                List<DutyGroupGeneratingCapacityEntity> generatingCapacityList = groupGeneratingCapacityMapper.selectList(new LambdaQueryWrapper<DutyGroupGeneratingCapacityEntity>() {{
-                    eq(DutyGroupGeneratingCapacityEntity::getStartTime, dutyMainInfoVo.getStartTime());
-                    eq(DutyGroupGeneratingCapacityEntity::getEndTime, dutyMainInfoVo.getEndTime());
-                    eq(DutyGroupGeneratingCapacityEntity::getDutyDept, dutyMainInfoVo.getCreateDept());
-                    eq(DutyGroupGeneratingCapacityEntity::getDateTime, DateUtil.format(dutyMainInfoVo.getDutyDate(), DateUtil.PATTERN_DATE));
-                }});
-                if (CollectionUtil.isNotEmpty(generatingCapacityList)) {
-                    double generatingCapacity = generatingCapacityList.stream().mapToDouble(DutyGroupGeneratingCapacityEntity::getGeneratingCapacity).sum();
-                    dutyMainInfoVo.setGeneratingCapacity(generatingCapacity);
-                }
                 vo.setHeadInfo(dutyMainInfoVo);
                 DutyMainInfoVo corryVo = getNextDutyDataV2(dutyMainInfoVo.getId());
                 if (ObjectUtil.isNotEmpty(corryVo) && Func.isNotBlank(corryVo.getDutyPersonIds())) {

HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/utils/ExcelMergeHandler.java

@@ -1,5 +1,6 @@
 package org.springblade.hzinfo_inspect.duty.utils;
 
+import com.alibaba.excel.metadata.CellData;
 import com.alibaba.excel.metadata.Head;
 import com.alibaba.excel.write.handler.CellWriteHandler;
 import com.alibaba.excel.write.metadata.holder.WriteSheetHolder;
@@ -44,6 +45,15 @@ public class ExcelMergeHandler implements CellWriteHandler {
 
     }
 
+    @Override
+    public void afterCellDataConverted(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, CellData cellData, Cell cell, Head head, Integer relativeRowIndex, Boolean isHead) {
+
+    }
+
+    @Override
+    public void afterCellDispose(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, List<CellData> cellDataList, Cell cell, Head head, Integer relativeRowIndex, Boolean isHead) {
+
+    }
 
 
     /**

HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/report/entity/InspectMonthReportExcel.java

@@ -1,25 +1,20 @@
 package org.springblade.hzinfo_inspect.report.entity;
 
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.alibaba.excel.annotation.write.style.*;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
-import com.alibaba.excel.enums.BooleanEnum;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
-import com.alibaba.excel.enums.poi.FillPatternTypeEnum;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
-import org.apache.poi.ss.usermodel.FillPatternType;
-
-import java.util.Date;
 
 /**
  * @Author: py
  */
 @ApiModel(value = "巡检月报-Excel-导出")
 @Data
-@HeadStyle(fillPatternType = FillPatternTypeEnum.SOLID_FOREGROUND, fillForegroundColor = 22)
 @HeadRowHeight(45)
 @ColumnWidth(20)
 @ContentRowHeight(80)
-@ContentStyle(wrapped = BooleanEnum.TRUE)
 public class InspectMonthReportExcel {
 
     @ExcelProperty(value = "用户名称", index = 0)

HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/video-image-service/src/main/java/org/springblade/video_image/video/entity/Video.java

@@ -1,7 +1,4 @@
-//
+
-// Source code recreated from a .class file by IntelliJ IDEA
-// (powered by Fernflower decompiler)
-//
 
 package org.springblade.video_image.video.entity;
 

HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/video-image-service/src/main/java/org/springblade/video_image/video/mapper/CloudVideoMapper.java

@@ -3,10 +3,11 @@ package org.springblade.video_image.video.mapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
 import org.springblade.video_image.video.entity.CloudVideo;
+import org.springblade.video_image.video.entity.PointLeafNode;
 
 import java.util.List;
 
-public interface CloudVideoMapper extends VideoBaseMapper {
+public interface CloudVideoMapper {
     void insert(CloudVideo var1);
 
     int update(CloudVideo var1);
@@ -16,4 +17,10 @@ public interface CloudVideoMapper extends VideoBaseMapper {
     IPage<CloudVideo> searchList(@Param("videoList") List<Long> var1, @Param("inUse") Integer var2, @Param("condition") String var3, IPage<CloudVideo> var4);
 
     List<CloudVideo> getAllList(@Param("stationId") String var1);
+
+    int clearBindingRelation(@Param("videoList") List<Long> var1);
+
+    List<PointLeafNode> getVideoList(@Param("pointIdList") List<Long> var1);
+
+    int deleteById(long var1);
 }

HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/video-image-service/src/main/java/org/springblade/video_image/video/mapper/CloudVideoMapper.xml

@@ -17,18 +17,56 @@
 		inUse
 	</sql>
 
+    <sql id="Video_Base_Column_List">
+        id, name, pointId, inUse
+    </sql>
+
+    <sql id="Clear_Condition">
+        <where>
+            <choose>
+                <when test="videoList != null and !videoList.isEmpty()">
+                    AND id IN (
+                    <foreach collection="videoList" item="videoId" separator=",">
+                        #{videoId}
+                    </foreach>
+                    )
+                </when>
+                <otherwise>
+                    AND 1 = 2
+                </otherwise>
+            </choose>
+        </where>
+    </sql>
+
+    <sql id="List_Condition">
+        <where>
+            <choose>
+                <when test="pointIdList != null and !pointIdList.isEmpty()">
+                    AND pointId IN (
+                    <foreach collection="pointIdList" item="pointId" separator=",">
+                        #{pointId}
+                    </foreach>
+                    )
+                </when>
+                <otherwise>
+                    AND 1 = 2
+                </otherwise>
+            </choose>
+        </where>
+    </sql>
+
     <update id="clearBindingRelation">
         UPDATE VIDEO_MONITOR
         SET	pointId = null
-        <include refid="org.springblade.video_image.video.mapper.VideoBaseMapper.Clear_Condition"/>
+        <include refid="Clear_Condition"/>
     </update>
 
     <select id="getVideoList" resultType="org.springblade.video_image.video.entity.PointLeafNode">
         SELECT
-        <include refid="org.springblade.video_image.video.mapper.VideoBaseMapper.Video_Base_Column_List"/>
+        <include refid="Video_Base_Column_List"/>
         FROM
         VIDEO_MONITOR
-        <include refid="org.springblade.video_image.video.mapper.VideoBaseMapper.List_Condition"/>
+        <include refid="List_Condition"/>
     </select>
 
     <delete id="deleteById">
@@ -39,10 +77,10 @@
 
     <select id="searchList" resultType="org.springblade.video_image.video.entity.CloudVideo">
         SELECT
-        <include refid="org.springblade.video_image.video.mapper.VideoBaseMapper.Video_Base_Column_List"/>
+        <include refid="Video_Base_Column_List"/>
         FROM
         VIDEO_MONITOR
-        <include refid="org.springblade.video_image.video.mapper.VideoBaseMapper.Clear_Condition"/>
+        <include refid="Clear_Condition"/>
         <if test="inUse != null">
             AND inUse = #{inUse, jdbcType=SMALLINT}
         </if>

HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/video-image-service/src/main/java/org/springblade/video_image/video/mapper/DirectLinkVideoMapper.java

@@ -8,10 +8,11 @@ package org.springblade.video_image.video.mapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
 import org.springblade.video_image.video.entity.DirectLinkVideo;
+import org.springblade.video_image.video.entity.PointLeafNode;
 
 import java.util.List;
 
-public interface DirectLinkVideoMapper extends VideoBaseMapper {
+public interface DirectLinkVideoMapper {
 
     IPage<DirectLinkVideo> searchList(@Param("videoList") List<Long> var1, @Param("inUse") Integer var2, @Param("condition") String var3, IPage<DirectLinkVideo> var4);
 
@@ -24,4 +25,10 @@ public interface DirectLinkVideoMapper extends VideoBaseMapper {
     IPage<DirectLinkVideo> getVideoListOfRtmp(@Param("deptId") String var1, IPage<DirectLinkVideo> var2);
 
     List<DirectLinkVideo> getAllList(@Param("deptId") String var1);
+
+    int clearBindingRelation(@Param("videoList") List<Long> var1);
+
+    List<PointLeafNode> getVideoList(@Param("pointIdList") List<Long> var1);
+
+    int deleteById(long var1);
 }

HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/video-image-service/src/main/java/org/springblade/video_image/video/mapper/DirectLinkVideoMapper.xml

@@ -14,18 +14,56 @@
         pointId
 	</sql>
 
+    <sql id="Video_Base_Column_List">
+        id, name, pointId, inUse
+    </sql>
+
+    <sql id="Clear_Condition">
+        <where>
+            <choose>
+                <when test="videoList != null and !videoList.isEmpty()">
+                    AND id IN (
+                    <foreach collection="videoList" item="videoId" separator=",">
+                        #{videoId}
+                    </foreach>
+                    )
+                </when>
+                <otherwise>
+                    AND 1 = 2
+                </otherwise>
+            </choose>
+        </where>
+    </sql>
+
+    <sql id="List_Condition">
+        <where>
+            <choose>
+                <when test="pointIdList != null and !pointIdList.isEmpty()">
+                    AND pointId IN (
+                    <foreach collection="pointIdList" item="pointId" separator=",">
+                        #{pointId}
+                    </foreach>
+                    )
+                </when>
+                <otherwise>
+                    AND 1 = 2
+                </otherwise>
+            </choose>
+        </where>
+    </sql>
+
     <update id="clearBindingRelation">
         UPDATE SYS_STATION_VIDEOPOINT
         SET	pointId = null
-        <include refid="org.springblade.video_image.video.mapper.VideoBaseMapper.Clear_Condition"/>
+        <include refid="Clear_Condition"/>
     </update>
 
     <select id="getVideoList" resultType="org.springblade.video_image.video.entity.PointLeafNode">
         SELECT
-        <include refid="org.springblade.video_image.video.mapper.VideoBaseMapper.Video_Base_Column_List"/>
+        <include refid="Video_Base_Column_List"/>
         FROM
         SYS_STATION_VIDEOPOINT
-        <include refid="org.springblade.video_image.video.mapper.VideoBaseMapper.List_Condition"/>
+        <include refid="List_Condition"/>
     </select>
 
     <delete id="deleteById">
@@ -36,10 +74,10 @@
 
     <select id="searchList" resultType="org.springblade.video_image.video.entity.DirectLinkVideo">
         SELECT
-        <include refid="org.springblade.video_image.video.mapper.VideoBaseMapper.Video_Base_Column_List"/>
+        <include refid="Video_Base_Column_List"/>
         FROM
         SYS_STATION_VIDEOPOINT
-        <include refid="org.springblade.video_image.video.mapper.VideoBaseMapper.Clear_Condition"/>
+        <include refid="Clear_Condition"/>
         <if test="inUse != null">
             AND inUse = #{inUse, jdbcType=SMALLINT}
         </if>

HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/video-image-service/src/main/java/org/springblade/video_image/video/mapper/VideoBaseMapper.java

@@ -1,19 +0,0 @@
-//
-// Source code recreated from a .class file by IntelliJ IDEA
-// (powered by Fernflower decompiler)
-//
-
-package org.springblade.video_image.video.mapper;
-
-import org.apache.ibatis.annotations.Param;
-import org.springblade.video_image.video.entity.PointLeafNode;
-
-import java.util.List;
-
-public interface VideoBaseMapper{
-    int clearBindingRelation(@Param("videoList") List<Long> var1);
-
-    List<PointLeafNode> getVideoList(@Param("pointIdList") List<Long> var1);
-
-    int deleteById(long var1);
-}

HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/video-image-service/src/main/java/org/springblade/video_image/video/mapper/VideoBaseMapper.xml

@@ -1,43 +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="org.springblade.video_image.video.mapper.VideoBaseMapper">
-
-    <sql id="Video_Base_Column_List">
-		id, name, pointId, inUse
-	</sql>
-
-    <sql id="Clear_Condition">
-        <where>
-            <choose>
-                <when test="videoList != null and !videoList.isEmpty()">
-                    AND id IN (
-                    <foreach collection="videoList" item="videoId" separator=",">
-                        #{videoId}
-                    </foreach>
-                    )
-                </when>
-                <otherwise>
-                    AND 1 = 2
-                </otherwise>
-            </choose>
-        </where>
-    </sql>
-
-    <sql id="List_Condition">
-        <where>
-            <choose>
-                <when test="pointIdList != null and !pointIdList.isEmpty()">
-                    AND pointId IN (
-                    <foreach collection="pointIdList" item="pointId" separator=",">
-                        #{pointId}
-                    </foreach>
-                    )
-                </when>
-                <otherwise>
-                    AND 1 = 2
-                </otherwise>
-            </choose>
-        </where>
-    </sql>
-</mapper>

hnac-framework-boot/src/main/resources/application-dev.yml

@@ -7,21 +7,17 @@ spring:
       strict: true #设置严格模式,默认false不启动. 启动后在未匹配到指定数据源时候会抛出异常,不启动则使用默认数据源.
       datasource:
         mysql:
-          #url: jdbc:mysql://175.6.40.67:10022/hzinfo_ris_pxhd?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
           url: jdbc:mysql://127.0.0.1:3306/hzinfo_ris_pxhd?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
           username: root
           password: 123
         slave:
           url: jdbc:mysql://127.0.0.1:3306/hzinfo_ris_pxhd?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
-          #url: jdbc:mysql://127.0.0.1:3306/hzinfo_ris?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
           username: root
           password: 123
         tdengine:
           db-type: postgresql
-          driver-class-name: com.taosdata.jdbc.TSDBDriver
+          driver-class-name: com.taosdata.jdbc.rs.RestfulDriver
-          url: jdbc:TAOS://192.168.65.86:6030/hzinfo_data?timezone=UTC-8&charset=UTF-8&locale=en_US.UTF-8
+          url: jdbc:TAOS-RS://192.168.1.202:6041/hzinfo_data?timezone=UTC-8&charset=UTF-8&locale=en_US.UTF-8
-#          driver-class-name: com.taosdata.jdbc.rs.RestfulDriver
-#          url: jdbc:TAOS-RS://192.168.65.105:6041/hzinfo_data?timezone=UTC-8&charset=UTF-8&locale=en_US.UTF-8
           username: root
           password: taosdata
   redis:
@@ -56,7 +52,7 @@ blade:
   data:
     sdk:
       enabled: true
-      url: http://127.0.0.1:8080/api/hzinfo-data-config  #nignx后台代理端口
+      url: http://127.0.0.1:7502/api/hzinfo-data-config  #nignx后台代理端口
       appId: '1529342971768860673'
       appSecret: 3b599c56a6c6c2d35dcfb7e63d04414f
     backups: true
@@ -78,10 +74,10 @@ blade:
         password: ${spring.datasource.dynamic.datasource.tdengine.password}
   mqtt:
     enabled: true
-    userName: admin
+    userName: hzinfo
-    password: 123456
+    password: hz123456
-    urls: tcp://192.168.65.16:1883
+    urls: tcp://192.168.1.202:1883
-#    urls: tcp://192.168.65.86:1883
+    #    urls: tcp://192.168.65.86:1883
     clientId: hzinfo_boot_mqtt
     topicNames: topic_device_model,topic_hzinfo_props,topic_hzinfo_yx,topic_hzinfo_heart_beat,topic_hzinfo_control_return,topic_hzinfo_events_alarm,topic_hzinfo_events
 
@@ -93,6 +89,7 @@ file:
     excelImage: D:\\upload\\excelResult\\excelImage
 
 
+
 hzinfo:
   task:
     pdf:
@@ -113,6 +110,8 @@ hzims:
         taskEnd: aliyun-task-end
         #巡检消息推送模板 - 极光
       jgPushCode: hzinfo-inspect
+  duty:
+    file-path: "D:/upload/duty"
 
 sms:
   aliyun:
@@ -134,7 +133,7 @@ emergency:
 
 hz3000:
   runtime:
-    setting: D:\\HZ3000\\runtime\\info\\factory.fac
+    setting: D:/HZ3000/runtime/info/factory.fac
     network:
       windows: D:/hz3000/runtime/info/network.xml
       linux: /home/hz3000/info/network.xml
@@ -154,6 +153,7 @@ hz3000:
       name:
         linux: libWriteData.so
 
+
 soe:
   wait:
     interval: 500
@@ -166,7 +166,8 @@ expire:
 
 dynamic:
   file:
-    path: D:/apache-tomcat-8.5.40/webapps/HZInfo/hz3000data/
+    path: D:\\nginx-1.18.0\\html\\HZInfo/hz3000data/
+
 
 
 wd:
@@ -175,7 +176,7 @@ wd:
   areaCode: 430225000000
   gisCodes: bigemap.bj8061hz
   gisLevel: 2
-  stcd: '360301002'
+  stcd: 360301002
 
 tencent:
   push:

hnac-framework-boot/src/main/resources/application.yml

@@ -19,7 +19,7 @@ spring:
     name: hnac-framework-boot
   servlet:
     multipart:
-      location: d:/upload
+      location: D:/upload
       maxFileSize: 500MB
       maxRequestSize: 500MB
   jmx:
@@ -75,7 +75,7 @@ blade:
       - bbMapper
       - ccMapper
       - PointMapper
-#    enabled: false
+  #    enabled: false
   #token配置
   token:
     #是否有状态
@@ -109,26 +109,28 @@ blade:
   secure:
     #接口放行
     skip-url:
-      - /
       - /webjars/**
       - /toLogin
       - /favicon.ico
-      - /js/**
       - /plugins/**
       - /adminlte/**
       - /static/**
       - /templates/**
+      - /js/**
       - /swagger-resources/**
       - /doc.html
       - /blade-system/tenant/info
       - /blade-auth/oauth/token
       - /blade-auth/oauth/captcha
+      - /test/simulationMultiple
       - /excelwd/downloadFile
       - /websocket/**
       - /yk/websocket
       - /fileInfo/**
       - /inspectInfo/**
       - /emergencyPlan/downloadFile
+      - /waterRain/stStbprpB/pageList/**
+      - /waterRain/stStbprpBData/getRealData/**
     #授权认证配置
     auth:
       - method: ALL
@@ -185,7 +187,7 @@ remoteControl:
 
 scada:
   resource:
-    path: D:/nginx-1.18.0-ris/html/subapp/resources/hzinfo-realmonitor
+    path: D:/nginx-1.18.0/html/subapp/resources/hzinfo-realmonitor
 
 get:
   realdata:
@@ -203,6 +205,4 @@ golden:
     username: sa
     password: golden
 
-upload:
+
-  file:
-    path: D:/nginx-1.18.0-ris/html/subapp/resources/upload

hnac-framework-boot/src/main/resources/ehcache-local.xml

@@ -8,7 +8,7 @@
                   timeToIdleSeconds="300" timeToLiveSeconds="0" overflowToDisk="true"
                   maxEntriesLocalDisk="100000" />
 
-<!-- 系统缓存 -->
+    <!-- 系统缓存 -->
     <cache name="sysCache" maxEntriesLocalHeap="100" eternal="true"
            overflowToDisk="true" />