feature(冲突解决): 冲突解决

冲突解决

dcuc-app-service/pom.xml

@@ -45,7 +45,7 @@
             <artifactId>duceap-cloud-starter-config-apollo</artifactId>
         </dependency>
         <!--审计-->
-        <dependency>
+        <!--<dependency>
             <groupId>com.dragonsoft</groupId>
             <artifactId>duceap-boot-starter-auditlog</artifactId>
             <exclusions>
@@ -54,7 +54,15 @@
                     <groupId>com.dragonsoft</groupId>
                 </exclusion>
             </exclusions>
-        </dependency>
+        </dependency>-->
+
+        <!--<dependency>
+            <groupId>com.dragonsoft</groupId>
+            <artifactId>auditlog-qm-tj</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>-->
+
+
         <!--MyBatis-Plus-->
         <dependency>
             <groupId>com.dragonsoft</groupId>
@@ -106,7 +114,7 @@
         <dependency>
             <groupId>com.dragoninfo</groupId>
             <artifactId>dcuc-user-api</artifactId>
-            <version>2.0.3-tjdsj-SNAPSHOT</version>
+            <version>2.1.0-tjdsj-SNAPSHOT</version>
         </dependency>
 
         <dependency>

dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/facade/ApplyInfoFacade.java

@@ -3,11 +3,9 @@ package com.dragoninfo.dcuc.app.facade;
 import com.dragoninfo.dcuc.app.dto.ApplyInfoDTO;
 import com.dragoninfo.dcuc.app.entity.ApplyInfo;
 import com.dragoninfo.dcuc.app.service.IApplyInfoService;
-import com.dragonsoft.duceap.auditlog.annotations.AuditLog;
-import com.dragonsoft.duceap.auditlog.enums.OperateTypeEnum;
+import com.dragoninfo.dcuc.user.user.enumresources.OperateTypeEnum;
 import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
 import com.dragonsoft.duceap.base.entity.search.SearchDTO;
-import com.dragonsoft.duceap.core.search.Searchable;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -27,37 +25,31 @@ public class ApplyInfoFacade implements IApplyInfoFacade {
     @Autowired
     private IApplyInfoService applyInfoService;
 
-    @AuditLog(actionType = "应用详情", operateType = OperateTypeEnum.SEARCH)
     @Override
     public ApplyInfo applyDetail(String id) {
         return applyInfoService.getOne(id);
     }
 
-    @AuditLog(actionType = "应用分页查询", operateType = OperateTypeEnum.SEARCH)
     @Override
     public Page<ApplyInfo> applyInfoPage(@RequestBody SearchDTO searchDTO) {
         return applyInfoService.applyInfoPage(searchDTO);
     }
 
-    @AuditLog(actionType = "应用新增", operateType = OperateTypeEnum.ADD)
     @Override
     public ApplyInfo saveAppIy(ApplyInfoDTO applyInfoDTO) {
         return applyInfoService.saveAppIy(applyInfoDTO);
     }
 
-    @AuditLog(actionType = "应用修改", operateType = OperateTypeEnum.UPDATE)
     @Override
     public ApplyInfo updateApply(ApplyInfoDTO applyInfoDTO) {
         return applyInfoService.updateApply(applyInfoDTO);
     }
 
-    @AuditLog(actionType = "应用删除", operateType = OperateTypeEnum.DELETE)
     @Override
     public void del(String id) {
         applyInfoService.del(id);
     }
 
-    @AuditLog(actionType = "获取应用信息", operateType = OperateTypeEnum.SEARCH)
     @Override
     public ApplyInfo getByApplyUrl(String applyUrl) {
         return applyInfoService.getAppByAppUrl(applyUrl);
@@ -79,127 +71,106 @@ public class ApplyInfoFacade implements IApplyInfoFacade {
         return applyInfoService.getListByCodes(appCodes);
     }
 
-    @AuditLog(actionType = "找到最新的排序", operateType = OperateTypeEnum.SEARCH)
     @Override
     public String getNewSort() {
         return applyInfoService.getNewSort();
     }
 
-    @AuditLog(actionType = "应用启动或停止", operateType = OperateTypeEnum.UPDATE)
     @Override
     public String startOrStop(String id) {
         return applyInfoService.startOrStop(id);
     }
 
-    @AuditLog(actionType = "查找应用名称映射", operateType = OperateTypeEnum.SEARCH)
     @Override
     public Map<String, String> findAppNameMap() {
         return applyInfoService.findAppNameMap();
     }
 
-    @AuditLog(actionType = "调整排序位置", operateType = OperateTypeEnum.UPDATE)
     @Override
     public void sortApp(String id, String target) {
         applyInfoService.sortApp(id, target);
     }
 
-    @AuditLog(actionType = "根据appCode获取appId", operateType = OperateTypeEnum.SEARCH)
     @Override
     public String codeConvertToId(String appCode) {
         return applyInfoService.codeConvertToId(appCode);
     }
 
-    @AuditLog(actionType = "将应用id转为应用名", operateType = OperateTypeEnum.SEARCH)
     @Override
     public String convertIdsToNames(String projectIds) {
         return applyInfoService.convertIdsToNames(projectIds);
     }
 
-    @AuditLog(actionType = "根据appCode获取应用详情", operateType = OperateTypeEnum.SEARCH)
     @Override
     public ApplyInfo getAppByCode(String appCode) {
         return applyInfoService.getAppByCode(appCode);
     }
 
-    @AuditLog(actionType = "检查应用信息是否已存", operateType = OperateTypeEnum.SEARCH)
     @Override
     public ResponseStatus isRepeat(ApplyInfo applyInfo) {
         return applyInfoService.isRepeat(applyInfo);
     }
 
-    @AuditLog(actionType = "根据机构ID获取所有应用ID", operateType = OperateTypeEnum.SEARCH)
     @Override
     public List<String> getAppIdsByOrgId(String orgId) {
         return applyInfoService.getAppIdsByOrgId(orgId);
     }
 
-    @AuditLog(actionType = "根据施工人员id查看该人员负责的应用", operateType = OperateTypeEnum.SEARCH)
     @Override
     public List<ApplyInfo> fzxmList(String userId) {
         return applyInfoService.fzxmList(userId);
     }
 
-    @AuditLog(actionType = "保存应用负责人", operateType = OperateTypeEnum.UPDATE)
     @Override
     public void saveDutyMan(String dutyProject, String userId, String mobileWork) {
         applyInfoService.saveDutyMan(dutyProject, userId, mobileWork);
     }
 
-    @AuditLog(actionType = "查找应用列表", operateType = OperateTypeEnum.SEARCH)
     @Override
     public Page<ApplyInfo> findApplyList(SearchDTO searchDTO) {
         return applyInfoService.findApplyList(searchDTO);
     }
 
-    @AuditLog(actionType = "获取厂商所属应用个数", operateType = OperateTypeEnum.SEARCH)
     @Override
     public Integer countByManufacturerId(String manufacturerId) {
         return applyInfoService.countByManufacturerId(manufacturerId);
     }
 
-    @AuditLog(actionType = "获取所有应用列表", operateType = OperateTypeEnum.SEARCH)
     @Override
     public List<ApplyInfo> getAllList() {
         return applyInfoService.findAll();
     }
 
-    @AuditLog(actionType = "根据厂商ID 获取应用信息", operateType = OperateTypeEnum.SEARCH)
     @Override
     public List<ApplyInfo> getAppListByManufacturerId(String manufacturerId) {
         return applyInfoService.getAppListByManufacturerId(manufacturerId);
     }
 
-    @AuditLog(actionType = "获取所有应用 map", operateType = OperateTypeEnum.SEARCH)
     @Override
     public Map<String, String> getAllIdNameMap() {
         return applyInfoService.getAllIdNameMap();
     }
 
-    @AuditLog(actionType = "根据应用代码、应用名称获取应用信息", operateType = OperateTypeEnum.SEARCH)
     @Override
     public ApplyInfo getOneByCodeAndName(String appCode, String appName) {
         return applyInfoService.getOneByCodeAndName(appCode, appName);
     }
 
-    @AuditLog(actionType = "根据名称、厂商ID获取应用信息", operateType = OperateTypeEnum.SEARCH)
     @Override
     public ApplyInfo getOneByNameAndManufacturerId(String applyName, String manufacturerId) {
         return applyInfoService.getOneByNameAndManufacturerId(applyName, manufacturerId);
     }
 
-    @AuditLog(actionType = "根据名称获取应用信息", operateType = OperateTypeEnum.SEARCH)
     @Override
     public ApplyInfo getOneByName(String applyName) {
         return applyInfoService.getOneByName(applyName);
     }
 
-    @AuditLog(actionType = "根据ID获取应用信息", operateType = OperateTypeEnum.SEARCH)
     @Override
     public List<ApplyInfo> getAppById(List<String> ids) {
         return applyInfoService.getAppById(ids);
     }
 
-    @AuditLog(actionType = "根据应用名称获取相似应用信息", operateType = OperateTypeEnum.SEARCH)
     @Override
     public List<ApplyInfo> getAppByAppNameLike(String applyName) {
         return applyInfoService.getAppByAppNameLike(applyName);

dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/facade/ManufacturerInfoFacade.java

@@ -2,8 +2,6 @@ package com.dragoninfo.dcuc.app.facade;
 
 import com.dragoninfo.dcuc.app.entity.ManufacturerInfo;
 import com.dragoninfo.dcuc.app.service.IManufacturerInfoService;
-import com.dragonsoft.duceap.auditlog.annotations.AuditLog;
-import com.dragonsoft.duceap.auditlog.enums.OperateTypeEnum;
 import com.dragonsoft.duceap.base.entity.metadata.CodeRecord;
 import com.dragonsoft.duceap.base.entity.search.SearchDTO;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,67 +23,56 @@ public class ManufacturerInfoFacade implements IManufacturerInfoFacade {
     @Autowired
     private IManufacturerInfoService manufacturerInfoService;
 
-    @AuditLog(actionType = "厂商分页查询", operateType = OperateTypeEnum.SEARCH)
     @Override
     public Page<ManufacturerInfo> manufacturerInfoPage(SearchDTO searchDTO) {
         return manufacturerInfoService.manufacturerInfoPage(searchDTO);
     }
 
-    @AuditLog(actionType = "厂商详情", operateType = OperateTypeEnum.SEARCH)
     @Override
     public ManufacturerInfo manufacturerInfoDetail(String id) {
         return manufacturerInfoService.manufacturerInfoDetail(id);
     }
 
-    @AuditLog(actionType = "厂商新增", operateType = OperateTypeEnum.ADD)
     @Override
     public ManufacturerInfo saveManufacturer(ManufacturerInfo info) {
         return manufacturerInfoService.saveManufacturer(info);
     }
 
-    @AuditLog(actionType = "厂商修改", operateType = OperateTypeEnum.UPDATE)
     @Override
     public ManufacturerInfo updateManufacturer(ManufacturerInfo info) {
         return manufacturerInfoService.updateManufacturer(info);
     }
 
-    @AuditLog(actionType = "厂商删除", operateType = OperateTypeEnum.DELETE)
     @Override
     public void del(String id) {
         manufacturerInfoService.del(id);
     }
 
-    @AuditLog(actionType = "根据代码获取厂商信息", operateType = OperateTypeEnum.SEARCH)
     @Override
     public ManufacturerInfo detailByCode(String code) {
         return manufacturerInfoService.detailByCode(code);
     }
 
-    @AuditLog(actionType = "根据名称获取厂商信息", operateType = OperateTypeEnum.SEARCH)
     @Override
     public ManufacturerInfo getOneByName(String manufacturerName) {
         return manufacturerInfoService.getOneByName(manufacturerName);
     }
 
-    @AuditLog(actionType = "根据代码、名称获取厂商信息", operateType = OperateTypeEnum.SEARCH)
     @Override
     public ManufacturerInfo getOneByCodeName(String code, String manufacturerName) {
         return manufacturerInfoService.getOneByCodeName(code, manufacturerName);
     }
 
-    @AuditLog(actionType = "获取所有厂商代码", operateType = OperateTypeEnum.SEARCH)
     @Override
     public List<CodeRecord> getAllCodeRecord() {
         return manufacturerInfoService.getAllCodeRecord();
     }
 
-    @AuditLog(actionType = "获取所有厂商id名称映射", operateType = OperateTypeEnum.SEARCH)
     @Override
     public Map<String, String> getAllIdNameMap() {
         return manufacturerInfoService.getAllIdNameMap();
     }
 
-    @AuditLog(actionType = "获取所有厂商列表", operateType = OperateTypeEnum.SEARCH)
     @Override
     public List<ManufacturerInfo> getAllList() {
         return manufacturerInfoService.findAll();

dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/service/IApplyOauthService.java

@@ -2,7 +2,6 @@ package com.dragoninfo.dcuc.app.service;
 
 import com.dragoninfo.dcuc.app.entity.ApplyInfo;
 import com.dragoninfo.dcuc.app.entity.ApplyOauth;
-import com.dragonsoft.duceap.auditlog.annotations.AuditLog;
 import com.dragonsoft.duceap.core.service.IBaseService;
 
 import java.util.List;
@@ -37,7 +36,6 @@ public interface IApplyOauthService extends IBaseService<ApplyOauth, String> {
      * @param map 条件
      * @return 信息
      */
-    @AuditLog(module = "根据Map里面的条件查询所有应用授权")
     List<ApplyOauth> applyOauthList(Map<String, Object> map);
 
 }

dcuc-app-service/src/main/resources/application-base.yml

@@ -61,14 +61,7 @@ duceap:
     locations: classpath:/config/mysql
   mybatis-plus:
     map-camel-case-to-underscore: true
-  auditlog:
-    login:
-      enabled: true
-    audit:
-      enabled: true
-    sqlaudit:
-      output: kafka
-      exclude-tables: T_LOG_*
+
   license:
     enabled: false
     #配置用来指定license对接的后端项目地址(格式：ip:port/context，如http://10.10.10.10:8080/ctx)，