Merge branch 'feature-wcz' of lift-manager/lift-server into develop

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

@@ -0,0 +1,19 @@
+spring:
+  datasource:
+    url: jdbc:mysql://132.232.206.88:3306/rdsliftmanager?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+    username: root
+    password: ms.c88pocY/
+    driver-class-name: com.mysql.cj.jdbc.Driver
+
+  #redis缓存配置
+  redis:
+    database: 0 #数据库索引，默认为0
+    host: 132.232.206.88 #服务器地址
+    port: 6379 #端口
+    password: mdx12358 #验证密码
+    jedis:
+      pool:
+        max-active: 8 #最大连接数
+        max-idle: 8 #最大空闲链接
+        max-wait: 20000ms
+        min-idle: 0

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

@@ -0,0 +1,19 @@
+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
+
+  #redis缓存配置
+  redis:
+    database: 0 #数据库索引，默认为0
+    host: 192.168.1.46 #服务器地址
+    port: 6379 #端口
+    password: newtyty #验证密码
+    jedis:
+      pool:
+        max-active: 8 #最大连接数
+        max-idle: 8 #最大空闲链接
+        max-wait: 20000ms
+        min-idle: 0

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

@@ -5,25 +5,7 @@ spring:
   application:
     name: lift-business-service
   profiles:
-    active: dev
-  datasource:
-    url: jdbc:mysql://132.232.206.88:3306/rdsliftmanager?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
-    username: root
-    password: ms.c88pocY/
-    driver-class-name: com.mysql.cj.jdbc.Driver
-
-  #redis缓存配置
-  redis:
-    database: 0 #数据库索引，默认为0
-    host: 132.232.206.88 #服务器地址
-    port: 6379 #端口
-    password: mdx12358 #验证密码
-    jedis:
-      pool:
-        max-active: 8 #最大连接数
-        max-idle: 8 #最大空闲链接
-        max-wait: 20000ms
-        min-idle: 0
+    active: test
 
 mybatis-plus:
   mapper-locations: classpath*:/mapper/**/**Mapper.xml

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/oa/controller/LiftCertificateController.java

@@ -78,6 +78,9 @@ public class LiftCertificateController {
     public RestResponse modify(@RequestBody LiftCertificate entity) {
         Long id = entity.getId();
         Judge.id(id);
+        Long ownerId = entity.getOwnerId();
+        Long mtCompanyId = entity.getMtCompanyId();
+        Judge.ids(ownerId,mtCompanyId);
         boolean result = liftCertificateService.updateById(entity);
         return Judge.result(result);
     }
@@ -109,7 +112,12 @@ public class LiftCertificateController {
      */
     @PostMapping("add")
     public RestResponse add(@RequestBody LiftCertificate entity) {
+        Long ownerId = entity.getOwnerId();
+        Long mtCompanyId = entity.getMtCompanyId();
+        Judge.ids(ownerId,mtCompanyId);
         Judge.notTrue(StrUtil.hasEmpty(entity.getFirstImgUrl(),entity.getSecondImgUrl()),"请上传操作证图片");
+        int count = liftCertificateService.countByUserAndMtCompany(ownerId,mtCompanyId);
+        Judge.notTrue(count > 0,"操作证已存在");
         boolean result = liftCertificateService.saveOrUpdate(entity);
         return Judge.result(result);
 

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/oa/entity/LiftCertificate.java

@@ -1,14 +1,11 @@
 package cn.com.ty.lift.enterprise.oa.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
 
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
+import java.time.LocalDate;
 
 /**
  * <p>
@@ -32,6 +29,12 @@ public class LiftCertificate implements Serializable {
     @TableField("owner_id")
     private Long ownerId;
 
+    /**
+     * 维保公司id
+     */
+    @TableField("mt_company_id")
+    private Long mtCompanyId;
+
     /**
      * 操作证号
      */

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/oa/service/LiftCertificateService.java

@@ -4,13 +4,12 @@ import cn.com.ty.lift.enterprise.oa.dto.LiftCertificateRequest;
 import cn.com.ty.lift.enterprise.oa.dto.LiftCertificateResponse;
 import cn.com.ty.lift.enterprise.oa.entity.LiftCertificate;
 import cn.com.ty.lift.enterprise.oa.mapper.LiftCertificateMapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
-import java.util.List;
 /**
  * <p>
  * 操作证 服务类
@@ -32,4 +31,12 @@ public class LiftCertificateService extends ServiceImpl<LiftCertificateMapper,Li
     public long countByCondition(LiftCertificateRequest request){
         return baseMapper.countByCondition(request);
     }
+
+    public int countByUserAndMtCompany(Long userId,Long mtCompanyId){
+        QueryWrapper<LiftCertificate> queryWrapper = new QueryWrapper<>();
+        LambdaQueryWrapper<LiftCertificate> lambdaQueryWrapper = queryWrapper.lambda();
+        lambdaQueryWrapper.eq(LiftCertificate::getOwnerId,userId);
+        lambdaQueryWrapper.eq(LiftCertificate::getMtCompanyId, mtCompanyId);
+        return count(lambdaQueryWrapper);
+    }
 }

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

@@ -0,0 +1,6 @@
+spring:
+  datasource:
+    url: jdbc:mysql://132.232.206.88:3306/rdsliftmanager?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+    username: root
+    password: ms.c88pocY/
+    driver-class-name: com.mysql.cj.jdbc.Driver

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

@@ -0,0 +1,6 @@
+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

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

@@ -6,10 +6,6 @@ spring:
     name: lift-enterprise-service
   profiles:
     active: dev
-  datasource:
-    url: jdbc:mysql://132.232.206.88:3306/rdsliftmanager?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
-    username: root
-    password: ms.c88pocY/
 
 #自动添加createTime、isDelete 等字段
 xwy: