Merge branch 'app-version-mark' into dev

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

@@ -12,6 +12,9 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
 
 @Service
@@ -26,6 +29,7 @@ public class AppVersionMarkBiz extends BaseBiz<AppVersionMarkMapper, AppVersionM
     private static final int APP_MARK_IS_DEL = 1;
     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;
 
     /**
      * @Description: 新增APP版本标识
@@ -40,10 +44,21 @@ public class AppVersionMarkBiz extends BaseBiz<AppVersionMarkMapper, AppVersionM
         }
         AppVersionMark appVersionMark = new AppVersionMark();
         appVersionMark.setMark(getMark());
+        try {
+            Date date = new Date();
+            //设置日期格式
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            String nowTime = simpleDateFormat.format(date);
+            Date crtTime = simpleDateFormat.parse(nowTime);
+            appVersionMark.setCrtTime(crtTime);
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
         appVersionMark.setMarkName(appVersionMarkDTO.getMarkName());
         appVersionMark.setMarkRemark(appVersionMarkDTO.getMarkRemark());
         appVersionMark.setIsDel(0);
-        insertSelective(appVersionMark);
+        // insertSelective(appVersionMark);
+        mapper.insert(appVersionMark);
         return ObjectRestResponse.succ();
     }
 
@@ -101,6 +116,10 @@ public class AppVersionMarkBiz extends BaseBiz<AppVersionMarkMapper, AppVersionM
         if (appVersionMarkDTO.getChangeMark() == CHANGE_UPD_APP_MARK) {
             updateSelectiveById(appVersionMark);
         } 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不可删除，请重新选择");
+            }
             appVersionMark.setIsDel(APP_MARK_IS_DEL);
             updateSelectiveById(appVersionMark);
         }
@@ -119,6 +138,17 @@ public class AppVersionMarkBiz extends BaseBiz<AppVersionMarkMapper, AppVersionM
         return list;
     }
 
+/**
+ * @Description:  app标识查询列表
+ * @Param:
+ * @return:  list
+ * @Author: zyh
+ * @Date: 2020/1/13
+ */
+public List<AppVersionMarkDTO> findListVersionAppMark( ) {
+    List list = mapper.findListVersionAppMark();
+    return list;
+}
 }
 
 

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

@@ -23,4 +23,8 @@ public interface AppVersionMarkMapper extends Mapper<AppVersionMark> {
                            @Param("updTime") Timestamp updTime);
 
     List<AppVersionMark> findVersionAppMark(@Param("mark") String mark);
+
+    int findIosOrAndroidVersionAppMark(@Param("id") Integer id);
+
+    List<AppVersionMark> findListVersionAppMark();
 }

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

@@ -10,7 +10,6 @@ import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.xxfc.platform.app.biz.AppVersionMarkBiz;
 import com.xxfc.platform.app.entity.AppVersionMark;
 import com.xxfc.platform.app.entity.dto.AppVersionMarkDTO;
-import com.xxfc.platform.app.vo.AppVersionMarkQuery;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,8 +43,7 @@ public class AppVersionMarkController extends BaseController<AppVersionMarkBiz,
     @CacheClear
     public ObjectRestResponse addAppVersionMark(@RequestBody AppVersionMarkDTO appVersionMarkDTO) {
         try {
-            appVersionMarkBiz.addAppVersionMark(appVersionMarkDTO);
-            return ObjectRestResponse.succ();
+            return ObjectRestResponse.succ(appVersionMarkBiz.addAppVersionMark(appVersionMarkDTO));
         } catch (Exception e) {
             log.error("新增失败[{}]", e);
             throw new BaseException("新增失败");
@@ -61,8 +59,7 @@ public class AppVersionMarkController extends BaseController<AppVersionMarkBiz,
     @CacheClear
     public ObjectRestResponse updAppVersionMark(@RequestBody AppVersionMarkDTO appVersionMarkDTO) {
         try {
-            appVersionMarkBiz.updAppVersionMark(appVersionMarkDTO);
-            return ObjectRestResponse.succ();
+            return ObjectRestResponse.succ(appVersionMarkBiz.updAppVersionMark(appVersionMarkDTO));
         } catch (Exception e) {
             log.error("更新失败[{}]", e);
             throw new BaseException("更新失败");
@@ -103,5 +100,16 @@ public class AppVersionMarkController extends BaseController<AppVersionMarkBiz,
         return ObjectRestResponse.succ(appVersionMarkBiz.findVersionAppMark(mark));
     }
 
+    /**
+     * @Description: app标识列表查询
+     * @Param: 过滤其他列，返会标识和标识名称
+     * @return: list
+     * @Author: zyh
+     * @Date: 2020/1/13
+     */
+    @GetMapping("/find/listMark")
+    public ObjectRestResponse findListVersionAppMark() {
+        return ObjectRestResponse.succ(appVersionMarkBiz.findListVersionAppMark());
+    }
 
 }

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

@@ -11,7 +11,7 @@
         where
         is_del=0
         <if test="mark!=null and mark!=''">
-            and  binary mark like concat('%',#{mark},'%')
+            and binary mark like concat('%',#{mark},'%')
         </if>
     </select>
 
@@ -26,4 +26,25 @@
         </if>
     </select>
 
+
+    <select id="findIosOrAndroidVersionAppMark" resultType="java.lang.Integer">
+        select count(*) from
+        `app_version_mark` a
+        where
+        is_del = 0
+        <if test="id!=null and id!=''">
+            and id= #{id}
+        </if>
+        and ( mark_name like concat('%','ios','%')
+        or mark_name like concat('%','安卓','%'))
+    </select>
+
+
+    <select id="findListVersionAppMark" resultType="com.xxfc.platform.app.entity.AppVersionMark">
+        select  `mark_name`,`mark`
+	    from
+        `app_version_mark` a
+        where
+        is_del = 0
+      </select>
 </mapper>
\ No newline at end of file