feature 代码提交

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/dao/BusinessCommonMapper.java

@@ -16,4 +16,7 @@ public interface BusinessCommonMapper {
     // 获取时效内的项目数量信息
     List<String> withinTimeEPCProjectNames(@Param("mainIds") List<String> mainIds,
                                            @Param("projectName") List<String> projectName);
+
+    void deletedAboutInfoByProjectName(@Param("projectName") String projectName,
+                                       @Param("mainId") String mainId);
 }

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/dao/SysConfigMapper.java

@@ -10,6 +10,6 @@ import com.rongwei.rwcommonentity.commonservers.domain.SysConfigDo;
  * @email sunlightcs@gmail.com
  * @date 2019-10-10 09:46:12
  */
-public interface SysConfigMapper extends BaseDao<SysConfigDo> {
+public interface ConfigMapper extends BaseDao<SysConfigDo> {
 	
 }

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/dao/JtFjglxmMapper.java

@@ -1,7 +1,7 @@
 package com.rongwei.bscommon.sys.dao;
 
-import com.rongwei.bsentity.domain.JtFjglxm;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rongwei.bsentity.domain.JtFjglxm;
 
 /**
  * @Entity com.rongwei.bsentity.domain.JtFjglxm

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/service/BusinessCommonService.java

@@ -0,0 +1,16 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.rongwei.rwcommon.base.R;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Map;
+
+/**
+ * BusinessCommonService class
+ *
+ * @author XH
+ * @date 2024/12/12
+ */
+public interface BusinessCommonService {
+    R deletedAboutInfoByProjectName(Map<String,String> projectNameMap);
+}

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/service/impl/BusinessCommonServiceImpl.java

@@ -0,0 +1,37 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import com.rongwei.bscommon.sys.dao.BusinessCommonMapper;
+import com.rongwei.bscommon.sys.service.BusinessCommonService;
+import com.rongwei.rwcommon.base.R;
+import com.rongwei.rwcommon.base.exception.CustomException;
+import net.logstash.logback.encoder.org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * BusinessCommonServiceImpl class
+ *
+ * @author XH
+ * @date 2024/12/12
+ */
+@Service
+public class BusinessCommonServiceImpl implements BusinessCommonService {
+    @Autowired
+    private BusinessCommonMapper businessCommonMapper;
+
+    @Override
+    public R deletedAboutInfoByProjectName(Map<String, String> projectNameMap) {
+        String projectName = projectNameMap.getOrDefault("projectName", "");
+        if (StringUtils.isBlank(projectName)) {
+            throw new CustomException("数据异常");
+        }
+        String mainId = projectNameMap.getOrDefault("mainId", "");
+        if (StringUtils.isBlank(mainId)) {
+            throw new CustomException("数据异常");
+        }
+        businessCommonMapper.deletedAboutInfoByProjectName(projectName, mainId);
+        return R.ok();
+    }
+}

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/service/impl/SysConfigServiceImpl.java

@@ -2,7 +2,7 @@ package com.rongwei.bscommon.sys.service.impl;
 
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.rongwei.bscommon.sys.dao.SysConfigMapper;
+import com.rongwei.bscommon.sys.dao.ConfigMapper;
 import com.rongwei.bscommon.sys.service.SysConfigService;
 import com.rongwei.rwcommonentity.commonservers.domain.SysConfigDo;
 import org.springframework.stereotype.Service;
@@ -12,7 +12,7 @@ import java.util.List;
 import java.util.Map;
 
 @Service("sysConfigService")
-public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfigDo> implements SysConfigService {
+public class SysConfigServiceImpl extends ServiceImpl<ConfigMapper, SysConfigDo> implements SysConfigService {
 
     @Override
     public String getContentByConfigCode(String code){

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/api/CalculatorContext.java

@@ -12,7 +12,7 @@ import java.util.Map;
  */
 public class CalculatorContext {
 
-    private ApiRequestAndProcessingStrategy strategy;
+    private final ApiRequestAndProcessingStrategy strategy;
 
     public CalculatorContext(ApiRequestAndProcessingStrategy strategy) {
 

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/api/KC112ApiRequestAndProcessing.java

@@ -56,7 +56,7 @@ public class KC112ApiRequestAndProcessing implements ApiRequestAndProcessingStra
         ApiCallDto paramVo = new ApiCallDto();
         paramVo.setData(apiCallData);
         paramVo.setApiCode(code);
-        ApiReturnDto apiReturnDto = this.attendanceAssessmentSdk.apiCall(paramVo);
+        ApiReturnDto apiReturnDto = attendanceAssessmentSdk.apiCall(paramVo);
         // 后续逻辑处理
         jtWyysService.removeById(id);
         // 后续逻辑处理

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/api/KC113ApiRequestAndProcessing.java

@@ -68,7 +68,7 @@ public class KC113ApiRequestAndProcessing implements ApiRequestAndProcessingStra
         ApiReturnDto apiReturnDto = attendanceAssessmentSdk.apiCall(paramVo);
         // 后续逻辑处理
         Map<String, String> apiReturnData = apiReturnDto.getApiReturnData();
-        String realDataId = apiReturnData.getOrDefault("DATAID", "").toString();
+        String realDataId = apiReturnData.getOrDefault("DATAID", "");
         if (StringUtils.isBlank(realDataId)) {
             throw new CustomException("接口请求成功,但无法获取dataId");
         }

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/api/KC115ApiRequestAndProcessing.java

@@ -75,7 +75,7 @@ public class KC115ApiRequestAndProcessing implements ApiRequestAndProcessingStra
         ApiReturnDto apiReturnDto = attendanceAssessmentSdk.apiCall(paramVo);
         // 后续逻辑处理
         Map<String, String> apiReturnData = apiReturnDto.getApiReturnData();
-        String realDataId = apiReturnData.getOrDefault("DATAID", "").toString();
+        String realDataId = apiReturnData.getOrDefault("DATAID", "");
         if (StringUtils.isBlank(realDataId)) {
             throw new CustomException("接口请求成功,但无法获取dataId");
         }

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/api/KC116ApiRequestAndProcessing.java

@@ -56,7 +56,7 @@ public class KC116ApiRequestAndProcessing implements ApiRequestAndProcessingStra
         ApiCallDto paramVo = new ApiCallDto();
         paramVo.setData(apiCallData);
         paramVo.setApiCode(code);
-        ApiReturnDto apiReturnDto = this.attendanceAssessmentSdk.apiCall(paramVo);
+        ApiReturnDto apiReturnDto = attendanceAssessmentSdk.apiCall(paramVo);
         // 后续逻辑处理
         jtScsdlService.removeById(id);
         // 后续逻辑处理

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/api/KC117ApiRequestAndProcessing.java

@@ -71,7 +71,7 @@ public class KC117ApiRequestAndProcessing implements ApiRequestAndProcessingStra
         ApiReturnDto apiReturnDto = attendanceAssessmentSdk.apiCall(paramVo);
         // 后续逻辑处理
         Map<String, String> apiReturnData = apiReturnDto.getApiReturnData();
-        String realDataId = apiReturnData.getOrDefault("DATAID", "").toString();
+        String realDataId = apiReturnData.getOrDefault("DATAID", "");
         if (StringUtils.isBlank(realDataId)) {
             throw new CustomException("接口请求成功,但无法获取dataId");
         }

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/api/KC118ApiRequestAndProcessing.java

@@ -58,7 +58,7 @@ public class KC118ApiRequestAndProcessing implements ApiRequestAndProcessingStra
         ApiCallDto paramVo = new ApiCallDto();
         paramVo.setData(apiCallData);
         paramVo.setApiCode(code);
-        ApiReturnDto apiReturnDto = this.attendanceAssessmentSdk.apiCall(paramVo);
+        ApiReturnDto apiReturnDto = attendanceAssessmentSdk.apiCall(paramVo);
         // 后续逻辑处理
         jtWtbhglService.removeById(id);
         // 后续逻辑处理

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/api/KC119ApiRequestAndProcessing.java

@@ -71,7 +71,7 @@ public class KC119ApiRequestAndProcessing implements ApiRequestAndProcessingStra
         ApiReturnDto apiReturnDto = attendanceAssessmentSdk.apiCall(paramVo);
         // 后续逻辑处理
         Map<String, String> apiReturnData = apiReturnDto.getApiReturnData();
-        String realDataId = apiReturnData.getOrDefault("DATAID", "").toString();
+        String realDataId = apiReturnData.getOrDefault("DATAID", "");
         if (StringUtils.isBlank(realDataId)) {
             throw new CustomException("接口请求成功,但无法获取dataId");
         }

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/api/KC120ApiRequestAndProcessing.java

@@ -58,7 +58,7 @@ public class KC120ApiRequestAndProcessing implements ApiRequestAndProcessingStra
         ApiCallDto paramVo = new ApiCallDto();
         paramVo.setData(apiCallData);
         paramVo.setApiCode(code);
-        ApiReturnDto apiReturnDto = this.attendanceAssessmentSdk.apiCall(paramVo);
+        ApiReturnDto apiReturnDto = attendanceAssessmentSdk.apiCall(paramVo);
         // 后续逻辑处理
         jtScbhglService.removeById(id);
         // 后续逻辑处理

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/api/KC121ApiRequestAndProcessing.java

@@ -70,7 +70,7 @@ public class KC121ApiRequestAndProcessing implements ApiRequestAndProcessingStra
         ApiReturnDto apiReturnDto = attendanceAssessmentSdk.apiCall(paramVo);
         // 后续逻辑处理
         Map<String, String> apiReturnData = apiReturnDto.getApiReturnData();
-        String realDataId = apiReturnData.getOrDefault("DATAID", "").toString();
+        String realDataId = apiReturnData.getOrDefault("DATAID", "");
         if (StringUtils.isBlank(realDataId)) {
             throw new CustomException("接口请求成功,但无法获取dataId");
         }

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/api/KC122ApiRequestAndProcessing.java

@@ -52,7 +52,7 @@ public class KC122ApiRequestAndProcessing implements ApiRequestAndProcessingStra
         ApiCallDto paramVo = new ApiCallDto();
         paramVo.setData(apiCallData);
         paramVo.setApiCode(code);
-        ApiReturnDto apiReturnDto = this.attendanceAssessmentSdk.apiCall(paramVo);
+        ApiReturnDto apiReturnDto = attendanceAssessmentSdk.apiCall(paramVo);
         // 后续逻辑处理
         jtSjjdqdService.removeById(id);
         // 后续逻辑处理

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/api/KC135ApiRequestAndProcessing.java

@@ -63,7 +63,7 @@ public class KC135ApiRequestAndProcessing implements ApiRequestAndProcessingStra
         ApiReturnDto apiReturnDto = attendanceAssessmentSdk.apiCall(paramVo);
         // 后续逻辑处理
         Map<String, String> apiReturnData = apiReturnDto.getApiReturnData();
-        String realDataId = apiReturnData.getOrDefault("DATAID", "").toString();
+        String realDataId = apiReturnData.getOrDefault("DATAID", "");
         if (StringUtils.isBlank(realDataId)) {
             throw new CustomException("接口请求成功,但无法获取dataId");
         }

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/api/KC137ApiRequestAndProcessing.java

@@ -64,7 +64,7 @@ public class KC137ApiRequestAndProcessing implements ApiRequestAndProcessingStra
         ApiReturnDto apiReturnDto = attendanceAssessmentSdk.apiCall(paramVo);
         // 后续逻辑处理
         Map<String, String> apiReturnData = apiReturnDto.getApiReturnData();
-        String realDataId = apiReturnData.getOrDefault("DATAID", "").toString();
+        String realDataId = apiReturnData.getOrDefault("DATAID", "");
         if (StringUtils.isBlank(realDataId)) {
             throw new CustomException("接口请求成功,但无法获取dataId");
         }

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/api/KC139ApiRequestAndProcessing.java

@@ -62,7 +62,7 @@ public class KC139ApiRequestAndProcessing implements ApiRequestAndProcessingStra
         ApiReturnDto apiReturnDto = attendanceAssessmentSdk.apiCall(paramVo);
         // 后续逻辑处理
         Map<String, String> apiReturnData = apiReturnDto.getApiReturnData();
-        String realDataId = apiReturnData.getOrDefault("DATAID", "").toString();
+        String realDataId = apiReturnData.getOrDefault("DATAID", "");
         if (StringUtils.isBlank(realDataId)) {
             throw new CustomException("接口请求成功,但无法获取dataId");
         }

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/api/KC141ApiRequestAndProcessing.java

@@ -69,7 +69,7 @@ public class KC141ApiRequestAndProcessing implements ApiRequestAndProcessingStra
         ApiReturnDto apiReturnDto = attendanceAssessmentSdk.apiCall(paramVo);
         // 后续逻辑处理
         Map<String, String> apiReturnData = apiReturnDto.getApiReturnData();
-        String realDataId = apiReturnData.getOrDefault("DATAID", "").toString();
+        String realDataId = apiReturnData.getOrDefault("DATAID", "");
         if (StringUtils.isBlank(realDataId)) {
             throw new CustomException("接口请求成功,但无法获取dataId");
         }

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/api/KC143ApiRequestAndProcessing.java

@@ -65,7 +65,7 @@ public class KC143ApiRequestAndProcessing implements ApiRequestAndProcessingStra
         ApiReturnDto apiReturnDto = attendanceAssessmentSdk.apiCall(paramVo);
         // 后续逻辑处理
         Map<String, String> apiReturnData = apiReturnDto.getApiReturnData();
-        String realDataId = apiReturnData.getOrDefault("DATAID", "").toString();
+        String realDataId = apiReturnData.getOrDefault("DATAID", "");
         if (StringUtils.isBlank(realDataId)) {
             throw new CustomException("接口请求成功,但无法获取dataId");
         }

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/scoreCalculation/ScoreCalculationServiceNum13.java

@@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -129,6 +130,6 @@ public class ScoreCalculationServiceNum13 implements ScoreCalculationService {
         if(numerator==0){
             return BigDecimal.ZERO;
         }
-        return BigDecimal.valueOf(numerator).divide(BigDecimal.valueOf(denominator), 6, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")).setScale(3, BigDecimal.ROUND_HALF_UP);
+        return BigDecimal.valueOf(numerator).divide(BigDecimal.valueOf(denominator), 6, RoundingMode.HALF_UP).multiply(new BigDecimal("100")).setScale(3, RoundingMode.HALF_UP);
     }
 }

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/scoreCalculation/ScoreCalculationServiceNum15.java

@@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.sql.Date;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -123,6 +124,6 @@ public class ScoreCalculationServiceNum15 implements ScoreCalculationService {
         if(numerator==0){
             return BigDecimal.ZERO;
         }
-        return BigDecimal.valueOf(numerator).divide(BigDecimal.valueOf(denominator), 6, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")).setScale(3, BigDecimal.ROUND_HALF_UP);
+        return BigDecimal.valueOf(numerator).divide(BigDecimal.valueOf(denominator), 6, RoundingMode.HALF_UP).multiply(new BigDecimal("100")).setScale(3, RoundingMode.HALF_UP);
     }
 }

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/scoreCalculation/ScoreCalculationServiceNum16.java

@@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -118,6 +119,6 @@ public class ScoreCalculationServiceNum16 implements ScoreCalculationService {
         if(numerator==0){
             return BigDecimal.ZERO;
         }
-        return BigDecimal.valueOf(numerator).divide(BigDecimal.valueOf(denominator), 6, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")).setScale(3, BigDecimal.ROUND_HALF_UP);
+        return BigDecimal.valueOf(numerator).divide(BigDecimal.valueOf(denominator), 6, RoundingMode.HALF_UP).multiply(new BigDecimal("100")).setScale(3, RoundingMode.HALF_UP);
     }
 }

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/scoreCalculation/ScoreCalculationServiceNum17.java

@@ -13,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
@@ -131,7 +132,7 @@ public class ScoreCalculationServiceNum17 implements ScoreCalculationService {
         if (numerator == 0) {
             return BigDecimal.ZERO;
         }
-        return BigDecimal.valueOf(numerator).divide(BigDecimal.valueOf(denominator), 6, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")).setScale(3, BigDecimal.ROUND_HALF_UP);
+        return BigDecimal.valueOf(numerator).divide(BigDecimal.valueOf(denominator), 6, RoundingMode.HALF_UP).multiply(new BigDecimal("100")).setScale(3, RoundingMode.HALF_UP);
     }
 
     /**

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/scoreCalculation/ScoreCalculationServiceNum3.java

@@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -172,8 +173,8 @@ public class ScoreCalculationServiceNum3 implements ScoreCalculationService {
         if (numerator == 0) {
             return BigDecimal.valueOf(100);
         }
-        return BigDecimal.valueOf(numerator).divide(BigDecimal.valueOf(denominator), 6, BigDecimal.ROUND_HALF_UP)
+        return BigDecimal.valueOf(numerator).divide(BigDecimal.valueOf(denominator), 6, RoundingMode.HALF_UP)
                 .multiply(new BigDecimal("100"))
-                .setScale(3, BigDecimal.ROUND_HALF_UP);
+                .setScale(3, RoundingMode.HALF_UP);
     }
 }

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/scoreCalculation/ScoreCalculationServiceNum4.java

@@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -172,8 +173,8 @@ public class ScoreCalculationServiceNum4 implements ScoreCalculationService {
         if (numerator == 0) {
             return BigDecimal.valueOf(100);
         }
-        return BigDecimal.valueOf(numerator).divide(BigDecimal.valueOf(denominator), 6, BigDecimal.ROUND_HALF_UP)
+        return BigDecimal.valueOf(numerator).divide(BigDecimal.valueOf(denominator), 6, RoundingMode.HALF_UP)
                 .multiply(new BigDecimal("100"))
-                .setScale(3, BigDecimal.ROUND_HALF_UP);
+                .setScale(3, RoundingMode.HALF_UP);
     }
 }

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/scoreCalculation/ScoreCalculationServiceNum5.java

@@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -171,8 +172,8 @@ public class ScoreCalculationServiceNum5 implements ScoreCalculationService {
         if (numerator == 0) {
             return BigDecimal.valueOf(100);
         }
-        return BigDecimal.valueOf(numerator).divide(BigDecimal.valueOf(denominator), 6, BigDecimal.ROUND_HALF_UP)
+        return BigDecimal.valueOf(numerator).divide(BigDecimal.valueOf(denominator), 6, RoundingMode.HALF_UP)
                 .multiply(new BigDecimal("100"))
-                .setScale(3, BigDecimal.ROUND_HALF_UP);
+                .setScale(3, RoundingMode.HALF_UP);
     }
 }

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/scoreCalculation/ScoreCalculationServiceNum9.java

@@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.List;
 
 import static com.rongwei.bscommon.sys.utils.JXKHConstant.DefaultSource.FOUR_SOURCE;
@@ -125,8 +126,8 @@ public class ScoreCalculationServiceNum9 implements ScoreCalculationService {
         if (numerator == 0) {
             return BigDecimal.valueOf(100);
         }
-        return BigDecimal.valueOf(numerator).divide(BigDecimal.valueOf(denominator), 6, BigDecimal.ROUND_HALF_UP)
+        return BigDecimal.valueOf(numerator).divide(BigDecimal.valueOf(denominator), 6, RoundingMode.HALF_UP)
                 .multiply(new BigDecimal("100"))
-                .setScale(3, BigDecimal.ROUND_HALF_UP);
+                .setScale(3, RoundingMode.HALF_UP);
     }
 }

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/utils/AttendanceAssessmentSdk.java

@@ -55,7 +55,7 @@ public class AttendanceAssessmentSdk {
     // token的虚拟目录
     private String tokenVirtualDirectory;
 
-    private Map<String, Object> businessDataMap = new HashMap<>(2);
+    private final Map<String, Object> businessDataMap = new HashMap<>(2);
     // api路由
     private Map<String, String> apiVirtualDirectoryMap = null;
     @Autowired

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/utils/JXKHUtils.java

@@ -12,6 +12,7 @@ import org.springframework.web.context.request.ServletRequestAttributes;
 import javax.annotation.PostConstruct;
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.Date;
 
 /**
@@ -66,7 +67,7 @@ public class JXKHUtils {
             throw new IllegalArgumentException("x1 和 x2 不能相等，因为这将导致除以零的错误。");
         }
         // 使用两点式方程计算y3值
-        return y1.add(y2.subtract(y1).multiply(x3.subtract(x1)).divide(x2.subtract(x1))).setScale(3, BigDecimal.ROUND_HALF_UP);
+        return y1.add(y2.subtract(y1).multiply(x3.subtract(x1)).divide(x2.subtract(x1))).setScale(3, RoundingMode.HALF_UP);
 
     }
 

jsglkh-common/src/main/resources/mybatis/BusinessCommonMapper.xml

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.rongwei.bscommon.sys.dao.BusinessCommonMapper">
-    <select id="withinTimeEPCProjectNames" resultType="java.lang.String">
-        select distinct js.XMMC
-        from jt_scsdl js
-        left join jt_kcsjxm jk on js.MAINID = jk.MAINID AND js.XMMC=jk.XMMC
-        <where>
-            js.DELETED='0'
-            AND jk.DELETED="0"
-            AND js.MAINID in
-            <foreach collection="mainIds" item="mainId" open="(" separator="," close=")">
-                #{mainId}
-            </foreach>
-            AND js.XMMC in
-            <foreach collection="projectName" item="projectName" open="(" separator="," close=")">
-                #{projectName}
-            </foreach>
-            AND js.PZSJ is not null
-            and js.PZSJ &lt;= jk.HJJHWCSJ
-        </where>
-
-    </select>
-
-</mapper>

jsglkh-common/src/main/resources/mybatis/sys/BusinessCommonMapper.xml

@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.rongwei.bscommon.sys.dao.BusinessCommonMapper">
+    <select id="withinTimeEPCProjectNames" resultType="java.lang.String">
+        select distinct js.XMMC
+        from jt_scsdl js
+        left join jt_kcsjxm jk on js.MAINID = jk.MAINID AND js.XMMC=jk.XMMC
+        <where>
+            js.DELETED='0'
+            AND jk.DELETED="0"
+            AND js.MAINID in
+            <foreach collection="mainIds" item="mainId" open="(" separator="," close=")">
+                #{mainId}
+            </foreach>
+            AND js.XMMC in
+            <foreach collection="projectName" item="projectName" open="(" separator="," close=")">
+                #{projectName}
+            </foreach>
+            AND js.PZSJ is not null
+            and js.PZSJ &lt;= jk.HJJHWCSJ
+        </where>
+
+    </select>
+    <update id="deletedAboutInfoByProjectName">
+        UPDATE "jt_fjglxm"
+        SET DELETED = '1'
+        where MAINID = #{mainId}
+          and XMMC = #{projectName};
+        UPDATE "jt_kcsjxm"
+        SET DELETED = '1'
+        where MAINID = #{mainId}
+          and XMMC = #{projectName};
+        UPDATE "jt_gzdg"
+        SET DELETED = '1'
+        where MAINID = #{mainId}
+          and XMMC = #{projectName};
+        UPDATE "jt_ztfaps"
+        SET DELETED = '1'
+        where MAINID = #{mainId}
+          and XMMC = #{projectName};
+        UPDATE "jt_wyys"
+        SET DELETED = '1'
+        where MAINID = #{mainId}
+          and XMMC = #{projectName};
+        UPDATE "jt_yjbhgl"
+        SET DELETED = '1'
+        where MAINID = #{mainId}
+          and XMMC = #{projectName};
+        UPDATE "jt_kcsjxm"
+        SET DELETED = '1'
+        where MAINID = #{mainId}
+          and XMMC = #{projectName};
+        UPDATE "jt_scsdl"
+        SET DELETED = '1'
+        where MAINID = #{mainId}
+          and XMMC = #{projectName};
+        UPDATE "jt_wtbhgl"
+        SET DELETED = '1'
+        where MAINID = #{mainId}
+          and XMMC = #{projectName};
+        UPDATE "jt_scbhgl"
+        SET DELETED = '1'
+        where MAINID = #{mainId}
+          and XMMC = #{projectName};
+        UPDATE "jt_sjjdqd"
+        SET DELETED = '1'
+        where MAINID = #{mainId}
+          and XMMC = #{projectName};
+        UPDATE "jt_sjbgqd"
+        SET DELETED = '1'
+        where MAINID = #{mainId}
+          and XMMC = #{projectName};
+        UPDATE "jt_zdxmszmn"
+        SET DELETED = '1'
+        where MAINID = #{mainId}
+          and XMMC = #{projectName};
+        UPDATE "jt_xcjhqd"
+        SET DELETED = '1'
+        where MAINID = #{mainId}
+          and XMMC = #{projectName}
+    </update>
+</mapper>

jsglkh-common/src/main/resources/mybatis/sys/ConfigMapper.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.rongwei.bscommon.sys.dao.ConfigMapper">
+</mapper>

jsglkh-common/src/main/resources/mybatis/JtFjglxmMapper.xml

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.rongwei.bscommon.sys.dao.JtFjglxmMapper">
 
     <resultMap id="BaseResultMap" type="com.rongwei.bsentity.domain.JtFjglxm">

jsglkh-common/src/main/resources/mybatis/JtGsjtbsjMapper.xml

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.rongwei.bscommon.sys.dao.JtGsjtbsjMapper">
 
     <resultMap id="BaseResultMap" type="com.rongwei.bsentity.domain.JtGsjtbsj">

jsglkh-common/src/main/resources/mybatis/JtGzdgMapper.xml

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.rongwei.bscommon.sys.dao.JtGzdgMapper">
 
     <resultMap id="BaseResultMap" type="com.rongwei.bsentity.domain.JtGzdg">

jsglkh-common/src/main/resources/mybatis/JtJscgpyqdMapper.xml

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.rongwei.bscommon.sys.dao.JtJscgpyqdMapper">
 
     <resultMap id="BaseResultMap" type="com.rongwei.bsentity.domain.JtJscgpyqd">

jsglkh-common/src/main/resources/mybatis/JtJsglcgqdMapper.xml

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.rongwei.bscommon.sys.dao.JtJsglcgqdMapper">
 
     <resultMap id="BaseResultMap" type="com.rongwei.bsentity.domain.JtJsglcgqd">

jsglkh-common/src/main/resources/mybatis/JtKcsjxmMapper.xml

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.rongwei.bscommon.sys.dao.JtKcsjxmMapper">
 
     <resultMap id="BaseResultMap" type="com.rongwei.bsentity.domain.JtKcsjxm">

jsglkh-common/src/main/resources/mybatis/JtKhxmMapper.xml

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.rongwei.bscommon.sys.dao.JtKhxmMapper">
 
     <resultMap id="BaseResultMap" type="com.rongwei.bsentity.domain.JtKhxm">

jsglkh-common/src/main/resources/mybatis/JtNdjhqdMapper.xml

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.rongwei.bscommon.sys.dao.JtNdjhqdMapper">
 
     <resultMap id="BaseResultMap" type="com.rongwei.bsentity.domain.JtNdjhqd">

jsglkh-common/src/main/resources/mybatis/JtPxjhqdMapper.xml

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.rongwei.bscommon.sys.dao.JtPxjhqdMapper">
 
     <resultMap id="BaseResultMap" type="com.rongwei.bsentity.domain.JtPxjhqd">

jsglkh-common/src/main/resources/mybatis/JtScbhglMapper.xml

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.rongwei.bscommon.sys.dao.JtScbhglMapper">
 
     <resultMap id="BaseResultMap" type="com.rongwei.bsentity.domain.JtScbhgl">

jsglkh-common/src/main/resources/mybatis/JtScsdlMapper.xml

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.rongwei.bscommon.sys.dao.JtScsdlMapper">
 
     <resultMap id="BaseResultMap" type="com.rongwei.bsentity.domain.JtScsdl">

jsglkh-common/src/main/resources/mybatis/JtSjbgqdMapper.xml

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.rongwei.bscommon.sys.dao.JtSjbgqdMapper">
 
     <resultMap id="BaseResultMap" type="com.rongwei.bsentity.domain.JtSjbgqd">

jsglkh-common/src/main/resources/mybatis/JtSjjdqdMapper.xml

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.rongwei.bscommon.sys.dao.JtSjjdqdMapper">
 
     <resultMap id="BaseResultMap" type="com.rongwei.bsentity.domain.JtSjjdqd">

jsglkh-common/src/main/resources/mybatis/JtWtbhglMapper.xml

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.rongwei.bscommon.sys.dao.JtWtbhglMapper">
 
     <resultMap id="BaseResultMap" type="com.rongwei.bsentity.domain.JtWtbhgl">

jsglkh-common/src/main/resources/mybatis/JtWyysMapper.xml

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.rongwei.bscommon.sys.dao.JtWyysMapper">
 
     <resultMap id="BaseResultMap" type="com.rongwei.bsentity.domain.JtWyys">

jsglkh-common/src/main/resources/mybatis/JtXcjhqdMapper.xml

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.rongwei.bscommon.sys.dao.JtXcjhqdMapper">
 
     <resultMap id="BaseResultMap" type="com.rongwei.bsentity.domain.JtXcjhqd">

jsglkh-common/src/main/resources/mybatis/JtXysjyqMapper.xml

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.rongwei.bscommon.sys.dao.JtXysjyqMapper">
 
     <resultMap id="BaseResultMap" type="com.rongwei.bsentity.domain.JtXysjyq">

jsglkh-common/src/main/resources/mybatis/JtYjbhglMapper.xml

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.rongwei.bscommon.sys.dao.JtYjbhglMapper">
 
     <resultMap id="BaseResultMap" type="com.rongwei.bsentity.domain.JtYjbhgl">

jsglkh-common/src/main/resources/mybatis/JtYxwjfbqdMapper.xml

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.rongwei.bscommon.sys.dao.JtYxwjfbqdMapper">
 
     <resultMap id="BaseResultMap" type="com.rongwei.bsentity.domain.JtYxwjfbqd">

jsglkh-common/src/main/resources/mybatis/JtZbrygwjzrfgqdMapper.xml

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.rongwei.bscommon.sys.dao.JtZbrygwjzrfgqdMapper">
 
     <resultMap id="BaseResultMap" type="com.rongwei.bsentity.domain.JtZbrygwjzrfgqd">

jsglkh-common/src/main/resources/mybatis/JtZdxmszmnMapper.xml

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.rongwei.bscommon.sys.dao.JtZdxmszmnMapper">
 
     <resultMap id="BaseResultMap" type="com.rongwei.bsentity.domain.JtZdxmszmn">

jsglkh-common/src/main/resources/mybatis/JtZjfjflqdMapper.xml

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.rongwei.bscommon.sys.dao.JtZjfjflqdMapper">
 
     <resultMap id="BaseResultMap" type="com.rongwei.bsentity.domain.JtZjfjflqd">

jsglkh-common/src/main/resources/mybatis/JtZtfapsMapper.xml

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.rongwei.bscommon.sys.dao.JtZtfapsMapper">
 
     <resultMap id="BaseResultMap" type="com.rongwei.bsentity.domain.JtZtfaps">

jsglkh-common/src/main/resources/mybatis/PmProjectMapper.xml

@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.rongwei.bscommon.sys.dao.PmProjectMapper">
-
    <delete id="truncateThisTable">
        TRUNCATE TABLE PM_Project;
    </delete>

jsglkh-common/src/main/resources/mybatis/SqlServerMapper.xml

@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.rongwei.bscommon.sys.dao.SqlServerMapper">
-
-
     <select id="getPmProjectList" resultType="com.rongwei.bsentity.domain.PmProject">
         select *
         from PM_Project

jsglkh-common/src/main/resources/mybatis/ZProjectMapper.xml

@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.rongwei.bscommon.sys.dao.ZProjectMapper">
-
-
-
    <delete id="truncateThisTable">
        TRUNCATE TABLE Z_PROJECT
    </delete>

jsglkh-server/pom.xml

@@ -72,6 +72,14 @@
     </dependencies>
 
     <build>
+<!--        <resources>-->
+<!--            <resource>-->
+<!--                <directory>${basedir}/src/main/java</directory>-->
+<!--                <includes>-->
+<!--                    <include>**/*.xml</include>-->
+<!--                </includes>-->
+<!--            </resource>-->
+<!--        </resources>-->
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>

jsglkh-server/src/main/java/com/rongwei/BusinessServerApplication.java

@@ -9,12 +9,10 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.scheduling.annotation.EnableAsync;
 
 @EnableAsync
-@SpringBootApplication(exclude = {
-        DataSourceAutoConfiguration.class,
-})
+@SpringBootApplication
 @EnableDiscoveryClient
 @EnableFeignClients
-@MapperScan("com.rongwei.*.*.dao")
+@MapperScan("com.rongwei.bscommon.sys.dao")
 public class BusinessServerApplication {
 
     public static void main(String[] args) {

jsglkh-server/src/main/java/com/rongwei/controller/BusinessCommonController.java

@@ -0,0 +1,29 @@
+package com.rongwei.controller;
+
+import com.rongwei.bscommon.sys.service.impl.BusinessCommonServiceImpl;
+import com.rongwei.rwcommon.base.R;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+/**
+ * CommonController class
+ *
+ * @author XH
+ * @date 2024/12/12
+ */
+@RestController
+@RequestMapping("/common")
+public class BusinessCommonController {
+    @Autowired
+    private BusinessCommonServiceImpl businessCommonService;
+
+    @PostMapping("/remove/project")
+    public R deletedAboutInfoByProjectName(@RequestBody Map<String,String> projectNameMap){
+        return businessCommonService.deletedAboutInfoByProjectName(projectNameMap);
+    }
+}

jsglkh-server/src/main/resources/bootstrap.yml

@@ -13,7 +13,6 @@ spring:
       max-request-size: 1000MB
 server:
   port: 9689
-
 management:
   endpoints:
     web:
@@ -27,22 +26,11 @@ feign:
         readTimeout: 5000
   sentinel:
     enabled: true
-jwt:
-  token-header: Authorization
-  expire: 14400
-  rsa-secret: xx1WET12^%3^(WE45
-client:
-  id: ace-auth
-  secret: 123456
-  token-header: x-client-token
-  expire: 14400
-  rsa-secret: x2318^^(*WRYQWR(QW&T
 mybatis-plus:
   configuration:
     log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl
     map-underscore-to-camel-case: false
-  xmlLocation: classpath:mybatis/*.xml
-  mapperLocations: "classpath:mybatis/*.xml"
+  mapperLocations: "classpath:mybatis/**/**.xml"
   typeAliasesPackage: com.rongwei.bsentity.domain
   global-config:
     db-config: