修改方法名

src/main/java/com/shkpr/service/alambizplugin/constants/ApiURI.java

@@ -48,7 +48,7 @@ public class ApiURI {
 
     public static final String URI_XXX_ANALY_SETTING_DEFINE_LIST = "analy-setting-define-list";
 
-    public static final String URI_XXX_ANALY_SETTING_UPSERT = "analy-setting-upsert";
+    public static final String URI_XXX_ANALY_SETTING_SYNC = "analy-setting-sync";
     public static final String URI_XXX_ANALY_SETTING_DEFAULT_LIST = "analy-setting-default-list";
     public static final String URI_XXX_ANALY_SETTING_LIST = "analy-setting-list";
     public static final String URI_XXX_ANALY_SETTING_DEFAULT_DETAIL = "analy-setting-default-detail";

src/main/java/com/shkpr/service/alambizplugin/controller/ApiDmaAnalySettingController.java

@@ -56,7 +56,7 @@ public class ApiDmaAnalySettingController {
      * 计数器
      */
     private final AtomicInteger mSeqAnalySettingDefineListReq;
-    private final AtomicInteger mSeqAnalySettingUpsertReq;
+    private final AtomicInteger mSeqAnalySettingSyncReq;
     private final AtomicInteger mSeqAnalySettingDefaultListReq;
     private final AtomicInteger mSeqAnalySettingListReq;
     private final AtomicInteger mSeqAnalySettingDefaultDetailReq;
@@ -69,7 +69,7 @@ public class ApiDmaAnalySettingController {
 
     public ApiDmaAnalySettingController(ObjectMapper objectMapper, DmaAnalySettingDefineService analySettingDefineService, DmaAnalySettingService analySettingService, DmaAnalySettingLossTargetService analySettingLossTargetService) {
         this.mSeqAnalySettingDefineListReq = new AtomicInteger(0);
-        this.mSeqAnalySettingUpsertReq = new AtomicInteger(0);
+        this.mSeqAnalySettingSyncReq = new AtomicInteger(0);
         this.mSeqAnalySettingDefaultListReq = new AtomicInteger(0);
         this.mSeqAnalySettingListReq = new AtomicInteger(0);
         this.mSeqAnalySettingDefaultDetailReq = new AtomicInteger(0);
@@ -143,7 +143,7 @@ public class ApiDmaAnalySettingController {
     }
 
     /**
-     * 合并分析设置
+     * 同步分析设置
      *
      * @param request       request
      * @param strClientType 客户端类型
@@ -152,8 +152,8 @@ public class ApiDmaAnalySettingController {
      * @return 合并状态
      * @throws SelfException selfException
      */
-    @PostMapping(value = ApiURI.URI_XXX_ANALY_SETTING_UPSERT)
-    public ResponseRes<String> analySettingUpsert(HttpServletRequest request
+    @PostMapping(value = ApiURI.URI_XXX_ANALY_SETTING_SYNC)
+    public ResponseRes<String> analySettingSync(HttpServletRequest request
             , @RequestHeader(value = ApiURI.HEADER_CLIENT_TYPE, required = false) String strClientType
             , @RequestHeader(value = ApiURI.HEADER_USER_AGENT, required = false) String strUserAgent
             , @RequestBody(required = false) @Validated(value = {CommonParamValidSK.class}) DmaAnalySettingParams oJsonParam
@@ -176,7 +176,7 @@ public class ApiDmaAnalySettingController {
 
         //begin
         long llReqBefore = System.currentTimeMillis();
-        String strRunSeq = String.format("%d-%d", llReqBefore, mSeqAnalySettingUpsertReq.incrementAndGet());
+        String strRunSeq = String.format("%d-%d", llReqBefore, mSeqAnalySettingSyncReq.incrementAndGet());
         LogPrintMgr.getInstance().printLogMsg(LogLevelFlag.LOG_INFO, mBizType, mStrClassName, strUserId
                 , String.format("%s:%s seq:{%s} param:%s begin====>"
                         , strPlatform
@@ -191,7 +191,7 @@ public class ApiDmaAnalySettingController {
 
 
         //执行
-        Boolean result = analySettingService.upsertAll(oJsonParam, defines);
+        Boolean result = analySettingService.syncAll(oJsonParam, defines);
         String resultStr = null;
         try {
             if (result != null) resultStr = objectMapper.writeValueAsString(result);

src/main/java/com/shkpr/service/alambizplugin/controllerfilter/third/ApiJWTDmaAnalySettingBizFilter.java

@@ -20,7 +20,7 @@ public class ApiJWTDmaAnalySettingBizFilter extends JWTAuthenticationFilter {
     static {
         msMapURI2Method = new HashMap<String, String>();
         msMapURI2Method.put(String.format("%s/%s", ApiURI.URI_DMA_ANALY_SETTING_H, ApiURI.URI_XXX_ANALY_SETTING_DEFINE_LIST), "GET");
-        msMapURI2Method.put(String.format("%s/%s", ApiURI.URI_DMA_ANALY_SETTING_H, ApiURI.URI_XXX_ANALY_SETTING_UPSERT), "POST");
+        msMapURI2Method.put(String.format("%s/%s", ApiURI.URI_DMA_ANALY_SETTING_H, ApiURI.URI_XXX_ANALY_SETTING_SYNC), "POST");
         msMapURI2Method.put(String.format("%s/%s", ApiURI.URI_DMA_ANALY_SETTING_H, ApiURI.URI_XXX_ANALY_SETTING_DEFAULT_LIST), "GET");
         msMapURI2Method.put(String.format("%s/%s", ApiURI.URI_DMA_ANALY_SETTING_H, ApiURI.URI_XXX_ANALY_SETTING_LIST), "GET");
         msMapURI2Method.put(String.format("%s/%s", ApiURI.URI_DMA_ANALY_SETTING_H, ApiURI.URI_XXX_ANALY_SETTING_DEFAULT_DETAIL), "GET");

src/main/java/com/shkpr/service/alambizplugin/dbdao/services/DmaAnalySettingServiceImpl.java

@@ -49,7 +49,7 @@ public class DmaAnalySettingServiceImpl implements DmaAnalySettingService {
     }
 
     /**
-     * 批量合并
+     * 批量同步
      *
      * @param params  参数
      * @param defines 定义
@@ -57,7 +57,7 @@ public class DmaAnalySettingServiceImpl implements DmaAnalySettingService {
      */
     @Transactional("mainDbTransactionManager")
     @Override
-    public Boolean upsertAll(DmaAnalySettingParams params, List<DmaAnalySettingDefine> defines) {
+    public Boolean syncAll(DmaAnalySettingParams params, List<DmaAnalySettingDefine> defines) {
         //参数
         String zoneId = params.getZoneId();
         Short settingType = params.getSettingType();

src/main/java/com/shkpr/service/alambizplugin/dbdao/services/intef/DmaAnalySettingService.java

@@ -17,13 +17,13 @@ import java.util.List;
  */
 public interface DmaAnalySettingService {
     /**
-     * 批量合并
+     * 批量同步
      *
      * @param params  参数
      * @param defines 定义
      * @return 保存状态
      */
-    Boolean upsertAll(DmaAnalySettingParams params, List<DmaAnalySettingDefine> defines);
+    Boolean syncAll(DmaAnalySettingParams params, List<DmaAnalySettingDefine> defines);
 
     /**
      * 查询默认列表