[DEL] delete operation log service interface

atms-api/src/main/java/pwc/taxtech/atms/controller/OperationLogController.java

 package pwc.taxtech.atms.controller;
 
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -9,9 +11,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
-
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiOperation;
 import pwc.taxtech.atms.common.CommonUtils;
 import pwc.taxtech.atms.common.OperateLogType;
 import pwc.taxtech.atms.common.OperationAction;
@@ -19,7 +18,7 @@ import pwc.taxtech.atms.common.OperationModule;
 import pwc.taxtech.atms.dto.OperationLogDto;
 import pwc.taxtech.atms.dto.PagingResultDto;
 import pwc.taxtech.atms.dto.QueryOperateParamDto;
-import pwc.taxtech.atms.service.OperationLogService;
+import pwc.taxtech.atms.service.impl.OperationLogServiceImpl;
 import pwc.taxtech.atms.vat.entity.VatOperationLog;
 
 import java.util.Date;
@@ -34,7 +33,7 @@ public class OperationLogController {
     private static Logger logger = LoggerFactory.getLogger(OperationLogController.class);
 
     @Autowired
-    private OperationLogService operationLogService;
+    private OperationLogServiceImpl operationLogService;
 
     @ApiOperation(value = "查询日志")
     @ApiImplicitParam(name = "queryOperateParamDto", value = "queryOperateParamDto", required = true, dataType = "QueryOperateParamDto")

atms-api/src/main/java/pwc/taxtech/atms/service/OperationLogService.java

-package pwc.taxtech.atms.service;
-
-import java.util.List;
-
-import pwc.taxtech.atms.common.OperateLogType;
-import pwc.taxtech.atms.common.OperationModule;
-import pwc.taxtech.atms.dto.OperationLogDto;
-import pwc.taxtech.atms.dto.PagingResultDto;
-import pwc.taxtech.atms.dto.QueryOperateParamDto;
-import pwc.taxtech.atms.dto.UpdateLogParams;
-
-public interface OperationLogService {
-
-    void addOperationLog(OperationLogDto operationLogDto);
-    
-    void addOperationLogList(List<OperationLogDto> operationLogDtoList);
-
-    PagingResultDto<OperationLogDto> getOperationLogList(QueryOperateParamDto queryOperateParamDto);
-
-    /**
-     * 修改数据添加日志方法
-     * @param updateLogParamsList
-     */
-    void updateDataAddLog(List<UpdateLogParams> updateLogParamsList);
-    
-    /**
-     * 修改数据添加日志方法
-     * @param updateLogParams
-     */
-    void updateDataAddLog(UpdateLogParams updateLogParams);
-    
-    /**
-     * 新增数据或删除数据添加日志方法
-     * @param paramList
-     */
-    void addOrDeleteDataAddLog(List<UpdateLogParams> updateLogParamsList);
-    
-    /**
-     * 新增数据或删除数据添加日志方法
-     * @param updateLogParamsList
-     */
-    void addOrDeleteDataAddLog(UpdateLogParams updateLogParams);
-    
-    void addDataAddLog(Object newObj, OperationModule operationModule, String userName, String operationDesc
-            , String operationContent, String OperationObject, OperateLogType logType);
-    
-    void updateDataAddLog(Object originalObj, Object updateObj, OperationModule operationModule, String userName
-            , String comment, String operationObject, String operationContent, OperateLogType logType);
-    
-    void deleteDataAddLog(Object deleteObj, OperationModule operationModule, String userName, String comment
-            , String operationContent, String OperationObject, OperateLogType logType);
-}

atms-api/src/main/java/pwc/taxtech/atms/service/impl/AbstractService.java

@@ -3,11 +3,9 @@ package pwc.taxtech.atms.service.impl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-
 import pwc.taxtech.atms.common.AtmsApiSettings;
 import pwc.taxtech.atms.common.AuthUserHelper;
 import pwc.taxtech.atms.dao.*;
-import pwc.taxtech.atms.service.OperationLogService;
 
 public class AbstractService {
     protected final Logger logger = LoggerFactory.getLogger(this.getClass());
@@ -17,7 +15,7 @@ public class AbstractService {
     @Autowired
     protected AtmsApiSettings atmsApiSettings;
     @Autowired
-    protected OperationLogService operationLogService;
+    protected OperationLogServiceImpl operationLogService;
 
     @Autowired
     protected AreaMapper areaMapper;
@@ -119,7 +117,7 @@ public class AbstractService {
     protected CellTemplateConfigMapper cellTemplateConfigMapper;
     @Autowired
     protected TemplateMapper templateMapper;
-//    @Autowired
+    //    @Autowired
 //    protected  TemplateFormulaMapper templateFormulaMapper;
     @Autowired
     protected FormulaConfigMapper formulaConfigMapper;

atms-api/src/main/java/pwc/taxtech/atms/service/impl/AreaRegionServiceImpl.java

@@ -28,7 +28,6 @@ import pwc.taxtech.atms.entity.AreaRegion;
 import pwc.taxtech.atms.entity.AreaRegionExample;
 import pwc.taxtech.atms.entity.Region;
 import pwc.taxtech.atms.entity.RegionExample;
-import pwc.taxtech.atms.service.OperationLogService;
 
 import java.util.ArrayList;
 import java.util.Comparator;
@@ -45,7 +44,7 @@ public class AreaRegionServiceImpl {
     private AreaMapper areaMapper;
 
     @Autowired
-    private OperationLogService operationLogService;
+    private OperationLogServiceImpl operationLogService;
     @Autowired
     private AuthUserHelper authUserHelper;
     @Autowired

atms-api/src/main/java/pwc/taxtech/atms/service/impl/AreaServiceImpl.java

@@ -24,7 +24,6 @@ import pwc.taxtech.atms.entity.AreaExample;
 import pwc.taxtech.atms.entity.AreaExample.Criteria;
 import pwc.taxtech.atms.entity.Organization;
 import pwc.taxtech.atms.exception.ApplicationException;
-import pwc.taxtech.atms.service.OperationLogService;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -39,7 +38,7 @@ public class AreaServiceImpl {
     @Autowired
     private OrganizationServiceImpl organizationService;
     @Autowired
-    private OperationLogService operationLogService;
+    private OperationLogServiceImpl operationLogService;
     @Autowired
     private AuthUserHelper authUserHelper;
 

atms-api/src/main/java/pwc/taxtech/atms/service/impl/BaseService.java

@@ -7,7 +7,6 @@ import org.springframework.web.client.RestTemplate;
 import pwc.taxtech.atms.common.AtmsApiSettings;
 import pwc.taxtech.atms.common.AuthUserHelper;
 import pwc.taxtech.atms.common.util.BeanUtil;
-import pwc.taxtech.atms.service.OperationLogService;
 
 public class BaseService {
     protected final Logger logger = LoggerFactory.getLogger(this.getClass());
@@ -17,7 +16,7 @@ public class BaseService {
     @Autowired
     protected AtmsApiSettings atmsApiSettings;
     @Autowired
-    protected OperationLogService operationLogService;
+    protected OperationLogServiceImpl operationLogService;
     @Autowired
     protected DistributedIdService idService;
     @Autowired

atms-api/src/main/java/pwc/taxtech/atms/service/impl/BusinessUnitServiceImpl.java

@@ -22,7 +22,6 @@ import pwc.taxtech.atms.entity.BusinessUnit;
 import pwc.taxtech.atms.entity.BusinessUnitExample;
 import pwc.taxtech.atms.entity.BusinessUnitExample.Criteria;
 import pwc.taxtech.atms.exception.ApplicationException;
-import pwc.taxtech.atms.service.OperationLogService;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -39,7 +38,7 @@ public class BusinessUnitServiceImpl {
     private BusinessUnitMapper businessUnitMapper;
 
     @Autowired
-    private OperationLogService operationLogService;
+    private OperationLogServiceImpl operationLogService;
 
     @Autowired
     private OrganizationServiceImpl organizationService;

atms-api/src/main/java/pwc/taxtech/atms/service/impl/CustomerServiceImpl.java

@@ -30,7 +30,6 @@ import pwc.taxtech.atms.entity.CustomerExample;
 import pwc.taxtech.atms.entity.CustomerExample.Criteria;
 import pwc.taxtech.atms.entity.EnterpriseAccountSet;
 import pwc.taxtech.atms.exception.ApplicationException;
-import pwc.taxtech.atms.service.OperationLogService;
 import pwc.taxtech.atms.vat.dao.CustomsInvoiceMapper;
 import pwc.taxtech.atms.vat.entity.CustomsInvoice;
 import pwc.taxtech.atms.vat.entity.CustomsInvoiceExample;
@@ -59,7 +58,7 @@ public class CustomerServiceImpl {
     private AuthUserHelper authUserHelper;
 
     @Autowired
-    private OperationLogService operationLogService;
+    private OperationLogServiceImpl operationLogService;
 
     @Autowired
     private EnterpriseAccountSetMapper enterpriseAccountSetMapper;

atms-api/src/main/java/pwc/taxtech/atms/service/impl/EnterpriseAccountSetServiceImpl.java

@@ -25,7 +25,6 @@ import pwc.taxtech.atms.entity.EnterpriseAccountSetOrg;
 import pwc.taxtech.atms.entity.EnterpriseAccountSetOrgExample;
 import pwc.taxtech.atms.entity.EnterpriseAccountSetOrgExample.Criteria;
 import pwc.taxtech.atms.entity.Organization;
-import pwc.taxtech.atms.service.OperationLogService;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -43,7 +42,7 @@ public class EnterpriseAccountSetServiceImpl {
     private OrganizationMapper organizationMapper;
 
     @Autowired
-    private OperationLogService operationLogService;
+    private OperationLogServiceImpl operationLogService;
 
     @Autowired
     private AuthUserHelper authUserHelper;

atms-api/src/main/java/pwc/taxtech/atms/service/impl/OperationLogServiceImpl.java

@@ -27,7 +27,6 @@ import pwc.taxtech.atms.dto.UpdateLogParams;
 import pwc.taxtech.atms.entity.*;
 import pwc.taxtech.atms.entity.OperationLogBasicDataExample.Criteria;
 import pwc.taxtech.atms.exception.ApplicationException;
-import pwc.taxtech.atms.service.OperationLogService;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
@@ -38,7 +37,7 @@ import java.util.Objects;
 /**
  */
 @Service
-public class OperationLogServiceImpl extends AbstractService implements OperationLogService {
+public class OperationLogServiceImpl extends AbstractService {
     private static final Logger logger = LoggerFactory.getLogger(OperationLogServiceImpl.class);
     @Autowired
     private OperationLogBasicDataMapper operationLogBasicDataMapper;
@@ -46,7 +45,6 @@ public class OperationLogServiceImpl extends AbstractService implements Operatio
     @Autowired
     private AuthUserHelper authUserHelper;
 
-	@Override
     public void addOperationLog(OperationLogDto operationLogDto) {
         OperationLogSmart record = new OperationLogSmart();
         Integer logtype = operationLogDto.getLogType();
@@ -88,7 +86,6 @@ public class OperationLogServiceImpl extends AbstractService implements Operatio
         operationLogBasicDataMapper.insertSmart(record);
     }
 
-	@Override
     public void addOperationLogList(List<OperationLogDto> operationLogDtoList) {
         logger.debug("OperationLogService addOperationLogList");
         if (!operationLogDtoList.isEmpty()) {
@@ -98,7 +95,6 @@ public class OperationLogServiceImpl extends AbstractService implements Operatio
         }
     }
 
-	@Override
     public PagingResultDto<OperationLogDto> getOperationLogList(QueryOperateParamDto queryOperateParamDto) {
         logger.debug("OperationLogService getOperationLogList");
         // validate
@@ -253,7 +249,6 @@ public class OperationLogServiceImpl extends AbstractService implements Operatio
      * @see
      * pwc.taxtech.atms.service.OperationLogService#updateDataAddLog(java.util.List)
      */
-	@Override
     public void updateDataAddLog(List<UpdateLogParams> updateLogParamsList) {
 
         for (UpdateLogParams updateLogParams : updateLogParamsList) {
@@ -263,7 +258,6 @@ public class OperationLogServiceImpl extends AbstractService implements Operatio
     }
 
     // check how many properties being updated and the log number should be same
-	@Override
     public void updateDataAddLog(UpdateLogParams updateLogParams) {
         logger.debug("OperationLogService updateDataAddLog, parameter: {}", updateLogParams);
         if (updateLogParams != null && updateLogParams.getOriginalState() != null
@@ -398,7 +392,6 @@ public class OperationLogServiceImpl extends AbstractService implements Operatio
      * pwc.taxtech.atms.service.OperationLogService#addOrDeleteDataAddLog(java.util.
      * List)
      */
-	@Override
     public void addOrDeleteDataAddLog(List<UpdateLogParams> updateLogParamsList) {
 
         for (UpdateLogParams updateLogParams : updateLogParamsList) {
@@ -412,7 +405,6 @@ public class OperationLogServiceImpl extends AbstractService implements Operatio
      * @see pwc.taxtech.atms.service.OperationLogService#addOrDeleteDataAddLog(pwc.
      * taxtech.atms.service.dto.UpdateLogParams)
      */
-	@Override
     public void addOrDeleteDataAddLog(UpdateLogParams updateLogParams) {
 
         logger.debug("OperationLogService addOrDeleteDataAddLog, parameter: {}", updateLogParams);
@@ -437,7 +429,6 @@ public class OperationLogServiceImpl extends AbstractService implements Operatio
         return upcaseFirstFlag ? Strings.upperFirst(result) : result;
     }
 
-	@Override
     public void addDataAddLog(Object newObj, OperationModule operationModule, String userName, String operationDesc,
                               String operationContent, String OperationObject, OperateLogType logType) {
         OperationLogDto addLog = new OperationLogDto();
@@ -457,7 +448,6 @@ public class OperationLogServiceImpl extends AbstractService implements Operatio
         this.addOperationLog(addLog);
     }
 
-	@Override
     public void updateDataAddLog(Object originalObj, Object updateObj, OperationModule operationModule, String userName,
                                  String comment, String operationObject, String operationContent, OperateLogType logType) {
         UpdateLogParams params = new UpdateLogParams();
@@ -473,7 +463,6 @@ public class OperationLogServiceImpl extends AbstractService implements Operatio
         this.updateDataAddLog(params);
     }
 
-	@Override
     public void deleteDataAddLog(Object deleteObj, OperationModule operationModule, String userName, String comment,
                                  String operationContent, String OperationObject, OperateLogType logType) {
         OperationLogDto addLog = new OperationLogDto();

atms-api/src/main/java/pwc/taxtech/atms/service/impl/OrganizationServiceImpl.java

@@ -56,7 +56,6 @@ import pwc.taxtech.atms.dto.user.NameDto;
 import pwc.taxtech.atms.entity.*;
 import pwc.taxtech.atms.entity.OrganizationExample.Criteria;
 import pwc.taxtech.atms.exception.ApplicationException;
-import pwc.taxtech.atms.service.OperationLogService;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -141,7 +140,7 @@ public class OrganizationServiceImpl {
     private DimensionValueMapper dimensionValueMapper;
 
     @Autowired
-    private OperationLogService operationLogService;
+    private OperationLogServiceImpl operationLogService;
 
     @Autowired
     private EnterpriseAccountSetOrgMapper enterpriseAccountSetOrgMapper;

atms-api/src/main/java/pwc/taxtech/atms/service/impl/OrganizationStructureServiceImpl.java

@@ -21,7 +21,6 @@ import pwc.taxtech.atms.dto.UpdateLogParams;
 import pwc.taxtech.atms.entity.OrganizationStructure;
 import pwc.taxtech.atms.entity.OrganizationStructureExample;
 import pwc.taxtech.atms.exception.ApplicationException;
-import pwc.taxtech.atms.service.OperationLogService;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -36,7 +35,7 @@ public class OrganizationStructureServiceImpl {
     private OrganizationStructureMapper organizationStructureMapper;
 
     @Autowired
-    private OperationLogService operationLogService;
+    private OperationLogServiceImpl operationLogService;
 
     @Autowired
     private OrganizationServiceImpl organizationService;

atms-api/src/main/java/pwc/taxtech/atms/service/impl/RuleEngineeConfigServiceImpl.java

@@ -21,7 +21,6 @@ import pwc.taxtech.atms.entity.TaxPayerReportRuleExample;
 import pwc.taxtech.atms.entity.TaxRuleSetting;
 import pwc.taxtech.atms.entity.TaxRuleSettingOrganization;
 import pwc.taxtech.atms.entity.TaxRuleSettingOrganizationExample;
-import pwc.taxtech.atms.service.OperationLogService;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -34,7 +33,7 @@ import java.util.stream.Collectors;
 public class RuleEngineeConfigServiceImpl extends AbstractService {
 
     @Autowired
-    OperationLogService operationService;
+    OperationLogServiceImpl operationService;
 
     @Autowired
     private AuthUserHelper authUserHelper;

atms-api/src/main/java/pwc/taxtech/atms/service/impl/UserServiceImpl.java

@@ -54,7 +54,6 @@ import pwc.taxtech.atms.exception.ApplicationException;
 import pwc.taxtech.atms.security.AtmsPasswordEncoder;
 import pwc.taxtech.atms.security.JwtUtil;
 import pwc.taxtech.atms.security.LdapAuthenticationProvider;
-import pwc.taxtech.atms.service.OperationLogService;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -96,7 +95,7 @@ public class UserServiceImpl extends AbstractService {
     @Autowired
     private UserOrganizationMapper userOrganizationMapper;
     @Autowired
-    private OperationLogService operationLogService;
+    private OperationLogServiceImpl operationLogService;
     @Autowired
     private OrganizationServiceImpl organizationService;
     @Autowired