新增用户管理楼盘字段

ruoyi-admin/src/main/java/com/ruoyi/web/controller/house/HousesReviewController.java

@@ -109,7 +109,7 @@ public class HousesReviewController extends BaseController {
     public TableDataInfo<HousesReview> list(HousesReviewBo bo, PageQuery pageQuery) {
         boolean admin = LoginHelper.isAdmin();
         if (!admin){
-            bo.setProjectName(LoginHelper.getUsername());
+            bo.setProjectName(LoginHelper.getLoginUser().getProperties());
         }
         return iHousesReviewService.queryPageList(bo, pageQuery);
     }

ruoyi-admin/src/test/java/com/ruoyi/test/DemoUnitTest.java

@@ -862,7 +862,11 @@ public class DemoUnitTest {
 
     @Test
     public void  paChon() throws Exception {
-        buyHousesService.logout("3184");
+        String str ="C2型人才国家级技能大师工作室领衔人";
+        String substring = str.substring(0,1);
+        System.out.println("substring = " + substring);
+
+//        buyHousesService.logout("3184");
 
 //        R gaoXinCardInfo = OpenUtils.getGaoXinCardInfo("510503199602214055");
 //        System.out.println("JSONUtil.toJsonPrettyStr(gaoXinCardInfo) = " + JSONUtil.toJsonPrettyStr(gaoXinCardInfo));

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

@@ -127,6 +127,11 @@ public class SysUser extends BaseEntity {
      */
     private String remark;
 
+    /**
+     * 楼盘
+     */
+    private  String properties;
+
     /**
      * 部门对象
      */

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java

@@ -94,6 +94,11 @@ public class LoginUser implements Serializable {
 
     private String companyId;
 
+    /**
+     * 楼盘
+     */
+    private String properties;
+
 
 
     /**

ruoyi-sms/src/main/java/com/ruoyi/sms/core/TelecomSendMsg.java

@@ -35,13 +35,13 @@ public class TelecomSendMsg{
             paramMap.put("Mobile",phones);
             String gbk = null;
             if ("register".equals(type)){
-                gbk = URLEncoder.encode("尊敬的用户,您正在办理用户注册操作,我们不会向您索要此验证码,切勿告知他人本次验证码有效性为:"+ Constants.CAPTCHA_EXPIRATION +"分钟,本次验证码为:"+content+"【成都高新人才安居资格认定】", "GBK");
+                gbk = URLEncoder.encode("尊敬的用户,您正在办理用户注册操作,我们不会向您索要此验证码,切勿告知他人。本次验证码有效性为:"+ Constants.CAPTCHA_EXPIRATION +"分钟,本次验证码为:"+content+"【成都高新人才安居资格认定】", "GBK");
             }else if ("login".equals(type)){
-                gbk = URLEncoder.encode("尊敬的用户,您正在办理用户登录操作,我们不会向您索要此验证码,切勿告知他人本次验证码有效性为:"+ Constants.CAPTCHA_EXPIRATION +"分钟,本次验证码为:"+content+"【成都高新人才安居资格认定】", "GBK");
+                gbk = URLEncoder.encode("尊敬的用户,您正在办理用户登录操作,我们不会向您索要此验证码,切勿告知他人。本次验证码有效性为:"+ Constants.CAPTCHA_EXPIRATION +"分钟,本次验证码为:"+content+"【成都高新人才安居资格认定】", "GBK");
             }else if ("forgetPwd".equals(type)){
-                gbk = URLEncoder.encode("尊敬的用户,您正在办理用户忘记密码操作,我们不会向您索要此验证码,切勿告知他人本次验证码有效性为:"+ Constants.CAPTCHA_EXPIRATION +"分钟,本次验证码为:"+content+"【成都高新人才安居资格认定】", "GBK");
+                gbk = URLEncoder.encode("尊敬的用户,您正在办理用户忘记密码操作,我们不会向您索要此验证码,切勿告知他人。本次验证码有效性为:"+ Constants.CAPTCHA_EXPIRATION +"分钟,本次验证码为:"+content+"【成都高新人才安居资格认定】", "GBK");
             }else if("updatePwd".equals(type)){
-                gbk = URLEncoder.encode("尊敬的用户,您正在办理用户修改密码,我们不会向您索要此验证码,切勿告知他人本次验证码有效性为:"+ Constants.CAPTCHA_EXPIRATION +"分钟,本次验证码为:"+content+"【成都高新人才安居资格认定】", "GBK");
+                gbk = URLEncoder.encode("尊敬的用户,您正在办理用户修改密码,我们不会向您索要此验证码,切勿告知他人。本次验证码有效性为:"+ Constants.CAPTCHA_EXPIRATION +"分钟,本次验证码为:"+content+"【成都高新人才安居资格认定】", "GBK");
             }else if ("updatePhone".equals(type)){
 
             }

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

@@ -103,7 +103,7 @@ public class SysLoginService {
     public String smsLogin(String phonenumber, String smsCode) {
         // 通过手机号查找用户
         SysUser user = loadUserByPhonenumber(phonenumber);
-//        checkLogin(LoginType.SMS, user.getUserName(), () -> !validateSmsCode(phonenumber, smsCode,CacheConstants.CAPTCHA_CODE_KEY));
+        checkLogin(LoginType.SMS, user.getUserName(), () -> !validateSmsCode(phonenumber, smsCode,CacheConstants.CAPTCHA_CODE_KEY));
         // 此处可根据登录用户的数据不同 自行创建 loginUser
         LoginUser loginUser = buildLoginSysUser(user);
         // 生成token
@@ -230,7 +230,6 @@ public class SysLoginService {
 
     private SysUser loadSysUserByUsername(String username) {
         SysUser user = sysUserMapper.selectOne(new LambdaQueryWrapper<SysUser>()
-            .select(SysUser::getUserName, SysUser::getStatus)
             .eq(SysUser::getUserName, username));
         if (ObjectUtil.isNull(user)) {
             log.info("登录用户：{} 不存在.", username);
@@ -244,7 +243,6 @@ public class SysLoginService {
 
     private SysUser loadUserByPhonenumber(String phonenumber) {
         SysUser user = sysUserMapper.selectOne(new LambdaQueryWrapper<SysUser>()
-            .select(SysUser::getPhonenumber, SysUser::getStatus)
             .eq(SysUser::getPhonenumber, phonenumber));
         if (ObjectUtil.isNull(user)) {
             log.info("登录用户：{} 不存在.", phonenumber);
@@ -294,6 +292,7 @@ public class SysLoginService {
         loginUser.setUsername(user.getUserName());
         loginUser.setUserType(user.getUserType());
         loginUser.setNickName(user.getNickName());
+        loginUser.setProperties(user.getProperties());
         loginUser.setMenuPermission(permissionService.getMenuPermission(user));
         loginUser.setRolePermission(permissionService.getRolePermission(user));
         loginUser.setDeptName(ObjectUtil.isNull(user.getDept()) ? "" : user.getDept().getDeptName());

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

@@ -752,8 +752,9 @@ public class BuyHousesServiceImpl implements IBuyHousesService {
                 map.put("cancelTime", DateUtils.dateTime("yyyy-MM-dd HH:mm:ss"));
                 map.put("note",buyHouses.getReply());//备注
                 map.put("status", "00N");
+                map.put("description",buyHouses.getReply());
                 System.out.println("JSONUtil.toJsonPrettyStr(map) = " + JSONUtil.toJsonPrettyStr(map));
-                housingConstructionBureauPushDto.openUrl("https://jcfw.cdzjryb.com//CCSRegistryCenter/rest",map,"254");//正式
+                housingConstructionBureauPushDto.openUrl("https://jcfw.cdzjryb.com/CCSRegistryCenter/rest",map,"254");//正式
 //                housingConstructionBureauPushDto.openUrl("https://171.221.172.13:8088/CCSRegistryCenter/rest", map, "254");//测试
                 if (ObjectUtil.isNotNull(houses.getApiKey()) && String.valueOf(houses.getApiKey()).equals("gaoxingongyuanchengshiju")) {
 //                    housingConstructionBureauPushDto.send3(map, "http://218.89.220.30:9200/rctopen/api/anju/openBuyHousesCallback");//测试
@@ -1496,7 +1497,7 @@ public class BuyHousesServiceImpl implements IBuyHousesService {
         map.put("note","人才主动撤销");//备注
         map.put("status", "00N");
         System.out.println("JSONUtil.toJsonPrettyStr(map) = " + JSONUtil.toJsonPrettyStr(map));
-        housingConstructionBureauPushDto.openUrl("https://jcfw.cdzjryb.com//CCSRegistryCenter/rest",map,"254");//正式
+        housingConstructionBureauPushDto.openUrl("https://jcfw.cdzjryb.com/CCSRegistryCenter/rest",map,"254");//正式
         return null;
     }
 }