Merge branch 'app-version-mark' into dev

xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/biz/AppVersionMarkBiz.java

 package com.xxfc.platform.app.biz;
 
 
+import com.ace.cache.annotation.CacheClear;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
@@ -8,7 +9,7 @@ import com.xxfc.platform.app.entity.AppVersionMark;
 import com.xxfc.platform.app.entity.dto.AppVersionMarkDTO;
 import com.xxfc.platform.app.mapper.AppVersionMarkMapper;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections.map.HashedMap;
+import org.apache.commons.collections4.map.HashedMap;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -45,8 +46,9 @@ public class AppVersionMarkBiz extends BaseBiz<AppVersionMarkMapper, AppVersionM
      * @Author: zyh
      * @Date: 2020/1/10
      */
+    @CacheClear
     public Map<Integer, String> addAppVersionMark(AppVersionMarkDTO appVersionMarkDTO) {
-        Map<Integer, String> statusMap = new HashMap<>();
+        Map<Integer, String> statusMap = new HashedMap<>();
         if (StringUtils.isBlank(appVersionMarkDTO.getMarkName()) || StringUtils.isBlank(appVersionMarkDTO.getMarkRemark())
                 || StringUtils.isBlank(appVersionMarkDTO.getSourceType()) || StringUtils.isBlank(appVersionMarkDTO.getMark())) {
             statusMap.put(FAIL_OPERATION_CODE, "参数不能为空");
@@ -55,8 +57,8 @@ public class AppVersionMarkBiz extends BaseBiz<AppVersionMarkMapper, AppVersionM
         AppVersionMark appVersionMark = new AppVersionMark();
         String markNoBlank = appVersionMarkDTO.getMark().replaceAll(" ", "");
         int count = mapper.queryIsMark(markNoBlank);
-        if (count == 1) {
-            statusMap.put(FAIL_OPERATION_CODE, "标识已存在");
+        if (count > 0) {
+            statusMap.put(FAIL_OPERATION_CODE, "标识已存在,请重新输入");
             return statusMap;
         }
         try {
@@ -129,23 +131,33 @@ public class AppVersionMarkBiz extends BaseBiz<AppVersionMarkMapper, AppVersionM
      * @Author: zyh
      * @Date: 2020/1/10
      */
+    @CacheClear
     public Map<Integer, String> updAppVersionMark(AppVersionMarkDTO appVersionMarkDTO) {
-        Map<Integer, String> status = new HashedMap();
+        Map<Integer, String> statusMap = new HashedMap<>();
         AppVersionMark appVersionMark = new AppVersionMark();
         BeanUtils.copyProperties(appVersionMarkDTO, appVersionMark);
         if (appVersionMarkDTO.getChangeMark() == CHANGE_UPD_APP_MARK) {
+            if (StringUtils.isNotEmpty(appVersionMarkDTO.getMark())) {
+                String markNoBlank = appVersionMarkDTO.getMark().replaceAll(" ", "");
+                int count = mapper.queryIsMark(markNoBlank);
+                if (count >0) {
+                    statusMap.put(FAIL_OPERATION_CODE, "标识已存在,请重新更改标识");
+                    return statusMap;
+                }
+                appVersionMark.setMark(markNoBlank);
+            }
             updateSelectiveById(appVersionMark);
         } else if (appVersionMarkDTO.getChangeMark() == CHANGE_DELETE_APP_MARK) {
             Integer count = mapper.findIosOrAndroidVersionAppMark(appVersionMarkDTO.getId());
             if (count.equals(IS_DEL_IOS_OR_ANDROID)) {
-                status.put(FAIL_OPERATION_CODE, FAIL_OPERATION);
-                return status;
+                statusMap.put(FAIL_OPERATION_CODE, FAIL_OPERATION);
+                return statusMap;
             }
             appVersionMark.setIsDel(APP_MARK_IS_DEL);
             updateSelectiveById(appVersionMark);
         }
-        status.put(SUCCESSFUL_OPERATION_CODE, SUCCESSFUL_OPERATION);
-        return status;
+        statusMap.put(SUCCESSFUL_OPERATION_CODE, SUCCESSFUL_OPERATION);
+        return statusMap;
     }
 
     /**