[DEL] delete rule enginee config servie interface

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

 package pwc.taxtech.atms.controller;
 
-import java.util.List;
-
+import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -10,39 +9,39 @@ 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.ApiOperation;
 import pwc.taxtech.atms.dpo.TaxRuleSettingDto;
 import pwc.taxtech.atms.dto.BatchUpdateTaxRuleDto;
 import pwc.taxtech.atms.dto.TaxPayerReportRuleDto;
-import pwc.taxtech.atms.service.RuleEngineeConfigService;
+import pwc.taxtech.atms.service.impl.RuleEngineeConfigServiceImpl;
+
+import java.util.List;
 
-/** @see PwC.Tax.Tech.Atms.WebApi\Controllers\RuleEngineeConfigController.cs */
 @RestController
 @RequestMapping("/api/v1/ruleEngineeConfig/")
 public class RuleEngineeConfigController {
     private static Logger logger = LoggerFactory.getLogger(RuleEngineeConfigController.class);
 
     @Autowired
-    RuleEngineeConfigService ruleEngineeConfigService;
+    RuleEngineeConfigServiceImpl ruleEngineeConfigService;
 
     @ApiOperation(value = "Get TaxPayerReportMapping", notes = "Return TaxPayerReportMapping")
     @RequestMapping(value = "taxPayerReportMapping", method = RequestMethod.GET)
-    public @ResponseBody List<TaxPayerReportRuleDto> getTaxPayerReportMapping() {
+    public @ResponseBody
+    List<TaxPayerReportRuleDto> getTaxPayerReportMapping() {
         logger.debug("RuleEngineeConfigController GetTaxPayerReportMapping");
         return ruleEngineeConfigService.getTaxPayerReportMapping();
     }
 
-    @ApiOperation(value="Get TaxRuleSetting",notes="Return TaxRuleSetting")
-    @RequestMapping(value="taxRuleSetting",method= RequestMethod.GET)
-    public @ResponseBody List<TaxRuleSettingDto> getTaxRuleSetting()
-    {
+    @ApiOperation(value = "Get TaxRuleSetting", notes = "Return TaxRuleSetting")
+    @RequestMapping(value = "taxRuleSetting", method = RequestMethod.GET)
+    public @ResponseBody
+    List<TaxRuleSettingDto> getTaxRuleSetting() {
         logger.debug("RuleEngineeConfigController GetTaxRuleSetting");
         return ruleEngineeConfigService.getTaxRuleSetting();
     }
 
-    @ApiOperation(value="",notes="saveTaxRuleSettings")
-    @RequestMapping(value="taxRuleSetting/Save",method = RequestMethod.POST)
+    @ApiOperation(value = "", notes = "saveTaxRuleSettings")
+    @RequestMapping(value = "taxRuleSetting/Save", method = RequestMethod.POST)
     public void saveTaxRuleSettings(@RequestBody BatchUpdateTaxRuleDto batchUpdateTaxRule) {
         logger.debug("RuleEngineeConfigController SaveTaxRuleSettings");
         ruleEngineeConfigService.savetaxrulesettings(batchUpdateTaxRule);

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

-package pwc.taxtech.atms.service;
-
-import java.util.List;
-
-import pwc.taxtech.atms.dpo.TaxRuleSettingDto;
-import pwc.taxtech.atms.dto.BatchUpdateTaxRuleDto;
-import pwc.taxtech.atms.dto.TaxPayerReportRuleDto;
-
-public interface RuleEngineeConfigService {
-    List<TaxPayerReportRuleDto> getTaxPayerReportMapping();
-    
-    List<TaxRuleSettingDto> getTaxRuleSetting();
-    
-    void savetaxrulesettings(BatchUpdateTaxRuleDto batchUpdateTaxRule);
-}

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

 package pwc.taxtech.atms.service.impl;
 
-import java.util.*;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.stream.Collectors;
-
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-
 import pwc.taxtech.atms.common.AuthUserHelper;
 import pwc.taxtech.atms.common.CommonUtils;
 import pwc.taxtech.atms.common.OperateLogType;
@@ -29,10 +22,16 @@ 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 pwc.taxtech.atms.service.RuleEngineeConfigService;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
 
 @Service
-public class RuleEngineeConfigServiceImpl extends AbstractService implements RuleEngineeConfigService {
+public class RuleEngineeConfigServiceImpl extends AbstractService {
 
     @Autowired
     OperationLogService operationService;
@@ -40,7 +39,6 @@ public class RuleEngineeConfigServiceImpl extends AbstractService implements Rul
     @Autowired
     private AuthUserHelper authUserHelper;
 
-	@Override
     public List<TaxPayerReportRuleDto> getTaxPayerReportMapping() {
         List<String> orgIds = organizationMapper.selectOnlyIdAndParentId().stream().map(OrganizationDto::getId)
                 .collect(Collectors.toList());
@@ -74,7 +72,6 @@ public class RuleEngineeConfigServiceImpl extends AbstractService implements Rul
         return dtoList;
     }
 
-	@Override
     public List<TaxRuleSettingDto> getTaxRuleSetting() {
         List<TaxRuleSettingDto> trsdList = taxRuleSettingMapper.GetTaxRuleSetting();
 
@@ -85,13 +82,12 @@ public class RuleEngineeConfigServiceImpl extends AbstractService implements Rul
         return trsdList;
     }
 
-	@Override
     @Transactional(readOnly = true)
     public void savetaxrulesettings(BatchUpdateTaxRuleDto batchUpdateTaxRule) {
         for (TaxRuleSettingOperation trso : batchUpdateTaxRule.getTaxRuleSettingOperations()) {
             TaxRuleSetting taxRuleSetting = new TaxRuleSetting();
             CommonUtils.copyProperties(trso.getTaxRuleSetting(), taxRuleSetting);
-			taxRuleSetting.setTaxBase(String.valueOf(Integer.parseInt(trso.getTaxRuleSetting().getTaxBase())/100));
+            taxRuleSetting.setTaxBase(String.valueOf(Integer.parseInt(trso.getTaxRuleSetting().getTaxBase()) / 100));
             taxRuleSetting.setCreateTime(new Date());
             taxRuleSetting.setUpdateTime(new Date());
 
@@ -124,25 +120,24 @@ public class RuleEngineeConfigServiceImpl extends AbstractService implements Rul
             }
         }
 
-		for(TaxPayerReportRuleDtoOperation tprrdo:batchUpdateTaxRule.getTaxPayerReportRuleOperations()) {
+        for (TaxPayerReportRuleDtoOperation tprrdo : batchUpdateTaxRule.getTaxPayerReportRuleOperations()) {
             TaxPayerReportRuleDto reportDto = tprrdo.getTaxPayerReportRule();
             TaxPayerReportRule taxPayerReportRule = new TaxPayerReportRule();
             CommonUtils.copyProperties(reportDto, taxPayerReportRule);
             StringBuilder sb = new StringBuilder();
-			for(String s: reportDto.getOrgs()){
+            for (String s : reportDto.getOrgs()) {
                 sb.append(s).append(",");
             }
             String tempStr = sb.toString();
-			taxPayerReportRule.setOrganizationId(tempStr.substring(0,tempStr.length()-2));
+            taxPayerReportRule.setOrganizationId(tempStr.substring(0, tempStr.length() - 2));
             taxPayerReportRule.setCreateTime(new Date());
             taxPayerReportRule.setUpdateTime(new Date());
-			SaveOrganizationServiceTemplateGroup(taxPayerReportRule,tprrdo.getAction());
-			if("Add".equals(tprrdo.getAction())) {
+            SaveOrganizationServiceTemplateGroup(taxPayerReportRule, tprrdo.getAction());
+            if ("Add".equals(tprrdo.getAction())) {
                 taxPayerReportRuleMapper.insert(taxPayerReportRule);
                 operationService.addDataAddLog(taxPayerReportRule, OperationModule.RuleEngineConfig, authUserHelper.getCurrentUserId(),
                         "AddRuleEngineConfiguration", "纳税类型", "纳税类型添加特殊机构", OperateLogType.OperationLogRuleEngine);
-			}
-			else if("Update".equals(tprrdo.getAction())) {
+            } else if ("Update".equals(tprrdo.getAction())) {
                 TaxPayerReportRule old = taxPayerReportRuleMapper.selectByPrimaryKey(reportDto.getId());
                 TaxPayerReportRule original = new TaxPayerReportRule();
                 CommonUtils.copyProperties(old, original);
@@ -158,8 +153,7 @@ public class RuleEngineeConfigServiceImpl extends AbstractService implements Rul
                 operationService.updateDataAddLog(original, taxPayerReportRule, OperationModule.RuleEngineConfig, authUserHelper.getCurrentUserId(),
                         "UpdateRuleEngineConfiguration", "纳税类型", taxPayerReportRule.getIsDefault() ? "默认纳税类型或默认纳税报表" : "纳税类型更新特殊机构", OperateLogType.OperationLogRuleEngine);
 
-			}
-			else if("Delete".equals(tprrdo.getAction())) {
+            } else if ("Delete".equals(tprrdo.getAction())) {
                 taxPayerReportRuleMapper.deleteByPrimaryKey(taxPayerReportRule.getId());
                 operationService.deleteDataAddLog(reportDto, OperationModule.RuleEngineConfig, authUserHelper.getCurrentUserId(),
                         "DeleteRuleEngineConfiguration", "纳税类型", "纳税类型删除特殊机构", OperateLogType.OperationLogRuleEngine);
@@ -196,23 +190,18 @@ public class RuleEngineeConfigServiceImpl extends AbstractService implements Rul
         example.createCriteria().andOrganizationIdEqualTo(taxPayerReportRule.getOrganizationId()).andServiceTypeIdEqualTo("2");
         Optional<OrganizationServiceTemplateGroup> thisOrgTemplate = organizationServiceTemplateGroupMapper.selectByExample(example).stream().findFirst();
 
-		if("Delete".equals(action)) {
+        if ("Delete".equals(action)) {
             thisOrgTemplate.ifPresent(organizationServiceTemplateGroup -> organizationServiceTemplateGroupMapper.deleteByPrimaryKey(organizationServiceTemplateGroup.getId()));
-		}
-		else
-		{
-			if(thisOrgTemplate.isPresent()) {
+        } else {
+            if (thisOrgTemplate.isPresent()) {
                 OrganizationServiceTemplateGroup organizationServiceTemplateGroup = thisOrgTemplate.get();
-				if(organizationServiceTemplateGroup.getTemplateGroupId().equals(taxPayerReportRule.getTemplateGroupId())) {
+                if (organizationServiceTemplateGroup.getTemplateGroupId().equals(taxPayerReportRule.getTemplateGroupId())) {
                     //不用改
-				}
-				else
-				{
+                } else {
                     organizationServiceTemplateGroup.setTemplateGroupId(taxPayerReportRule.getTemplateGroupId());
                     organizationServiceTemplateGroupMapper.updateByPrimaryKeySelective(organizationServiceTemplateGroup);
                 }
-			}
-			else {
+            } else {
                 OrganizationServiceTemplateGroup entity = new OrganizationServiceTemplateGroup();
 
                 entity.setId(distributedIdService.nextId());