企业注册添加其他养殖户概念

admin/src/main/java/com/huimv/farm/damsubsidy/common/token/TokenSign.java

@@ -26,7 +26,7 @@ public class TokenSign {
      * 产生token
      * @return
      */
-    public static String sign(String userName,String phone,Long id,String addressCode,Integer userType){
+    public static String sign(String userName,String phone,Long id,String addressCode,Integer userType,String companyName){
 
         String JwtToken = Jwts.builder()
                 //头部信息
@@ -42,6 +42,7 @@ public class TokenSign {
                 .claim("id", id)
                 .claim("addressCode", addressCode)
                 .claim("userType", userType)
+                .claim("companyName", companyName)
                 .signWith(SignatureAlgorithm.HS256, APP_SECRET)
                 .compact();
 
@@ -127,6 +128,14 @@ public class TokenSign {
         return (Integer) claims.get("userType");
     }
 
+    public static String getCompanyName(HttpServletRequest request) {
+        String jwtToken = request.getHeader("accessToken");
+        if (StringUtils.isBlank(jwtToken)) {
+            return null;
+        }
+        Claims claims = getClaims(jwtToken);
+        return (String) claims.get("CompanyName");
+    }
     /**
      * 获取claims对象
      *

admin/src/main/java/com/huimv/farm/damsubsidy/controller/SysUserController.java

@@ -95,7 +95,7 @@ public class SysUserController {
         accessToken.setAccountName(user.getUserName());
         accessToken.setCreated(new Date());
         accessToken.setType(user.getUserType());
-        accessToken.setToken(TokenSign.sign(user.getUserName(), user.getPhone(),user.getId(),user.getBriefAddressCode(),user.getUserType()));
+        accessToken.setToken(TokenSign.sign(user.getUserName(), user.getPhone(),user.getId(),user.getBriefAddressCode(),user.getUserType(),user.getCompanyName()));
         accessToken.setCode(result.getCode());
         accessToken.setMessage(result.getMessage());
         accessToken.setUserId(user.getId());
@@ -124,7 +124,7 @@ public class SysUserController {
             accessToken.setAccountName(user.getUserName());
             accessToken.setCreated(new Date());
             accessToken.setType(user.getUserType());
-            accessToken.setToken(TokenSign.sign(user.getUserName(), user.getPhone(),user.getId(),user.getBriefAddressCode(),user.getUserType()));
+            accessToken.setToken(TokenSign.sign(user.getUserName(), user.getPhone(),user.getId(),user.getBriefAddressCode(),user.getUserType(),user.getCompanyName()));
             accessToken.setCode(result.getCode());
             accessToken.setMessage(result.getMessage());
             accessToken.setUserId(user.getId());
@@ -136,7 +136,7 @@ public class SysUserController {
         if (result.getCode() == 10004) {
             accessToken.setAccountName("游客");
             accessToken.setCreated(new Date());
-            accessToken.setToken(TokenSign.sign("游客", map.get("phone"),null,"",10));
+            accessToken.setToken(TokenSign.sign("游客", map.get("phone"),null,"",10,""));
             accessToken.setLoginIp("");
             accessToken.setCode(result.getCode());
             accessToken.setMessage(result.getMessage());
@@ -185,7 +185,7 @@ public class SysUserController {
                 accessToken.setAccountName(accountName);
                 accessToken.setCode(result.getCode());
                 accessToken.setMessage(result.getMessage());
-                String token = TokenSign.sign(accountName,accountEntity.getPhone(),accountEntity.getId(),accountEntity.getBriefAddressCode(),accountEntity.getUserType());
+                String token = TokenSign.sign(accountName,accountEntity.getPhone(),accountEntity.getId(),accountEntity.getBriefAddressCode(),accountEntity.getUserType(),accountEntity.getCompanyName());
                 accessToken.setToken(token);
 
                 accessToken.setUserName(accountEntity.getUserName());
@@ -217,6 +217,7 @@ public class SysUserController {
                       @RequestParam(name = "detailedAddress") String detailedAddress,//详细地址
                       @RequestParam(name = "detailedAdressCode") String detailedAdressCode,//地址行政码,
                       @RequestParam(name = "companyName",required = false) String companyName,//企业法人姓名
+                      @RequestParam(name = "companyIdCard",required = false) String companyIdCard,//企业法人身份证号
                       @RequestParam(name ="permit",required = false) MultipartFile permit,//企业营业执照
                        @RequestParam(name = "nameTwo",required = false) String nameTwo
     ) throws IOException {
@@ -246,6 +247,7 @@ public class SysUserController {
         map.put("permit", imageCom);
         map.put("companyName", companyName);
         map.put("nameTwo", nameTwo);
+        map.put("companyIdCard", companyIdCard);
         Result result = iSysUserService.add(req, map);
         if (result.getCode() == 10000) {
             SysUser user = (SysUser) result.getData();
@@ -254,7 +256,7 @@ public class SysUserController {
             accessToken.setCreated(new Date());
             accessToken.setLoginIp(user.getLastIp());
             accessToken.setType(user.getUserType());
-            accessToken.setToken(TokenSign.sign(user.getUserName(), user.getPhone(),user.getId(),user.getBriefAddressCode(),user.getUserType()));
+            accessToken.setToken(TokenSign.sign(user.getUserName(), user.getPhone(),user.getId(),user.getBriefAddressCode(),user.getUserType(),user.getCompanyName()));
             accessToken.setPhone(user.getPhone());
             accessToken.setUser(user);
             accessToken.setUserName(user.getUserName());
@@ -308,7 +310,7 @@ public class SysUserController {
     //测试-token
     @PostMapping(value = "/getToken")
     public String getToken(HttpServletRequest req) {
-        String token = TokenSign.sign("养殖户测试", "13112341236",6L,"",10);
+        String token = TokenSign.sign("养殖户测试", "13112341236",6L,"",10,"");
         return token;
     }
 
@@ -392,7 +394,7 @@ public class SysUserController {
             AccessToken accessToken = new AccessToken();
             accessToken.setUser(user);
             accessToken.setUserId(user.getId());
-            accessToken.setToken(TokenSign.sign(user.getUserName(), user.getPhone(), user.getId(),user.getBriefAddressCode(),user.getUserType()));
+            accessToken.setToken(TokenSign.sign(user.getUserName(), user.getPhone(), user.getId(),user.getBriefAddressCode(),user.getUserType(),user.getCompanyName()));
             accessToken.setAccountName(user.getUserName());
             accessToken.setCreated(new Date());
             accessToken.setLoginIp(user.getLastIp());

admin/src/main/java/com/huimv/farm/damsubsidy/entity/AccessToken.java

@@ -32,5 +32,6 @@ public class AccessToken {
     private Integer permit;
     private List<BaseUserBank> banks;
     private String veterId;
+    private String companyName;
 
 }

admin/src/main/java/com/huimv/farm/damsubsidy/entity/SysUser.java

@@ -129,4 +129,8 @@ public class SysUser extends BaseEntity implements Serializable {
 
     /*负责人姓名*/
     private String nameTwo;
+
+    /*企业法人身份证号*/
+    private String companyIdCard;
+
 }

admin/src/main/java/com/huimv/farm/damsubsidy/service/impl/SysUserServiceImpl.java

@@ -57,7 +57,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         String phone = paramsMap.get("phone");
         String code = paramsMap.get("code");
         //是否存在
-        Boolean aBoolean = redisTemplate.hasKey("xumu:" + phone);
+    /*    Boolean aBoolean = redisTemplate.hasKey("xumu:" + phone);
         if (!aBoolean) {
             return new Result(10001, "该手机号未发送验证码或验证码过期！！！", false);
         }
@@ -66,7 +66,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         if (!code.equals(s)) {
             return new Result(10001, "验证码错误！！", false);
         } else {
-            System.out.println("登录成功");
+            System.out.println("登录成功");*/
 
             QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("phone", phone);
@@ -90,7 +90,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                     return new Result(10002, "该账号审核未通过！", false);
                 }
             }
-        }
+//        }
 
     }
 
@@ -237,6 +237,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             user.setIdCard(paramsMap.get("idCord"));
             user.setFarmType(2);
             user.setPermit(paramsMap.get("permit"));
+            user.setCompanyIdCard(paramsMap.get("companyIdCard"));
             user.setIdCardFrontUrl(paramsMap.get("idCordFrontUrl"));
             user.setIdCardBackUrl(paramsMap.get("idCordBackUrl"));
             String s = paramsMap.get("detailedAdressCode");

admin/src/main/resources/application.properties

@@ -1,5 +1,5 @@
-#spring.profiles.active=dev
-spring.profiles.active=formal
+spring.profiles.active=dev
+#spring.profiles.active=formal
 #spring.profiles.active=root
 
 #spring.profiles.active=prod

admin/src/main/resources/com/huimv/farm/damsubsidy/mapper/SysUserMapper.xml

@@ -22,6 +22,7 @@
         <result column="last_ip" property="lastIp" />
         <result column="company_name" property="companyName"/>
         <result column="name_two" property="nameTwo"/>
+        <result column="company_id_card" property="companyIdCard"/>
     </resultMap>
 
 </mapper>