接口哦1

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

@@ -0,0 +1,24 @@
+package com.huimv.farm.damsubsidy.config;
+
+import javax.servlet.*;
+import java.io.IOException;
+
+public class CharacterEncodingFilter implements Filter {
+    private String charset;
+
+    @Override
+    public void destroy() {        // TODO Auto-generated method stub
+    }
+
+    @Override
+    public void doFilter(ServletRequest request, ServletResponse response,
+                         FilterChain filterChain) throws IOException, ServletException {        // TODO Auto-generated method stub        request.setCharacterEncoding(charset);
+        filterChain.doFilter(request, response);
+    }
+
+    @Override
+    public void init(FilterConfig config) throws ServletException {        // TODO Auto-generated method stub
+        charset = config.getInitParameter("charset");
+    }
+
+}

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

@@ -2,18 +2,28 @@ package com.huimv.farm.damsubsidy.controller;
 
 
 import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.lang.UUID;
 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.BillSubsidy;
 import com.huimv.farm.damsubsidy.service.IBillSubsidyService;
 import com.huimv.farm.test.Print;
 import com.spire.xls.FileFormat;
 import com.spire.xls.Workbook;
 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;
 
 /**
@@ -58,6 +68,43 @@ public class BillSubsidyController {
     public Result edit(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
         return subsidyService.edit(httpServletRequest, paramsMap);
     }
+    @RequestMapping("/edit2")
+    public Result edit2(HttpServletRequest httpServletRequest,
+                        @RequestParam("workImg") MultipartFile workImg,
+                        @RequestParam("id") String id,
+                        @RequestParam("type") String type,
+                        @RequestParam("rejectReason") String rejectReason) {
+        String imgname = "成功";
+        String originalFilename = workImg.getOriginalFilename();
+        String filenameExtension = StringUtils.getFilenameExtension(originalFilename);
+        String path = DateUtil.format(new Date(), "yyyy-MM");
+        try {
+            InputStream inputStream = workImg.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;
+
+        Map<String, String> map = new HashMap<>();
+        map.put("id", id);
+        map.put("type", type);
+        map.put("rejectReason", rejectReason);
+        map.put("workAccptUrl", content);
+        return subsidyService.edit2(httpServletRequest, map);
+    }
+
+
 
     @RequestMapping("/appeal")
     public Result appeal(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {

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

@@ -8,6 +8,7 @@ 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.config.CharacterEncodingFilter;
 import com.huimv.farm.damsubsidy.entity.AccessToken;
 import com.huimv.farm.damsubsidy.entity.SysUser;
 import com.huimv.farm.damsubsidy.service.ISysUserService;
@@ -167,6 +168,7 @@ public class SysUserController {
         map.put("idCordFrontUrl", content);
         map.put("idCordBackUrl", content2);
         map.put("type", type);
+        CharacterEncodingFilter characterEncodingFilter = new CharacterEncodingFilter();
         map.put("userName", userName);
         map.put("idCord", idCord);
         map.put("phone", phone);
@@ -177,6 +179,7 @@ public class SysUserController {
             accessToken.setAccountName(user.getUserName());
             accessToken.setCreated(new Date());
             accessToken.setLoginIp(user.getLastIp());
+            accessToken.setType(user.getUserType());
             accessToken.setToken(TokenSign.sign(user.getUserName(), user.getPhone(),user.getId()));
             JSONObject jsonObject = new JSONObject();
             jsonObject.put("newToken", accessToken);

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

@@ -24,6 +24,8 @@ public interface IBillSubsidyService extends IService<BillSubsidy> {
 
     Result edit(HttpServletRequest httpServletRequest,Map<String,String> paramsMap);
 
+    Result edit2(HttpServletRequest httpServletRequest,Map<String,String> paramsMap);
+
     Result appeal(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
     Result addApplication(HttpServletRequest httpServletRequest, BillSubsidy billSubsidy);
 

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

@@ -94,7 +94,6 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
     public Result edit(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
         Integer type = Integer.parseInt(paramsMap.get("type"));
         String id = paramsMap.get("id");
-        Integer stateType = Integer.parseInt(paramsMap.get("stateType"));
         //拒绝
         if (type == 1) {
             String refuseReason = paramsMap.get("refuseReason"); //拒绝理由
@@ -104,43 +103,57 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
             QueryWrapper<BillSubsidy> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("id", id);
             BillSubsidy billSubsidy = subsidyMapper.selectOne(queryWrapper);
+            billSubsidy.setRefuseReason(refuseReason);
             billSubsidy.setSubsidySch(2);
             billSubsidy.setAcceptTime(new Date());
-            subsidyMapper.insert(billSubsidy);
-            return new Result(ResultCode.SUCCESS, "更新状态成功！");
+            subsidyMapper.updateById(billSubsidy);
+            return new Result(ResultCode.SUCCESS, billSubsidy);
         } else { //受理
             QueryWrapper<BillSubsidy> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("id", id);
             BillSubsidy billSubsidy = subsidyMapper.selectOne(queryWrapper);
-            if (stateType == 1) { //驳回
-                String rejectReason = paramsMap.get("rejectReason");
-                String workAccptUrl = paramsMap.get("workAccptUrl");
-                if (rejectReason == null || rejectReason == "") {
-                    return new Result(ResultCode.FAIL, "驳回理由不能为空！");
-                }
-                if (workAccptUrl == null || workAccptUrl == "") {
-                    return new Result(ResultCode.FAIL, "工作验收表不能为空！");
-                }
-                billSubsidy.setSubsidySch(4);
-                billSubsidy.setRejectReason(rejectReason);
+            billSubsidy.setSubsidySch(1);
+            billSubsidy.setAcceptTime(new Date());
+            subsidyMapper.updateById(billSubsidy);
+            return new Result(ResultCode.SUCCESS, billSubsidy);
+        }
+    }
+
+    @Override
+    public Result edit2(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        Integer type = Integer.parseInt(paramsMap.get("type"));
+        String id = paramsMap.get("id");
+
+        String workAccptUrl = paramsMap.get("workAccptUrl");
+        QueryWrapper<BillSubsidy> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("id", id);
+        BillSubsidy billSubsidy = subsidyMapper.selectOne(queryWrapper);
+        if (type == 1) { //驳回
+            String rejectReason = paramsMap.get("rejectReason");
+            if (rejectReason == null || rejectReason == "") {
+                return new Result(ResultCode.FAIL, "驳回理由不能为空！");
+            }
+            if (workAccptUrl == null || workAccptUrl == "") {
+                return new Result(ResultCode.FAIL, "工作验收表不能为空！");
+            }
+            billSubsidy.setSubsidySch(4);
+            billSubsidy.setRejectReason(rejectReason);
+            billSubsidy.setWorkAccptUrl(workAccptUrl);
+            billSubsidy.setAcceptTime(new Date());
+            subsidyMapper.updateById(billSubsidy);
+            return new Result(ResultCode.SUCCESS, billSubsidy);
+        } else { //通过
+            billSubsidy.setSubsidySch(3);
+            billSubsidy.setAcceptTime(new Date());
+            if (workAccptUrl == null || workAccptUrl == "") {
+                billSubsidy.setIsPay(0);
+            } else {
                 billSubsidy.setWorkAccptUrl(workAccptUrl);
-                billSubsidy.setAcceptTime(new Date());
-                subsidyMapper.insert(billSubsidy);
-                return new Result(ResultCode.SUCCESS, "更新状态成功！");
-            } else { //通过
-                billSubsidy.setSubsidySch(3);
-                billSubsidy.setAcceptTime(new Date());
-                String workAccptUrl = paramsMap.get("workAccptUrl");
-                if (workAccptUrl == null || workAccptUrl == "") {
-                    billSubsidy.setIsPay(0);
-                } else {
-                    billSubsidy.setWorkAccptUrl(workAccptUrl);
-                    billSubsidy.setIsPay(1);
-                }
-                billSubsidy.setReviewedTime(new Date());
-                subsidyMapper.insert(billSubsidy);
-                return new Result(ResultCode.SUCCESS, "更新状态成功！");
+                billSubsidy.setIsPay(1);
             }
+            billSubsidy.setReviewedTime(new Date());
+            subsidyMapper.updateById(billSubsidy);
+            return new Result(ResultCode.SUCCESS, billSubsidy);
         }
     }
 
@@ -152,19 +165,15 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
         queryWrapper.eq("id", id);
         BillSubsidy billSubsidy = subsidyMapper.selectOne(queryWrapper);
         if (type == 1) { //驳回
-            String appeal = paramsMap.get("appeal");
             billSubsidy.setSubsidySch(4);
             billSubsidy.setAppealTime(new Date());
-            billSubsidy.setAppeal(appeal);
-            subsidyMapper.insert(billSubsidy);
+            subsidyMapper.updateById(billSubsidy);
         } else {
-            String appeal = paramsMap.get("appeal");
             billSubsidy.setSubsidySch(3);
             billSubsidy.setAppealTime(new Date());
-            billSubsidy.setAppeal(appeal);
-            subsidyMapper.insert(billSubsidy);
+            subsidyMapper.updateById(billSubsidy);
         }
-        return new Result(ResultCode.SUCCESS, "更新状态成功！");
+        return new Result(ResultCode.SUCCESS, billSubsidy);
     }
 
     @Resource

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

@@ -15,6 +15,7 @@ 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 org.springframework.transaction.annotation.Transactional;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
@@ -91,13 +92,14 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     }
 
 
+    @Transactional
     @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("idCard"));
+        user.setIdCard(paramsMap.get("idCord"));
         user.setPhone(paramsMap.get("phone"));
         user.setIdCardFrontUrl(paramsMap.get("idCordFrontUrl"));
         user.setIdCardBackUrl(paramsMap.get("idCordBackUrl"));
@@ -122,7 +124,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         user.setIsRealName(1);
 
         QueryWrapper<SysUser> queryWrapper1 = new QueryWrapper<>();
-        queryWrapper1.eq("user_name", paramsMap.get("userName")).eq("id_card", paramsMap.get("idCord"));
+        queryWrapper1.eq("id_card", paramsMap.get("idCord"));
         SysUser user2 = userMapper.selectOne(queryWrapper1);
         if (ObjectUtil.isNotEmpty(user2)) {
             return new Result(ResultCode.FAIL, "");