Merge branch 'app-version-mark' into dev

xx-app/xx-app-api/src/main/java/com/xxfc/platform/app/entity/AppVersionMark.java

@@ -72,4 +72,11 @@ public class AppVersionMark implements Serializable {
     private Long updTime;
 
 
+    /**
+     * 版本标识来源类型
+     */
+    @Column(name = "source_type")
+    @ApiModelProperty(value = "版本标识更新时间", hidden = true)
+    private String  sourceType;
+
 }

xx-app/xx-app-api/src/main/java/com/xxfc/platform/app/entity/dto/AppVersionMarkDTO.java

@@ -40,4 +40,7 @@ public class AppVersionMarkDTO {
     @ApiModelProperty(value = "操作标识 1:新增 2：修改 3：删除")
     private int changeMark;
 
+    @ApiModelProperty(value = "版本标识更新时间")
+    private String sourceType;
+
 }

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

@@ -8,6 +8,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.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -15,7 +16,9 @@ import org.springframework.stereotype.Service;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @Service
 @Slf4j
@@ -30,6 +33,10 @@ public class AppVersionMarkBiz extends BaseBiz<AppVersionMarkMapper, AppVersionM
     private static final int CHANGE_DELETE_APP_MARK = 2;
     private static final int NO_RANDOM_REAPPEAR = 50;
     public static final int IS_DEL_IOS_OR_ANDROID = 1;
+    public static final int SUCCESSFUL_OPERATION_CODE = 1;
+    public static final int FAIL_OPERATION_CODE = 2;
+    public static final String SUCCESSFUL_OPERATION = "操作成功";
+    public static final String FAIL_OPERATION = "安卓/苹果不可删除";
 
     /**
      * @Description: 新增APP版本标识
@@ -38,12 +45,20 @@ public class AppVersionMarkBiz extends BaseBiz<AppVersionMarkMapper, AppVersionM
      * @Author: zyh
      * @Date: 2020/1/10
      */
