Merge remote-tracking branch 'origin/dev' 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.70
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.72
     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.70</version>
+    <version>0.0.72</version>
 
     <parent>
         <groupId>com.epmet</groupId>

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

@@ -72,7 +72,7 @@ public interface CodeCustomerService extends BaseService<CodeCustomerEntity> {
      * @author generator
      * @date 2020-07-09
      */
-    void save(CodeCustomerDTO dto);
+    String save(CodeCustomerDTO dto);
 
     /**
      * 默认更新

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

@@ -86,10 +86,10 @@ public class CodeCustomerServiceImpl extends BaseServiceImpl<CodeCustomerDao, Co
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void save(CodeCustomerDTO dto) {
+    public String save(CodeCustomerDTO dto) {
         CodeCustomerEntity entity = ConvertUtils.sourceToTarget(dto, CodeCustomerEntity.class);
         insert(entity);
-        dto = ConvertUtils.sourceToTarget(entity, CodeCustomerDTO.class);
+        return entity.getId();
     }
 
     @Override

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

@@ -155,9 +155,9 @@ public class CodeServiceImpl implements CodeService {
 		codeCustomerDTO.setExtJson(extJson);
 		codeCustomerDTO.setAppId(authInfo.getAuthorizerAppid());
 		codeCustomerDTO.setStatus(CodeConstant.UNAUDITED);
-		codeCustomerService.save(codeCustomerDTO);
+		String codeId = codeCustomerService.save(codeCustomerDTO);
 
-		saveOperation(formDTO.getCustomerId(), codeCustomerDTO.getId(), formDTO.getUserVersion(), CodeConstant.OPER_UPLOAD, "上传成功");
+		saveOperation(formDTO.getCustomerId(), codeId, formDTO.getUserVersion(), CodeConstant.OPER_UPLOAD, "上传成功");
 	}
 
 	@Override

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

@@ -28,7 +28,7 @@
             DATE_FORMAT(coh.CREATED_TIME, '%Y-%m-%d %T') AS "operationTime",
             coh.VERSION,
             coh.OPERATION,
-            coh.`DESCRIPTION`
+            coh.`DESCRIPTION` AS "describe"
         FROM code_operation_history coh
         INNER JOIN code_customer cc ON coh.CODE_ID = cc.ID
         WHERE