生物防控人员

huimv-receive/src/main/java/com/huimv/receive/controller/SysUserController.java

@@ -30,8 +30,6 @@ import java.util.stream.Collectors;
 @RequestMapping("/admin/user")
 @CrossOrigin
 public class SysUserController {
-    @Autowired
-    private IUserService iUserService;
 
     @Autowired
     private ISysUserService sysUserService;
@@ -73,7 +71,7 @@ public class SysUserController {
     @PostMapping("/add")
     public Result add(@RequestParam("userId") String userId,
                       @RequestParam(value = "userName",required = false) String userName,
-                      @RequestParam(value = "gender",required = false) Integer gender,
+                      @RequestParam(value = "gender",required = false) String gender,
                       @RequestParam(value = "nation",required = false) String nation,
                       @RequestParam(value = "nativePlace",required = false) String nativePlace,
                       @RequestParam(value = "birthday",required = false) String birthday,
@@ -104,7 +102,7 @@ public class SysUserController {
         SysUser sysUser = new SysUser();
         sysUser.setUserName(userName);
         sysUser.setUserId(userId);
-        sysUser.setGender(gender);
+        sysUser.setGender(Integer.parseInt(gender));
         sysUser.setNation(nation);
         sysUser.setNativePlace(nativePlace);
 
@@ -170,81 +168,11 @@ public class SysUserController {
     }
 
     @PostMapping("/update")
-    public Result update(@RequestParam("id") Integer id,
-                         @RequestParam("userId") String userId,
-                         @RequestParam(value = "userName",required = false) String userName,
-                         @RequestParam(value = "gender",required = false) Integer gender,
-                         @RequestParam(value = "nation",required = false) String nation,
-                         @RequestParam(value = "nativePlace",required = false) String nativePlace,
-                         @RequestParam(value = "birthday",required = false) String birthday,
-                         @RequestParam(value = "politicsPace",required = false) String politicsPace,
-                         @RequestParam(value = "peopleType",required = false) String peopleType,
-                         @RequestParam(value = "educationalLevel",required = false) String educationalLevel,
-                         @RequestParam(value = "cardType",required = false) String cardType,
-                         @RequestParam(value = "cardNum",required = false) String cardNum,
-                         @RequestParam(value = "userPhone",required = false) String userPhone,
-                         @RequestParam(value = "publicPhone",required = false) String publicPhone,
-                         @RequestParam(value = "userMali",required = false) String userMali,
-                         @RequestParam(value = "publicMali",required = false) String publicMali,
-                         @RequestParam(value = "entryTime",required = false) String entryTime,
-                         @RequestParam(value = "probation",required = false) String probation,
-                         @RequestParam(value = "department",required = false) String department,
-                         @RequestParam(value = "job",required = false) String job,
-                         @RequestParam(value = "jobType",required = false) String jobType,
-                         @RequestParam(value = "workLocation",required = false) String workLocation,
-                         @RequestParam(value = "workLocationType",required = false) Integer workLocationType,
-                         @RequestParam(value = "farmId",required = false) String farmId,
-                         @RequestParam(value = "emergentUser",required = false) String emergentUser,
-                         @RequestParam(value = "emergentUserPhone,required = false") String emergentUserPhone,
-                         @RequestParam(value = "sheng",required = false) String sheng,
-                         @RequestParam(value = "shi",required = false) String shi,
-                         @RequestParam(value = "xxdz",required = false) String xxdz,
-                         @RequestParam(value = "yzbm",required = false) String yzbm,
-                         @RequestParam("imgUrl") MultipartFile imgUrl) throws IOException {
-        SysUser sysUser = new SysUser();
-        sysUser.setUserName(userName);
-        sysUser.setId(id);
-        sysUser.setUserId(userId);
-        sysUser.setGender(gender);
-        sysUser.setNation(nation);
-        sysUser.setNativePlace(nativePlace);
-
-        sysUser.setBirthday(DateUtil.parse(birthday,"yyyy-MM-dd"));
-        sysUser.setPoliticsPace(politicsPace);
-        sysUser.setPeopleType(peopleType);
-        sysUser.setEducationalLevel(educationalLevel);
-        sysUser.setCardType(cardType);
-        sysUser.setCardNum(cardNum);
-        sysUser.setUserPhone(userPhone);
-        sysUser.setPublicPhone(publicPhone);
-        sysUser.setUserMali(userMali);
-        sysUser.setPublicMali(publicMali);
-        sysUser.setEntryTime(DateUtil.parse(entryTime,"yyyy-MM-dd"));
-        sysUser.setProbation(probation);
-        sysUser.setDepartment(department);
-        sysUser.setJob(job);
-        sysUser.setJobType(jobType);
-        sysUser.setWorkLocation(workLocation);
-        sysUser.setWorkLocationType(workLocationType);
-        sysUser.setFarmId(farmId);
-        sysUser.setEmergentUser(emergentUser);
-        sysUser.setEmergentUserPhone(emergentUserPhone);
-        sysUser.setSheng(sheng);
-        sysUser.setShi(shi);
-        sysUser.setXxdz(xxdz);
-        sysUser.setYzbm(yzbm);
-
-        if (ObjectUtil.isNotEmpty(imgUrl)) {
-            String imageCom = uploadImage.getImageCom(imgUrl);
-            if ("上传失败".equals(imageCom)) {
-                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                return new Result(10001, "图片上传失败", false);
-            }else {
-                sysUser.setImgUrl(imageCom);
-            }
-        }
-
+    public Result update(@RequestBody SysUser sysUser) {
+        String cardType = sysUser.getCardType();
+        String cardNum = sysUser.getCardNum();
 
+        String userPhone = sysUser.getUserPhone();
         if(StringUtils.isNotBlank(userPhone)){
             if (!PhoneNumberValidator.isValidPhoneNumber(userPhone))
                 return new Result(10001,"手机号格式不正确",false);
@@ -264,7 +192,16 @@ public class SysUserController {
             sysUser.setAge(DateUtil.ageOfNow(sysUser.getBirthday()));
         }
         sysUserService.updateById(sysUser);
-        return new Result(10000,"保存成功",true);
+        accountMultilevelService.updateByUser(sysUser);
+        return new Result(10000,"修改成功",true);
+    }
+
+    @PostMapping("/uploadUserImg")
+    public Result uploadUserImg(@RequestParam("imgUrl") MultipartFile imgUrl,
+                         @RequestParam("id") Integer id) throws IOException {
+
+       return sysUserService.uploadUserImg(imgUrl,id);
+
     }
 
     @PostMapping("/remove")

huimv-receive/src/main/java/com/huimv/receive/service/ISysAccountMultilevelService.java

@@ -3,6 +3,7 @@ package com.huimv.receive.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huimv.receive.common.utils.Result;
 import com.huimv.receive.entity.SysAccountMultilevel;
+import com.huimv.receive.entity.SysUser;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
@@ -39,4 +40,6 @@ public interface ISysAccountMultilevelService extends IService<SysAccountMultile
 
     //导出
     void printAccount(HttpServletResponse httpServletRequest, Map<String, String> paramsMap) throws Exception;
+
+    void updateByUser(SysUser sysUser);
 }

huimv-receive/src/main/java/com/huimv/receive/service/ISysUserService.java

@@ -5,8 +5,10 @@ import com.huimv.receive.common.utils.Result;
 import com.huimv.receive.entity.SysUser;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huimv.receive.entity.pojo.UserPagePojo;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import java.util.Map;
 
 /**
@@ -39,4 +41,6 @@ public interface ISysUserService extends IService<SysUser> {
 
     //导出
     void printUser(HttpServletResponse httpServletRequest, Map<String, String> paramsMap) throws Exception;
+
+    Result uploadUserImg(MultipartFile imgUrl, Integer id) throws IOException;
 }

huimv-receive/src/main/java/com/huimv/receive/service/impl/SysAccountMultilevelServiceImpl.java

@@ -218,4 +218,25 @@ public class SysAccountMultilevelServiceImpl extends ServiceImpl<SysAccountMulti
 
     }
 
+    @Override
+    public void updateByUser(SysUser sysUser) {
+        Integer id = sysUser.getId();
+        SysAccountMultilevel sysAccountMultilevel = accountMultilevelMapper.selectOne(new QueryWrapper<SysAccountMultilevel>().eq("user_id", id));
+        if (ObjectUtil.isNotEmpty(sysAccountMultilevel)){
+            sysAccountMultilevel.setUserName(sysUser.getUserName());
+            sysAccountMultilevel.setJobs(sysUser.getJob());
+            sysAccountMultilevel.setType(Integer.parseInt(sysUser.getJob().split(",")[0]));
+            sysAccountMultilevel.setWorkLocation(sysUser.getWorkLocation());
+            sysAccountMultilevel.setWorkLocationType(sysUser.getWorkLocationType());
+            sysAccountMultilevel.setPhone(sysUser.getUserPhone());
+            sysAccountMultilevel.setWorkName(sysUser.getDepartment());
+            sysAccountMultilevel.setPapersCode(sysUser.getCardNum());
+            sysAccountMultilevel.setImgUrl(sysUser.getImgUrl());
+//        sysAccountMultilevel.setPapersType(sysUser.getCardType());
+            sysAccountMultilevel.setUserId(id);
+            accountMultilevelMapper.updateById(sysAccountMultilevel);
+        }
+
+    }
+
 }

huimv-receive/src/main/java/com/huimv/receive/service/impl/SysUserServiceImpl.java

@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huimv.receive.common.utils.Print;
 import com.huimv.receive.common.utils.Result;
 import com.huimv.receive.common.utils.ResultCode;
+import com.huimv.receive.common.utils.UploadImage;
 import com.huimv.receive.entity.*;
 import com.huimv.receive.entity.pojo.UserPagePojo;
 import com.huimv.receive.entity.vo.UserAccountVo;
@@ -27,8 +28,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.aspectj.weaver.ast.Var;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import java.util.*;
 import java.util.List;
 
@@ -54,6 +58,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     @Autowired
     private SysAccountMultilevelMapper sysAccountMultilevelMapper;
 
+    @Autowired
+    private UploadImage uploadImage;
+
     @Override
     public Result pageAll(UserPagePojo userPagePojo) {
         Integer pageNum = userPagePojo.getPageNum();
@@ -203,6 +210,28 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     }
 
     @Override
+    public Result uploadUserImg(MultipartFile imgUrl, Integer id) throws IOException {
+        String imageCom = uploadImage.getImageCom(imgUrl);
+        if (ObjectUtil.isNotEmpty(imgUrl)) {
+            if (imageCom.equals("上传失败")) {
+                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                return new Result(10001, "图片上传失败", false);
+            }
+
+        }
+        SysUser sysUser = new SysUser();
+        sysUser.setId(id);
+        sysUser.setImgUrl(imageCom);
+        userMapper.updateById(sysUser);
+
+        SysAccountMultilevel sysAccountMultilevel = new SysAccountMultilevel();
+        sysAccountMultilevel.setImgUrl(imageCom);
+        sysAccountMultilevelMapper.update(sysAccountMultilevel,new UpdateWrapper<SysAccountMultilevel>().eq("user_id",id));
+        return new Result(10000,"修改成功",true);
+
+    }
+
+    @Override
     public Result removeAccount(Map<String, String> map) {
         String ids = map.get("ids");
         sysAccountMultilevelMapper.delete(new QueryWrapper<SysAccountMultilevel>().in("user_id", Arrays.asList(ids.split(","))));

huimv-receive/src/main/resources/mapper/SysUserMapper.xml

@@ -62,11 +62,11 @@ GROUP BY age_range
 
     <select id="userJob" resultType="com.huimv.receive.entity.vo.UserJob">
 
-     SELECT
-        SUM(CASE WHEN job = 5 THEN 1 ELSE 0 END) AS clean,
-        SUM(CASE WHEN job = 4 THEN 1 ELSE 0 END) AS pcr,
-        SUM(CASE WHEN job = 3 THEN 1 ELSE 0 END) AS safe,
-        SUM(CASE WHEN job = 1 THEN 1 ELSE 0 END) AS factory
+      SELECT
+        IFNULL (SUM(CASE WHEN job = 5 THEN 1 ELSE 0 END) ,0)AS clean,
+        IFNULL (SUM(CASE WHEN job = 4 THEN 1 ELSE 0 END) ,0) AS pcr,
+        IFNULL (SUM(CASE WHEN job = 3 THEN 1 ELSE 0 END)  ,0)AS safe,
+       IFNULL ( SUM(CASE WHEN job = 1 THEN 1 ELSE 0 END)  ,0)AS factory
     FROM
        `sys_user`
        WHERE farm_id = #{farmId}