后台登录

admin/pom.xml

@@ -28,26 +28,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
-        <!--必须-->
-        <dependency>
-            <groupId>org.jxls</groupId>
-            <artifactId>jxls</artifactId>
-            <version>2.6.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.jxls</groupId>
-            <artifactId>jxls-poi</artifactId>
-            <version>1.1.0</version>
-        </dependency>
-        <!--      日志包  非必须  避免控制台提示日志相关警告信息-->
-
-        <dependency>
-            <groupId>e-iceblue</groupId>
-            <artifactId>spire.xls.free</artifactId>
-            <version>2.2.0</version>
-        </dependency>
-
-
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -79,24 +59,8 @@
             <artifactId>poi-ooxml</artifactId>
             <version>4.1.2</version>
         </dependency>
-      <!--  <dependency>
-            <groupId>cn.afterturn</groupId>
-            <artifactId>easypoi-spring-boot-starter</artifactId>
-            <version>4.0.0</version>
-        </dependency>
 
         <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-validator</artifactId>
-            <version>5.4.0.Final</version>
-        </dependency>
-
-        <dependency>
-            <groupId>cn.afterturn</groupId>
-            <artifactId>easypoi-base</artifactId>
-            <version>4.1.0</version>
-        </dependency>-->
-        <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>druid-spring-boot-starter</artifactId>
             <version>1.2.8</version>
@@ -159,7 +123,24 @@
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
         </dependency>
+        <!--必须-->
+        <dependency>
+            <groupId>org.jxls</groupId>
+            <artifactId>jxls</artifactId>
+            <version>2.6.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jxls</groupId>
+            <artifactId>jxls-poi</artifactId>
+            <version>1.1.0</version>
+        </dependency>
+        <!--      日志包  非必须  避免控制台提示日志相关警告信息-->
 
+        <dependency>
+            <groupId>e-iceblue</groupId>
+            <artifactId>spire.xls.free</artifactId>
+            <version>2.2.0</version>
+        </dependency>
 
     </dependencies>
 

admin/src/main/java/com/huimv/farm/damsubsidy/common/utils/DictTranslate.java

@@ -1,4 +1,4 @@
-package com.huimv.farm.damsubsidy.common.utils;
+package com.huimv.farm.damsubsidy.common.annotate;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -21,4 +21,5 @@ public @interface DictTranslate
 	 */
 	String targetField();
 
+
 }

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

@@ -81,10 +81,12 @@ public class TokenSign {
             return null;
         }
         Claims claims = getClaims(jwtToken);
+        assert claims != null;
         if(ObjectUtil.isEmpty(claims)||ObjectUtil.isEmpty(claims.get("id"))){
-
+            return null;
         }
-        return (Long) claims.get("id");
+        Object id = claims.get("id");
+        return  id instanceof  Integer ? Long.valueOf((Integer)  id) :(Long) id;
     }
 
     public static String getFarmIds(HttpServletRequest request) {
@@ -93,6 +95,7 @@ public class TokenSign {
             return null;
         }
         Claims claims = getClaims(jwtToken);
+        assert claims != null;
         return (String) claims.get("farmIds");
     }
 

admin/src/main/java/com/huimv/farm/damsubsidy/common/utils/PovertyUtils.java