-    public ObjectRestResponse addAppVersionMark(AppVersionMarkDTO appVersionMarkDTO) {
-        if (StringUtils.isBlank(appVersionMarkDTO.getMarkName()) || StringUtils.isBlank(appVersionMarkDTO.getMarkRemark())) {
-            return ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE, "参数不能为空");
+    public Map<Integer, String> addAppVersionMark(AppVersionMarkDTO appVersionMarkDTO) {
+        Map<Integer, String> statusMap = new HashMap<>();
+        if (StringUtils.isBlank(appVersionMarkDTO.getMarkName()) || StringUtils.isBlank(appVersionMarkDTO.getMarkRemark())
+                || StringUtils.isBlank(appVersionMarkDTO.getSourceType()) || StringUtils.isBlank(appVersionMarkDTO.getMark())) {
+            statusMap.put(FAIL_OPERATION_CODE, "参数不能为空");
+            return statusMap;
         }
         AppVersionMark appVersionMark = new AppVersionMark();
-        appVersionMark.setMark(getMark());
+        String markNoBlank = appVersionMarkDTO.getMark().replaceAll(" ", "");
+        int count = mapper.queryIsMark(markNoBlank);
+        if (count == 1) {
+            statusMap.put(FAIL_OPERATION_CODE, "标识已存在");
+            return statusMap;
+        }
         try {
             Date date = new Date();
             //设置日期格式
@@ -54,14 +69,18 @@ public class AppVersionMarkBiz extends BaseBiz<AppVersionMarkMapper, AppVersionM
         } catch (ParseException e) {
             e.printStackTrace();
         }
+        appVersionMark.setMark(markNoBlank);
+        appVersionMark.setSourceType(appVersionMarkDTO.getSourceType());
         appVersionMark.setMarkName(appVersionMarkDTO.getMarkName());
         appVersionMark.setMarkRemark(appVersionMarkDTO.getMarkRemark());
         appVersionMark.setIsDel(0);
         // insertSelective(appVersionMark);
         mapper.insert(appVersionMark);
-        return ObjectRestResponse.succ();
+        statusMap.put(SUCCESSFUL_OPERATION_CODE, SUCCESSFUL_OPERATION);
+        return statusMap;
     }
 
+
     /**
      * @Description: 随机产生，判断数据库是否已经存在
      * @return: 标识
@@ -110,7 +129,8 @@ public class AppVersionMarkBiz extends BaseBiz<AppVersionMarkMapper, AppVersionM
      * @Author: zyh
      * @Date: 2020/1/10
      */
-    public ObjectRestResponse updAppVersionMark(AppVersionMarkDTO appVersionMarkDTO) {
+    public Map<Integer, String> updAppVersionMark(AppVersionMarkDTO appVersionMarkDTO) {
+        Map<Integer, String> status = new HashedMap();
         AppVersionMark appVersionMark = new AppVersionMark();
         BeanUtils.copyProperties(appVersionMarkDTO, appVersionMark);
         if (appVersionMarkDTO.getChangeMark() == CHANGE_UPD_APP_MARK) {
@@ -118,12 +138,14 @@ public class AppVersionMarkBiz extends BaseBiz<AppVersionMarkMapper, AppVersionM
         } else if (appVersionMarkDTO.getChangeMark() == CHANGE_DELETE_APP_MARK) {
             Integer count = mapper.findIosOrAndroidVersionAppMark(appVersionMarkDTO.getId());
             if (count.equals(IS_DEL_IOS_OR_ANDROID)) {
-                return ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE, "安卓/IOS不可删除，请重新选择");
+                status.put(FAIL_OPERATION_CODE, FAIL_OPERATION);
+                return status;
             }
             appVersionMark.setIsDel(APP_MARK_IS_DEL);
             updateSelectiveById(appVersionMark);
         }
-        return ObjectRestResponse.succ();
+        status.put(SUCCESSFUL_OPERATION_CODE, SUCCESSFUL_OPERATION);
+        return status;
     }
 
     /**
@@ -139,9 +161,9 @@ public class AppVersionMarkBiz extends BaseBiz<AppVersionMarkMapper, AppVersionM
     }
 
     /**
-     * @Description: app标识查询列表
+     * @Description: 会员页面查询注册来源 下拉框接口
      * @Param:
-     * @return: list
+     * @return: list（mark名称）
      * @Author: zyh
      * @Date: 2020/1/13
      */
@@ -150,17 +172,6 @@ public class AppVersionMarkBiz extends BaseBiz<AppVersionMarkMapper, AppVersionM
         return list;
     }
 
-    /**
-     * @Description: 会员页面查询注册来源 下拉框接口
-     * @Param:
-     * @return: list（mark名称）
-     * @Author: zyh
-     * @Date: 2020/1/13
-     */
-    public List<AppVersionMarkDTO> queryListForUserMember() {
-        List list = mapper.queryListForUserMember();
-        return list;
-    }
 }
 
 

xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/mapper/AppVersionMarkMapper.java

