接口增加修改

src/main/java/com/travel/controller/IndexController.java

@@ -358,7 +358,18 @@ public class IndexController {
     public JSON getIndexHomeUrl(IndexHome indexHome){
         Map<String, Object> map = new HashMap<>();
         try{
+            List<IndexHome> listVal = new ArrayList<>();
             List<IndexHome> list = indexService.getIndexHomeUrl(indexHome);
+            for(IndexHome indexHome1 : list) {
+                if(indexHome1.getArticleImgUrl1() == null || indexHome1.getArticleImgUrl1() == ""){
+                    indexHome1.setUrlVal(indexHome1.getArticleVideoUrl());
+                    indexHome1.setImgVideo("1");
+                } else {
+                    indexHome1.setUrlVal(indexHome1.getArticleImgUrl1());
+                    indexHome1.setImgVideo("0");
+                }
+                listVal.add(indexHome1);
+            }
             map.put("data", list);
             map.put("code", "0");
             map.put("msg", "200");

src/main/java/com/travel/controller/PersonalController.java

@@ -63,10 +63,16 @@ public class PersonalController {
             if(list.size() == 0){
                 loginService.insetUser(user); //先新增信息
                 Integer maxId = loginService.getMaxId(user);
-                user.setId(maxId.toString()).setName("tuya_" + maxId).setCode("CUS0000000" + maxId).setHeadpir("https://lidaotech.oss-cn-beijing.aliyuncs.com/test/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_20220622112747.png");
+                user.setId(maxId.toString()).setName("tuya_" + maxId).setCode(PersonalController.SerialNumber("CUS", maxId + "")).setHeadpir("https://lidaotech.oss-cn-beijing.aliyuncs.com/test/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_20220622112747.png");
                 loginService.updateKeyToLog(user);//添加用户昵称  编号  头像
                 list.add(user);
             }
+            //判断账号是否被锁定
+            if(list.get(0).getFlag().equals("1")){
+                map.put("msg", "500");
+                map.put("errMsg", "此账号发生异常 请联系网站管理员");
+                return map;
+            }
             Map<String, String> payload = new HashMap<>();
             payload.put("phone", list.get(0).getPhone());
             payload.put("code", list.get(0).getCode());
@@ -168,6 +174,12 @@ public class PersonalController {
                     user1.setName("tuya_" + user1.getId()).setCode(SerialNumber("CUS", user1.getId() + "")).setHeadpir("https://lidaotech.oss-cn-beijing.aliyuncs.com/test/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_20220622112747.png");
                     loginService.updateUser(user1);
                 }
+                //判断账号是否被锁定
+                if(user1.getFlag().equals("1")){
+                    map.put("msg", "500");
+                    map.put("errMsg", "此账号发生异常 请联系网站管理员");
+                    return map;
+                }
                 //生成token传参
                 Map<String, String> payload = new HashMap<>();
                 payload.put("phone", user1.getPhone());

src/main/java/com/travel/controller/ReleaseTravelController.java

@@ -243,7 +243,7 @@ public class ReleaseTravelController {
                 }
             }
             map.put("msg", "200");
-        }catch (Exception e){
+        }catch (Exception e) {
             e.printStackTrace();
             map.put("msg", "500");
             map.put("errMsg", "服务器请求异常，请稍后再试");

src/main/java/com/travel/controller/SupplierController.java

@@ -128,6 +128,12 @@ public class SupplierController {
                     user1.setName("TUYAGYS_" + user1.getId()).setCode(PersonalController.SerialNumber("SUP", user1.getId() + "")).setHeadpir("https://cdn.novenn.com/random/avatars/1595853160487.jpg");
                     supplierService.updateUser(user1);
                 }
+                //判断账号是否被锁定
+                if(user1.getFlag().equals("1")){
+                    map.put("msg", "500");
+                    map.put("errMsg", "此账号发生异常 请联系网站管理员");
+                    return map;
+                }
                 //验证是否完成注册
                 if(user1.getNatureSupplier() == null){
                     user1.setFirstType("0");//未登录 未注册

src/main/java/com/travel/model/IndexHome.java

@@ -37,4 +37,12 @@ public class IndexHome implements Serializable {
      * 类型
      */
     private String type;
+    /**
+     * 图片
+     */
+    private String articleImgUrl1;
+    /**
+     * 视频
+     */
+    private String articleVideoUrl;
 }

src/main/resources/config/mapping/IndexMapper.xml

@@ -24,13 +24,16 @@
     </select>
     <!-- 查询首页轮播 -->
     <select id="getIndexHomeUrl" resultType="IndexHome">
-        select * from sys_home_url
+        select
+            *,
+            article_id as id,
+            article_title as titleName,
+            article_title2 as viceTitleName,
+            article_id as uuid
+        from tuya_article_info
         <trim prefix="WHERE" prefixOverrides="and | or">
-            <if test="imgVideo != null and imgVideo != ''">
-                and img_video = #{imgVideo}
-            </if>
             <if test="type != null and type != ''">
-                and type = #{type}
+                and category_id = #{type}
             </if>
         </trim>
     </select>