feat(reservoir): 实现划界管理功能并优化文件上传

- 新增划界管理实体类，包含划界依据、文件名和文件地址字段
- 实现文件上传服务 TransferService，支持单文件和多文件上传
- 添加文件上传接口 uploadFile，支持划界相关文件上传
- 优化 WqLrinfBController，增加文件上传功能并调整接口注释
- 移除原有湖库信息相关字段，适配划界管理需求
- 注释掉部分无用的查询条件代码，简化业务逻辑
- 调整接口文档描述，统一使用划界管理相关术语
- 修复值班管理模块接口文档标题不一致问题
- 优化巡检问题处理接口返回状态逻辑
- 完善文件上传路径配置，支持自定义子目录存储

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

@@ -20,24 +20,21 @@ public class ImsDutyRecDTO extends ImsDutyRecEntity {
 
 	private static final long serialVersionUID = 1L;
 
-	@ApiModelProperty(value = "巡检路线数据")
+//	@ApiModelProperty(value = "巡检路线数据")
-	@NotNull
+//	@NotNull
-	private String  routeData;
+//	private String  routeData;
-
+//
-	@ApiModelProperty(value = "巡检路线ID字段")
+//	@ApiModelProperty(value = "巡检路线ID字段")
-	@NotNull
+//	@NotNull
-	private Long routeId;
+//	private Long routeId;
-
+//
-	@ApiModelProperty(value = "路线名称")
+//	@ApiModelProperty(value = "路线名称")
-	@NotNull
+//	@NotNull
-	private String routeName;
+//	private String routeName;
 
 	@ApiModelProperty(value = "交班对象值班信息")
 	private ImsSchedulingVo headDutyMainVo;
 
-	/**
-	 * 接班对象值班信息
-	 */
 	@ApiModelProperty(value = "接班对象值班信息")
 	private ImsSchedulingVo carryDutyMainVo;
 

HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service-api/hzinfo-inspect-service-api/src/main/java/org/springblade/hzinfo_inspect/plan/vo/PlanVO.java

@@ -42,15 +42,6 @@ public class PlanVO extends BaseEntity implements Serializable  {
 	@ApiModelProperty(value = "计划名称,长度必须为1到128")
 	@Size(min=1,max = 128,message ="计划名称长度必须为1到128")
 	private String name;
-/*
-	@ApiModelProperty(value="班次id")
-	private Long classId;
-
-	*//**
-	 * 值班班次名称
-	 *//*
-	@ApiModelProperty(value = "值班班次名称")
-	private String className;*/
 
 	/**
 	 * 计划开始时间

HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service-api/reservoir-baseinfo-service-api/src/main/java/org/springblade/reservoirbase/entity/WqLrinfB.java

@@ -8,23 +8,19 @@ import org.springblade.core.mp.base.BaseEntity;
 import java.math.BigDecimal;
 
 /**
- *湖库表
+ * 划界管理
  */
 @Data
 @TableName("wq_lrinf_b")
 public class WqLrinfB extends BaseEntity {
-    @ApiModelProperty("湖库代码")
-    private String lrcd;
-    @ApiModelProperty("水域类型")
-    private String watp;
-    @ApiModelProperty("湖（库）名称")
-    private String lrnm;
-    @ApiModelProperty("湖（库）面积")
-    private BigDecimal lrar;
-    @ApiModelProperty("水库库容")
-    private BigDecimal rscp;
-    @ApiModelProperty("经纬度")
-    private String coordinateset;
 
+    @ApiModelProperty("划界依据")
+    private String accord;
+
+    @ApiModelProperty("文件名称")
+    private String fileName;
+
+    @ApiModelProperty("文件地址")
+    private String fileUrl;
 
 }

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

@@ -29,7 +29,7 @@ import java.util.List;
 @RestController
 @AllArgsConstructor
 @RequestMapping("/imsDutyClass")
-@Api(value = "班次controller", tags = "班次相关操作（班次设置）")
+@Api(value = "班次管理", tags = "班次相关操作（班次设置）")
 public class ImsDutyClassController {
 
 	private final IImsDutyClassService imsDutyClassService;

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

@@ -27,7 +27,7 @@ import java.util.List;
 @RestController
 @AllArgsConstructor
 @RequestMapping("/imsDutyClassType")
-@Api(value = "班次类型controller", tags = "班次类型相关操作")
+@Api(value = "班次类型管理", tags = "班次类型相关操作")
 public class ImsDutyClassTypeController {
 
     private final IImsDutyClassTypeService imsDutyClassTypeService;

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

@@ -33,7 +33,7 @@ import java.util.List;
 @RestController
 @AllArgsConstructor
 @RequestMapping("/imsDutyGroup")
-@Api(value = "值班小组controller", tags = "值班小组相关操作(班组设置+人员分组)")
+@Api(value = "班组设置+人员分组", tags = "值班小组相关操作")
 public class ImsDutyGroupController {
 
     private final IImsDutyGroupService imsDutyGroupService;

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

@@ -41,7 +41,7 @@ import java.util.List;
 @RestController
 @AllArgsConstructor
 @RequestMapping("/imsDutyMain")
-@Api(value = "值班信息主表相关操作", tags = "值班信息主表相关操作")
+@Api(value = "值班信息管理", tags = "值班信息主表相关操作")
 public class ImsDutyMainController {
 
     private final IImsDutyMainService imsDutyMainService;

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

@@ -24,7 +24,7 @@ import java.util.List;
 @RestController
 @AllArgsConstructor
 @RequestMapping("/imsDutyMainTemplate")
-@Api(value = "排班模版controller", tags = "排班模版")
+@Api(value = "排班模版管理", tags = "排班模版")
 public class ImsDutyMainTemplateController {
 	private final IImsDutyMainTemplateService iImsDutyMainTemplateService;
 

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

@@ -33,7 +33,7 @@ import javax.validation.Valid;
 @RestController
 @AllArgsConstructor
 @RequestMapping("/imsDutyRec")
-@Api(value = "值班交接controller", tags = "值班交接相关操作（交接班管理）")
+@Api(value = "交接班管理", tags = "值班交接相关操作（交接班管理）")
 public class ImsDutyRecController {
 
     private final IImsDutyRecService imsDutyRecService;

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

@@ -46,16 +46,20 @@ public class ImsDutyEmergencyServiceImpl extends ServiceImpl<ImsDutyEmergencyMap
     private IUserClient userClient;
     @Autowired
     private ImsDutyClassServiceImpl imsDutyClassService;
+
     @Override
     public R saveEntity(ImsDutyEmergencyEntity imsDutyEmergencyEntity) {
         ImsDutyMainEntity entity = imsDutyMainMapper.selectOne(new LambdaQueryWrapper<ImsDutyMainEntity>() {{
             eq(ImsDutyMainEntity::getStatus, DutyMainStatus.EXEC.getVal());
-			eq(ImsDutyMainEntity::getCreateDept, imsDutyEmergencyEntity.getCreateDept());
+//            eq(ImsDutyMainEntity::getCreateDept, imsDutyEmergencyEntity.getCreateDept());
             like(ImsDutyMainEntity::getDutyPersonIds, AuthUtil.getUserId()).last(" limit 1");
         }});
         if (ObjectUtil.isEmpty(entity)) {
-			return R.success("您当前未值班");
+            return R.fail("您当前未值班");
         }
+        imsDutyEmergencyEntity.setDutyClass(entity.getClassId());
+        imsDutyEmergencyEntity.setDutyClassName(entity.getClassName());
+        imsDutyEmergencyEntity.setDutyTime(entity.getDutyDate());
         this.saveOrUpdate(imsDutyEmergencyEntity);
         return R.success("保存成功");
     }
@@ -90,6 +94,7 @@ public class ImsDutyEmergencyServiceImpl extends ServiceImpl<ImsDutyEmergencyMap
         }
         return R.data(imsDutyEmergencyEntityIPage);
     }
+
     private QueryWrapper<ImsDutyEmergencyEntity> getQueryWrapper(ImsDutyEmergencyVo imsDutyEmergencyVo) {
         QueryWrapper<ImsDutyEmergencyEntity> queryWrapper = new QueryWrapper();
         if (ObjectUtils.isNotEmpty(imsDutyEmergencyVo.getId())) {

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

@@ -13,7 +13,6 @@ import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.*;
-import org.springblade.flow.core.feign.IFlowClient;
 import org.springblade.hzinfo_inspect.duty.constants.OperationalConstants;
 import org.springblade.hzinfo_inspect.duty.dto.ChangeShiftsReqDTO;
 import org.springblade.hzinfo_inspect.duty.dto.ChangeShiftsRspDTO;
@@ -170,13 +169,13 @@ public class ImsDutyRecServiceImpl extends ServiceImpl<ImsDutyRecMapper, ImsDuty
 
         String tenantId = AuthUtil.getTenantId();
         // 新建巡检计划并获取巡检任务Id
-        PlanVO planVO = new PlanVO();
+/*        PlanVO planVO = new PlanVO();
         planVO.setRouteId(recDTO.getRouteId());
         planVO.setRouteData(recDTO.getRouteData());
         planVO.setRouteName(recDTO.getRouteName());
         planVO.setPlanUsers(Lists.newArrayList(managerId));
         Long inspectTaskId = this.createInspectPlan(planVO);
-        recDTO.setInspectTaskId(inspectTaskId);
+        recDTO.setInspectTaskId(inspectTaskId);*/
         recDTO.setExecTime(new Date());
         recDTO.setStatus(DutyRecStatus.EXEC.getVal());
         // 判断交接班是否延时

HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/problem/controller/InspectionProblemController.java

@@ -41,6 +41,7 @@ public class InspectionProblemController extends BladeController {
 
     /**
      * 获取已处理巡检问题视图列表信息
+     *
      * @param ipv 巡检问题视图实例
      * @return 已处理巡检问题视图列表
      */
@@ -55,6 +56,7 @@ public class InspectionProblemController extends BladeController {
 
     /**
      * 获取巡检问题视图列表信息
+     *
      * @param ipv 巡检问题视图实例
      * @return 巡检问题视图列表
      */
@@ -69,6 +71,7 @@ public class InspectionProblemController extends BladeController {
 
     /**
      * 获取巡检问题视图信息
+     *
      * @param ipv 巡检问题视图实例
      * @return 巡检问题视图实例
      */
@@ -82,6 +85,7 @@ public class InspectionProblemController extends BladeController {
 
     /**
      * 插入巡检问题信息
+     *
      * @param ip 巡检问题实例
      * @return 结果整型数
      */
@@ -96,6 +100,7 @@ public class InspectionProblemController extends BladeController {
 
     /**
      * 更新巡检问题信息
+     *
      * @param ip 巡检问题实例
      * @return 结果整型数
      */
@@ -109,20 +114,18 @@ public class InspectionProblemController extends BladeController {
 
     /**
      * 移除已处理巡检问题信息
-     * @param ipuh 已处理巡检问题实例
-     * @return 结果整型数
      */
-   
     @RequestMapping("/removeHandledInspectionProblem")
     @ResponseBody
     public R removeHandledInspectionProblem(@RequestBody InspectionProblemUserHandle ipuh) {
         ipuh.setUserId(AuthUtil.getUserId());
-        int res = ipuhs.deleteInspectionProblemUserHandle(ipuh);
+        int result = ipuhs.deleteInspectionProblemUserHandle(ipuh);
-        return R.data(res,"移除成功");
+        return R.status(result > 0);
     }
 
     /**
      * 批量插入巡检问题附件信息
+     *
      * @param ids 问题id以及文件id集合
      * @return 结果整型数
      */
@@ -136,10 +139,10 @@ public class InspectionProblemController extends BladeController {
 
     /**
      * 批量插入巡检问题处理过程附件信息
+     *
      * @param ids 过程id以及文件id集合
      * @return 结果整型数
      */
-
     @RequestMapping("/addInspectionProblemHandleAttachmentBatch")
     @ResponseBody
     public R addInspectionProblemHandleAttachmentBatch(@RequestBody List<Long> ids) {
@@ -149,10 +152,10 @@ public class InspectionProblemController extends BladeController {
 
     /**
      * 批量插入巡检问题处理过程附件信息
+     *
      * @param ids 过程id以及文件id集合
      * @return 结果整型数
      */
-
     @RequestMapping("/addProblemHandleAttachment")
     @ResponseBody
     public R addProblemHandleAttachment(@RequestBody List<String> ids) {

HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/reservoir-baseinfo-service/src/main/java/org/springblade/reservoirbase/controller/WqLrinfBController.java

@@ -11,10 +11,13 @@ import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.reservoirbase.entity.WqLrinfB;
+import org.springblade.reservoirbase.service.ITransferService;
 import org.springblade.reservoirbase.service.IWqLrinfBService;
 import org.springblade.reservoirbase.util.ParamUtil;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.List;
@@ -23,13 +26,13 @@ import java.util.Map;
 @RestController
 @RequestMapping("/reservoirBaseInfo/wqLrinfB")
 @AllArgsConstructor
-@Api(value = "湖库信息", tags = "湖库信息接口")
+@Api(value = "划界管理", tags = "划界管理")
 public class WqLrinfBController extends BladeController implements CacheNames {
+
     private final IWqLrinfBService wqLrinfBService;
 
-    /**
+    private final ITransferService iTransferService;
-     * 分页
+
-     */
     @GetMapping("/pageList")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "lrcd", value = "湖库代码", paramType = "query", dataType = "string"),
@@ -37,16 +40,23 @@ public class WqLrinfBController extends BladeController implements CacheNames {
             @ApiImplicitParam(name = "lrnm", value = "湖（库）名称", paramType = "query", dataType = "string")
     })
     @ApiOperationSupport(order = 1)
-    @ApiOperation(value = "分页", notes = "传入wqLrinfB")
+    @ApiOperation(value = "分页查询", notes = "传入wqLrinfB")
     public R<IPage<WqLrinfB>> pageList(@ApiIgnore @RequestParam Map<String, Object> param, Query query) {
         LambdaQueryWrapper<WqLrinfB> wrapper = ParamUtil.conditionWqLrinfB(param);
         IPage<WqLrinfB> pages = wqLrinfBService.page(Condition.getPage(query), wrapper);
         return R.data(pages);
     }
 
-    /**
+    @PostMapping(value = "/uploadFile")
-     * 列表
+    @ApiOperation(notes = "上传单个文件", value = "上传单个文件")
-     */
+    public R<String> uploadFile(@RequestParam("file") MultipartFile file) {
+        String path = iTransferService.addFile(file, "huajie");
+        if (StringUtil.isNoneBlank(path)) {
+            return R.data(path);
+        } else {
+            return R.fail("上传失败");
+        }
+    }
     @GetMapping("/list")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "stcd", value = "测站编码", paramType = "query", dataType = "string"),
@@ -61,10 +71,6 @@ public class WqLrinfBController extends BladeController implements CacheNames {
         return R.data(list);
     }
 
-
-    /**
-     * 详情
-     */
     @GetMapping("/detail")
     @ApiOperationSupport(order = 3)
     @ApiOperation(value = "详情", notes = "传入wqLrinfB")
@@ -73,14 +79,11 @@ public class WqLrinfBController extends BladeController implements CacheNames {
         return R.data(detail);
     }
 
-    /**
-     * 新增
-     */
     @PostMapping("/save")
     @ApiOperationSupport(order = 4)
     @ApiOperation(value = "新增", notes = "传入wqLrinfB")
     public R save(@RequestBody WqLrinfB wqLrinfB) {
-        LambdaQueryWrapper<WqLrinfB> wrapper=new LambdaQueryWrapper();
+        /*LambdaQueryWrapper<WqLrinfB> wrapper=new LambdaQueryWrapper();
         wrapper.eq(WqLrinfB::getLrcd,wqLrinfB.getLrcd());
         List<WqLrinfB> list =wqLrinfBService.list(wrapper);
         if(list!=null && !list.isEmpty()){
@@ -92,13 +95,10 @@ public class WqLrinfBController extends BladeController implements CacheNames {
         list =wqLrinfBService.list(wrapper);
         if(list!=null && !list.isEmpty()){
             return R.fail("湖库名称已存在");
-        }
+        }*/
         return R.status(wqLrinfBService.save(wqLrinfB));
     }
 
-    /**
-     * 修改
-     */
     @PostMapping("/update")
     @ApiOperationSupport(order = 5)
     @ApiOperation(value = "修改", notes = "传入wqLrinfB")
@@ -106,9 +106,6 @@ public class WqLrinfBController extends BladeController implements CacheNames {
         return R.status(wqLrinfBService.updateById(wqLrinfB));
     }
 
-    /**
-     * 删除
-     */
     @PostMapping("/remove")
     @ApiOperationSupport(order = 6)
     @ApiOperation(value = "逻辑删除", notes = "ids")

HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/reservoir-baseinfo-service/src/main/java/org/springblade/reservoirbase/service/ITransferService.java

@@ -0,0 +1,13 @@
+package org.springblade.reservoirbase.service;
+
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+public interface ITransferService {
+
+    String addFile(MultipartFile file,String childPath);
+
+    List<String> addFiles(MultipartFile[] files,String childPath);
+
+}

HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/reservoir-baseinfo-service/src/main/java/org/springblade/reservoirbase/service/impl/TransferServiceImpl.java

@@ -0,0 +1,64 @@
+package org.springblade.reservoirbase.service.impl;
+
+import org.apache.commons.io.FileUtils;
+import org.springblade.reservoirbase.service.ITransferService;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+@Service
+public class TransferServiceImpl implements ITransferService {
+
+    @Value("${file.upload.path}")
+    private String fileUploadPath;
+
+    @Override
+    public String addFile(MultipartFile file, String childPath) {
+        MultipartFile[] files = new MultipartFile[1];
+        files[0] = file;
+        return addFiles(files, childPath).get(0);
+    }
+
+    @Override
+    public List<String> addFiles(MultipartFile[] files, String childPath) {
+        List<String> list = new ArrayList<>();
+        String dirName = UUID.randomUUID().toString().replace("-", "");
+        File uploadPath = new File(fileUploadPath, childPath);
+        uploadPath = new File(uploadPath, dirName);
+        try {
+            if (!uploadPath.exists()) {
+                uploadPath.mkdirs();
+            }
+            for (MultipartFile file : files) {
+                saveFile(file, uploadPath);
+                list.add(File.separator + childPath + File.separator + dirName + File.separator + file.getOriginalFilename());
+            }
+            return list;
+        } catch (IOException e) {
+            return list;
+        }
+    }
+
+    /**
+     * 保存文件,如果后期有要求需要处理重名情况
+     *
+     * @param file       待保存的文件
+     * @param uploadPath 上传的路径
+     * @throws IOException
+     */
+    private void saveFile(MultipartFile file, File uploadPath) throws IOException {
+        String originalName = file.getOriginalFilename();
+        File path = new File(uploadPath, originalName);
+        if (!path.exists()) {
+            path.createNewFile();
+        }
+        FileUtils.copyInputStreamToFile(file.getInputStream(), path);
+    }
+
+}

HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/reservoir-baseinfo-service/src/main/java/org/springblade/reservoirbase/util/ParamUtil.java

@@ -63,7 +63,7 @@ public class ParamUtil {
 
     public static LambdaQueryWrapper<WqLrinfB> conditionWqLrinfB(Map<String, Object> param){
         LambdaQueryWrapper<WqLrinfB> wrapper=new LambdaQueryWrapper();
-        if(param.get("lrcd")!=null) {
+  /*      if(param.get("lrcd")!=null) {
             wrapper.like(WqLrinfB::getLrcd,param.get("lrcd"));
         }
         if(param.get("lrnm")!=null) {
@@ -71,7 +71,7 @@ public class ParamUtil {
         }
         if(param.get("watp")!=null) {
             wrapper.eq(WqLrinfB::getWatp,param.get("watp"));
-        }
+        }*/
         return wrapper;
     }
 

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

@@ -0,0 +1,184 @@
+#数据源配置
+spring:
+  datasource:
+    dynamic:
+      enabled: true
+      primary: mysql #设置默认的数据源或者数据源组,默认值即为master
+      strict: true #设置严格模式,默认false不启动. 启动后在未匹配到指定数据源时候会抛出异常,不启动则使用默认数据源.
+      datasource:
+        mysql:
+          url: jdbc:mysql://192.168.1.58:3576/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: hzinfo
+          password: 1qaz2WSX!
+        slave:
+          url: jdbc:mysql://192.168.1.58:3576/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: 1qaz2WSX!
+        tdengine:
+          db-type: postgresql
+          driver-class-name: com.taosdata.jdbc.rs.RestfulDriver
+          url: jdbc:TAOS-RS://192.168.1.202:6041/hzinfo_data?timezone=UTC-8&charset=UTF-8&locale=en_US.UTF-8
+          username: root
+          password: taosdata
+  redis:
+    host: 192.168.1.58  #本地redis
+    port: 3577
+    password: L_MM&h=+Nm&p)U9sk.uH
+    database: 0
+    ssl: false
+    timeout: 3000
+
+
+jedis:
+  pool:
+    maxActive: 100
+    maxIdle: 50
+    maxWait: 1500
+    testOnBorrow: true
+    testOnReturn: true
+
+blade:
+  notCkeckTenantId: "200000"
+  sdk:
+    signatrue:
+      enabled: false
+  analyze-data:
+    minute-days: 30
+    socond-hour: 6
+    day-day: 365
+  soe-shake:
+    open: true
+    second: 60
+  data:
+    sdk:
+      enabled: true
+      url: http://127.0.0.1:7502/api/hzinfo-data-config  #nignx后台代理端口
+      appId: '1529342971768860673'
+      appSecret: 3b599c56a6c6c2d35dcfb7e63d04414f
+    backups: true
+    yc-batch-number: 50
+    yx-batch-number: 50
+    soe-batch-number: 20
+    stations:
+      - stationId: 999999
+        delay: 10
+      - stationId: 12345654321
+        delay: 10
+      - stationId: 999900000002
+        delay: 10
+  datasource:
+    socket:
+      tdengine:
+        url: ${spring.datasource.dynamic.datasource.tdengine.url}
+        username: ${spring.datasource.dynamic.datasource.tdengine.username}
+        password: ${spring.datasource.dynamic.datasource.tdengine.password}
+  mqtt:
+    enabled: true
+    userName: hzinfo
+    password: hz123456
+    urls: tcp://192.168.1.58: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
+
+file:
+  upload:
+    path: D:\\upload
+  excel:
+    excelUrl: D:\\upload\\excelResult
+    excelImage: D:\\upload\\excelResult\\excelImage
+
+
+
+hzinfo:
+  task:
+    pdf:
+      # pdf模板路径 ，请配置绝对路径
+      # module-path: /data/inspect/pdf/templet/inspectObj.html # linux
+      module-path: D:\upload\hzinfo\pdf\templet\inspectObj.html # windows
+      # pdf文件存储路径，请配置绝对路径
+      # file-path: /data/inspect/pdf/file # linux
+      file-path: D:/upload/hzinfo/file # windows
+
+hzims:
+  inspect:
+    task:
+      templateCode:
+        #巡检任务开始前发送短信信息阿里云模板
+        taskBegin: aliyun-task-begin
+        #巡检任务结束前发送短信信息阿里云模板
+        taskEnd: aliyun-task-end
+        #巡检消息推送模板 - 极光
+      jgPushCode: hzinfo-inspect
+  duty:
+    file-path: "D:/upload/duty"
+
+sms:
+  aliyun:
+    templateCode:
+      warn: SMS_167050010
+  connectTimeout: 10000
+  readTimeout: 10000
+  accessKeyId: LTAIdaVZqHxfh10d
+  accessKeySecret: HLIrI0mGhGdlvnU1h64ewShSF58VGg
+  profilePoint: cn-changsha
+  endPoint: cn-changsha
+  signName: \u534E\u81EA\u79D1\u6280
+
+emergency:
+  plan:
+    enable:
+      suffix: doc,docx,pdf,xls,xlsx,csv,jpg,png,mkv,mp3,mp4,wmv
+
+
+hz3000:
+  runtime:
+    setting: D:/HZ3000/runtime/info/factory.fac
+    network:
+      windows: D:/hz3000/runtime/info/network.xml
+      linux: /home/hz3000/info/network.xml
+    #====linux====
+  dll:
+    path:
+      linux: /home/hz3000/dlls/sysdlls/
+  fiveprevention:
+    dll:
+      linux: libfiveprevention.so
+  read:
+    dll:
+      name:
+        linux: libReadData.so
+  write:
+    dll:
+      name:
+        linux: libWriteData.so
+
+
+soe:
+  wait:
+    interval: 500
+    time: 120000
+  interval: 30000
+  show:
+    number: 10
+expire:
+  time: 15
+
+dynamic:
+  file:
+    path: D:\\nginx-1.18.0\\html\\HZInfo/hz3000data/
+
+
+
+wd:
+  gisUrl: http://175.6.40.67:8053
+  areaCodes: 430225000000
+  areaCode: 430225000000
+  gisCodes: bigemap.bj8061hz
+  gisLevel: 2
+  stcd: 360301002
+
+tencent:
+  push:
+    appId: 1580011926
+    secretKey: ae7e4b5fd20c3599113b6ebfbf82e7ea