资源操作日志

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/UnionEnterpriseAuthResLogService.java

@@ -4,6 +4,8 @@ import com.gic.enterprise.entity.TabSysUnionEnterpriseAuthResLog;
 import com.gic.enterprise.qo.union.UnionEnterpriseAuthResLogQO;
 import com.github.pagehelper.Page;
 
+import java.util.Date;
+
 /**
  * 资源授权操作日志
  * @ClassName:
@@ -16,12 +18,23 @@ public interface UnionEnterpriseAuthResLogService {
      * 新增操作日志
      * @param unionEnterpriseAuthId
      * @param resourceType UnionEnterpriseAuthResTypeEnum
-     * @param logContent 日志内容
+     * @param logContent 日志内容 UnionEnterpriseAuthResOperateEnum
      * @return
      */
     int saveUnionEnterpriseAuthResLog(Integer unionEnterpriseAuthId, Integer resourceType, String logContent);
 
     /**
+     * 新增操作日志
+     * @param unionEnterpriseAuthId
+     * @param resourceType
+     * @param logContent UnionEnterpriseAuthResOperateEnum
+     * @param dealStartTime 处理开始时间
+     * @param dealEndTime 处理结束时间
+     * @return
+     */
+    int saveUnionEnterpriseAuthResLog(Integer unionEnterpriseAuthId, Integer resourceType, String logContent, Date dealStartTime, Date dealEndTime);
+
+    /**
      * 操作日志查询
      * @param param
      * @return

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/UnionEnterpriseAuthResLogServiceImpl.java

@@ -26,6 +26,11 @@ public class UnionEnterpriseAuthResLogServiceImpl implements UnionEnterpriseAuth
 
     @Override
     public int saveUnionEnterpriseAuthResLog(Integer unionEnterpriseAuthId, Integer resourceType, String logContent) {
+        return saveUnionEnterpriseAuthResLog(unionEnterpriseAuthId, resourceType, logContent, null, null);
+    }
+
+    @Override
+    public int saveUnionEnterpriseAuthResLog(Integer unionEnterpriseAuthId, Integer resourceType, String logContent, Date dealStartTime, Date dealEndTime) {
         TabSysUnionEnterpriseAuthResLog record = new TabSysUnionEnterpriseAuthResLog();
         Date now = new Date();
         record.setUpdateTime(now)
@@ -33,7 +38,9 @@ public class UnionEnterpriseAuthResLogServiceImpl implements UnionEnterpriseAuth
                 .setDeleteFlag(0)
                 .setUnionEnterpriseAuthId(unionEnterpriseAuthId)
                 .setResourceType(resourceType)
-                .setLogContent(logContent);
+                .setLogContent(logContent)
+                .setDealEndTime(dealEndTime)
+                .setDealStartTime(dealStartTime);
         return tabSysUnionEnterpriseAuthResLogMapper.insertSelective(record);
     }
 

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/union/UnionEnterpriseAuthResDetailApiServiceImpl.java

@@ -2,6 +2,7 @@ package com.gic.enterprise.service.outer.impl.union;
 
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.enterprise.constant.union.UnionEnterpriseAuthDetailStatusEnum;
+import com.gic.enterprise.constant.union.UnionEnterpriseAuthResOperateEnum;
 import com.gic.enterprise.constant.union.UnionEnterpriseAuthResTypeEnum;
 import com.gic.enterprise.dto.union.UnionEnterpriseAuthDTO;
 import com.gic.enterprise.entity.TabSysUnionEnterpriseAuth;
@@ -10,6 +11,7 @@ import com.gic.enterprise.error.ErrorCode;
 import com.gic.enterprise.exception.CommonException;
 import com.gic.enterprise.service.UnionEnterpriseAuthResDetailApiService;
 import com.gic.enterprise.service.UnionEnterpriseAuthResDetailService;
+import com.gic.enterprise.service.UnionEnterpriseAuthResLogService;
 import com.gic.enterprise.service.UnionEnterpriseAuthService;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,6 +34,8 @@ public class UnionEnterpriseAuthResDetailApiServiceImpl implements UnionEnterpri
     private UnionEnterpriseAuthResDetailService unionEnterpriseAuthResDetailService;
     @Autowired
     private UnionEnterpriseAuthService unionEnterpriseAuthService;
+    @Autowired
+    private UnionEnterpriseAuthResLogService unionEnterpriseAuthResLogService;
 
     @Override
     public ServiceResponse<Void> authDataCallback() {
@@ -49,6 +53,14 @@ public class UnionEnterpriseAuthResDetailApiServiceImpl implements UnionEnterpri
                 .getUnionEnterpriseAuthResDetail(old.getUnionEnterpriseAuthId(), UnionEnterpriseAuthResTypeEnum.STORE.getCode());
 
         boolean isUnionSuccess = UnionEnterpriseAuthDetailStatusEnum.HAS_AUTH.getCode().equals(authStatus);
+        //日志
+        if (isUnionSuccess) {
+            unionEnterpriseAuthResLogService.saveUnionEnterpriseAuthResLog(old.getUnionEnterpriseAuthId(), UnionEnterpriseAuthResTypeEnum.STORE.getCode(),
+                    UnionEnterpriseAuthResOperateEnum.UNION.getMessage(), null, new Date());
+        } else {
+            unionEnterpriseAuthResLogService.saveUnionEnterpriseAuthResLog(old.getUnionEnterpriseAuthId(), UnionEnterpriseAuthResTypeEnum.STORE.getCode(),
+                    UnionEnterpriseAuthResOperateEnum.UNION.getMessage(), new Date(), null);
+        }
         //如果是，则判断其他资源是否已经完成
         if (isUnionSuccess && isAllDealSuccess(old.getUnionEnterpriseAuthId(), UnionEnterpriseAuthResTypeEnum.STORE.getCode(), true)) {
             //更新最新联合时间（）
@@ -70,6 +82,13 @@ public class UnionEnterpriseAuthResDetailApiServiceImpl implements UnionEnterpri
         TabSysUnionEnterpriseAuthResDetail detail = unionEnterpriseAuthResDetailService
                 .getUnionEnterpriseAuthResDetail(old.getUnionEnterpriseAuthId(), UnionEnterpriseAuthResTypeEnum.STORE.getCode());
         boolean isAllRelieveSuccess = UnionEnterpriseAuthDetailStatusEnum.HAS_RELIEVE.getCode().equals(authStatus);
+        if (isAllRelieveSuccess) {
+            unionEnterpriseAuthResLogService.saveUnionEnterpriseAuthResLog(old.getUnionEnterpriseAuthId(), UnionEnterpriseAuthResTypeEnum.STORE.getCode(),
+                    UnionEnterpriseAuthResOperateEnum.RELIEVED.getMessage(), null, new Date());
+        } else {
+            unionEnterpriseAuthResLogService.saveUnionEnterpriseAuthResLog(old.getUnionEnterpriseAuthId(), UnionEnterpriseAuthResTypeEnum.STORE.getCode(),
+                    UnionEnterpriseAuthResOperateEnum.RELIEVED.getMessage(), new Date(), null);
+        }
         //如果是，则判断其他资源是否已经完成
         if (isAllRelieveSuccess && isAllDealSuccess(old.getUnionEnterpriseAuthId(), UnionEnterpriseAuthResTypeEnum.STORE.getCode(), false)) {
             //更新最新联合时间（）