add->修改 维保记录只匹配worker_id1字段

lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/dao/mapper/MaintenancePlanMapper.java

@@ -60,6 +60,6 @@ public interface MaintenancePlanMapper extends BaseMapper<MaintenancePlan> {
     Long getCountByPlanId(Long planId);
 
     @Select("select (select value from global_set where company_id = #{mtCompanyId}  and code = 'sameUnits') >" +
-            "       (select count(*) from maintenance_record where mt_company_id=#{mtCompanyId} and (worker_id1 = #{workerId1} or worker_id = #{workerId1}) and status = '1' and DATE_FORMAT(work_date, '%Y-%m-%d') = #{today})")
+            "       (select count(*) from maintenance_record where mt_company_id=#{mtCompanyId} and (worker_id1 = #{workerId1}) and status = '1' and DATE_FORMAT(work_date, '%Y-%m-%d') = #{today})")
     boolean selectLiftMaintainableBy(Long workerId1, Long mtCompanyId, String today);
 }

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

@@ -1,6 +1,6 @@
 spring:
   datasource:
-    url: jdbc:mysql://rm-bp1qkwy173koi066xuo.mysql.rds.aliyuncs.com:3306/rdsliftmanager?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://rm-bp1qkwy173koi066x.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-bp1j7odydtfqtprdvmpd.redis.rds.aliyuncs.com #(外网地址)服务器地址
+    host: r-bp1j7odydtfqtprdvm.redis.rds.aliyuncs.com #(内网地址)服务器地址
     port: 6379 #端口
     password: Gdkc-290431 #验证密码
     jedis:
@@ -20,7 +20,7 @@ spring:
     timeout: 600000s
   activemq:
     #ActiveMQ通讯地址
-    broker-url: tcp://121.40.209.47:61616
+    broker-url: tcp://172.16.24.145:61616
     #用户名
     user: admin
     #密码
@@ -48,9 +48,9 @@ spring:
 #aliyun OSS服务配置信息，加载到SystemConfiguration
 aliyun:
   oss:
-#    endpoint: http://oss-cn-hangzhou.aliyuncs.com
+    #    endpoint: http://oss-cn-hangzhou.aliyuncs.com
     #使用内网需要把返回的路径 -internal去掉，不然外网无法访问
-    endpoint: http://oss-cn-hangzhou.aliyuncs.com
+    endpoint: http://oss-cn-hangzhou-internal.aliyuncs.com
     bucketName: ty-oss-file
     accessKeyId: LTAI4G1iLTczu8JxM2En57gY
     accessKeySecret: VHeRj3C2br87Uh447ruHsSTvYSDWeC

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

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

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

@@ -1,6 +1,6 @@
 spring:
   datasource:
-    url: jdbc:mysql://rm-bp1qkwy173koi066xuo.mysql.rds.aliyuncs.com:3306/rdsliftmanager?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://rm-bp1qkwy173koi066x.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-bp1j7odydtfqtprdvmpd.redis.rds.aliyuncs.com #(外网地址)服务器地址
+    host: r-bp1j7odydtfqtprdvm.redis.rds.aliyuncs.com #(内网地址)服务器地址
     port: 6379 #端口
     password: Gdkc-290431 #验证密码
     jedis:
@@ -18,11 +18,9 @@ spring:
         max-wait: 20000ms
         min-idle: 0
     timeout: 600000s
-
-  #消息队列配置
   activemq:
     #ActiveMQ通讯地址
-    broker-url: tcp://121.40.209.47:61616
+    broker-url: tcp://172.16.24.145:61616
     #用户名
     user: admin
     #密码
@@ -42,11 +40,17 @@ spring:
   jms:
     #如果是点对点（queue），那么此处默认应该是false，如果发布订阅，那么一定设置为true
     pub-sub-domain: false
+  servlet:
+    multipart:
+      #配置文件接收大小最大为3MB
+      max-file-size: 3MB
 
 #aliyun OSS服务配置信息，加载到SystemConfiguration
 aliyun:
   oss:
-    endpoint: http://oss-cn-hangzhou.aliyuncs.com
+    #    endpoint: http://oss-cn-hangzhou.aliyuncs.com
+    #使用内网需要把返回的路径 -internal去掉，不然外网无法访问
+    endpoint: http://oss-cn-hangzhou-internal.aliyuncs.com
     bucketName: ty-oss-file
     accessKeyId: LTAI4G1iLTczu8JxM2En57gY
     accessKeySecret: VHeRj3C2br87Uh447ruHsSTvYSDWeC

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

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