瀏覽代碼

[chg] 维保单审核,补录和继续填写,删除收费项

wcz 5 年之前
父節點
當前提交
22bff63291
共有 21 個文件被更改,包括 136 次插入88 次删除
  1. 5 5
      lift-business-service/src/main/java/cn/com/ty/lift/business/library/dao/entity/Lift.java
  2. 12 15
      lift-business-service/src/main/java/cn/com/ty/lift/business/library/dao/entity/model/LiftImportModel.java
  3. 14 4
      lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/controller/MaintenanceRecordController.java
  4. 0 8
      lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/dao/entity/MaintenancePlan.java
  5. 1 0
      lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/dao/entity/MaintenanceRecord.java
  6. 13 0
      lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/dao/entity/model/response/MtPlanResponse.java
  7. 9 0
      lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/dao/entity/model/response/MtRecordResponse.java
  8. 20 5
      lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/service/MaintenanceRecordService.java
  9. 4 3
      lift-business-service/src/main/resources/application-dev.yml
  10. 3 4
      lift-enterprise-service/src/main/resources/application-web.yml
  11. 1 1
      lift-business-service/src/main/resources/application.yml
  12. 5 5
      lift-business-service/src/main/resources/mapper/lift/LiftMapper.xml
  13. 6 1
      lift-business-service/src/main/resources/mapper/maintenance/MaintenancePlanMapper.xml
  14. 6 0
      lift-business-service/src/main/resources/mapper/maintenance/MaintenanceRecordMapper.xml
  15. 15 1
      lift-enterprise-service/src/main/resources/application-dev.yml
  16. 13 0
      lift-enterprise-service/src/main/resources/application-dev1.yml
  17. 1 1
      lift-enterprise-service/src/main/resources/application.yml
  18. 3 4
      lift-system-service/src/main/resources/application-dev.yml
  19. 4 3
      lift-business-service/src/main/resources/application-web.yml
  20. 0 27
      lift-system-service/src/main/resources/application-web.yml
  21. 1 1
      lift-system-service/src/main/resources/application.yml

+ 5 - 5
lift-business-service/src/main/java/cn/com/ty/lift/business/library/dao/entity/Lift.java

