wwh 2 lat temu
rodzic
commit
a7071886ba

+ 2 - 0
admin/src/main/java/com/huimv/farm/damsubsidy/SubsidyApplication.java

@@ -12,4 +12,6 @@ public class SubsidyApplication {
         SpringApplication.run(SubsidyApplication.class, args);
     }
 
+
+
 }

+ 2 - 3
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,Integer id,String farmIds){
+    public static String sign(String userName,String phone){
 
         String JwtToken = Jwts.builder()
                 //头部信息
@@ -38,8 +38,7 @@ public class TokenSign {
                 .setExpiration(new Date(System.currentTimeMillis() + EXPIRE_TIME))
                 //token主体部分,存储用户信息
                 .claim("userName", userName)
-                .claim("id",id)
-                .claim("farmIds",farmIds)
+                .claim("phone",phone)
                 .signWith(SignatureAlgorithm.HS256, APP_SECRET)
                 .compact();
 

+ 2 - 1
admin/src/main/java/com/huimv/farm/damsubsidy/config/ApiPrefixAutoConfiguration.java

@@ -1,3 +1,4 @@
+/*
 package com.huimv.farm.damsubsidy.config;
 
 import org.springframework.context.annotation.Configuration;
@@ -13,4 +14,4 @@ public class ApiPrefixAutoConfiguration implements WebMvcConfigurer {
         configurer.addPathPrefix("",  c -> c.isAnnotationPresent(RestController.class));
     }
 
-}
+}*/

+ 1 - 1
admin/src/main/java/com/huimv/farm/damsubsidy/config/InterceptorConfig.java

@@ -21,6 +21,6 @@ public class InterceptorConfig implements WebMvcConfigurer {
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
         registry.addInterceptor(jwtInterceptor()).
-                excludePathPatterns("/huatongApi/admin/my/*");
+                excludePathPatterns("/sys-user/*");
     }
 }

+ 55 - 2
admin/src/main/java/com/huimv/farm/damsubsidy/controller/SysUserController.java

@@ -1,9 +1,19 @@
 package com.huimv.farm.damsubsidy.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import cn.hutool.core.util.ObjectUtil;
+import com.huimv.farm.damsubsidy.common.token.TokenSign;
+import com.huimv.farm.damsubsidy.common.utils.Result;
+import com.huimv.farm.damsubsidy.common.utils.ResultCode;
+import com.huimv.farm.damsubsidy.entity.AccessToken;
+import com.huimv.farm.damsubsidy.entity.SysUser;
+import com.huimv.farm.damsubsidy.service.ISysUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RestController;
+import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
+import java.util.Map;
 
 /**
  * <p>
@@ -15,6 +25,49 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/sys-user")
+@CrossOrigin
 public class SysUserController {
 
+    @Autowired
+    private ISysUserService iSysUserService;
+
+    @PostMapping(value = "/login")
+    public Result loginMultilevel(HttpServletRequest req, @RequestBody Map<String, String> map)  {
+
+        Result result = iSysUserService.loginMultilevel(req, map);
+        AccessToken accessToken = new AccessToken();
+        if (result.getCode() == 10000) {
+            SysUser user = (SysUser) result.getData();
+            accessToken.setAccountName(user.getUserName());
+            accessToken.setCreated(new Date());
+            accessToken.setLoginIp(user.getLastIp());
+            accessToken.setToken(TokenSign.sign(user.getUserName(), user.getPhone()));
+        } else {
+            accessToken.setAccountName("游客");
+            accessToken.setCreated(new Date());
+            accessToken.setToken(TokenSign.sign("游客",map.get("phone")));
+            accessToken.setLoginIp("");
+        }
+        return new Result(ResultCode.SUCCESS,accessToken);
+    }
+
+
+    @PostMapping(value = "/add")
+    public Result add(HttpServletRequest req, @RequestBody Map<String, String> map)  {
+        return new Result(ResultCode.SUCCESS, iSysUserService.add(req, map));
+    }
+    @PostMapping(value = "/edit")
+    public Result edit(HttpServletRequest req, @RequestBody SysUser user)  {
+        return new Result(ResultCode.SUCCESS, iSysUserService.edit(req, user));
+    }
+    @PostMapping(value = "/list")
+    public Result list(HttpServletRequest req, @RequestBody Map<String, String> map)  {
+        return new Result(ResultCode.SUCCESS, iSysUserService.list(req, map));
+    }
+    //测试-token
+    @PostMapping(value = "/getToken")
+    public String getToken(HttpServletRequest req)  {
+        String token =  TokenSign.sign("superadmin","123456789");
+        return  token;
+    }
 }

+ 106 - 0
admin/src/main/java/com/huimv/farm/damsubsidy/entity/AccessToken.java

@@ -0,0 +1,106 @@
+package com.huimv.farm.damsubsidy.entity;
+
+import java.util.Date;
+
+/**
+ * 登录的token信息
+ * @author guojian
+ */
+public class AccessToken {
+    private String token;
+    private String loginIp;
+    private Date created;
+    private String accountName;
+    private Integer code;
+    private Integer type;
+    private String message;
+    private Integer lastFarmId;
+    private String userName;
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public Integer getLastFarmId() {
+        return lastFarmId;
+    }
+
+    public void setLastFarmId(Integer lastFarmId) {
+        this.lastFarmId = lastFarmId;
+    }
+
+    public AccessToken() {
+    }
+
+    public String getToken() {
+        return token;
+    }
+
+    public void setToken(String token) {
+        this.token = token;
+    }
+
+    public String getLoginIp() {
+        return loginIp;
+    }
+
+    public void setLoginIp(String loginIp) {
+        this.loginIp = loginIp;
+    }
+
+    public Date getCreated() {
+        return created;
+    }
+
+    public void setCreated(Date created) {
+        this.created = created;
+    }
+
+    public String getAccountName() {
+        return accountName;
+    }
+
+    public void setAccountName(String accountName) {
+        this.accountName = accountName;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    public AccessToken(String token, String loginIp, Date created, String accountName, Integer code, Integer type, String message) {
+        this.token = token;
+        this.loginIp = loginIp;
+        this.created = created;
+        this.accountName = accountName;
+        this.code = code;
+        this.type = type;
+        this.message = message;
+    }
+}

+ 9 - 0
admin/src/main/java/com/huimv/farm/damsubsidy/entity/SysUser.java

@@ -78,5 +78,14 @@ public class SysUser extends BaseEntity implements Serializable {
      */
     private String lastIp;
 
+    /**
+     * 农户类别
+     */
+    private Integer farmType;
+
+    /*养殖场名称*/
+    private String farmName;
 
+    /*经营许可证*/
+    private String permit;
 }

+ 5 - 1
admin/src/main/java/com/huimv/farm/damsubsidy/service/IBillLandingInspectionService.java

@@ -1,8 +1,12 @@
 package com.huimv.farm.damsubsidy.service;
 
+import com.huimv.farm.damsubsidy.common.utils.Result;
 import com.huimv.farm.damsubsidy.entity.BillLandingInspection;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
 /**
  * <p>
  * 落地检 服务类
@@ -12,5 +16,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @since 2023-04-26
  */
 public interface IBillLandingInspectionService extends IService<BillLandingInspection> {
-
+    Result list(HttpServletRequest httpServletRequest, Map<String,String> paramsMap);
 }

+ 10 - 0
admin/src/main/java/com/huimv/farm/damsubsidy/service/ISysUserService.java

@@ -1,8 +1,12 @@
 package com.huimv.farm.damsubsidy.service;
 
+import com.huimv.farm.damsubsidy.common.utils.Result;
 import com.huimv.farm.damsubsidy.entity.SysUser;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
 /**
  * <p>
  *  服务类
@@ -12,5 +16,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @since 2023-04-26
  */
 public interface ISysUserService extends IService<SysUser> {
+    Result loginMultilevel(HttpServletRequest httpServletRequest,Map<String,String> paramsMap);
+
+    Result add(HttpServletRequest httpServletRequest,Map<String,String> paramsMap);
+
+    Result edit(HttpServletRequest httpServletRequest,SysUser user);
 
+    Result list(HttpServletRequest httpServletRequest,Map<String,String> paramsMap);
 }

+ 20 - 0
admin/src/main/java/com/huimv/farm/damsubsidy/service/impl/BillLandingInspectionServiceImpl.java

@@ -1,11 +1,17 @@
 package com.huimv.farm.damsubsidy.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huimv.farm.damsubsidy.common.utils.Result;
 import com.huimv.farm.damsubsidy.entity.BillLandingInspection;
 import com.huimv.farm.damsubsidy.mapper.BillLandingInspectionMapper;
 import com.huimv.farm.damsubsidy.service.IBillLandingInspectionService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
 /**
  * <p>
  * 落地检 服务实现类
@@ -17,4 +23,18 @@ import org.springframework.stereotype.Service;
 @Service
 public class BillLandingInspectionServiceImpl extends ServiceImpl<BillLandingInspectionMapper, BillLandingInspection> implements IBillLandingInspectionService {
 
+    @Autowired
+    private BillLandingInspectionMapper billLandingInspectionMapper;
+
+    @Override
+    public Result list(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+//        Integer inspectionName = Integer.valueOf(paramsMap.get("inspectionName"));
+//        String date = paramsMap.get("date");
+//        if (date == "1") {
+//            QueryWrapper<>
+//        } else {
+//
+//        }
+        return null;
+    }
 }

+ 55 - 0
admin/src/main/java/com/huimv/farm/damsubsidy/service/impl/SysUserServiceImpl.java

@@ -1,11 +1,20 @@
 package com.huimv.farm.damsubsidy.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huimv.farm.damsubsidy.common.utils.Result;
+import com.huimv.farm.damsubsidy.common.utils.ResultCode;
 import com.huimv.farm.damsubsidy.entity.SysUser;
 import com.huimv.farm.damsubsidy.mapper.SysUserMapper;
 import com.huimv.farm.damsubsidy.service.ISysUserService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
+import java.util.Map;
+
 /**
  * <p>
  *  服务实现类
@@ -17,4 +26,50 @@ import org.springframework.stereotype.Service;
 @Service
 public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> implements ISysUserService {
 
+    @Autowired
+    private SysUserMapper userMapper;
+    @Override
+    public Result loginMultilevel(HttpServletRequest httpServletRequest, Map<String,String> paramsMap) {
+        //TODO 验证码接口暂时不写,验证码验证接口写在此接口之前,这里默认验证码已经正确!
+        String phone = paramsMap.get("phone");
+        QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("phone", phone);
+        SysUser sysUser = userMapper.selectOne(queryWrapper);
+        if (ObjectUtil.isEmpty(sysUser)) {
+            return new Result(ResultCode.DATA_NULL, "用户暂未注册,请注册!");
+        } else {
+            return new Result(ResultCode.SUCCESS, sysUser);
+        }
+    }
+
+    @Override
+    public Result add(HttpServletRequest httpServletRequest,Map<String,String> paramsMap) {
+        SysUser user = new SysUser();
+        user.setUserType(Integer.parseInt(paramsMap.get("type")));
+        user.setUserName(paramsMap.get("userName"));
+        user.setIdCard(paramsMap.get("idCord"));
+        user.setPhone(paramsMap.get("phone"));
+        user.setIdCardFrontUrl(paramsMap.get("idCordFrontUrl"));
+        user.setIdCardBackUrl(paramsMap.get("idCordBackUrl"));
+        user.setCreateTime(new Date());
+        user.setIsRealName(1);
+        userMapper.insert(user);
+        QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("phone", paramsMap.get("phone"));
+        SysUser user1 = userMapper.selectOne(queryWrapper);
+        return new Result(ResultCode.SUCCESS,user1);
+    }
+
+    @Override
+    public Result edit(HttpServletRequest httpServletRequest,SysUser user) {
+        userMapper.updateById(user);
+        return new Result(ResultCode.SUCCESS,"修改成功!");
+    }
+
+    @Override
+    public Result list(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("phone", paramsMap.get("phone"));
+        return new Result(ResultCode.SUCCESS,userMapper.selectOne(queryWrapper));
+    }
 }