Merge branches 'dev' and 'release' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev

epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-third-server:
     container_name: epmet-third-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.125
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.127
     ports:
       - "8110:8110"
     network_mode: host # 使用现有网络

epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-test.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-third-server:
     container_name: epmet-third-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-third-server:0.0.123
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-third-server:0.0.125
     ports:
       - "8110:8110"
     network_mode: host # 使用现有网络

epmet-module/epmet-third/epmet-third-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.0.125</version>
+    <version>0.0.127</version>
 
     <parent>
         <groupId>com.epmet</groupId>

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/CodeController.java

@@ -232,11 +232,24 @@ public class CodeController {
 		return new Result<CodeVersionInfoResultDTO>().ok(result);
 	}
 
+	/**
+	 * 版本回退
+	 * @author zhaoqifeng
+	 * @date 2020/8/13 16:51
+	 * @param formDTO
+	 * @return com.epmet.commons.tools.utils.Result
+	 */
 	@PostMapping("speedupaudit")
 	public Result speedUpAudit(@RequestBody CodeCommonFormDTO formDTO) {
 		codeService.speedUpAudit(formDTO);
 		return new Result<>();
 	}
 
+	@PostMapping("revertcoderelease")
+	public Result revertCodeRelease(@RequestBody CodeCommonFormDTO formDTO) {
+		codeService.revertCodeRelease(formDTO);
+		return new Result<>();
+	}
+
 
 }

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/CodeAuditResultDao.java

@@ -46,10 +46,11 @@ public interface CodeAuditResultDao extends BaseDao<CodeAuditResultEntity> {
 	 * 获取审核失败列表
 	 * @author zhaoqifeng
 	 * @date 2020/8/5 11:11
-	 * @param codeId
+	 * @param customerId
+	 * @param clientType
 	 * @return java.util.List<com.epmet.dto.CodeAuditResultDTO>
 	 */
-	List<CodeAuditResultDTO> selectAuditFailedList(@Param("codeId") String codeId);
+	List<CodeAuditResultDTO> selectAuditFailedList(@Param("customerId") String customerId, @Param("clientType") String clientType);
 
     /**
      * @Description  更新 代码审核结果中的审核状态

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/CodeAuditResultService.java

@@ -106,10 +106,11 @@ public interface CodeAuditResultService extends BaseService<CodeAuditResultEntit
     /**
      * 获取审核失败列表
      *
-     * @param codeId
+     * @param customerId
+     * @param clientType
      * @return com.epmet.dto.CodeAuditResultDTO
      * @author zhaoqifeng
      * @date 2020/7/15 17:13
      */
-    List<CodeAuditResultDTO> getAuditFailedList(String codeId);
+    List<CodeAuditResultDTO> getAuditFailedList(String customerId, String clientType);
 }

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeAuditResultServiceImpl.java

@@ -107,8 +107,8 @@ public class CodeAuditResultServiceImpl extends BaseServiceImpl<CodeAuditResultD
     }
 
     @Override
-    public List<CodeAuditResultDTO> getAuditFailedList(String codeId) {
-        return baseDao.selectAuditFailedList(codeId);
+    public List<CodeAuditResultDTO> getAuditFailedList(String customerId, String clientType) {
+        return baseDao.selectAuditFailedList(customerId, clientType);
     }
 
 }

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java

@@ -420,7 +420,8 @@ public class CodeServiceImpl implements CodeService {
 			throw new RenException("未授权");
 		}
 		//获取审核结果信息
-		List<CodeAuditResultDTO> codeAuditResultList = codeAuditResultService.getAuditFailedList(formDTO.getCodeId());
+		List<CodeAuditResultDTO> codeAuditResultList = codeAuditResultService.getAuditFailedList(codeCustomerDTO.getCustomerId(),
+				codeCustomerDTO.getClientType());
 		codeAuditResultList.forEach(dto -> {
 			ReasonResultDTO result = new ReasonResultDTO();
 			result.setReason(dto.getReason());

epmet-module/epmet-third/epmet-third-server/src/main/resources/db/migration/V0.0.7__thirdUpdate.sql

@@ -0,0 +1,5 @@
+alter table code_audit_result add FEEDBACK_INFO varchar(255) NULL  comment '反馈内容' after SCREEN_SHOT_URL;
+alter table code_audit_result add FEEDBACK_STUFF tinytext NULL  comment '反馈素材' after FEEDBACK_INFO;
+
+
+

epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/CodeAuditResultDao.xml

@@ -22,10 +22,17 @@
         ORDER BY CREATED_TIME DESC
     </select>
     <select id="selectAuditFailedList" resultType="com.epmet.dto.CodeAuditResultDTO">
-        SELECT * FROM code_audit_result
-        WHERE CODE_ID = #{codeId}
-                  AND (RESULT = 'audit_failed' OR RESULT = 'delay')
-        ORDER BY CREATED_TIME DESC
+        SELECT
+            car.*
+        FROM
+            code_audit_result car
+                INNER JOIN code_customer cc ON car.CODE_ID = cc.ID
+                AND cc.CUSTOMER_ID = #{customerId}
+                AND cc.CLIENT_TYPE = #{clientType}
+        WHERE
+            ( car.RESULT = 'audit_failed' OR car.RESULT = 'delay' )
+        ORDER BY
+            car.CREATED_TIME DESC
     </select>
     <!-- 更新 代码审核结果中的审核状态 -->
     <update id="updateAuditResult">

epmet-user/epmet-user-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-user-server:
     container_name: epmet-user-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.115
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.116
     ports:
       - "8087:8087"
     network_mode: host # 不会创建新的网络

epmet-user/epmet-user-server/deploy/docker-compose-test.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-user-server:
     container_name: epmet-user-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-user-server:0.3.115
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-user-server:0.3.116
     ports:
       - "8087:8087"
     network_mode: host # 不会创建新的网络

epmet-user/epmet-user-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.115</version>
+    <version>0.3.116</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-user</artifactId>

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java

@@ -190,12 +190,9 @@ public class GridLatestServiceImpl extends BaseServiceImpl<GridLatestDao, GridLa
      **/
     @Override
     public List<CustomerUser4PointResultDTO> getCustomerUsers(CustomerUserFormDTO customerUserFormDTO) {
-
-        List<String> userIds = baseDao.selectAllUserByCustomerId(customerUserFormDTO.getCustomerId());
         List<CustomerUser4PointResultDTO> allData = new LinkedList<>();
-        if(null == userIds || userIds.isEmpty()){
-            return allData;
-        }
+        List<String> userIds = baseDao.selectAllUserByCustomerId(customerUserFormDTO.getCustomerId());
+        if(null == userIds) userIds = new LinkedList<>();
         CommonCustomerFormDTO customerParam = new CommonCustomerFormDTO();
         customerParam.setCustomerId(customerUserFormDTO.getCustomerId());
         Result<List<String>> volunteer = epmetHeartOpenFeignClient.volunteerUserIds(customerParam);
@@ -203,6 +200,9 @@ public class GridLatestServiceImpl extends BaseServiceImpl<GridLatestDao, GridLa
             userIds.addAll(volunteer.getData());
             userIds = userIds.stream().distinct().collect(Collectors.toList());
         }
+        if(null == userIds || userIds.isEmpty()){
+            return allData;
+        }
         PageHelper.startPage(customerUserFormDTO.getPageNo(),customerUserFormDTO.getPageSize());
         allData = userWechatDao.selectResiAndStrangerInfo(userIds,customerUserFormDTO.getName());
         if(null == allData || allData.isEmpty()){

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java

@@ -193,6 +193,8 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
 	public void saveUserResiInfo(UserResiInfoDTO userResiInfoDTO) {
         //1:注册信息表新增数据
 		baseDao.insert(ConvertUtils.sourceToTarget(userResiInfoDTO, UserResiInfoEntity.class));
+		//更新该用户在该客户下的注册状态
+		userCustomerDao.updateRegistered(userResiInfoDTO.getCustomerId(), userResiInfoDTO.getUserId());
         //2:角色表新增角色数据
         UserRoleDTO userRoleDTO = new UserRoleDTO();
         userRoleDTO.setCustomerId(userResiInfoDTO.getCustomerId());

epmet-user/epmet-user-server/src/main/resources/mapper/GridLatestDao.xml

@@ -85,13 +85,13 @@
 
     <!-- 查询一个客户下的居民和陌生人 传参 : 客户Id -->
     <select id="selectAllUserByCustomerId" resultType="string">
-        SELECT
-            *
-        FROM
-            USER_CUSTOMER
-        WHERE
-            DEL_FLAG = '0'
-            AND IS_REGISTER = '1'
+       SELECT
+		USER_ID
+		FROM
+			REGISTER_RELATION
+		WHERE
+			DEL_FLAG ='0'
+			AND REGISTER = '1'
             AND CUSTOMER_ID = #{customerId}
     </select>