@@ -32,7 +32,7 @@ public class Lift extends BaseEntity {
     /**
      * 电梯类别(1:曳引梯;2:液压梯;3:杂物梯;4:自动扶梯;5:自动人行道)
      */
-    private Byte category;
+    private Integer category;
 
     /**
      * 电梯类型(1:直梯;2:扶梯)
@@ -57,7 +57,7 @@ public class Lift extends BaseEntity {
     /**
      * 设备用途(11:货梯;12:客梯;13:医梯;14:观光梯;15:杂物梯;16:别墅梯;21:扶梯;22:人行道)
      */
-    private Byte deviceUsage;
+    private Integer deviceUsage;
 
     /**
      * 电梯品牌
@@ -132,7 +132,7 @@ public class Lift extends BaseEntity {
     /**
      * 安全钳类型(1:瞬时式安全钳;2:渐进式安全钳)
      */
-    private Byte clampType;
+    private Integer clampType;
 
     /**
      * 改造单位
@@ -172,7 +172,7 @@ public class Lift extends BaseEntity {
     /**
      * 顶升型式
      */
-    private Byte topType;
+    private Integer topType;
 
     /**
      * 控制方式
@@ -222,7 +222,7 @@ public class Lift extends BaseEntity {
     /**
      * 显示楼层
      */
-    private Byte innerFloor;
+    private Integer innerFloor;
 
     /**
      * 年检日期

+ 12 - 15
lift-business-service/src/main/java/cn/com/ty/lift/business/library/dao/entity/model/LiftImportModel.java

@@ -52,21 +52,19 @@ public class LiftImportModel {
     /**
      * 电梯类别(1:曳引梯;2:液压梯;3:杂物梯;4:自动扶梯;5:自动人行道)
      */
-    private Byte category;
-    public Byte getCategory(){
-        int index = categories.indexOf(categoryStr);
-        return new Byte(String.valueOf(index));
+    private Integer category;
+    public Integer getCategory(){
+        return categories.indexOf(categoryStr);
     }
     /**
      * 设备用途(11:货梯;12:客梯;13:医梯;14:观光梯;15:杂物梯;16:别墅梯;21:扶梯;22:人行道)
      */
     private String deviceUsageStr;
 
-    private Byte deviceUsage;
+    private Integer deviceUsage;
 
-    public Byte getDeviceUsage(){
-        int index = deviceUsages.indexOf(deviceUsageStr) + 11;
-        return new Byte(String.valueOf(index));
+    public Integer getDeviceUsage(){
+        return deviceUsages.indexOf(deviceUsageStr) + 11;
     }
 
     /**
@@ -78,11 +76,10 @@ public class LiftImportModel {
      */
     private String clampTypeStr;
 
-    private Byte clampType;
+    private Integer clampType;
 
-    public Byte getClampType(){
-        int index = clampTypes.indexOf(clampTypeStr);
-        return new Byte(String.valueOf(index));
+    public Integer getClampType(){
+        return clampTypes.indexOf(clampTypeStr);
     }
     /**
      * 电梯载重
@@ -105,14 +102,14 @@ public class LiftImportModel {
      */
     private String topTypeStr;
 
-    private Byte topType;
+    private Integer topType;
 
-    public Byte getTopType(){
+    public Integer getTopType(){
         int index = topTypes.indexOf(topTypeStr);
         if(index == -1){
             index = 0;
         }
-        return new Byte(String.valueOf(index));
+        return index;
     }
     /**
      * 控制方式

+ 14 - 4
lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/controller/MaintenanceRecordController.java

@@ -228,8 +228,17 @@ public class MaintenanceRecordController {
      */
     @PostMapping("add")
     public RestResponse add(@Valid @RequestBody MaintenanceRecord entity){
-        //app端添加,-1:待审核
-        entity.setStatus("-1");
+        /**
+         * app端添加维保单
+         * -3:没有维保记录(可以补录)null -> -3
+         * -2:已补录工单,(没有维保项,可以继续填写)
+         * -1:待审核(通过app端添加的),通过后台添加的,直接 ->3
+         */
+        if(StrUtil.isEmpty(entity.getMaintenanceOption())){
+            entity.setStatus("-2");
+        }else{
+            entity.setStatus("-1");
+        }
         entity.setIsRegular(0);
         //补录
         entity.setIsRepair(1);
@@ -242,7 +251,8 @@ public class MaintenanceRecordController {
     }
 
     /**
-     * 通过:app端提交的保养单点通过后生成正式保养单,清除超期; -> status:-1修改成0
+     * 通过:app端提交的保养单点通过后生成正式保养单  status:-1 -> 3
+     * 清除超期: 超期的计划修改status ->1,workDate -> now
      * @param request MtRecordRequest
      * @return RestResponse
      */
@@ -252,7 +262,7 @@ public class MaintenanceRecordController {
         MaintenanceRecord entity = maintenanceRecordService.getById(request.getId());
         Judge.notNull(entity);
         Judge.notTrue("-1".equals(entity.getStatus()),"维保单必须待审核才能操作");
-        entity.setStatus("0");
+        entity.setStatus("3");
         boolean result = maintenanceRecordService.pass(entity);
         return RestResponse.success(result);
     }

+ 0 - 8
lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/dao/entity/MaintenancePlan.java

@@ -72,12 +72,4 @@ public class MaintenancePlan extends BaseEntity {
      * 是否按需维保(0:否 1:是)
      */
     private String demand;
-    /**
-     * 关联维保记录的状态
-     * 0:没有维保记录(可以补录)
-     * 1:已补录工单,(可以继续填写)
-     * 2:待审核(通过app端添加的),通过后台添加的,直接 ->3
-     * 3:审核通过或者后台直接添加
-     */
-//    private Integer recordStatus;
 }

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

@@ -126,6 +126,7 @@ public class MaintenanceRecord extends BaseEntity {
 
 	/**
 	 * 状态 -1:待审核,0:待处理,1:已签到,保养中,2:完成保养,待评价,3:完成。
+	 * -2:已补录工单(缺少维保项),可以继续填写
 	 */
 	private String status;
 

+ 13 - 0
lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/dao/entity/model/response/MtPlanResponse.java

@@ -13,6 +13,10 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = true)
 public class MtPlanResponse extends MaintenancePlan {
 
+    /**
+     * 维保记录id
+     */
+    private Long mtRecordId;
     /**
      * 电梯类型 1直梯,2扶梯
      */
@@ -45,4 +49,13 @@ public class MtPlanResponse extends MaintenancePlan {
      * 超期类型,1计划超期,2法规超期
      */
     private Integer overdue;
+
+    /**
+     * 关联维保记录的状态
+     * -3:没有维保记录(可以补录)
+     * -2:已补录工单,(没有维保项,可以继续填写)
+     * -1:待审核(通过app端添加的),通过后台添加的,直接 ->3
+     * 3:审核通过或者后台直接添加
+     */
+    private String recordStatus;
 }

+ 9 - 0
lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/dao/entity/model/response/MtRecordResponse.java

@@ -26,10 +26,19 @@ public class MtRecordResponse extends MaintenanceRecord {
      */
     private String projectName;
 
+    /**
+     * 维保公司名
+     */
+    private String mtCompanyName;
+
     /**
      * 单位设备编号
      */
     private String useCompanyCode;
+    /**
+     * 电梯类别(1:曳引梯;2:液压梯;3:杂物梯;4:自动扶梯;5:自动人行道)
+     */
+    private Integer category;
 
     /**
      * 注册代码

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

@@ -34,6 +34,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
@@ -268,7 +269,8 @@ public class MaintenanceRecordService extends ServiceImpl<MaintenanceRecordMappe
     }
 
     /**
-     * 通过:app端提交的保养单点通过后生成正式保养单,清除超期; -> status:-1修改成0
+     * 通过:app端提交的保养单点通过后生成正式保养单  status:-1 -> 3
+     * 清除超期: 超期的计划修改status ->1,workDate -> now
      * @param entity MaintenanceRecord
      * @return boolean
      */
@@ -278,7 +280,14 @@ public class MaintenanceRecordService extends ServiceImpl<MaintenanceRecordMappe
         if(!mr){
             return false;
         }
-        boolean mp = maintenancePlanService.removeById(entity.getMtPlanId());
+        //清除超期
+        MaintenancePlan plan = maintenancePlanService.getById(entity.getMtPlanId());
+        if(null == plan){
+            return true;
+        }
+        plan.setStatus(1);
+        plan.setWorkDate(LocalDate.now());
+        boolean mp = maintenancePlanService.updateById(plan);
         if(mp){
             return true;
         }else{
@@ -290,9 +299,9 @@ public class MaintenanceRecordService extends ServiceImpl<MaintenanceRecordMappe
 
     /**
      * 维保记录评价,同时更新维保记录状态 status -> 3
-     * @param record
-     * @param entity
-     * @return
+     * @param record MaintenanceRecord
+     * @param entity Evaluation
+     * @return boolean
      */
     @Transactional(rollbackFor = Exception.class)
     public boolean evaluate(MaintenanceRecord record, Evaluation entity){
@@ -310,6 +319,12 @@ public class MaintenanceRecordService extends ServiceImpl<MaintenanceRecordMappe
         }
     }
 
+    /**
+     * 删除维保收费项,汇总金额,拼接sparepart
+     * @param record
+     * @param mtRecordCost
+     * @return
+     */
     @Transactional(rollbackFor = Exception.class)
     public boolean deleteCost(MaintenanceRecord record, MtRecordCost mtRecordCost) {
         if (null == mtRecordCost) {

+ 4 - 3
lift-business-service/src/main/resources/application-dev.yml

@@ -1,6 +1,6 @@
 spring:
   datasource:
-    url: jdbc:mysql://192.168.1.46:3306/rdsliftmanager?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://111.47.6.224:13769/rdsliftmanager?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
     username: root
     password: Tyty-2020
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -8,8 +8,8 @@ spring:
   #redis缓存配置
   redis:
     database: 0 #数据库索引,默认为0
-    host: 192.168.1.46 #服务器地址
-    port: 6379 #端口
+    host: 111.47.6.224 #服务器地址
+    port: 13789 #端口
     password: newtyty #验证密码
     jedis:
       pool:
@@ -17,6 +17,7 @@ spring:
         max-idle: 8 #最大空闲链接
         max-wait: 20000ms
         min-idle: 0
+
 #aliyun OSS服务配置信息,加载到SystemConfiguration
 aliyun:
   oss:

+ 3 - 4
lift-enterprise-service/src/main/resources/application-web.yml

@@ -1,6 +1,6 @@
 spring:
   datasource:
-    url: jdbc:mysql://111.47.6.224:13769/rdsliftmanager?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://192.168.1.46:3306/rdsliftmanager?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
     username: root
     password: Tyty-2020
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -8,8 +8,8 @@ spring:
   #redis缓存配置
   redis:
     database: 0 #数据库索引,默认为0
-    host: 111.47.6.224 #服务器地址
-    port: 13789 #端口
+    host: 192.168.1.46 #服务器地址
+    port: 6379 #端口
     password: newtyty #验证密码
     jedis:
       pool:
@@ -17,7 +17,6 @@ spring:
         max-idle: 8 #最大空闲链接
         max-wait: 20000ms
         min-idle: 0
-
 #aliyun OSS服务配置信息,加载到SystemConfiguration
 aliyun:
   oss:

+ 1 - 1
lift-business-service/src/main/resources/application.yml

@@ -5,7 +5,7 @@ spring:
   application:
     name: lift-business-service
   profiles:
-    active: web
+    active: dev
 
 mybatis-plus:
   mapper-locations: classpath*:/mapper/**/**Mapper.xml

+ 5 - 5
lift-business-service/src/main/resources/mapper/lift/LiftMapper.xml

@@ -4,12 +4,12 @@
 	<resultMap id="BaseResultMap" type="cn.com.ty.lift.business.library.dao.entity.Lift" >
 		<id column="id" property="id" jdbcType="BIGINT" />
 		<result column="registration_code" property="registrationCode" jdbcType="VARCHAR" />
-		<result column="category" property="category" jdbcType="TINYINT" />
+		<result column="category" property="category" jdbcType="INTEGER" />
 		<result column="lift_type" property="liftType" jdbcType="INTEGER" />
 		<result column="lift_code" property="liftCode" jdbcType="CHAR" />
 		<result column="manufacture_date" property="manufactureDate" jdbcType="DATE" />
 		<result column="factory_code" property="factoryCode" jdbcType="VARCHAR" />
-		<result column="device_usage" property="deviceUsage" jdbcType="TINYINT" />
+		<result column="device_usage" property="deviceUsage" jdbcType="INTEGER" />
 		<result column="lift_brand" property="liftBrand" jdbcType="VARCHAR" />
 		<result column="install_company" property="installCompany" jdbcType="VARCHAR" />
 		<result column="lift_model" property="liftModel" jdbcType="VARCHAR" />
@@ -24,7 +24,7 @@
 		<result column="motor_power" property="motorPower" jdbcType="DECIMAL" />
 		<result column="rated_speed" property="ratedSpeed" jdbcType="DECIMAL" />
 		<result column="layer_station_door" property="layerStationDoor" jdbcType="VARCHAR" />
-		<result column="clamp_type" property="clampType" jdbcType="TINYINT" />
+		<result column="clamp_type" property="clampType" jdbcType="INTEGER" />
 		<result column="reform_company" property="reformCompany" jdbcType="VARCHAR" />
 		<result column="device_position" property="devicePosition" jdbcType="VARCHAR" />
 		<result column="coordinate" property="coordinate" jdbcType="VARCHAR" />
@@ -34,7 +34,7 @@
 		<result column="steel_belt" property="steelBelt" jdbcType="INTEGER" />
 		<result column="cylinder_type" property="cylinderType" jdbcType="VARCHAR" />
 		<result column="cylinder_num" property="cylinderNum" jdbcType="INTEGER" />
-		<result column="top_type" property="topType" jdbcType="TINYINT" />
+		<result column="top_type" property="topType" jdbcType="INTEGER" />
 		<result column="control_type" property="controlType" jdbcType="VARCHAR" />
 		<result column="mpa" property="mpa" jdbcType="INTEGER" />
 		<result column="factory" property="factory" jdbcType="VARCHAR" />
@@ -44,7 +44,7 @@
 		<result column="agency" property="agency" jdbcType="VARCHAR" />
 		<result column="reform_date" property="reformDate" jdbcType="TIMESTAMP" />
 		<result column="install_date" property="installDate" jdbcType="TIMESTAMP" />
-		<result column="inner_floor" property="innerFloor" jdbcType="TINYINT" />
+		<result column="inner_floor" property="innerFloor" jdbcType="INTEGER" />
 		<result column="annual_inspection_date" property="annualInspectionDate" jdbcType="DATE" />
 		<result column="area_code" property="areaCode" jdbcType="CHAR" />
 		<result column="device_id" property="deviceId" jdbcType="VARCHAR" />

+ 6 - 1
lift-business-service/src/main/resources/mapper/maintenance/MaintenancePlanMapper.xml

@@ -24,6 +24,8 @@
 		<result column="registration_code" property="registrationCode" jdbcType="VARCHAR" />
 		<result column="device_position" property="devicePosition" jdbcType="VARCHAR" />
 		<result column="worker_name" property="workerName" jdbcType="VARCHAR" />
+        <result column="mt_record_id" property="mtRecordId" jdbcType="BIGINT" />
+        <result column="record_status" property="recordStatus" jdbcType="VARCHAR" />
 	</resultMap>
 
 	<sql id="Base_Column_List" >
@@ -128,12 +130,15 @@
             li.registration_code,
             li.lift_type,
             pr.project_name,
-            ui.`name` AS worker_name
+            ui.`name` AS worker_name,
+			mr.id AS mt_record_id,
+            ifnull(mr.status, -3) AS record_status
         FROM
             maintenance_plan mp
 		LEFT JOIN lift li ON li.id = mp.lift_id
 		LEFT JOIN project pr ON pr.id = mp.project_id
 		LEFT JOIN user_info ui ON ui.user_id = mp.worker_id
+		LEFT JOIN maintenance_record mr ON mr.mt_plan_id = mp.id
         WHERE mp.plan_date &lt; now() AND mp.work_date IS NULL
         <if test="cond.mtCompanyId != null and cond.mtCompanyId > 0">
             AND mp.mt_company_id = #{cond.mtCompanyId}

+ 6 - 0
lift-business-service/src/main/resources/mapper/maintenance/MaintenanceRecordMapper.xml

@@ -34,6 +34,8 @@
 
         <result column="project_name" property="projectName" jdbcType="VARCHAR" />
 		<result column="use_company_code" property="useCompanyCode" jdbcType="VARCHAR" />
+        <result column="mt_company_name" property="mtCompanyName" jdbcType="VARCHAR" />
+		<result column="category" property="category" jdbcType="INTEGER" />
         <result column="registration_code" property="registrationCode" jdbcType="VARCHAR" />
         <result column="worker_name" property="workerName" jdbcType="VARCHAR" />
         <result column="repair_diff" property="repairDiff" jdbcType="BIGINT" />
@@ -82,6 +84,7 @@
             mr.*,
             li.use_company_code,
             li.registration_code,
+            li.category,
             ui.`name` AS worker_name,
             pr.project_name,
             ev.star_level,
@@ -136,6 +139,8 @@
 			mr.*,
 			li.use_company_code,
 			li.registration_code,
+			li.category,
+            mc.name AS mt_company_name,
 			ui.`name` AS worker_name,
 			pr.project_name,
 			ev.star_level
@@ -145,6 +150,7 @@
 		LEFT JOIN user_info ui ON mr.worker_id1 = ui.user_id
 		LEFT JOIN project pr ON mr.project_id = pr.id
 		LEFT JOIN evaluation ev ON mr.id = ev.record_id
+        LEFT JOIN maintenance_company mc ON mr.mt_company_id = mc.id
 		<where>
 			<if test="cond.id != null and cond.id > 0">
 				mr.id = #{cond.id}

+ 15 - 1
lift-enterprise-service/src/main/resources/application-dev.yml

@@ -1,9 +1,23 @@
 spring:
   datasource:
-    url: jdbc:mysql://192.168.1.46:3306/rdsliftmanager?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://111.47.6.224:13769/rdsliftmanager?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
     username: root
     password: Tyty-2020
     driver-class-name: com.mysql.cj.jdbc.Driver
+
+  #redis缓存配置
+  redis:
+    database: 0 #数据库索引,默认为0
+    host: 111.47.6.224 #服务器地址
+    port: 13789 #端口
+    password: newtyty #验证密码
+    jedis:
+      pool:
+        max-active: 8 #最大连接数
+        max-idle: 8 #最大空闲链接
+        max-wait: 20000ms
+        min-idle: 0
+
 #aliyun OSS服务配置信息,加载到SystemConfiguration
 aliyun:
   oss:

+ 13 - 0
lift-enterprise-service/src/main/resources/application-dev1.yml

@@ -0,0 +1,13 @@
+spring:
+  datasource:
+    url: jdbc:mysql://192.168.1.46:3306/rdsliftmanager?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+    username: root
+    password: Tyty-2020
+    driver-class-name: com.mysql.cj.jdbc.Driver
+#aliyun OSS服务配置信息,加载到SystemConfiguration
+aliyun:
+  oss:
+    endpoint: http://oss-cn-beijing.aliyuncs.com
+    bucketName: temp15827479607
+    accessKeyId: LTAI4FkSqFZa6LH9HqAsVott
+    accessKeySecret: w7GXuh5tf1hduQuZ2AzT3a4q14BI1i

+ 1 - 1
lift-enterprise-service/src/main/resources/application.yml

@@ -5,7 +5,7 @@ spring:
   application:
     name: lift-enterprise-service
   profiles:
-    active: web
+    active: dev
 
 #自动添加createTime、isDelete 等字段
 xwy:

+ 3 - 4
lift-system-service/src/main/resources/application-dev.yml

@@ -1,16 +1,15 @@
 spring:
   datasource:
-    url: jdbc:mysql://192.168.1.46:3306/rdsliftmanager?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://111.47.6.224:13769/rdsliftmanager?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
     username: root
     password: Tyty-2020
     driver-class-name: com.mysql.cj.jdbc.Driver
 
-
   #redis缓存配置
   redis:
     database: 0 #数据库索引,默认为0
-    host: 192.168.1.46 #服务器地址
-    port: 6379 #端口
+    host: 111.47.6.224 #服务器地址
+    port: 13789 #端口
     password: newtyty #验证密码
     jedis:
       pool:

+ 4 - 3
lift-business-service/src/main/resources/application-web.yml

@@ -1,15 +1,16 @@
 spring:
   datasource:
-    url: jdbc:mysql://111.47.6.224:13769/rdsliftmanager?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://192.168.1.46:3306/rdsliftmanager?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
     username: root
     password: Tyty-2020
     driver-class-name: com.mysql.cj.jdbc.Driver
 
+
   #redis缓存配置
   redis:
     database: 0 #数据库索引,默认为0
-    host: 111.47.6.224 #服务器地址
-    port: 13789 #端口
+    host: 192.168.1.46 #服务器地址
+    port: 6379 #端口
     password: newtyty #验证密码
     jedis:
       pool:

+ 0 - 27
lift-system-service/src/main/resources/application-web.yml

@@ -1,27 +0,0 @@
-spring:
-  datasource:
-    url: jdbc:mysql://111.47.6.224:13769/rdsliftmanager?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
-    username: root
-    password: Tyty-2020
-    driver-class-name: com.mysql.cj.jdbc.Driver
-
-  #redis缓存配置
-  redis:
-    database: 0 #数据库索引,默认为0
-    host: 111.47.6.224 #服务器地址
-    port: 13789 #端口
-    password: newtyty #验证密码
-    jedis:
-      pool:
-        max-active: 8 #最大连接数
-        max-idle: 8 #最大空闲链接
-        max-wait: 20000ms
-        min-idle: 0
-
-#aliyun OSS服务配置信息,加载到SystemConfiguration
-aliyun:
-  oss:
-    endpoint: http://oss-cn-beijing.aliyuncs.com
-    bucketName: temp15827479607
-    accessKeyId: LTAI4FkSqFZa6LH9HqAsVott
-    accessKeySecret: w7GXuh5tf1hduQuZ2AzT3a4q14BI1i

+ 1 - 1
lift-system-service/src/main/resources/application.yml

@@ -14,7 +14,7 @@ spring:
   application:
     name: lift-system-service
   profiles:
-    active: web
+    active: dev
 
 #自动添加createTime、isDelete 等字段
 xwy: