Merge branch 'develop_tzs_ymt' into develop_tzs_register

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/config/RedissonManager.java

@@ -24,25 +24,25 @@ public class RedissonManager {
     /**
      * 公共-密码
      */
-    @Value("${spring.redis.password}")
+    @Value("${spring.redis.password:default}")
     private String password;
 
     /**
      * 单机环境使用
      */
-    @Value("${spring.redis.host}")
+    @Value("${spring.redis.host:default}")
     private String host;
 
     /**
      * 单机环境使用
      */
-    @Value("${spring.redis.port}")
+    @Value("${spring.redis.port:6379}")
     private String port;
 
     /**
      * 单机环境使用
      */
-    @Value("${spring.redis.database}")
+    @Value("${spring.redis.database:0}")
     private int database;
 
     @Bean

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/service/impl/AlertCalledServiceImpl.java

@@ -62,6 +62,7 @@ import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.time.ZoneOffset;
 import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
@@ -864,7 +865,7 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
     private long calculateExpirationTime() {
         LocalDateTime now = LocalDateTime.now();
         LocalDateTime nextDay = now.plus(1, ChronoUnit.DAYS).withHour(0).withMinute(0).withSecond(0).withNano(0);
-        return nextDay.toInstant(ZoneOffset.of("+0")).toEpochMilli();
+        return nextDay.atZone(ZoneId.systemDefault()).toInstant().toEpochMilli();
     }
 
 

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/service/impl/TzsCitInfoServiceImpl.java

@@ -88,12 +88,12 @@ public class TzsCitInfoServiceImpl extends BaseService<TzsCitInfoDto, TzsCitInfo
                 return massage;
             }
         }
-        if(!extphone.equals(tzsCitInfo.getExtphone())) {
-            if (!ValidationUtil.isEmpty(this.list(new LambdaQueryWrapper<TzsCitInfo>().eq(TzsCitInfo::getExtphone, tzsCitInfo.getExtphone())))) {
-                massage = "登录坐席参数extphone已存在，不可重复添加！";
-                return massage;
-            }
-        }
+//        if(!extphone.equals(tzsCitInfo.getExtphone())) {
+//            if (!ValidationUtil.isEmpty(this.list(new LambdaQueryWrapper<TzsCitInfo>().eq(TzsCitInfo::getExtphone, tzsCitInfo.getExtphone())))) {
+//                massage = "登录坐席参数extphone已存在，不可重复添加！";
+//                return massage;
+//            }
+//        }
 
         //保存数据
         if(!ValidationUtil.isEmpty(tzsCitInfo.getCtiUserId())) {

amos-boot-system-tzs/amos-boot-module-app/amos-boot-module-app-api/src/main/java/com/yeejoin/amos/boot/module/app/api/dto/CylinderEquBaseInfoForWXModel.java

+package com.yeejoin.amos.boot.module.app.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "OtherEquBaseInfoForWXModel", description = "")
+public class CylinderEquBaseInfoForWXModel extends EquipTechParamBoilerModel{
+
+    @ApiModelProperty(value = "气瓶充装介M质")
+    private String fillingMedium;
+
+    @ApiModelProperty(value = "充装量")
+    private String fillingCapacity;
+
+    @ApiModelProperty(value = "最近一次充装时间")
+    private String lastFillingTime;
+
+    @ApiModelProperty(value = "使用期限")
+    private String termOfUse;
+}

amos-boot-system-tzs/amos-boot-module-app/amos-boot-module-app-api/src/main/java/com/yeejoin/amos/boot/module/app/api/dto/ElevatorBaseInfoForWXModel.java

@@ -6,32 +6,17 @@ import lombok.Data;
 
 @Data
 @ApiModel(value = "ElevatorBaseInfoForWXModel", description = "")
-public class ElevatorBaseInfoForWXModel {
+public class ElevatorBaseInfoForWXModel extends EquBaseInfoForWXModel{
 
     @ApiModelProperty(value = "电梯识别码")
     private String code96333;
 
-    @ApiModelProperty(value = "设备代码")
-    private String equCode;
-
-    @ApiModelProperty(value = "使用登记证编号")
-    private String useOrgCode;
-
-    @ApiModelProperty(value = "设备类别")
-    private String equCategory;
-
     @ApiModelProperty(value = "制造单位名")
     private String produceUnitName;
 
     @ApiModelProperty(value = "出厂编号")
     private String factoryNum;
 
-    @ApiModelProperty(value = "所属区域")
-    private String area;
-
     @ApiModelProperty(value = "使用地址")
     private String address;
-
-    @ApiModelProperty(value = "单位内编号")
-    private String intraUnitNumber;
 }

amos-boot-system-tzs/amos-boot-module-app/amos-boot-module-app-api/src/main/java/com/yeejoin/amos/boot/module/app/api/dto/EquBaseInfoForWXModel.java

+package com.yeejoin.amos.boot.module.app.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "EquBaseInfoForWXModel", description = "")
+public class EquBaseInfoForWXModel {
+
+    @ApiModelProperty(value = "设备代码")
+    private String equCode;
+
+    @ApiModelProperty(value = "使用登记证编号")
+    private String useOrgCode;
+
+    @ApiModelProperty(value = "设备类别")
+    private String equCategory;
+
+    @ApiModelProperty(value = "所属区域")
+    private String county;
+
+    @ApiModelProperty(value = "单位内编号")
+    private String intraUnitNumber;
+
+
+}

amos-boot-system-tzs/amos-boot-module-app/amos-boot-module-app-api/src/main/java/com/yeejoin/amos/boot/module/app/api/dto/OtherEquBaseInfoForWXModel.java

@@ -6,30 +6,11 @@ import lombok.Data;
 
 @Data
 @ApiModel(value = "OtherEquBaseInfoForWXModel", description = "")
-public class OtherEquBaseInfoForWXModel {
-
-
-    @ApiModelProperty(value = "设备代码")
-    private String equCode;
-
-    @ApiModelProperty(value = "使用登记证编号")
-    private String useOrgCode;
-
-    @ApiModelProperty(value = "设备类别")
-    private String equCategory;
+public class OtherEquBaseInfoForWXModel extends  EquBaseInfoForWXModel{
 
     @ApiModelProperty(value = "制造单位名")
     private String produceUnitName;
 
     @ApiModelProperty(value = "出厂编号")
     private String factoryNum;
-
-    @ApiModelProperty(value = "所属区域")
-    private String area;
-
-    @ApiModelProperty(value = "使用地址")
-    private String address;
-
-    @ApiModelProperty(value = "单位内编号")
-    private String intraUnitNumber;
 }

amos-boot-system-tzs/amos-boot-module-app/amos-boot-module-app-api/src/main/java/com/yeejoin/amos/boot/module/app/flc/api/feign/IdxFeignService.java

@@ -11,7 +11,8 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
 import java.util.List;
 import java.util.Map;
 
-@FeignClient(value = "AMOS-IDX", path = "idx", configuration = {FeignConfiguration.class})
+@FeignClient(value = "AMOS-IDX", path = "idx", configuration =
+        {FeignConfiguration.class})
 public interface IdxFeignService {
 
     @RequestMapping("/dimensionTable/getTreeChildIds")