Merge branch 'dev_thirdplatform' into dev

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

@@ -133,21 +133,21 @@ public class CodeServiceImpl implements CodeService {
 		codeExtDTO.setExtJson(extJson);
 		codeExtService.update(codeExtDTO);
 
-		WxMaCodeCommitReq request = ConvertUtils.sourceToTarget(formDTO, WxMaCodeCommitReq.class);
+//		WxMaCodeCommitReq request = ConvertUtils.sourceToTarget(formDTO, WxMaCodeCommitReq.class);
-		request.setExtJson(extJson);
+//		request.setExtJson(extJson);
-		//调用微信API上传代码
+//		//调用微信API上传代码
-		WxResult wxResult = wxMaCodeService.commit(authInfo.getAuthorizerAccessToken(), request);
+//		WxResult wxResult = wxMaCodeService.commit(authInfo.getAuthorizerAccessToken(), request);
-		//上传失败，抛出异常
+//		//上传失败，抛出异常
-		if (!wxResult.success()) {
+//		if (!wxResult.success()) {
-			saveOperation(formDTO.getCustomerId(), null, formDTO.getUserVersion(), CodeConstant.OPER_UPLOAD, wxResult.getErrorMsg());
+//			saveOperation(formDTO.getCustomerId(), null, formDTO.getUserVersion(), CodeConstant.OPER_UPLOAD, wxResult.getErrorMsg());
-			throw new RenException(wxResult.getErrorCode(), wxResult.getErrorMsg());
+//			throw new RenException(wxResult.getErrorCode(), wxResult.getErrorMsg());
-		}
+//		}
 		//获取客户信息
 		CustomerDTO customerDTO = new CustomerDTO();
 		customerDTO.setId(formDTO.getCustomerId());
 		PaCustomerDTO paCustomerDTO = paCustomerService.get(formDTO.getCustomerId());
 		//将之前上传信息删除
-		codeCustomerService.deleteCode(formDTO.getCustomerId(), formDTO.getClientType());
+//		codeCustomerService.deleteCode(formDTO.getCustomerId(), formDTO.getClientType());
 
 		//将上传信息存入表中
 		CodeCustomerDTO codeCustomerDTO = ConvertUtils.sourceToTarget(formDTO, CodeCustomerDTO.class);
@@ -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