洗消后台修改

huimv.nongke.secure/huimv.nongke.secure/src/main/java/com/huimv/secure/controller/LoginController.java

@@ -229,8 +229,8 @@ public class LoginController {
     public Result logoutWeChat(HttpServletRequest req, @RequestParam String jsCode) {
         String remoteHost = req.getRemoteHost();
         Map<String, Object> paramsMap = new HashMap<>();
-        paramsMap.put("appid", "wxa28e45fe5cb10ff1");
-        paramsMap.put("secret", "c16e584ec6e69fd35edd98ec21ec5e94");
+        paramsMap.put("appid", "wxb68dc341b4212c77");
+        paramsMap.put("secret", "ced18a31c7f2250cba4673733029f70a");
         paramsMap.put("js_code", jsCode);
         paramsMap.put("grant_type", "authorization_code");
         String result = HttpUtil.get("https://api.weixin.qq.com/sns/jscode2session", paramsMap);

huimv.nongke.secure/huimv.nongke.secure/src/main/java/com/huimv/secure/controller/SysAccountMultilevelController.java

@@ -3,12 +3,18 @@ package com.huimv.secure.controller;
 
 import com.huimv.secure.common.token.TokenSign;
 import com.huimv.secure.common.utils.Result;
+import com.huimv.secure.common.utils.ResultCode;
+import com.huimv.secure.common.utils.UploadImage;
 import com.huimv.secure.entity.SysAccountMultilevel;
 import com.huimv.secure.service.ISysAccountMultilevelService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
 import java.util.Map;
 
 /**
@@ -25,6 +31,8 @@ import java.util.Map;
 public class SysAccountMultilevelController {
     @Autowired
     private ISysAccountMultilevelService accountMultilevelService;
+    @Autowired
+    private UploadImage uploadImage;
 
 
     @PostMapping("/add")
@@ -47,4 +55,34 @@ public class SysAccountMultilevelController {
         return accountMultilevelService.deleteAccount(paramsMap);
     }
 
+    @GetMapping("/findOne")
+    public Result findOne(Integer id){
+        return new Result(ResultCode.SUCCESS, accountMultilevelService.getById(id));
+    }
+
+    @GetMapping("/getLastFarmId")
+    public Result getLastFarmId(HttpServletRequest request){
+        Integer userId = TokenSign.getMemberIdByJwtToken(request);
+        return  accountMultilevelService.getLastFarmId(userId);
+    }
+
+    @PostMapping("/listSubordinateByFarm")
+    public Result listSubordinateByFarm(@RequestBody Map map , HttpServletRequest request){
+        Integer userId = TokenSign.getMemberIdByJwtToken(request);
+        String farmId = (String)map.get("farmId");
+        return accountMultilevelService.listSubordinateByFarm(farmId,userId);
+    }
+
+    @PostMapping("/editImg")
+    @Transactional(rollbackFor = Exception.class)
+    public Result editImg(HttpServletRequest httpServletRequest, @RequestParam("img") MultipartFile img) throws IOException {
+        SysAccountMultilevel sysAccountMultilevel = accountMultilevelService.getById(TokenSign.getMemberIdByJwtToken(httpServletRequest));
+        if (uploadImage.getImageCom(img).equals("上传失败")) {
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return new Result(10001,"图片上传失败",false);
+        }
+        sysAccountMultilevel.setImgUrl(uploadImage.getImageCom(img));
+        accountMultilevelService.updateById(sysAccountMultilevel);
+        return Result.SUCCESS();
+    }
 }

huimv.nongke.secure/huimv.nongke.secure/src/main/java/com/huimv/secure/controller/SysUserController.java

@@ -153,10 +153,11 @@ public class SysUserController {
         user.setWorkLocation(sysUser.getWorkLocation());
         user.setXxdz(sysUser.getXxdz());
         String s = "";
-        List<String> job = sysUser.getJob();
+        String job = sysUser.getJob();
         //TODO 判空
         if(ObjectUtil.isNotEmpty(job)){
-            for (String s1 : job) {
+            String[] split = job.split(",");
+            for (String s1 : split) {
                 s = s+s1 + ",";
             }
         }
@@ -165,10 +166,12 @@ public class SysUserController {
         QueryWrapper<SysAccountMultilevel> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("user_id", sysUser.getUserId());
         SysAccountMultilevel one = accountMultilevelService.getOne(queryWrapper);
-        one.setUserName(sysUser.getUserName());
-        one.setType(Integer.parseInt(s.substring(0, s.length() - 1).split(",")[0]));
-        one.setWorkLocation(sysUser.getWorkLocation());
-        accountMultilevelService.updateById(one);
+        if (ObjectUtil.isNotEmpty(one)) {
+            one.setUserName(sysUser.getUserName());
+            one.setType(Integer.parseInt(s.substring(0, s.length() - 1).split(",")[0]));
+            one.setWorkLocation(sysUser.getWorkLocation());
+            accountMultilevelService.updateById(one);
+        }
         return new Result(10000,"修改成功",true);
     }
 
@@ -210,6 +213,12 @@ public class SysUserController {
     public Result page(@RequestBody UserPagePojo userPagePojo) {
         return sysUserService.pageAll(userPagePojo);
     }
+
+    //员工查询
+    @PostMapping("/list")
+    public Result list(@RequestBody Map map) {
+        return sysUserService.list(map);
+    }
     //性别年龄分布
     @PostMapping("/userAgeAndGender")
     public Result userAgeAndGender(@RequestBody Map<String,String> map) {

huimv.nongke.secure/huimv.nongke.secure/src/main/java/com/huimv/secure/entity/Farm.java

@@ -24,8 +24,8 @@ public class Farm extends Model {
 
     private static final long serialVersionUID = 1L;
 
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
+    @TableId(value = "id")
+    private String id;
 
     private String farmName;
 

huimv.nongke.secure/huimv.nongke.secure/src/main/java/com/huimv/secure/entity/SysUser.java

@@ -7,6 +7,7 @@ import java.time.LocalDateTime;
 import java.io.Serializable;
 import java.util.Date;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -49,6 +50,7 @@ public class SysUser implements Serializable {
     /**
      * 出生日期
      */
+    @JsonFormat(pattern = "yyyy-MM-dd" ,timezone = "GMT+8")
     private Date birthday;
 
 

huimv.nongke.secure/huimv.nongke.secure/src/main/java/com/huimv/secure/entity/vo/UserVo.java

@@ -92,7 +92,7 @@ public class UserVo implements Serializable {
     /**
      * 工作岗位 1 场长，3生物安全负责人 ，4 pcr 检测人员，5洗消站点工作人员
      */
-    private List<String> job;
+    private String job;
 
     private String farmId;
 

huimv.nongke.secure/huimv.nongke.secure/src/main/java/com/huimv/secure/service/ISysAccountMultilevelService.java

@@ -27,4 +27,8 @@ public interface ISysAccountMultilevelService extends IService<SysAccountMultile
 
     /*删除账号*/
     Result deleteAccount(Map<String,String> paramsMap);
+
+    Result getLastFarmId(Integer userId);
+
+    Result listSubordinateByFarm(String farmId, Integer userId);
 }

huimv.nongke.secure/huimv.nongke.secure/src/main/java/com/huimv/secure/service/ISysUserService.java

@@ -29,6 +29,8 @@ public interface ISysUserService extends IService<SysUser> {
 
     Result listWorkLocation(Map map);
 
+    Result list(Map map);
+
     /*根据员工账号查询信息*/
     Result listDetail(Map<String,String> paramsMap);
 }

huimv.nongke.secure/huimv.nongke.secure/src/main/java/com/huimv/secure/service/impl/SysAccountMultilevelServiceImpl.java

@@ -7,13 +7,16 @@ import com.huimv.secure.common.utils.Result;
 import com.huimv.secure.common.utils.ResultCode;
 import com.huimv.secure.common.utils.UploadImage;
 import com.huimv.secure.entity.SysAccountMultilevel;
+import com.huimv.secure.entity.SysUser;
 import com.huimv.secure.mapper.SysAccountMultilevelMapper;
+import com.huimv.secure.mapper.SysUserMapper;
 import com.huimv.secure.service.ISysAccountMultilevelService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -30,16 +33,44 @@ public class SysAccountMultilevelServiceImpl extends ServiceImpl<SysAccountMulti
     @Autowired
     private SysAccountMultilevelMapper accountMultilevelMapper;
     @Autowired
+    private SysUserMapper userMapper;
+    @Autowired
     private UploadImage uploadImage;
 
     @Override
-    public Result add(SysAccountMultilevel sysAccountMultilevel) {
-        int account = this.count(new QueryWrapper<SysAccountMultilevel>().eq("account", sysAccountMultilevel.getAccount()));
-        if (account > 0) {
-            return new Result(10001, "该账号已经存在，请重新创建", false);
+    public Result add(SysAccountMultilevel sysAccountMultilevel1) {
+        SysUser sysUser =  userMapper.selectOne(new QueryWrapper<SysUser>().eq("user_id", sysAccountMultilevel1.getUserId()));
+        String account = sysAccountMultilevel1.getAccount();
+        String password = sysAccountMultilevel1.getPassword();
+        Integer countAccount = accountMultilevelMapper.selectCount(new QueryWrapper<SysAccountMultilevel>().eq("account",account));
+        if (countAccount >0){
+            return new Result(10001,"该账号已存在",false);
+        }
+        Integer countUser = accountMultilevelMapper.selectCount(new QueryWrapper<SysAccountMultilevel>().eq("user_id",sysAccountMultilevel1.getUserId()));
+        if (countUser >0){
+            return new Result(10001,"该用户已绑定账号",false);
         }
+        SysAccountMultilevel sysAccountMultilevel = new SysAccountMultilevel();
+        sysAccountMultilevel.setAccount(account);
+        sysAccountMultilevel.setPassword(password);
+        sysAccountMultilevel.setUserName(sysUser.getUserName());
+        sysAccountMultilevel.setAccountStatus(1);
+        sysAccountMultilevel.setFarmId(sysUser.getFarmId());
+        sysAccountMultilevel.setFarmIds(sysUser.getFarmId());
+        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.setPapersCode(sysUser.getCardNum());
+        sysAccountMultilevel.setLastFarmId(sysUser.getFarmId());
+        sysAccountMultilevel.setPid(0);
+        sysAccountMultilevel.setPids("");
+        sysAccountMultilevel.setImgUrl(sysUser.getImgUrl());
+//        sysAccountMultilevel.setPapersType(sysUser.getCardType());
+        sysAccountMultilevel.setUserId(sysAccountMultilevel1.getUserId());
         accountMultilevelMapper.insert(sysAccountMultilevel);
-        return new Result(10000, "添加成功", true);
+        return new Result(10000,"添加成功",true);
     }
 
     @Override
@@ -89,4 +120,32 @@ public class SysAccountMultilevelServiceImpl extends ServiceImpl<SysAccountMulti
         }
         return new Result(10000, "删除成功", true);
     }
+
+    @Override
+    public Result getLastFarmId(Integer userId) {
+        SysAccountMultilevel sysAccountMultilevel = accountMultilevelMapper.selectById(userId);
+        String lastFarmId = sysAccountMultilevel.getLastFarmId();
+        String farmIds = sysAccountMultilevel.getFarmIds();
+        if (farmIds == null) {
+            return new Result(10001, "该账号没有绑定牧场", true);
+        }
+        if (lastFarmId == null) {
+            String[] split = farmIds.split(",");
+            String s = split[0];
+            sysAccountMultilevel.setLastFarmId(s);
+            accountMultilevelMapper.updateById(sysAccountMultilevel);
+            return new Result(ResultCode.SUCCESS, s);
+        }
+        return new Result(ResultCode.SUCCESS, lastFarmId);
+    }
+
+    @Override
+    public Result listSubordinateByFarm(String farmId, Integer userId) {
+        QueryWrapper<SysAccountMultilevel> wrapper = new QueryWrapper<>();
+        wrapper.like("pids", userId);
+        wrapper.like("farm_ids", farmId);
+        List<SysAccountMultilevel> page = this.list(wrapper);
+        return new Result(ResultCode.SUCCESS, page);
+    }
+
 }

huimv.nongke.secure/huimv.nongke.secure/src/main/java/com/huimv/secure/service/impl/SysUserServiceImpl.java

@@ -115,6 +115,15 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     }
 
     @Override
+    public Result list(Map map) {
+        String farmId = (String)map.get("farmId");
+        if (checkFarm(farmId)) {
+            return new Result(10001,"牧场信息为空",false);
+        }
+        return new Result(ResultCode.SUCCESS,this.list(new QueryWrapper<SysUser>().eq("farm_id",farmId)));
+    }
+
+    @Override
     public Result listDetail(Map<String, String> paramsMap) {
         String userId = paramsMap.get("userId");//员工工号
         String farmId = paramsMap.get("farmId");

huimv.nongke.secure/huimv.nongke.secure/src/main/resources/application-prod.yml

@@ -13,7 +13,7 @@ spring:
 
   datasource:
     druid:
-      url: jdbc:mysql://192.168.1.7:3306/huimv-nongke-secure?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+      url: jdbc:mysql://115.238.57.190:3306/huimv-nongke-secure?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
       username: root
       password: hm123456
       driver-class-name: com.mysql.cj.jdbc.Driver