Merge branch 'master' of http://111.47.6.224:3000/udream-cxs/lift-server.git

lift-batch-service/src/main/resources/application-prod.yml

@@ -1,6 +1,6 @@
 spring:
   datasource:
-    url: jdbc:mysql://rm-bp1qkwy173koi066x.mysql.rds.aliyuncs.com:3306/rdsliftmanager?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://rm-bp1qkwy173koi066xuo.mysql.rds.aliyuncs.com:3306/rdsliftmanager?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
     username: tykj
     password: Tdkg-13250409
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -8,7 +8,7 @@ spring:
   #redis缓存配置
   redis:
     database: 0 #数据库索引，默认为0
-    host: r-bp1j7odydtfqtprdvm.redis.rds.aliyuncs.com #(内网地址)服务器地址
+    host: r-bp1j7odydtfqtprdvmpd.redis.rds.aliyuncs.com #(外网地址)服务器地址
     port: 6379 #端口
     password: Gdkc-290431 #验证密码
     jedis:

lift-batch-service/src/main/resources/application-web.yml

@@ -8,7 +8,7 @@ spring:
   #redis缓存配置
   redis:
     database: 0 #数据库索引，默认为0
-    host: r-bp1j7odydtfqtprdvmpd.redis.rds.aliyuncs.com #(内网地址)服务器地址
+    host: r-bp1j7odydtfqtprdvmpd.redis.rds.aliyuncs.com #(外网地址)服务器地址
     port: 6379 #端口
     password: Gdkc-290431 #验证密码
     jedis:

lift-batch-service/src/main/resources/bootstrap.yml

@@ -20,5 +20,5 @@ eureka:
     lease-expiration-duration-in-seconds: 20
   client:
     service-url:
-      defaultZone: http://172.16.24.142:10225/eureka/
+      defaultZone: http://192.168.1.121:10225/eureka/
 

lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/dao/entity/MaintenanceRecord.java

@@ -194,4 +194,7 @@ public class MaintenanceRecord extends BaseEntity {
 	 */
 	@TableField(exist = false)
 	private List<MtRecordCost> mtRecordCosts;
+
+	@TableField(exist = false)
+	private Integer category;
 }

lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/service/MaintenanceRecordService.java

@@ -562,6 +562,9 @@ public class MaintenanceRecordService extends ServiceImpl<MaintenanceRecordMappe
         MaintenanceRecord record = getById(id);
         List<MtRecordImg> imgList = mtRecordImgService.listByRecord(id);
         MaintenanceRecordDetailResponse response = new MaintenanceRecordDetailResponse();
+        log.debug("设置电梯种类");
+        Long liftId = record.getLiftId();
+        record.setCategory(liftService.getById(liftId).getCategory());
         response.setRecord(record);
         response.setRecordImageList(imgList);
         return response;

lift-business-service/src/main/resources/application-prod.yml

@@ -1,6 +1,6 @@
 spring:
   datasource:
-    url: jdbc:mysql://rm-bp1qkwy173koi066x.mysql.rds.aliyuncs.com:3306/rdsliftmanager?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://rm-bp1qkwy173koi066xuo.mysql.rds.aliyuncs.com:3306/rdsliftmanager?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
     username: tykj
     password: Tdkg-13250409
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -8,7 +8,7 @@ spring:
   #redis缓存配置
   redis:
     database: 0 #数据库索引，默认为0
-    host: r-bp1j7odydtfqtprdvm.redis.rds.aliyuncs.com #(内网地址)服务器地址
+    host: r-bp1j7odydtfqtprdvmpd.redis.rds.aliyuncs.com #(外网地址)服务器地址
     port: 6379 #端口
     password: Gdkc-290431 #验证密码
     jedis:
@@ -20,7 +20,7 @@ spring:
     timeout: 600000s
   activemq:
     #ActiveMQ通讯地址
-    broker-url: tcp://172.16.24.145:61616
+    broker-url: tcp://121.40.209.47:61616
     #用户名
     user: admin
     #密码

lift-business-service/src/main/resources/bootstrap.yml