@@ -15,6 +15,7 @@ import java.util.List;
  */
 public interface AppVersionMarkMapper extends Mapper<AppVersionMark> {
     int queryIsMark(@Param("mark") String mark);
+    int queryIsMarkNew(@Param("mark") String mark);
 
     void updAppVersionMark(@Param("markName") String markName,
                            @Param("markRemark") String markRemark,

xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/rest/AppVersionMarkController.java

@@ -7,6 +7,7 @@ import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
 import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.xxfc.platform.app.biz.AppVersionMarkBiz;
 import com.xxfc.platform.app.entity.AppVersionMark;
 import com.xxfc.platform.app.entity.dto.AppVersionMarkDTO;
@@ -16,7 +17,12 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import tk.mybatis.mapper.entity.Example;
 
+import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
+
+import static com.xxfc.platform.app.biz.AppVersionMarkBiz.FAIL_OPERATION_CODE;
+import static com.xxfc.platform.app.biz.AppVersionMarkBiz.SUCCESSFUL_OPERATION_CODE;
 
 /**
  * @program: ace-security
@@ -43,7 +49,18 @@ public class AppVersionMarkController extends BaseController<AppVersionMarkBiz,
     @CacheClear
     public ObjectRestResponse addAppVersionMark(@RequestBody AppVersionMarkDTO appVersionMarkDTO) {
         try {
-            return ObjectRestResponse.succ(appVersionMarkBiz.addAppVersionMark(appVersionMarkDTO));
+            Integer status = SUCCESSFUL_OPERATION_CODE;
+            String message = "";
+            Map<Integer, String> mapStatus = appVersionMarkBiz.addAppVersionMark(appVersionMarkDTO);
+            Iterator<Integer> iter = mapStatus.keySet().iterator();
+            while (iter.hasNext()) {
+                status = iter.next();
+                message = mapStatus.get(status);
+            }
+            if (status.equals(FAIL_OPERATION_CODE)) {
+                return ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE, message);
+            }
+            return ObjectRestResponse.succ();
         } catch (Exception e) {
             log.error("新增失败[{}]", e);
             throw new BaseException("新增失败");
@@ -59,13 +76,26 @@ public class AppVersionMarkController extends BaseController<AppVersionMarkBiz,
     @CacheClear
     public ObjectRestResponse updAppVersionMark(@RequestBody AppVersionMarkDTO appVersionMarkDTO) {
         try {
-            return ObjectRestResponse.succ(appVersionMarkBiz.updAppVersionMark(appVersionMarkDTO));
+            Map<Integer, String> map = appVersionMarkBiz.updAppVersionMark(appVersionMarkDTO);
+            Iterator<Integer> iter = map.keySet().iterator();
+            Integer status = 1;
+            String message = "";
+            while (iter.hasNext()) {
+                status = iter.next();
+                message = map.get(status);
+            }
+            if (status.equals(1)) {
+                return ObjectRestResponse.succ();
+            } else {
+                return ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE, message);
+            }
         } catch (Exception e) {
             log.error("更新失败[{}]", e);
             throw new BaseException("更新失败");
         }
     }
 
+
     /**
      * @Description: 页面展示
      * @Param: AppVersionMarkQuery query 业务需求：暂时没有查询框
@@ -100,10 +130,11 @@ public class AppVersionMarkController extends BaseController<AppVersionMarkBiz,
         return ObjectRestResponse.succ(appVersionMarkBiz.findVersionAppMark(mark));
     }
 
+
     /**
-     * @Description: app标识列表查询
-     * @Param: 过滤其他列，返会标识和标识名称
-     * @return: list
+     * @Description: 会员页面查询注册来源 下拉框接口
+     * @Param:
+     * @return: list（mark名称）
      * @Author: zyh
      * @Date: 2020/1/13
      */
@@ -112,9 +143,5 @@ public class AppVersionMarkController extends BaseController<AppVersionMarkBiz,
         return ObjectRestResponse.succ(appVersionMarkBiz.findListVersionAppMark());
     }
 
-    @GetMapping("/query/mark")
-    public ObjectRestResponse queryListForUserMember() {
-        return ObjectRestResponse.succ(appVersionMarkBiz.queryListForUserMember());
-    }
 
 }

xx-app/xx-app-server/src/main/resources/mapper/AppVersionMarkMapper.xml

@@ -16,6 +16,18 @@
     </select>
 
 
+    <select id="queryIsMarkNew" parameterType="java.lang.String" resultType="java.lang.Integer">
+        SELECT
+        count(*)
+        FROM
+        `app_version_mark`
+        where
+        is_del=0
+        <if test="mark!=null and mark!=''">
+            and binary mark=#{mark}
+        </if>
+    </select>
+
     <select id="findVersionAppMark" resultType="com.xxfc.platform.app.entity.AppVersionMark">
         select * from
         `app_version_mark` a