ruoyi-admin/src/main/java/com/ruoyi/web/controller/benyun/IUserinfoController.java

@@ -29,6 +29,7 @@ public class IUserinfoController {
      * @param openAccountVO
      * @return
      */
+    @SaIgnore
     @PostMapping("/createAdmin")
     public R createAdmin(@Validated @RequestBody OpenAccountVO openAccountVO) {
         ArrayList<Integer> integers = new ArrayList<>();
@@ -43,6 +44,7 @@ public class IUserinfoController {
      * @param openAccountVO
      * @return
      */
+    @SaIgnore
     @PostMapping("/createUser")
     public R createUser(@Validated @RequestBody OpenAccountVO openAccountVO) {
         ArrayList<Integer> integers = new ArrayList<>();
@@ -53,6 +55,7 @@ public class IUserinfoController {
     }
 
 
+    @SaIgnore
     @PostMapping("/disableUser")
     public R disableUser(@Validated @RequestBody OpenAccountVO openAccountVO) {
         iUserinfoService.disableUser(openAccountVO);

ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java

@@ -128,7 +128,6 @@ public class CaptchaController {
         RedisUtils.setCacheObject(verifyKey, code, Duration.ofMinutes(Constants.CAPTCHA_EXPIRATION));
         ajax.put("uuid", uuid);
         ajax.put("img", captcha.getImageBase64());
-        System.out.println(code);
         return R.ok(ajax);
     }
 

ruoyi-demo/src/main/java/com/ruoyi/demo/controller/ChannelMapController.java

@@ -248,7 +248,7 @@ public class ChannelMapController {
      */
     @GetMapping("/getWdInfo")
     public R getWdInfo(String wdId){
-        WdInfo wdInfo = channelMapService.getWdInfo(wdId);
+        WdInfo wdInfo = channelMapService.getWdInfo(wdId,LoginHelper.getUserId());
         if(wdInfo == null)
             return R.ok(null);
         if("1".equals(wdInfo.getWdTypeCode())){

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/WdInfo.java

@@ -155,4 +155,10 @@ public class WdInfo implements Serializable {
     @TableField("show_delete")
     @TableLogic
     private int showDelete;
+
+    /**
+     * 是否关注
+     */
+    @TableField(exist = false)
+    private int attention;
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/init/BenyunCoreInit.java

@@ -76,6 +76,7 @@ public class BenyunCoreInit {
         List<String> three = new ArrayList<>();
         List<String> four = new ArrayList<>();
         List<String> five = new ArrayList<>();
+        List<String> newOne = new ArrayList<>();
 
         BoundHashOperations boundHashOperations = redisTemplate.boundHashOps(RedisInitContant.INIT_CITY_TIER_MAP);
         Set<String> keys = boundHashOperations.keys();
@@ -97,6 +98,9 @@ public class BenyunCoreInit {
                 case "五线":
                     five.add(s);
                     break;
+                case "新一线":
+                    newOne.add(s);
+                    break;
             }
         }
         redisTemplate.boundHashOps(RedisInitContant.INIT_CITY_TIER_LIST_MAP).put("一线",one);
@@ -104,6 +108,7 @@ public class BenyunCoreInit {
         redisTemplate.boundHashOps(RedisInitContant.INIT_CITY_TIER_LIST_MAP).put("三线",three);
         redisTemplate.boundHashOps(RedisInitContant.INIT_CITY_TIER_LIST_MAP).put("四线",four);
         redisTemplate.boundHashOps(RedisInitContant.INIT_CITY_TIER_LIST_MAP).put("五线",five);
+        redisTemplate.boundHashOps(RedisInitContant.INIT_CITY_TIER_LIST_MAP).put("新一线",newOne);
         System.out.println("CityTierListMap已完成");
     }
 

ruoyi-demo/src/main/java/com/ruoyi/demo/service/ChannelMapService.java

@@ -15,7 +15,7 @@ public interface ChannelMapService {
 
     public Page<WdInfo> point(ChannelMapAceeptVo channel);
 
-    WdInfo getWdInfo(String wdId);
+    WdInfo getWdInfo(String wdId,Long userId);
 
     WdCount areaProvince(ChannelMapAceeptVo channel);
 

ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/ChannelMapServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 
+import com.ruoyi.common.helper.LoginHelper;
 import com.ruoyi.demo.entity.*;
 import com.ruoyi.demo.entity.bo.*;
 import com.ruoyi.demo.entity.vo.ChannelMapAceeptVo;
@@ -526,7 +527,7 @@ public class ChannelMapServiceImpl implements ChannelMapService {
      * @return
      */
     @Override
-    public WdInfo getWdInfo(String wdId) {
+    public WdInfo getWdInfo(String wdId,Long userId) {
         QueryWrapper<WdInfo> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("wd_id",wdId);
 
@@ -534,6 +535,18 @@ public class ChannelMapServiceImpl implements ChannelMapService {
         if(wdInfo == null)
             return wdInfo;
 
+        //查询是否关注
+        CompletableFuture<Integer> objectCompletableFuture = CompletableFuture.supplyAsync(() -> {
+            QueryWrapper<AttentionPool> queryWrapper1 = new QueryWrapper<>();
+            queryWrapper1.select("wd_id");
+            queryWrapper1.eq("user_id", userId);
+            queryWrapper1.and(attentionPoolQueryWrapper -> {
+                attentionPoolQueryWrapper.eq("wd_id",wdId);
+            });
+            AttentionPool attentionPool = attentionPoolDao.selectOne(queryWrapper1);
+            return attentionPool == null ? 0:1;
+        });
+
         if("1".equals(wdInfo.getWdTypeCode())){
             //门店网点
             QueryWrapper<StoreWd> queryWrapper1 = new QueryWrapper<>();
@@ -542,7 +555,7 @@ public class ChannelMapServiceImpl implements ChannelMapService {
             StoreWdInfoBo storeWdInfoBo = new StoreWdInfoBo(wdInfo);
             storeWdInfoBo.setStoreWd(storeWd);
             storeWdInfoBo.setTags(wdRedisStoreage.getWdTag(wdInfo));
-            storeWdInfoBo.setAddrCode(initMapUtil.getInitAddrCodeMap(storeWdInfoBo.getAddrCode()));
+            storeWdInfoBo.setAttention(objectCompletableFuture.join());
             return storeWdInfoBo;
         }else if("2".equals(wdInfo.getWdTypeCode())){
             //小区网点
@@ -552,7 +565,7 @@ public class ChannelMapServiceImpl implements ChannelMapService {
             HouseWdInfoBo houseWdInfoBo = new HouseWdInfoBo(wdInfo);
             houseWdInfoBo.setHouseWd(houseWd);
             houseWdInfoBo.setTags(wdRedisStoreage.getWdTag(wdInfo));
-            houseWdInfoBo.setAddrCode(initMapUtil.getInitAddrCodeMap(houseWdInfoBo.getAddrCode()));
+            houseWdInfoBo.setAttention(objectCompletableFuture.join());
             return houseWdInfoBo;
         }else if("3".equals(wdInfo.getWdTypeCode())){
             //楼宇网点
@@ -562,7 +575,7 @@ public class ChannelMapServiceImpl implements ChannelMapService {
             BuildWdInfoBo buildWdInfoBo = new BuildWdInfoBo(wdInfo);
             buildWdInfoBo.setBuildWd(buildWd);
             buildWdInfoBo.setTags(wdRedisStoreage.getWdTag(wdInfo));
-            buildWdInfoBo.setAddrCode(initMapUtil.getInitAddrCodeMap(buildWdInfoBo.getAddrCode()));
+            buildWdInfoBo.setAttention(objectCompletableFuture.join());
             return buildWdInfoBo;
         }else if("4".equals(wdInfo.getWdTypeCode())){
             //交通设施网点
@@ -572,7 +585,7 @@ public class ChannelMapServiceImpl implements ChannelMapService {
             TrafficWdInfoBo trafficWdInfoBo = new TrafficWdInfoBo(wdInfo);
             trafficWdInfoBo.setTrafficWd(trafficWd);
             trafficWdInfoBo.setTags(wdRedisStoreage.getWdTag(wdInfo));
-            trafficWdInfoBo.setAddrCode(initMapUtil.getInitAddrCodeMap(trafficWdInfoBo.getAddrCode()));
+            trafficWdInfoBo.setAttention(objectCompletableFuture.join());
             return trafficWdInfoBo;
         }else if("5".equals(wdInfo.getWdTypeCode())){
             //企业网点
@@ -582,7 +595,7 @@ public class ChannelMapServiceImpl implements ChannelMapService {
             EnterpriseWdInfoBo enterpriseWdInfoBo = new EnterpriseWdInfoBo(wdInfo);
             enterpriseWdInfoBo.setEnterpriseWd(enterpriseWd);
             enterpriseWdInfoBo.setTags(wdRedisStoreage.getWdTag(wdInfo));
-            enterpriseWdInfoBo.setAddrCode(initMapUtil.getInitAddrCodeMap(enterpriseWdInfoBo.getAddrCode()));
+            enterpriseWdInfoBo.setAttention(objectCompletableFuture.join());
             return enterpriseWdInfoBo;
         }
 

ruoyi-system/src/main/java/com/ruoyi/system/domain/OpenAccount.java

@@ -179,7 +179,7 @@ public class OpenAccount {
     }
 
     public OpenAccount(OpenAccountVO openAccountVO) {
-        this.uId = openAccountVO.getU_id();
+        this.uId = openAccountVO.getUId();
         this.userName = openAccountVO.getUserName();
         this.nickName = openAccountVO.getNickName();
         this.phonenumber = openAccountVO.getPhonenumber();

ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/OpenAccountVO.java

@@ -16,11 +16,11 @@ public class OpenAccountVO implements Serializable {
     /**
      * 统一用户id（uId不懂为什么用不了）
      */
-//    @NotBlank(message = "uId不能为空")
-//    private Long uId;
+    @NotNull(message = "uId不能为空")
+    private Long uId;
 
-    @NotNull(message = "u_id不能为空")
-    private Long u_id;
+//    @NotNull(message = "u_id不能为空")
+//    private Long u_id;
 
     /**
      * 用户账号
@@ -58,7 +58,6 @@ public class OpenAccountVO implements Serializable {
     /**
      * 密码
      */
-    @NotBlank(message = "密码不能为空")
     private String password;
     /**
      * 角色列表

ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java

@@ -198,7 +198,6 @@ public class SysLoginService {
      */
     public void validateCaptcha(String username, String code, String uuid) {
         String verifyKey = CacheConstants.CAPTCHA_CODE_KEY + StringUtils.defaultString(uuid, "");
-        System.out.println("verifyKey"+verifyKey);
         String captcha = RedisUtils.getCacheObject(verifyKey);
         RedisUtils.deleteObject(verifyKey);
         if (captcha == null) {

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/IUserinfoServiceImpl.java

@@ -68,7 +68,7 @@ public class IUserinfoServiceImpl implements IUserinfoService {
     @Override
     public void disableUser(OpenAccountVO openAccountVO) {
         UpdateWrapper<OpenAccount> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("u_id",openAccountVO.getU_id());
+        updateWrapper.eq("u_id",openAccountVO.getUId());
         updateWrapper.set("delFlag",2);
         iUserinfoMapper.update(null,updateWrapper);
     }
@@ -80,15 +80,15 @@ public class IUserinfoServiceImpl implements IUserinfoService {
         //判断u_id 和 用户名称是否存在
         QueryWrapper<OpenAccount> queryWrapper = new QueryWrapper<>();
         queryWrapper.select("u_id","user_name");
-        queryWrapper.eq("u_id",openAccountVO.getU_id());
+        queryWrapper.eq("u_id",openAccountVO.getUId());
         queryWrapper.or();
         queryWrapper.eq("user_name",openAccountVO.getUserName());
         List<OpenAccount> openAccounts = iUserinfoMapper.selectList(queryWrapper);
         if (!openAccounts.isEmpty()){
             if (openAccounts.size() == 2)
-                return "u_id、userName已存在";
-            else if (openAccounts.get(0).getUId() == openAccountVO.getU_id())
-                return "u_id已存在";
+                return "uId、userName已存在";
+            else if (openAccounts.get(0).getUId() == openAccountVO.getUId())
+                return "uId已存在";
             else
                 return "userName已存在";
         }

ruoyi-ui/src/router/index.js

@@ -64,7 +64,7 @@ export const constantRoutes = [
   {
     path: '/',
     component: Layout,
-    redirect: '/wdInfo/wdinfo',//'/data/wdData',
+    redirect: '/index',//'/data/wdData',
     children: [
       {
         path: 'index',

ruoyi-ui/src/views/index.vue

@@ -1,5 +1,19 @@
 <template>
-  <div class="app-container home">
+  <div class="app-container home" >
+    <div class="inde">
+      <el-row type="flex" justify="start">
+          <el-col>
+            <el-row><span style="padding: 20px;font-weight: bolder;font-size: 40px;color: #000;">welcome</span></el-row>
+            <el-row><span style="padding: 20px;color: #000;">欢迎登录精确营销后台管理系统</span></el-row>
+          </el-col>
+      </el-row>
+      <el-row type="flex" align="middle" justify="center" style="width: 100%;height: 800px;">
+          <el-image
+            :src="require('@/assets/img.png')"
+            style="width: 40%;"
+            :fit="fit"></el-image>
+      </el-row>
+    </div>
     <!-- <el-row :gutter="20">
       <el-col :sm="24" :lg="12" style="padding-left: 20px">
         <h2>精确营销后台管理系统 后台管理框架</h2>
@@ -115,6 +129,7 @@ export default {
     return {
       // 版本号
       version: "4.8.0",
+      fit: "fill",
     };
   },
   methods: {
@@ -127,6 +142,11 @@ export default {
 
 <style scoped lang="scss">
 .home {
+  height: 100%;
+  .inde {
+    background-color: #E5EFFF;
+    height: 100%;
+  }
   blockquote {
     padding: 10px 20px;
     margin: 0 0 20px;

ruoyi-ui/vue.config.js

@@ -35,7 +35,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://127.0.0.1:8080`,
+        target: `http://192.168.2.207:8080`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: '/jzyx'