@@ -20,5 +20,5 @@ eureka:
     lease-expiration-duration-in-seconds: 20
   client:
     service-url:
-      defaultZone: http://172.16.24.142:10225/eureka/
+      defaultZone: http://192.168.1.121:10225/eureka/
 

lift-enterprise-service/src/main/resources/application-prod.yml

@@ -1,6 +1,6 @@
 spring:
   datasource:
-    url: jdbc:mysql://rm-bp1qkwy173koi066x.mysql.rds.aliyuncs.com:3306/rdsliftmanager?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://rm-bp1qkwy173koi066xuo.mysql.rds.aliyuncs.com:3306/rdsliftmanager?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
     username: tykj
     password: Tdkg-13250409
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -8,7 +8,7 @@ spring:
   #redis缓存配置
   redis:
     database: 0 #数据库索引，默认为0
-    host: r-bp1j7odydtfqtprdvm.redis.rds.aliyuncs.com #(内网地址)服务器地址
+    host: r-bp1j7odydtfqtprdvmpd.redis.rds.aliyuncs.com #(外网地址)服务器地址
     port: 6379 #端口
     password: Gdkc-290431 #验证密码
     jedis:
@@ -22,7 +22,7 @@ spring:
   #消息队列配置
   activemq:
     #ActiveMQ通讯地址
-    broker-url: tcp://172.16.24.145:61616
+    broker-url: tcp://121.40.209.47:61616
     #用户名
     user: admin
     #密码

lift-enterprise-service/src/main/resources/bootstrap.yml

@@ -20,4 +20,4 @@ eureka:
     lease-expiration-duration-in-seconds: 20
   client:
     service-url:
-      defaultZone: http://172.16.24.142:10225/eureka/
+      defaultZone: http://192.168.1.121:10225/eureka/

lift-push-pc/src/main/resources/application-prod.yml

@@ -1,6 +1,6 @@
 spring:
   datasource:
-    url: jdbc:mysql://rm-bp1qkwy173koi066x.mysql.rds.aliyuncs.com:3306/rdsliftmanager?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://rm-bp1qkwy173koi066xuo.mysql.rds.aliyuncs.com:3306/rdsliftmanager?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
     username: tykj
     password: Tdkg-13250409
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -8,7 +8,7 @@ spring:
   #redis缓存配置
   redis:
     database: 0 #数据库索引，默认为0
-    host: r-bp1j7odydtfqtprdvm.redis.rds.aliyuncs.com #(内网地址，上线改为内网地址)服务器地址
+    host: r-bp1j7odydtfqtprdvmpd.redis.rds.aliyuncs.com #(外网地址，上线改为内网地址)服务器地址
     port: 6379 #端口
     password: Gdkc-290431 #验证密码
     jedis:
@@ -22,7 +22,7 @@ spring:
   # activemq配置
   activemq:
     #ActiveMQ通讯地址
-    broker-url: tcp://172.16.24.145:61616
+    broker-url: tcp://121.40.209.47:61616
     #用户名
     user: admin
     #密码

lift-push/src/main/resources/application-prod.yml

@@ -1,6 +1,6 @@
 spring:
   datasource:
-    url: jdbc:mysql://rm-bp1qkwy173koi066x.mysql.rds.aliyuncs.com:3306/rdsliftmanager?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://rm-bp1qkwy173koi066xuo.mysql.rds.aliyuncs.com:3306/rdsliftmanager?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
     username: tykj
     password: Tdkg-13250409
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -8,7 +8,7 @@ spring:
   #redis缓存配置
   redis:
     database: 0 #数据库索引，默认为0
-    host: r-bp1j7odydtfqtprdvm.redis.rds.aliyuncs.com #(内网地址)服务器地址
+    host: r-bp1j7odydtfqtprdvmpd.redis.rds.aliyuncs.com #(外网地址)服务器地址
     port: 6379 #端口
     password: Gdkc-290431 #验证密码
     jedis:
@@ -20,7 +20,7 @@ spring:
     timeout: 600000s
   activemq:
     #ActiveMQ通讯地址