@@ -6,16 +6,112 @@ import org.apache.poi.ss.formula.functions.T;
 import java.math.BigInteger;
 import java.security.MessageDigest;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
 public class PovertyUtils {
 
-    public static List<PovertyUserRegist> getPoverty(List<Map<String, Object>> read) {
+    public static List<PovertyUserRegist> getPoverty(List<Map<String, Object>> read,Long userId) {
+        Date date = new Date();
         List<PovertyUserRegist> endList = new ArrayList<>();
         for (Map<String, Object> stringObjectMap : read) {
             PovertyUserRegist povertyUserRegist = new PovertyUserRegist();
             povertyUserRegist.setXh(stringObjectMap.get("序号")+"");
+            povertyUserRegist.setCounty(stringObjectMap.get("县(市、区、旗)")+"");
+            povertyUserRegist.setVillage(stringObjectMap.get("乡(镇)")+"");
+            povertyUserRegist.setXzc(stringObjectMap.get("行政村")+"");
+            povertyUserRegist.setZrc(stringObjectMap.get("自然村")+"");
+            povertyUserRegist.setFpzph(stringObjectMap.get("易返贫致贫户(监测对象)类别")+"");
+            povertyUserRegist.setHbh(stringObjectMap.get("户编号")+"");
+            povertyUserRegist.setRbh(stringObjectMap.get("人编号")+"");
+            povertyUserRegist.setXm(stringObjectMap.get("姓名")+"");
+            povertyUserRegist.setZjhm(stringObjectMap.get("证件号码")+"");
+            povertyUserRegist.setJtrks(stringObjectMap.get("家庭人口数")+"");
+            povertyUserRegist.setYhzgx(stringObjectMap.get("与户主关系")+"");
+            povertyUserRegist.setMz(stringObjectMap.get("民族")+"");
+            povertyUserRegist.setZzmm(stringObjectMap.get("政治面貌")+"");
+            povertyUserRegist.setWhcd(stringObjectMap.get("文化程度")+"");
+            povertyUserRegist.setZxszk(stringObjectMap.get("在校生状况")+"");
+            povertyUserRegist.setJkzk(stringObjectMap.get("健康状况")+"");
+            povertyUserRegist.setLdjn(stringObjectMap.get("劳动技能")+"");
+            povertyUserRegist.setSfCxJmJbYl(stringObjectMap.get("是否参加城乡居民基本医疗保险")+"");
+            povertyUserRegist.setSfCzZgJbYl(stringObjectMap.get("是否参加城镇职工基本医疗保险")+"");
+            povertyUserRegist.setSfCxJmJbLao(stringObjectMap.get("是否参加城乡居民基本养老保险")+"");
+            povertyUserRegist.setSfCzZgJbLao(stringObjectMap.get("是否参加城镇职工基本养老保险")+"");
+            povertyUserRegist.setSfShbz(stringObjectMap.get("是否享受农村居民最低生活保障")+"");
+            povertyUserRegist.setSfDbbx(stringObjectMap.get("是否参加大病保险")+"");
+            povertyUserRegist.setSfTkgy(stringObjectMap.get("是否特困供养人员")+"");
+            povertyUserRegist.setSfYifpbq(stringObjectMap.get("是否易地扶贫搬迁人口")+"");
+            povertyUserRegist.setWgqy(stringObjectMap.get("务工区域")+"");
+            povertyUserRegist.setWgsj(stringObjectMap.get("务工时间")+"");
+            povertyUserRegist.setLxdh(stringObjectMap.get("联系电话")+"");
+            povertyUserRegist.setSfJzDzAn(stringObjectMap.get("是否居住在大中型异地扶贫搬迁集中安置区")+"");
+            povertyUserRegist.setAndz(stringObjectMap.get("安置区地址")+"");
+            povertyUserRegist.setXmmc(stringObjectMap.get("项目名称")+"");
+            povertyUserRegist.setSfFx(stringObjectMap.get("风险是否已消除")+"");
+            povertyUserRegist.setFxbzcx(stringObjectMap.get("风险标注次序")+"");
+            povertyUserRegist.setFxsbsj(stringObjectMap.get("风险识别时间")+"");
+            povertyUserRegist.setFxxcsj(stringObjectMap.get("风险消除时间")+"");
+            povertyUserRegist.setFxxcfs(stringObjectMap.get("风险消除方式")+"");
+            povertyUserRegist.setZpfx1(stringObjectMap.get("致贫风险1")+"");
+            povertyUserRegist.setZpfx2(stringObjectMap.get("致贫风险2")+"");
+            povertyUserRegist.setZpfx3(stringObjectMap.get("致贫风险3")+"");
+            povertyUserRegist.setZpfx4(stringObjectMap.get("致贫风险4")+"");
+            povertyUserRegist.setZpfx5(stringObjectMap.get("致贫风险5")+"");
+            povertyUserRegist.setBz(stringObjectMap.get("备注")+"");
+            povertyUserRegist.setZrzhlx(stringObjectMap.get("自然灾害类型")+"");
+            povertyUserRegist.setXxcjr(stringObjectMap.get("信息采集人")+"");
+//            povertyUserRegist.setXxcjLxdh(stringObjectMap.get("联系电话")+"");
+            povertyUserRegist.setSfFxbzZfaq(stringObjectMap.get("风险标注信息是否住房出现安全问题")+"");
+            povertyUserRegist.setSfFxbzYwjy(stringObjectMap.get("风险标注信息是否义务教育阶段适龄儿童少年失学辍学")+"");
+            povertyUserRegist.setSfFxbzYsaq(stringObjectMap.get("风险标注信息是否饮水出现安全问题")+"");
+            povertyUserRegist.setSfFxbzWcjcx(stringObjectMap.get("风险标注信息是否有家庭成员未参加城乡居民（职工）基本医疗保险")+"");
+            povertyUserRegist.setSfFxxcZfaq(stringObjectMap.get("风险消除信息是否住房出现安全问题")+"");
+            povertyUserRegist.setSfFxxcYwjy(stringObjectMap.get("风险消除信息是否义务教育阶段适龄儿童少年失学辍学")+"");
+            povertyUserRegist.setSfFxxcYsaq(stringObjectMap.get("风险消除信息是否饮水出现安全问题")+"");
+            povertyUserRegist.setSfFxxcWcjcx(stringObjectMap.get("风险消除信息是否有家庭成员未参加城乡居民（职工）基本医疗保险")+"");
+            povertyUserRegist.setFxbzSrGz(stringObjectMap.get("风险标注信息工资性收入")+"");
+            povertyUserRegist.setFxbzSrSc(stringObjectMap.get("风险标注信息生产经营性收入")+"");
+            povertyUserRegist.setFxbzSrCc(stringObjectMap.get("风险标注信息财产性收入")+"");
+            povertyUserRegist.setFxbzSrZy(stringObjectMap.get("风险标注信息转移性收入")+"");
+            povertyUserRegist.setFxbzZcScjy(stringObjectMap.get("风险标注信息生产经营性支出")+"");
+            povertyUserRegist.setFxbzSrC(stringObjectMap.get("风险标注信息家庭纯收入")+"");
+            povertyUserRegist.setFxbzSrRjc(stringObjectMap.get("风险标注信息家庭人均纯收入")+"");
+            povertyUserRegist.setFxbzSrLp(stringObjectMap.get("风险标注信息理赔收入")+"");
+            povertyUserRegist.setFxbzZcXxhg(stringObjectMap.get("风险标注信息合规自付支出")+"");
+            povertyUserRegist.setFxbzNrFw(stringObjectMap.get("风险标注信息纳入易返贫致贫户(监测对象)的收入参考范围")+"");
+            povertyUserRegist.setFxbzNrRjfw(stringObjectMap.get("风险标注信息纳入易返贫致贫户(监测对象)的人均收入参考范围")+"");
+            povertyUserRegist.setFxxcSrGz(stringObjectMap.get("风险消除信息工资性收入")+"");
+            povertyUserRegist.setFxxcSrSc(stringObjectMap.get("风险消除信息生产经营性收入")+"");
+            povertyUserRegist.setFxxcSrCc(stringObjectMap.get("风险消除信息财产性收入")+"");
+            povertyUserRegist.setFxxcSrZy(stringObjectMap.get("风险消除信息转移性收入")+"");
+            povertyUserRegist.setFxxcZcScjy(stringObjectMap.get("风险消除信息生产经营性支出")+"");
+            povertyUserRegist.setFxxcSrC(stringObjectMap.get("风险消除信息家庭纯收入")+"");
+            povertyUserRegist.setFxxcSrRjc(stringObjectMap.get("风险消除信息家庭人均纯收入")+"");
+            povertyUserRegist.setFxxcSrLp(stringObjectMap.get("风险消除信息理赔收入")+"");
+            povertyUserRegist.setFxxcZcXxhg(stringObjectMap.get("风险消除信息合规自付支出")+"");
+            povertyUserRegist.setFxxcNrFw(stringObjectMap.get("风险消除信息纳入易返贫致贫户(监测对象)的收入参考范围")+"");
+            povertyUserRegist.setFxxcNrRjfw(stringObjectMap.get("风险消除信息纳入易返贫致贫户(监测对象)的人均收入参考范围")+"");
+            povertyUserRegist.setCybf(stringObjectMap.get("产业帮扶")+"");
+            povertyUserRegist.setJybf(stringObjectMap.get("就业帮扶")+"");
+            povertyUserRegist.setJrbf(stringObjectMap.get("金融帮扶")+"");
+            povertyUserRegist.setGygbf(stringObjectMap.get("公益岗位帮扶")+"");
+            povertyUserRegist.setZfaqbz(stringObjectMap.get("住房安全保障")+"");
+            povertyUserRegist.setYsaqbz(stringObjectMap.get("饮水安全保障")+"");
+            povertyUserRegist.setJkbf(stringObjectMap.get("健康帮扶")+"");
+            povertyUserRegist.setYwjybz(stringObjectMap.get("义务教育保障")+"");
+            povertyUserRegist.setJybf(stringObjectMap.get("教育帮扶")+"");
+            povertyUserRegist.setZhbz(stringObjectMap.get("综合保障")+"");
+            povertyUserRegist.setShbf(stringObjectMap.get("社会帮扶")+"");
+            povertyUserRegist.setBq(stringObjectMap.get("搬迁")+"");
+            povertyUserRegist.setScshtjgz(stringObjectMap.get("生产生活条件改善")+"");
+            povertyUserRegist.setJcssjs(stringObjectMap.get("基础设施建设")+"");
+            //
+            povertyUserRegist.setUpdateTime(date);
+            povertyUserRegist.setUpdateUser(userId);
+            povertyUserRegist.setCreatTime(date);
+            povertyUserRegist.setCreatUser(userId);
             endList.add(povertyUserRegist);
         }
         return  endList;

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

@@ -1,26 +1,26 @@
-//package com.huimv.farm.damsubsidy.config;
-//
-//import org.springframework.context.annotation.Bean;
-//import org.springframework.context.annotation.Configuration;
-//import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
-//import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-//
-///**
-// * @Description: 注册验证tocken的拦截器
-// * @Author
-// * @Date 2021/4/19 20:41
-// * @Version V1.0
-// */
-//@Configuration
-//public class InterceptorConfig implements WebMvcConfigurer {
-//    @Bean
-//    public JWTInterceptor jwtInterceptor(){
-//        return new JWTInterceptor();
-//    }
-//
-//    @Override
-//    public void addInterceptors(InterceptorRegistry registry) {
-//        registry.addInterceptor(jwtInterceptor()).
-//                excludePathPatterns("/sys-user/*");
-//    }
-//}
+package com.huimv.farm.damsubsidy.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+/**
+ * @Description: 注册验证tocken的拦截器
+ * @Author
+ * @Date 2021/4/19 20:41
+ * @Version V1.0
+ */
+@Configuration
+public class InterceptorConfig implements WebMvcConfigurer {
+    @Bean
+    public JWTInterceptor jwtInterceptor(){
+        return new JWTInterceptor();
+    }
+
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        registry.addInterceptor(jwtInterceptor()).
+                excludePathPatterns("/sys-user/*");
+    }
+}

admin/src/main/java/com/huimv/farm/damsubsidy/config/JWTInterceptor.java

@@ -1,82 +1,82 @@
-//package com.huimv.farm.damsubsidy.config;
-//
-//import com.alibaba.fastjson.JSONObject;
-//import com.huimv.farm.damsubsidy.common.token.TokenConstant;
-//import com.huimv.farm.damsubsidy.common.token.TokenSign;
-//import io.jsonwebtoken.Claims;
-//import org.springframework.web.method.HandlerMethod;
-//import org.springframework.web.servlet.HandlerInterceptor;
-//import org.springframework.web.servlet.ModelAndView;
-//
-//import javax.servlet.http.HttpServletRequest;
-//import javax.servlet.http.HttpServletResponse;
-//import java.util.HashMap;
-//import java.util.Map;
-//
-///**
-// * <p>
-// * jwt拦截器
-// * </p>
-// *
-// * @since 2021/4/19
-// */
-//public class JWTInterceptor implements HandlerInterceptor {
-//
-//
-//    @Override
-//    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
-//        // 如果不是映射到方法，则直接通过
-//        if (!(handler instanceof HandlerMethod)) {
-//            return true;
-//        }
-//
-//        response.setContentType("application/json;charset=utf-8");
-//        // 获取token
-//        String token = request.getHeader("accessToken");
-//
-//
-//        if (null == token) {
-//            Map<String, Object> map = new HashMap<>();
-//            map.put("data", "token is null");
-//            map.put("code", "401");
-//            response.setStatus(401);
-//            response.getWriter().write(JSONObject.toJSONString(map));
-//            return false;
-//        } else {
-//            Claims claims = TokenSign.getClaims(token);
-//            if (claims == null) {
-//                Map<String, Object> map = new HashMap<>();
-//                map.put("data", "token is overdue");
-//                map.put("code", "403");
-//                response.setStatus(403);
-//                response.getWriter().write(JSONObject.toJSONString(map));
-//                return false;
-//            }
-//
-//            boolean result = TokenSign.verify(token);
-//            if (result) {
-//                //更新存储的token信息
-//                TokenConstant.updateTokenMap(token);
-//                return true;
-//            }
-//            Map<String, Object> map = new HashMap<>();
-//            map.put("data", "token is null");
-//            map.put("code", "401");
-//            response.setStatus(401);
-//            response.getWriter().write(JSONObject.toJSONString(map));
-//            return false;
-//
-//        }
-//    }
-//
-//
-//    @Override
-//    public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView) throws Exception {
-//
-//    }
-//
-//    @Override
-//    public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception {
-//
-//    }
-//}
+package com.huimv.farm.damsubsidy.config;
+
+import com.alibaba.fastjson.JSONObject;
+import com.huimv.farm.damsubsidy.common.token.TokenConstant;
+import com.huimv.farm.damsubsidy.common.token.TokenSign;
+import io.jsonwebtoken.Claims;
+import org.springframework.web.method.HandlerMethod;
+import org.springframework.web.servlet.HandlerInterceptor;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * <p>
+ * jwt拦截器
+ * </p>
+ *
+ * @since 2021/4/19
+ */
+public class JWTInterceptor implements HandlerInterceptor {
+
+
+    @Override
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
+        // 如果不是映射到方法，则直接通过
+        if (!(handler instanceof HandlerMethod)) {
+            return true;
+        }
+
+        response.setContentType("application/json;charset=utf-8");
+        // 获取token
+        String token = request.getHeader("accessToken");
+
+
+        if (null == token) {
+            Map<String, Object> map = new HashMap<>();
+            map.put("data", "token is null");
+            map.put("code", "401");
+            response.setStatus(401);
+            response.getWriter().write(JSONObject.toJSONString(map));
+            return false;
+        } else {
+            Claims claims = TokenSign.getClaims(token);
+            if (claims == null) {
+                Map<String, Object> map = new HashMap<>();
+                map.put("data", "token is overdue");
+                map.put("code", "403");
+                response.setStatus(403);
+                response.getWriter().write(JSONObject.toJSONString(map));
+                return false;
+            }
+
+            boolean result = TokenSign.verify(token);
+            if (result) {
+                //更新存储的token信息
+                TokenConstant.updateTokenMap(token);
+                return true;
+            }
+            Map<String, Object> map = new HashMap<>();
+            map.put("data", "token is null");
+            map.put("code", "401");
+            response.setStatus(401);
+            response.getWriter().write(JSONObject.toJSONString(map));
+            return false;
+
+        }
+    }
+
+
+    @Override
+    public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView) throws Exception {
+
+    }
+
+    @Override
+    public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception {
+
+    }
+}

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

@@ -0,0 +1,49 @@
+package com.huimv.farm.damsubsidy.controller;
+
+import com.huimv.farm.damsubsidy.common.utils.Result;
+import com.huimv.farm.damsubsidy.common.utils.ResultCode;
+import com.huimv.farm.damsubsidy.entity.BaseVeterStation;
+import com.huimv.farm.damsubsidy.service.IBaseVeterStationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2023-05-05
+ */
+@RestController
+@RequestMapping("/base-veter-station")
+public class BaseVeterStationController {
+
+    @Autowired
+    private IBaseVeterStationService baseVeterStationService;
+
+    @PostMapping("/add")
+    public Result addMenu(@RequestBody BaseVeterStation baseVeterStation , HttpServletRequest request){
+        baseVeterStationService.save(baseVeterStation);
+        return new Result(ResultCode.SUCCESS,"添加成功");
+    }
+
+    @PostMapping("/edit")
+    public Result editMenu(@RequestBody BaseVeterStation baseVeterStation){
+        baseVeterStationService.updateById(baseVeterStation);
+        return new Result(ResultCode.SUCCESS,"修改成功");
+    }
+
+    @RequestMapping("/remove")
+    public Result removeMenu(@RequestParam(name = "id") Integer id){
+        baseVeterStationService.removeById(id);
+        return new Result(ResultCode.SUCCESS,"删除成功");
+    }
+
+    @PostMapping("/list")
+    public Result optimizeList() {
+        return new Result(ResultCode.SUCCESS,baseVeterStationService.list());
+    }
+}

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

@@ -4,23 +4,28 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.UUID;
 import cn.hutool.poi.excel.ExcelReader;
 import cn.hutool.poi.excel.ExcelUtil;
+import com.huimv.farm.damsubsidy.common.annotate.DictTranslate;
 import com.huimv.farm.damsubsidy.common.utils.PovertyUtils;
 import com.huimv.farm.damsubsidy.common.utils.UploadImage;
 import com.huimv.farm.damsubsidy.entity.PovertyUserRegist;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.*;
+import java.lang.reflect.Field;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 @CrossOrigin
 @RestController
 @RequestMapping("/image")
 public class ImagesTest {
 
+
     @PostMapping("/test")
     public  String test( @RequestParam("image") MultipartFile image,
             @RequestParam("image1") MultipartFile image1) {
@@ -53,16 +58,13 @@ public class ImagesTest {
         return content;
     }
 
-
-    @RequestMapping("excelTest/import")
+   /* @RequestMapping("excelTest/import")
     @ResponseBody
-     public String evaluationUpdate(@RequestParam(value = "file", required = true) MultipartFile file) throws Exception {
+     public String evaluationUpdate(@RequestParam(value = "file", required = true) MultipartFile file,) throws Exception {
         ExcelReader reader = ExcelUtil.getReader(file.getInputStream());
-//        List<PoverVo> povertyUserRegists =  reader.readAll();
-        List<Map<String, Object>> maps = reader.readAll();
         List<Map<String, Object>> read = reader.read(2, 3, 2147483647);
-        List<PovertyUserRegist> povertyUserRegist =  PovertyUtils.getPoverty(read);
-        
+        List<PovertyUserRegist> poverty = PovertyUtils.getPoverty(read);
         return "成功";
-    }
+    }*/
+
 }

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

@@ -1,9 +1,30 @@
 package com.huimv.farm.damsubsidy.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import cn.hutool.http.HttpRequest;
+import cn.hutool.poi.excel.ExcelReader;
+import cn.hutool.poi.excel.ExcelUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.huimv.farm.damsubsidy.common.token.TokenSign;
+import com.huimv.farm.damsubsidy.common.utils.PovertyUtils;
+import com.huimv.farm.damsubsidy.common.utils.Result;
+import com.huimv.farm.damsubsidy.common.utils.ResultCode;
+import com.huimv.farm.damsubsidy.entity.BaseVeterStation;
+import com.huimv.farm.damsubsidy.entity.PovertyUserRegist;
+import com.huimv.farm.damsubsidy.entity.SysUser;
+import com.huimv.farm.damsubsidy.service.IPovertyUserRegistService;
+import com.huimv.farm.damsubsidy.service.ISysUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -16,5 +37,64 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("/poverty-user-regist")
 public class PovertyUserRegistController {
+    @Autowired
+    private IPovertyUserRegistService povertyUserRegistService;
+    @Autowired
+    private ISysUserService sysUserService;
+
+    @RequestMapping("excelPovert/import")
+    @ResponseBody
+    @Transactional
+    public Result userId(@RequestParam(value = "file", required = true) MultipartFile file, HttpServletRequest request) throws Exception {
+        PovertyUserRegist povertyUserRegist = new PovertyUserRegist();
+        Long userId = TokenSign.getMemberIdByJwtToken(request);
+        povertyUserRegist.setIsDelete(1);
+        povertyUserRegist.setUpdateTime(new Date());
+        povertyUserRegist.setUpdateUser(userId);
+        UpdateWrapper<PovertyUserRegist> updateWrapper = new UpdateWrapper<>();
+        povertyUserRegistService.update(povertyUserRegist,updateWrapper.eq("is_delete",0));
+
+        //导入贫困户，1 删除之前的，
+        ExcelReader reader = ExcelUtil.getReader(file.getInputStream());
+        List<Map<String, Object>> read = reader.read(2, 3, 2147483647);
+        List<PovertyUserRegist> poverty = PovertyUtils.getPoverty(read,userId);
+        povertyUserRegistService.saveBatch(poverty);
+
+        //实名养殖户
+        QueryWrapper<SysUser> sysUserQueryWrapper = new QueryWrapper<>();
+        sysUserQueryWrapper.eq("is_real_name",1).eq("user_type",3).eq("is_delete",0);
+        List<SysUser> list = sysUserService.list(sysUserQueryWrapper);
+        //1查询未删除的 2，查询已经删除的
+        for (SysUser sysUser : list) {
+//            String userName = sysUser.getUserName();
+            String idCard = sysUser.getIdCard();
+            QueryWrapper<PovertyUserRegist> wrapper = new QueryWrapper<>();
+            wrapper.eq("ZJHM",idCard);
+            wrapper.eq("is_delete",0);
+            int count = povertyUserRegistService.count(wrapper);
+            if (count >0 ){
+                sysUser.setFarmType(0);
+                sysUserService.updateById(sysUser);
+                break;
+            }
+            wrapper.clear();
+            wrapper.eq("ZJHM",idCard);
+            wrapper.eq("is_delete",1);
+            int countDelete = povertyUserRegistService.count(wrapper);
+            if (countDelete > 0 ){
+                sysUser.setFarmType(1);
+                sysUserService.updateById(sysUser);
+                break;
+            }
+            sysUser.setFarmType(2);
+            sysUserService.updateById(sysUser);
+        }
+        return new Result(ResultCode.SUCCESS,"上传成功");
+    }
+
+    @PostMapping("excelPovert/list")
+    public Result list(@RequestBody Map map, HttpServletRequest request) throws Exception {
+      return povertyUserRegistService.list(map,request);
+    }
 
 }

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

@@ -0,0 +1,69 @@
+package com.huimv.farm.damsubsidy.controller;
+
+
+import com.huimv.farm.damsubsidy.entity.Sheet1;
+import com.huimv.farm.damsubsidy.mapper.Sheet1Mapper;
+import com.huimv.farm.damsubsidy.service.ISheet1Service;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2023-05-06
+ */
+@RestController
+@RequestMapping("/sheet1")
+public class Sheet1Controller {
+    @Autowired
+    private ISheet1Service sheet1Service;
+    @GetMapping("/sheet")
+    public Map<String, Map<String, Map<String, List<Sheet1>>>> getAll() {
+
+        //每个province的map都放进去
+        Map<String, Map<String, Map<String, List<Sheet1>>>> provinceMap = new HashMap<>();
+
+        //获取所有的数据
+        List<Sheet1> all = sheet1Service.list();
+
+        //根据pro_code分好的List 相当于每个province
+        Map<String, List<Sheet1>> provinces = all.stream().collect(Collectors.groupingBy(Sheet1::getCodeProv));
+
+        for (Map.Entry<String,List<Sheet1>> province : provinces.entrySet()) {
+            //获取每个省的cityList
+            List<Sheet1> singleProvince = province.getValue();
+
+            //每个city的countryList
+            Map<String, List<Sheet1>> cities = singleProvince.stream().collect(Collectors.groupingBy(Sheet1::getCodeCity));
+
+            //每个city的map都放进去
+            Map<String, Map<String, List<Sheet1>>> cityMap = new HashMap<>();
+
+            for (Map.Entry<String,List<Sheet1>> city : cities.entrySet()) {
+
+                //每个city的countryList
+                List<Sheet1> singleCity = city.getValue();
+
+                //根据country的code区分的list 也就是每个country的townList
+                Map<String, List<Sheet1>> countrys = singleCity.stream().collect(Collectors.groupingBy(Sheet1::getCodeCoun));
+
+                cityMap.put(city.getKey(), countrys);
+            }
+
+            provinceMap.put(province.getKey(), cityMap);
+        }
+        return provinceMap;
+    }
+
+}

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

@@ -3,7 +3,6 @@ package com.huimv.farm.damsubsidy.controller;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.UUID;
-import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.huimv.farm.damsubsidy.common.token.TokenSign;
 import com.huimv.farm.damsubsidy.common.utils.Result;
@@ -77,7 +76,18 @@ public class SysUserController {
         String remoteHost = req.getRemoteHost();
         //手机登录
         if ("1".equals(loginType)){
-          return   iSysUserService.loginMultilevel(req,map);
+            String phone = map.get("phone");
+            if (StringUtils.isEmpty(phone)){
+                return new Result(ResultCode.FAIL, "请输入手机号");
+            }
+            Result result = iSysUserService.loginMultilevel(req, map);
+            if ( result.getCode() == 10000) {
+               SysUser sysUser = (SysUser) result.getData();
+                if (sysUser.getUserType() != 0 && sysUser.getUserType() != 4){
+                    return new Result(ResultCode.FAIL, "该用户未授权");
+                }
+            }
+            return  result;
         }
         if ("2".equals(loginType)){
             // 未对密码加密
@@ -86,8 +96,6 @@ public class SysUserController {
 
                 SysUser accountEntity = (SysUser) result.getData();
                 Long id = accountEntity.getId();
-
-
                 AccessToken accessToken = new AccessToken();
                 accessToken.setCreated(new Date());
                 accessToken.setAccountName(accountName);
@@ -216,16 +224,19 @@ public class SysUserController {
         return token;
     }
 
-
-
     @PostMapping("/listSubordinate")
     public Result listSubordinate(@RequestBody Map map , HttpServletRequest request) {
         Long userId = TokenSign.getMemberIdByJwtToken(request);
         int pageNum = (Integer) map.get("pageNum");
         int pageSize = (Integer) map.get("pageSize");
         String searchStr = (String) map.get("searchStr");
+        return iSysUserService.listSubordinate(searchStr,pageNum,pageSize,userId);
+    }
+
+    @PostMapping("/addXiang")
+    public Result addXiang(@RequestBody SysUser sysUser , HttpServletRequest request) {
+        Long userId = TokenSign.getMemberIdByJwtToken(request);
 
-//        return iSysUserService.listSubordinate(searchStr,pageNum,pageSize,userId);
-        return null;
+        return iSysUserService.addXiang(sysUser,userId);
     }
 }

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

@@ -0,0 +1,43 @@
+package com.huimv.farm.damsubsidy.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author author
+ * @since 2023-05-05
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("base_veter_station")
+public class BaseVeterStation implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 兽医站名称
+     */
+//    @DictTranslate(dataSource = "ss", targetField = "ss")
+    private String stationName;
+
+    /**
+     * 地址
+     */
+    private String address;
+
+
+}

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

@@ -7,6 +7,7 @@ import java.io.Serializable;
 import java.util.Date;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.huimv.farm.damsubsidy.common.annotate.DictTranslate;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -33,12 +34,12 @@ public class PovertyUserRegist implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "GMT+8")
     private Date creatTime;
 
-    private String creatUser;
+    private Long creatUser;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "GMT+8")
     private Date updateTime;
 
-    private String updateUser;
+    private Long updateUser;
 
     private Integer isDelete;
 

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

@@ -0,0 +1,44 @@
+package com.huimv.farm.damsubsidy.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author author
+ * @since 2023-05-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("sheet1")
+public class Sheet1 implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private String nameProv;
+
+    private String codeProv;
+
+    private String nameCity;
+
+    private String codeCity;
+
+    private String nameCoun;
+
+    private String codeCoun;
+
+    private String nameTown;
+
+    private String codeTown;
+
+
+}

admin/src/main/java/com/huimv/farm/damsubsidy/mapper/BaseVeterStationMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.farm.damsubsidy.mapper;
+
+import com.huimv.farm.damsubsidy.entity.BaseVeterStation;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2023-05-05
+ */
+public interface BaseVeterStationMapper extends BaseMapper<BaseVeterStation> {
+
+}

admin/src/main/java/com/huimv/farm/damsubsidy/mapper/Sheet1Mapper.java

@@ -0,0 +1,16 @@
+package com.huimv.farm.damsubsidy.mapper;
+
+import com.huimv.farm.damsubsidy.entity.Sheet1;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2023-05-06
+ */
+public interface Sheet1Mapper extends BaseMapper<Sheet1> {
+
+}

admin/src/main/java/com/huimv/farm/damsubsidy/service/IBaseVeterStationService.java

@@ -0,0 +1,16 @@
+package com.huimv.farm.damsubsidy.service;
+
+import com.huimv.farm.damsubsidy.entity.BaseVeterStation;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author author
+ * @since 2023-05-05
+ */
+public interface IBaseVeterStationService extends IService<BaseVeterStation> {
+
+}

admin/src/main/java/com/huimv/farm/damsubsidy/service/IPovertyUserRegistService.java

@@ -1,10 +1,13 @@
 package com.huimv.farm.damsubsidy.service;
 
+import com.huimv.farm.damsubsidy.common.utils.Result;
 import com.huimv.farm.damsubsidy.entity.PovertyUserRegist;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletRequest;
 import java.io.InputStream;
+import java.util.Map;
 
 /**
  * <p>
@@ -16,4 +19,5 @@ import java.io.InputStream;
  */
 public interface IPovertyUserRegistService extends IService<PovertyUserRegist> {
 
+    Result list(Map map, HttpServletRequest request);
 }

admin/src/main/java/com/huimv/farm/damsubsidy/service/ISheet1Service.java

@@ -0,0 +1,16 @@
+package com.huimv.farm.damsubsidy.service;
+
+import com.huimv.farm.damsubsidy.entity.Sheet1;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author author
+ * @since 2023-05-06
+ */
+public interface ISheet1Service extends IService<Sheet1> {
+
+}

admin/src/main/java/com/huimv/farm/damsubsidy/service/ISysUserService.java

@@ -48,4 +48,6 @@ public interface ISysUserService extends IService<SysUser> {
     Result getLastFarmId(Integer userId);
 
     Result loginMultilevelClient(String accountName, String password);
+
+    Result addXiang(SysUser sysUser, Long userId);
 }

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

@@ -0,0 +1,20 @@
+package com.huimv.farm.damsubsidy.service.impl;
+
+import com.huimv.farm.damsubsidy.entity.BaseVeterStation;
+import com.huimv.farm.damsubsidy.mapper.BaseVeterStationMapper;
+import com.huimv.farm.damsubsidy.service.IBaseVeterStationService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2023-05-05
+ */
+@Service
+public class BaseVeterStationServiceImpl extends ServiceImpl<BaseVeterStationMapper, BaseVeterStation> implements IBaseVeterStationService {
+
+}

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

@@ -1,16 +1,38 @@
 package com.huimv.farm.damsubsidy.service.impl;
 
 import cn.hutool.poi.excel.ExcelUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huimv.farm.damsubsidy.common.utils.Result;
+import com.huimv.farm.damsubsidy.common.utils.ResultCode;
+import com.huimv.farm.damsubsidy.entity.BillSubsidy;
 import com.huimv.farm.damsubsidy.entity.PovertyUserRegist;
 import com.huimv.farm.damsubsidy.mapper.PovertyUserRegistMapper;
 import com.huimv.farm.damsubsidy.service.IPovertyUserRegistService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import javax.servlet.http.HttpServletRequest;
 import java.io.InputStream;
 import java.util.ArrayList;
+import java.util.Map;
 
 @Service
 public class PovertyUserRegistServiceImpl extends ServiceImpl<PovertyUserRegistMapper, PovertyUserRegist> implements IPovertyUserRegistService {
 
+    @Override
+    public Result list(Map map, HttpServletRequest request) {
+        String pageNum = (String)map.get("pageNum");
+        String pageSize = (String)map.get("pageSize");
+        if (StringUtils.isBlank(pageNum) ){
+            pageNum = "1";
+        }
+        if (StringUtils.isBlank(pageSize)){
+            pageSize = "10";
+        }
+        QueryWrapper<PovertyUserRegist> wrapper = new QueryWrapper<>();
+        wrapper.eq("is_delete",0);
+        return new Result(ResultCode.SUCCESS, this.page(new Page(Integer.parseInt(pageNum),Integer.parseInt(pageSize)), wrapper));
+    }
 }

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

@@ -0,0 +1,20 @@
+package com.huimv.farm.damsubsidy.service.impl;
+
+import com.huimv.farm.damsubsidy.entity.Sheet1;
+import com.huimv.farm.damsubsidy.mapper.Sheet1Mapper;
+import com.huimv.farm.damsubsidy.service.ISheet1Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2023-05-06
+ */
+@Service
+public class Sheet1ServiceImpl extends ServiceImpl<Sheet1Mapper, Sheet1> implements ISheet1Service {
+
+}

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

@@ -61,17 +61,35 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         SysUser accountMultilevel = userMapper.selectOne(wrapper);
 
         if (ObjectUtil.isEmpty(accountMultilevel)){
-            return new Result(10001, "账号不存在或密码错误.", false);
+            return new Result(ResultCode.DATA_NULL, "账号不存在或密码错误");
         }
 
         Integer accoutType = accountMultilevel.getAccoutType();
 
         if ( accoutType!= 1  ){
-            return new Result(10002, "账号未启用.", false);
+            return new Result(ResultCode.DATA_NULL, "账号未启用");
         }
         return new Result(ResultCode.SUCCESS,accountMultilevel);
     }
 
+    @Override
+    public Result addXiang(SysUser sysUser, Long userId) {
+        SysUser byId = this.getById(userId);
+
+        Date date = new Date();
+        sysUser.setCreateTime(date);
+        sysUser.setUpdateTime(date);
+        sysUser.setCreateUser(userId+"");
+        sysUser.setUpdateUser(userId+"");
+        sysUser.setUserType(4);
+        sysUser.setIsRealName(0);
+        sysUser.setPid(Math.toIntExact(userId));
+        sysUser.setPids(byId.getPids()+","+userId);
+        this.save(sysUser);
+
+        return new Result(ResultCode.SUCCESS,"添加成功");
+    }
+
 
     @Override
     public Result add(HttpServletRequest httpServletRequest,Map<String,String> paramsMap) {

admin/src/main/resources/mapper/BaseVeterStationMapper.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huimv.farm.damsubsidy.mapper.BaseVeterStationMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.farm.damsubsidy.entity.BaseVeterStation">
+        <id column="id" property="id" />
+        <result column="station_name" property="stationName" />
+        <result column="address" property="address" />
+    </resultMap>
+
+</mapper>

admin/src/main/resources/mapper/Sheet1Mapper.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huimv.farm.damsubsidy.mapper.Sheet1Mapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.farm.damsubsidy.entity.Sheet1">
+        <result column="name_prov" property="nameProv" />
+        <result column="code_prov" property="codeProv" />
+        <result column="name_city" property="nameCity" />
+        <result column="code_city" property="codeCity" />
+        <result column="name_coun" property="nameCoun" />
+        <result column="code_coun" property="codeCoun" />
+        <result column="name_town" property="nameTown" />
+        <result column="code_town" property="codeTown" />
+    </resultMap>
+
+</mapper>