pc端部分接口

admin/pom.xml

@@ -17,6 +17,13 @@
         <java.version>8</java.version>
     </properties>
     <dependencies>
+
+        <dependency>
+            <groupId>com.cloopen</groupId>
+            <artifactId>java-sms-sdk</artifactId>
+            <version>1.0.3</version>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>

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

@@ -0,0 +1,72 @@
+package com.huimv.farm.damsubsidy.config;
+
+import com.cloopen.rest.sdk.BodyType;
+import com.cloopen.rest.sdk.CCPRestSmsSDK;
+
+import java.util.HashMap;
+import java.util.Random;
+import java.util.Set;
+
+/**
+ * @author zxb
+ */
+public class MsmTest {
+
+    /**
+     * 生成六位验证码
+     *
+     * @return 验证码
+     */
+    public static String generateCode() {
+        Random random = new Random();
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < 4; i++) {
+            sb.append(random.nextInt(10));
+        }
+        return sb.toString();
+    }
+
+    public static void main(String[] args) {
+        // 整合容联云短信服务
+        //生产环境请求地址：app.cloopen.com
+        String serverIp = "app.cloopen.com";
+        //请求端口
+        String serverPort = "8883";
+        //主账号,登陆云通讯网站后,可在控制台首页看到开发者主账号ACCOUNT SID和主账号令牌AUTH TOKEN
+        String accountSId = "2c94811c87c2d4870187c67ae71b0092"; // 需修改
+        String accountToken = "c6269c2e3b8c4bf187d7916d6278ed48"; // 需修改
+        //请使用管理控制台中已创建应用的APPID
+        String appId ="2c94811c87c2d4870187c67ae8590099";  // 需修改
+        CCPRestSmsSDK sdk = new CCPRestSmsSDK();
+        sdk.init(serverIp, serverPort);
+        sdk.setAccount(accountSId, accountToken);
+        sdk.setAppId(appId);
+        sdk.setBodyType(BodyType.Type_JSON);
+        // 多个号码之间用英文逗号隔开，号码数不超过 200 个
+        String to = "18270497680";
+        // 模板id，官网控制台模板列表获取。测试模板写死是 1
+        String templateId = "1";
+        String code = generateCode();
+        // datas 用于替换短信模板中的值，可以定义多个。这里替换模板中的 验证码 和 有效时间
+        String[] datas = {code, "3"};
+        // subAppend 扩展码，可选，四位数字 0~9999，具体用处尚不明确，建议注释
+        // String subAppend = "1234";
+        // reqId 第三方自定义消息id，可选，最大支持32位英文数字，同账号下同一自然天内不允许重复，建议注释
+        // String reqId = "fadfafas";
+        // HashMap<String, Object> result = sdk.sendTemplateSMS(to, templateId, datas, subAppend, reqId);
+        HashMap<String, Object> result = sdk.sendTemplateSMS(to, templateId, datas);
+        if ("000000".equals(result.get("statusCode"))) {
+            //正常返回输出data包体信息（map）
+            HashMap<String, Object> data = (HashMap<String, Object>) result.get("data");
+            Set<String> keySet = data.keySet();
+            for (String key : keySet) {
+                Object object = data.get(key);
+                System.out.println(key + " = " + object);
+            }
+        } else {
+            //异常返回输出错误码和错误信息
+            System.out.println("错误码=" + result.get("statusCode") + " 错误信息= " + result.get("statusMsg"));
+        }
+    }
+
+}

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

@@ -57,4 +57,16 @@ public class BillLandingInspectionController {
     }
 
 
+    @Autowired
+    private IBillLandingInspectionService billLandingInspectionService;
+
+    @RequestMapping("/list")
+    public Result list(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+       return billLandingInspectionService.list(httpServletRequest, paramsMap);
+    }
+
+    @RequestMapping("/listById")
+    public Result listById(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+        return billLandingInspectionService.listById(httpServletRequest, paramsMap);
+    }
 }

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

@@ -37,6 +37,28 @@ public class BillSubsidyController {
         return iBillSubsidyService.saveApplication(httpServletRequest,billSubsidy);
     }
 
+    @Autowired
+    private IBillSubsidyService subsidyService;
+
+    @RequestMapping("/list")
+    public Result list(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+        return subsidyService.list(httpServletRequest, paramsMap);
+    }
+
+    @RequestMapping("/listById")
+    public Result listById(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+        return subsidyService.listById(httpServletRequest, paramsMap);
+    }
+
+    @RequestMapping("/edit")
+    public Result edit(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+        return subsidyService.edit(httpServletRequest, paramsMap);
+    }
+
+    @RequestMapping("/appeal")
+    public Result appeal(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+        return subsidyService.appeal(httpServletRequest, paramsMap);
+    }
     @PostMapping("/editApplication")
     public Result editApplication(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> parasMap){
         return iBillSubsidyService.editApplication(httpServletRequest,parasMap);

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

@@ -1,23 +1,33 @@
 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;
 import com.huimv.farm.damsubsidy.common.utils.ResultCode;
+import com.huimv.farm.damsubsidy.common.utils.UploadImage;
 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.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
+import java.io.BufferedInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.Map;
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author author
@@ -32,7 +42,7 @@ public class SysUserController {
     private ISysUserService iSysUserService;
 
     @PostMapping(value = "/login")
-    public Result loginMultilevel(HttpServletRequest req, @RequestBody Map<String, String> map)  {
+    public Result loginMultilevel(HttpServletRequest req, @RequestBody Map<String, String> map) {
 
         Result result = iSysUserService.loginMultilevel(req, map);
         AccessToken accessToken = new AccessToken();
@@ -42,32 +52,128 @@ public class SysUserController {
             accessToken.setCreated(new Date());
             accessToken.setLoginIp(user.getLastIp());
             accessToken.setToken(TokenSign.sign(user.getUserName(), user.getPhone()));
-        } else {
+        }
+        if (result.getCode() == 10004) {
             accessToken.setAccountName("游客");
             accessToken.setCreated(new Date());
-            accessToken.setToken(TokenSign.sign("游客",map.get("phone")));
+            accessToken.setToken(TokenSign.sign("游客", map.get("phone")));
             accessToken.setLoginIp("");
         }
-        return new Result(ResultCode.SUCCESS,accessToken);
+        if (result.getCode() == 10001) {
+            return iSysUserService.loginMultilevel(req, map);
+        }
+        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));
+    public Result add(HttpServletRequest req,@RequestParam("idCordFrontUrl") MultipartFile idCordFrontUrl,
+                      @RequestParam("idCordBackUrl") MultipartFile idCordBackUrl,
+                      @RequestParam("type") String type,
+                      @RequestParam("userName") String userName,
+                      @RequestParam("idCord") String idCord,
+                      @RequestParam("phone") String phone) {
+        String imgname = "成功";
+        String originalFilename = idCordFrontUrl.getOriginalFilename();
+        String filenameExtension = StringUtils.getFilenameExtension(originalFilename);
+        String path = DateUtil.format(new Date(), "yyyy-MM");
+        try {
+            InputStream inputStream = idCordFrontUrl.getInputStream();
+            BufferedInputStream in = new BufferedInputStream(inputStream);
+            ByteArrayOutputStream out = new ByteArrayOutputStream(1024);
+            byte[] temp = new byte[1024];
+            int size = 0;
+            while ((size = in.read(temp)) != -1) {
+                out.write(temp, 0, size);
+            }
+            in.close();
+            byte[] content = out.toByteArray();
+            imgname = UUID.randomUUID() + "." + filenameExtension;
+            UploadImage.sshSftp(content, path, imgname);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        String content = "https://img.ifarmcloud.com/images/" + path + "/" + imgname;
+        String imgname2 = "成功";
+        String originalFilename2 = idCordBackUrl.getOriginalFilename();
+        String filenameExtension2 = StringUtils.getFilenameExtension(originalFilename2);
+        String path2 = DateUtil.format(new Date(), "yyyy-MM");
+        try {
+            InputStream inputStream = idCordBackUrl.getInputStream();
+            BufferedInputStream in = new BufferedInputStream(inputStream);
+            ByteArrayOutputStream out = new ByteArrayOutputStream(1024);
+            byte[] temp = new byte[1024];
+            int size = 0;
+            while ((size = in.read(temp)) != -1) {
+                out.write(temp, 0, size);
+            }
+            in.close();
+            byte[] content2 = out.toByteArray();
+            imgname2 = UUID.randomUUID() + "." + filenameExtension2;
+            UploadImage.sshSftp(content2, path2, imgname2);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        String content2 = "https://img.ifarmcloud.com/images/" + path2 + "/" + imgname2;
+
+        Map<String, String> map = new HashMap<>();
+        map.put("idCordFrontUrl", content);
+        map.put("idCordBackUrl", content2);
+        map.put("type", type);
+        map.put("userName", userName);
+        map.put("idCord", idCord);
+        map.put("phone", phone);
+        Result result = iSysUserService.add(req, map);
+        if (result.getCode() == 10000) {
+            SysUser user = (SysUser) result.getData();
+            AccessToken accessToken = new AccessToken();
+            accessToken.setAccountName(user.getUserName());
+            accessToken.setCreated(new Date());
+            accessToken.setLoginIp(user.getLastIp());
+            accessToken.setToken(TokenSign.sign(user.getUserName(), user.getPhone()));
+            JSONObject jsonObject = new JSONObject();
+            jsonObject.put("newToken", accessToken);
+            jsonObject.put("user", user);
+            return new Result(ResultCode.SUCCESS, jsonObject);
+        } else {
+            return new Result(ResultCode.FAIL,"用户已实名");
+        }
     }
+
     @PostMapping(value = "/edit")
-    public Result edit(HttpServletRequest req, @RequestBody SysUser user)  {
+    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)  {
+    public Result list(HttpServletRequest req, @RequestBody Map<String, String> map) {
         return new Result(ResultCode.SUCCESS, iSysUserService.list(req, map));
     }
+    @PostMapping(value = "/findPhone")
+    public Result findPhone(HttpServletRequest req, @RequestBody Map<String, String> map) {
+        return new Result(ResultCode.SUCCESS, iSysUserService.findPhone(req, map));
+    }
+
+
+    //pc端
+    @PostMapping(value = "/listPc")
+    public Result listPc(HttpServletRequest req, @RequestBody Map<String, String> map) {
+        return new Result(ResultCode.SUCCESS, iSysUserService.listPc(req, map));
+    }
+
+    @PostMapping(value = "/listPc2")
+    public Result listPc2(HttpServletRequest req, @RequestBody Map<String, String> map) {
+        return new Result(ResultCode.SUCCESS, iSysUserService.listPc2(req, map));
+    }
+    @PostMapping(value = "/editState")
+    public Result editState(HttpServletRequest req, @RequestBody SysUser user) {
+        return new Result(ResultCode.SUCCESS, iSysUserService.editState(req, user));
+    }
+
     //测试-token
     @PostMapping(value = "/getToken")
-    public String getToken(HttpServletRequest req)  {
-        String token =  TokenSign.sign("superadmin","123456789");
-        return  token;
+    public String getToken(HttpServletRequest req) {
+        String token = TokenSign.sign("superadmin", "123456789");
+        return token;
     }
 }

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

@@ -26,6 +26,7 @@ package com.huimv.farm.damsubsidy.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -52,11 +53,12 @@ public class BaseEntity implements Serializable {
      * 创建人
      */
     @TableField(fill = FieldFill.INSERT)
-    private Long createUser;
+    private String createUser;
 
     /**
      * 更新时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     @TableField(fill = FieldFill.UPDATE)
     private Date updateTime;
 

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

@@ -88,4 +88,7 @@ public class SysUser extends BaseEntity implements Serializable {
 
     /*经营许可证*/
     private String permit;
+
+    /*审核进度*/
+    private Integer accoutType;
 }

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

@@ -4,8 +4,6 @@ import com.huimv.farm.damsubsidy.common.utils.Result;
 import com.huimv.farm.damsubsidy.entity.BillLandingInspection;
 import com.baomidou.mybatisplus.extension.service.IService;
 
-import java.util.Map;
-
 import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
 
@@ -20,6 +18,8 @@ import java.util.Map;
 public interface IBillLandingInspectionService extends IService<BillLandingInspection> {
     Result list(HttpServletRequest httpServletRequest, Map<String,String> paramsMap);
 
+    Result listById(HttpServletRequest httpServletRequest,Map<String,String> paramsMap);
+
     Result addApplication(HttpServletRequest httpServletRequest, BillLandingInspection billLandingInspection);
 
     Result cancelApplication(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);

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

@@ -29,6 +29,9 @@ public interface IBillSubsidyService extends IService<BillSubsidy> {
 
     Result saveApplication(HttpServletRequest httpServletRequest, BillSubsidy billSubsidy);
 
+    //pc端
+    Result listPcSub(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
+
     Result editApplication(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 
     Result listApplication(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);

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

@@ -23,4 +23,14 @@ public interface ISysUserService extends IService<SysUser> {
     Result edit(HttpServletRequest httpServletRequest,SysUser user);
 
     Result list(HttpServletRequest httpServletRequest,Map<String,String> paramsMap);
+
+    Result findPhone(HttpServletRequest httpServletRequest,Map<String,String> paramsMap);
+
+
+    //pc端
+    Result listPc(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
+
+    Result editState(HttpServletRequest httpServletRequest,SysUser user);
+
+    Result listPc2(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 }

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

@@ -82,7 +82,7 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
             baseAnimal.setEaratgNo(earatgNo);
             baseAnimal.setAnimalType(billLandingInspection.getAnimalType());
             baseAnimal.setInspectionNum(billLandingInspection.getInspectionNum());
-            baseAnimal.setCreateUser(Long.valueOf(TokenSign.getUserName(httpServletRequest)));
+            baseAnimal.setCreateUser(TokenSign.getUserName(httpServletRequest));
             baseAnimal.setCreateTime(new Date());
             baseAnimalMapper.insert(baseAnimal);
         }

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

@@ -9,14 +9,8 @@ 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.common.utils.ResultCode;
-import com.huimv.farm.damsubsidy.entity.BillBuyInfo;
-import com.huimv.farm.damsubsidy.entity.BillIsolated;
-import com.huimv.farm.damsubsidy.entity.BillLandingInspection;
-import com.huimv.farm.damsubsidy.mapper.BillBuyInfoMapper;
-import com.huimv.farm.damsubsidy.mapper.BillIsolatedMapper;
-import com.huimv.farm.damsubsidy.entity.SysUser;
-import com.huimv.farm.damsubsidy.mapper.BillLandingInspectionMapper;
-import com.huimv.farm.damsubsidy.mapper.SysUserMapper;
+import com.huimv.farm.damsubsidy.entity.*;
+import com.huimv.farm.damsubsidy.mapper.*;
 import com.huimv.farm.damsubsidy.service.IBillLandingInspectionService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -39,12 +33,14 @@ import java.util.Map;
 @Service
 public class BillLandingInspectionServiceImpl extends ServiceImpl<BillLandingInspectionMapper, BillLandingInspection> implements IBillLandingInspectionService {
 
-    @Resource
+    @Autowired
     private BillLandingInspectionMapper billLandingInspectionMapper;
-    @Resource
+    @Autowired
     private BillIsolatedMapper isolatedMapper;
-    @Resource
+    @Autowired
     private BillBuyInfoMapper buyInfoMapper;
+    @Autowired
+    private BillSubsidyMapper subsidyMapper;
     @Resource
     private SysUserMapper sysUserMapper;
 
@@ -52,22 +48,15 @@ public class BillLandingInspectionServiceImpl extends ServiceImpl<BillLandingIns
     public Result list(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
         String type = paramsMap.get("type");//信息类型
         String date = paramsMap.get("date");
-        String startTime = paramsMap.get("startTime");
-        String endTime = paramsMap.get("endTime");
-
-
-        if (startTime != null) {
-            startTime = startTime + " 00:00:00";
-        }
-        if (endTime != null) {
-            endTime = endTime + " 23:59:59";
-        }
-
 
         JSONArray jsonArray = new JSONArray();
         if (type == "1") { //检疫申请
             QueryWrapper<BillLandingInspection> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_time").between("create_time", startTime, endTime);
+            if (date == null || date == "") {
+                queryWrapper.orderByDesc("create_time");
+            } else {
+                queryWrapper.orderByDesc("create_time").eq("inspection_sch",date);
+            }
             List<BillLandingInspection> billLandingInspections = billLandingInspectionMapper.selectList(queryWrapper);
             for (BillLandingInspection billLandingInspection : billLandingInspections) {
                 JSONObject jsonObject = new JSONObject();
@@ -75,45 +64,111 @@ public class BillLandingInspectionServiceImpl extends ServiceImpl<BillLandingIns
                 jsonObject.put("id", billLandingInspection.getId());
                 jsonObject.put("time", billLandingInspection.getCreateTime());
                 jsonObject.put("state", billLandingInspection.getInspectionSch());
-                jsonArray.add(jsonObject);
-            }
-            return new Result(ResultCode.SUCCESS, jsonArray);
-        }
-        if (type == "2") { //隔离申请
-            QueryWrapper<BillIsolated> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("str_isolated").between("str_isolated", startTime, endTime);
-            List<BillIsolated> billIsolateds = isolatedMapper.selectList(queryWrapper);
-            for (BillIsolated billIsolated : billIsolateds) {
-                JSONObject jsonObject = new JSONObject();
-                jsonObject.put("name", billIsolated.getInspectionName());
-                jsonObject.put("time", billIsolated.getStrIsolated());
-                jsonObject.put("id", billIsolated.getId());
-                jsonObject.put("state", billIsolated.getIsolatedSch());
+                jsonObject.put("num", billLandingInspection.getInspectionNum());
                 jsonArray.add(jsonObject);
             }
             return new Result(ResultCode.SUCCESS, jsonArray);
         }
         //交易信息
-        if (type == "3") {
+        if (type == "2") {
             QueryWrapper<BillBuyInfo> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_time").between("create_time", startTime, endTime);
+            queryWrapper.orderByDesc("create_time");
             List<BillBuyInfo> billBuyInfos = buyInfoMapper.selectList(queryWrapper);
             for (BillBuyInfo billBuyInfo : billBuyInfos) {
                 JSONObject jsonObject = new JSONObject();
                 jsonObject.put("name", billBuyInfo.getBuyName());
                 jsonObject.put("id", billBuyInfo.getId());
                 jsonObject.put("time", billBuyInfo.getCreateTime());
+                jsonObject.put("num", billBuyInfo.getInspectionNum());
                 jsonArray.add(jsonObject);
             }
             return new Result(ResultCode.SUCCESS, jsonArray);
         }
         //补贴申请
+        if (type == "3") {
+            QueryWrapper<BillSubsidy> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_time");
+            List<BillSubsidy> billSubsidies = subsidyMapper.selectList(queryWrapper);
+            for (BillSubsidy billSubsidy : billSubsidies) {
+                JSONObject jsonObject = new JSONObject();
+                jsonObject.put("name", billSubsidy.getSubsidyName());
+                jsonObject.put("time", billSubsidy.getCreateTime());
+                jsonObject.put("id", billSubsidy.getId());
+                jsonObject.put("num", billSubsidy.getInspectionNum());
+                jsonArray.add(jsonObject);
+            }
+        }
+        //验收信息
         if (type == "4") {
-            QueryWrapper<BillBuyInfo> queryWrapper = new QueryWrapper<>();
-            queryWrapper.between("create_time", startTime, endTime).orderByDesc("create_time");
+            QueryWrapper<BillSubsidy> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_time");
+
+            List<BillSubsidy> billSubsidies = subsidyMapper.selectList(queryWrapper);
+            for (BillSubsidy billSubsidy : billSubsidies) {
+                JSONObject jsonObject = new JSONObject();
+                jsonObject.put("name", billSubsidy.getSubsidyName());
+                jsonObject.put("time", billSubsidy.getCreateTime());
+                jsonObject.put("state", billSubsidy.getSubsidySch());
+                jsonObject.put("id", billSubsidy.getId());
+                jsonObject.put("num", billSubsidy.getInspectionNum());
+                jsonArray.add(jsonObject);
+            }
+        }
+        //支付信息
+        if (type == "5") {
+            QueryWrapper<BillSubsidy> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_time").eq("subsidy_sch", 3);
+            List<BillSubsidy> billSubsidies = subsidyMapper.selectList(queryWrapper);
+            for (BillSubsidy billSubsidy : billSubsidies) {
+                JSONObject jsonObject = new JSONObject();
+                jsonObject.put("name", billSubsidy.getFarmerName() + "的支付信息");
+                if (ObjectUtil.isEmpty(billSubsidy.getPayTime())) {
+                    jsonObject.put("state", "未支付");
+                } else {
+                    jsonObject.put("state", "已支付");
+                }
+                jsonObject.put("id", billSubsidy.getId());
+                jsonObject.put("time", billSubsidy.getCreateTime());
+                jsonObject.put("num", billSubsidy.getInspectionNum());
+                jsonArray.add(jsonObject);
+            }
+        }
+        return new Result(ResultCode.SUCCESS, jsonArray);
+    }
+
+    @Override
+    public Result listById(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        Integer id = Integer.valueOf(paramsMap.get("id"));
+        String num = paramsMap.get("num");
+        String type = paramsMap.get("type");
+        JSONObject jsonObject = new JSONObject();
+        if (type == "1") {
+            //检疫
+            jsonObject.put("data1", billLandingInspectionMapper.selectById(id));
+            jsonObject.put("data2", isolatedMapper.selectOne(new QueryWrapper<BillIsolated>().eq("inspection_num", num)));
+        }
+        if (type == "2") {
+            //交易
+            jsonObject.put("data1", buyInfoMapper.selectById(id));
+            jsonObject.put("data2", billLandingInspectionMapper.selectOne(new QueryWrapper<BillLandingInspection>().eq("inspection_num", num)));
+        }
+        if (type == "3") {
+            //补贴
+            jsonObject.put("data1", subsidyMapper.selectById(id));
+            jsonObject.put("data2","");
+        }
+        if (type == "4") {
+            //验收
+            jsonObject.put("data1", subsidyMapper.selectById(id));
+            jsonObject.put("data2","");
+        }
+        if (type == "5") {
+            //支付
+            jsonObject.put("data1", subsidyMapper.selectById(id));
+            jsonObject.put("data2", "");
         }
+        return new Result(ResultCode.SUCCESS, jsonObject);
 
-        return null;
     }
 
     @Override
@@ -125,7 +180,7 @@ public class BillLandingInspectionServiceImpl extends ServiceImpl<BillLandingIns
         }
         billLandingInspection.setInspectionName(TokenSign.getUserName(httpServletRequest)+"的落地检疫申请");
         billLandingInspection.setCreateTime(DateTime.now());
-        billLandingInspection.setCreateUser(Long.valueOf(TokenSign.getUserName(httpServletRequest)));
+        billLandingInspection.setCreateUser(TokenSign.getUserName(httpServletRequest));
         billLandingInspection.setInspectionType(0);
         if (this.save(billLandingInspection)){
             return Result.SUCCESS();

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

@@ -9,6 +9,8 @@ import com.huimv.farm.damsubsidy.common.utils.Result;
 import com.huimv.farm.damsubsidy.entity.BaseAnimal;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+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.BillSubsidy;
 import com.huimv.farm.damsubsidy.entity.SysUser;
@@ -25,12 +27,10 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
 import javax.servlet.http.HttpServletRequest;
-import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
-import java.util.regex.Pattern;
 
 /**
  * <p>
@@ -43,12 +43,9 @@ import java.util.regex.Pattern;
 @Service
 public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillSubsidy> implements IBillSubsidyService {
 
-    @Resource
+    @Autowired
     private BillSubsidyMapper subsidyMapper;
-
-    @Resource
-    private BaseAnimalMapper baseAnimalMapper;
-    @Resource
+    @Autowired
     private SysUserMapper sysUserMapper;
 
     @Override
@@ -170,6 +167,8 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
         }
         return new Result(ResultCode.SUCCESS, "更新状态成功！");
     }
+    @Resource
+    private BaseAnimalMapper baseAnimalMapper;
 
     @Override
     @Transactional
@@ -204,7 +203,7 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
         }
         billSubsidy.setSubsidyName(TokenSign.getUserName(httpServletRequest)+"的补贴申请");
         billSubsidy.setCreateTime(DateTime.now());
-        billSubsidy.setCreateUser(Long.valueOf(TokenSign.getUserName(httpServletRequest)));
+        billSubsidy.setCreateUser(TokenSign.getUserName(httpServletRequest));
         if (this.saveOrUpdate(billSubsidy)) {
             return Result.SUCCESS();
         }else {
@@ -213,10 +212,9 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
     }
 
     @Override
-    @Transactional
     public Result saveApplication(HttpServletRequest httpServletRequest, BillSubsidy billSubsidy) {
         billSubsidy.setSubsidySch(4);
-        billSubsidy.setCreateUser(Long.valueOf(TokenSign.getUserName(httpServletRequest)));
+        billSubsidy.setCreateUser(TokenSign.getUserName(httpServletRequest));
         if (this.saveOrUpdate(billSubsidy)) {
             return Result.SUCCESS();
         }else {
@@ -225,7 +223,11 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
     }
 
     @Override
-    @Transactional
+    public Result listPcSub(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        return null;
+    }
+
+    @Override
     public Result editApplication(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
         String id = paramsMap.get("id");
         String type = paramsMap.get("type");
@@ -262,7 +264,6 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
                 return Result.ERROR();
             }
         }
-
     }
 
     @Override
@@ -300,5 +301,4 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
         BillSubsidy billSubsidy = this.getOne(new QueryWrapper<BillSubsidy>().eq("creat_user", TokenSign.getUserName(httpServletRequest)).eq("subsidy_sch", 4));
         return new Result(ResultCode.SUCCESS,billSubsidy);
     }
-
 }

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

@@ -2,6 +2,7 @@ package com.huimv.farm.damsubsidy.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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.SysUser;
@@ -32,6 +33,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     public Result loginMultilevel(HttpServletRequest httpServletRequest, Map<String,String> paramsMap) {
         //TODO 验证码接口暂时不写，验证码验证接口写在此接口之前，这里默认验证码已经正确！
         String phone = paramsMap.get("phone");
+        if (!phone.matches("1[3-9]\\d{9}")) {
+            return new Result(ResultCode.FAIL, "手机号格式不正确");
+        }
         QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("phone", phone);
         SysUser sysUser = userMapper.selectOne(queryWrapper);
@@ -44,6 +48,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
     @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"));
@@ -52,7 +57,19 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         user.setIdCardFrontUrl(paramsMap.get("idCordFrontUrl"));
         user.setIdCardBackUrl(paramsMap.get("idCordBackUrl"));
         user.setCreateTime(new Date());
+        user.setCreateUser(paramsMap.get("userName"));
+        if (ObjectUtil.isNotEmpty(paramsMap.get("address"))) {
+            user.setAddress(paramsMap.get("address"));
+        }
+        user.setAccoutType(0);
         user.setIsRealName(1);
+
+        QueryWrapper<SysUser> queryWrapper1 = new QueryWrapper<>();
+        queryWrapper1.eq("user_name", paramsMap.get("userName")).eq("id_card", paramsMap.get("idCord"));
+        SysUser user2 = userMapper.selectOne(queryWrapper1);
+        if (ObjectUtil.isNotEmpty(user2)) {
+            return new Result(ResultCode.FAIL, "");
+        }
         userMapper.insert(user);
         QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("phone", paramsMap.get("phone"));
@@ -72,4 +89,88 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         queryWrapper.eq("phone", paramsMap.get("phone"));
         return new Result(ResultCode.SUCCESS,userMapper.selectOne(queryWrapper));
     }
+
+    @Override
+    public Result findPhone(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String userName = paramsMap.get("userName");
+        String idCord = paramsMap.get("idCord");
+        String phone = paramsMap.get("phone");
+        if (!phone.matches("1[3-9]\\d{9}")) {
+            return new Result(ResultCode.FAIL, "手机号格式不正确");
+        }
+        QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("user_name", userName).eq("id_card", idCord);
+        SysUser user = userMapper.selectOne(queryWrapper);
+        return new Result(ResultCode.SUCCESS, user.getPhone());
+    }
+
+    @Override
+    public Result listPc(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String startTime = paramsMap.get("startTime");
+        String endTime = paramsMap.get("endTime");
+        String word = paramsMap.get("word");
+        String role = paramsMap.get("role");
+        String pageSize = paramsMap.get("pageSize");
+        String pageNum = paramsMap.get("pageSize");
+
+        if (pageSize == null || pageSize == "") {
+            pageSize = "10";
+        }
+        if (pageNum == null || pageNum == "") {
+            pageNum = "1";
+        }
+        if (startTime != "") {
+            startTime = startTime + " 00:00:00";
+        }
+        if (endTime != "") {
+            endTime = endTime + " 23:59:59";
+        }
+
+        QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("accout_type", 0).between("create_time", startTime, endTime)
+                .eq("user_type", role).like("user_name", word).or().like("phone", word)
+                .or().like("id_card", word);
+
+        Page<SysUser> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+        Page<SysUser> sysUserPage = userMapper.selectPage(page, queryWrapper);
+        return new Result(ResultCode.SUCCESS,sysUserPage);
+    }
+
+    @Override
+    public Result editState(HttpServletRequest httpServletRequest, SysUser user) {
+        userMapper.updateById(user);
+        return new Result(ResultCode.SUCCESS);
+    }
+
+    @Override
+    public Result listPc2(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String startTime = paramsMap.get("startTime");
+        String endTime = paramsMap.get("endTime");
+        String word = paramsMap.get("word");
+        String role = paramsMap.get("role");
+        String pageSize = paramsMap.get("pageSize");
+        String pageNum = paramsMap.get("pageSize");
+
+        if (pageSize == null || pageSize == "") {
+            pageSize = "10";
+        }
+        if (pageNum == null || pageNum == "") {
+            pageNum = "1";
+        }
+        if (startTime != "") {
+            startTime = startTime + " 00:00:00";
+        }
+        if (endTime != "") {
+            endTime = endTime + " 23:59:59";
+        }
+        QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("accout_type", 1).or().eq("accout_typr",4).between("create_time", startTime, endTime)
+                .eq("user_type", role).like("user_name", word).or().like("phone", word)
+                .or().like("id_card", word);
+
+        Page<SysUser> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+        Page<SysUser> sysUserPage = userMapper.selectPage(page, queryWrapper);
+        return new Result(ResultCode.SUCCESS,sysUserPage);
+    }
+
 }