-    broker-url: tcp://172.16.24.145:61616
+    broker-url: tcp://121.40.209.47:61616
     #用户名
     user: admin
     #密码

lift-push/src/main/resources/bootstrap.yml

@@ -20,5 +20,5 @@ eureka:
     lease-expiration-duration-in-seconds: 20
   client:
     service-url:
-      defaultZone: http://172.16.24.142:10225/eureka/
+      defaultZone: http://192.168.1.121:10225/eureka/
 

lift-quan-service/src/main/resources/application-prod.yml

@@ -1,6 +1,6 @@
 spring:
   datasource:
-    url: jdbc:mysql://rm-bp1qkwy173koi066x.mysql.rds.aliyuncs.com:3306/rdsliftmanager?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://rm-bp1qkwy173koi066xuo.mysql.rds.aliyuncs.com:3306/rdsliftmanager?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
     username: tykj
     password: Tdkg-13250409
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -8,7 +8,7 @@ spring:
   #redis缓存配置
   redis:
     database: 0 #数据库索引，默认为0
-    host: r-bp1j7odydtfqtprdvm.redis.rds.aliyuncs.com #(内网地址)服务器地址
+    host: r-bp1j7odydtfqtprdvmpd.redis.rds.aliyuncs.com #(外网地址)服务器地址
     port: 6379 #端口
     password: Gdkc-290431 #验证密码
     jedis:
@@ -20,7 +20,7 @@ spring:
     timeout: 600000
   activemq:
     #ActiveMQ通讯地址
-    broker-url: tcp://172.16.24.145:61616
+    broker-url: tcp://121.40.209.47:61616
     #用户名
     user: admin
     #密码

lift-quan-service/src/main/resources/bootstrap.yml

@@ -20,5 +20,5 @@ eureka:
     lease-expiration-duration-in-seconds: 20
   client:
     service-url:
-      defaultZone: http://172.16.24.142:10225/eureka/
+      defaultZone: http://192.168.1.121:10225/eureka/
 

lift-system-service/src/main/resources/application-prod.yml

@@ -1,6 +1,6 @@
 spring:
   datasource:
-    url: jdbc:mysql://rm-bp1qkwy173koi066x.mysql.rds.aliyuncs.com:3306/rdsliftmanager?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://rm-bp1qkwy173koi066xuo.mysql.rds.aliyuncs.com:3306/rdsliftmanager?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
     username: tykj
     password: Tdkg-13250409
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -8,7 +8,7 @@ spring:
   #redis缓存配置
   redis:
     database: 0 #数据库索引，默认为0
-    host: r-bp1j7odydtfqtprdvm.redis.rds.aliyuncs.com #(内网地址，上线改为内网地址)服务器地址
+    host: r-bp1j7odydtfqtprdvmpd.redis.rds.aliyuncs.com #(外网地址，上线改为内网地址)服务器地址
     port: 6379 #端口
     password: Gdkc-290431 #验证密码
     jedis:
@@ -21,7 +21,7 @@ spring:
   # activeMQ 移动端消息推送配置
   activemq:
     #ActiveMQ通讯地址
-    broker-url: tcp://172.16.24.145:61616
+    broker-url: tcp://121.40.209.47:61616
     #用户名
     user: admin
     #密码

lift-system-service/src/main/resources/bootstrap.yml

@@ -20,5 +20,5 @@ eureka:
     lease-expiration-duration-in-seconds: 20
   client:
     service-url:
-      defaultZone: http://172.16.24.142:10225/eureka/
+      defaultZone: http://192.168.1.121:10225/eureka/
 

lift-ud-service/src/main/resources/application-prod.yml

@@ -8,7 +8,7 @@ spring:
   #redis缓存配置
   redis:
     database: 0 #数据库索引，默认为0
-    host: r-bp1j7odydtfqtprdvmpd.redis.rds.aliyuncs.com #服务器地址
+    host: r-bp1j7odydtfqtprdvmpd.redis.rds.aliyuncs.com #外网服务器地址
     port: 6379 #端口
     password: Gdkc-290431 #验证密码
     jedis: