生物防控人员

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

@@ -52,6 +52,11 @@ public class SysUserController {
     public Result page(@RequestBody Map map) {
         return sysUserService.pageAll(map);
     }
+    //员工查询
+    @PostMapping("/list")
+    public Result list(@RequestBody Map map) {
+        return sysUserService.list(map);
+    }
 
     //员工新增
     @PostMapping("/add")
@@ -131,4 +136,18 @@ public class SysUserController {
     }
 
 
+
+    //账号增加
+    @PostMapping("/addAccount")
+    public Result addAccount(@RequestBody Map<String,Object> map) {
+        return  sysUserService.addAccount(map);
+    }
+
+    //账号修改
+    @PostMapping("/updateAccount")
+    public Result updateAccount(@RequestBody Map<String,Object> map) {
+        return  sysUserService.updateAccount(map);
+    }
+
+
 }

huimv-receive/src/main/java/com/huimv/receive/entity/SysAccountMultilevel.java

@@ -50,7 +50,7 @@ public class SysAccountMultilevel extends Model {
     private Integer type;
 
     private String workLocation;
-    private String workLocationType;
+    private Integer workLocationType;
     //工作岗位 1 场长 2 紧急进程审核员  ，3生物安全负责人 ，4 pcr 检测人员，5洗消站点工作人员
     private String workPost;
     private String phone;
@@ -61,5 +61,6 @@ public class SysAccountMultilevel extends Model {
     private String papersCode;
     private String wechatId;
     private Integer userId;
+    private Integer farmId;
 
 }

huimv-receive/src/main/java/com/huimv/receive/entity/vo/UserAccountVo.java

@@ -0,0 +1,79 @@
+package com.huimv.receive.entity.vo;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class UserAccountVo {
+    private Long id;
+
+    /**
+     * 员工工号
+     */
+    private String userId;
+
+    /**
+     * 员工姓名
+     */
+    private String userName;
+
+    /**
+     * 0 男  1女
+     */
+    private Integer male;
+
+
+    /**
+     * 出生日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "GMT+8")
+    private Date birthday;
+
+
+    /**
+     * 证件类型
+     */
+    private String cardType;
+
+    /**
+     * 年龄
+     */
+    private Integer age;
+
+    /**
+     * 证件号码
+     */
+    private String cardNum;
+
+
+
+    /**
+     * 部门
+     */
+    private String department;
+
+    /**
+     * 工作岗位 1 场长，3生物安全负责人 ，4 pcr 检测人员，5洗消站点工作人员
+     */
+    private Integer job;
+
+    /**
+     * 工作性质
+     */
+    private String jobType;
+
+    /**
+     * 工作地点
+     */
+    private String workLocation;
+
+    /**
+     * 1人员初级洗消站 2净区 3人员二级洗消站 4场内 5生产区 6车辆初级洗消站 7车辆二级洗消站 8中转料塔外围 9车辆三级洗消站 10销售中转站 11环保区洗消中心 12环保区净区 13洗消中心净区
+     */
+    private Integer workLocationType;
+
+    private String farmId;
+}

huimv-receive/src/main/java/com/huimv/receive/mapper/SysUserMapper.java

@@ -1,7 +1,13 @@
 package com.huimv.receive.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huimv.receive.entity.SysUser;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.receive.entity.vo.UserAccountVo;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -13,4 +19,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface SysUserMapper extends BaseMapper<SysUser> {
 
+    IPage<UserAccountVo> pageAccount(Page<UserAccountVo> userAccountVoPage,@Param(Constants.WRAPPER)QueryWrapper<SysUser> wrapper,String farmId);
 }

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

@@ -22,4 +22,10 @@ public interface ISysUserService extends IService<SysUser> {
     Result listWorkLocation(Map map);
 
     Result pageAccount(Map<String, Object> map);
+
+    Result addAccount(Map<String, Object> map);
+
+    Result list(Map map);
+
+    Result updateAccount(Map<String, Object> map);
 }

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

@@ -3,6 +3,7 @@ package com.huimv.receive.service.impl;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.api.R;
@@ -11,7 +12,12 @@ import com.huimv.receive.common.utils.Result;
 import com.huimv.receive.common.utils.ResultCode;
 import com.huimv.receive.entity.BaseLocation;
 import com.huimv.receive.entity.Farm;
+import com.huimv.receive.entity.SysAccountMultilevel;
 import com.huimv.receive.entity.SysUser;
+import com.huimv.receive.entity.vo.UserAccountVo;
+import com.huimv.receive.mapper.BaseLocationMapper;
+import com.huimv.receive.mapper.FarmMapper;
+import com.huimv.receive.mapper.SysAccountMultilevelMapper;
 import com.huimv.receive.mapper.SysUserMapper;
 import com.huimv.receive.service.IBaseLocationService;
 import com.huimv.receive.service.IFarmService;
@@ -35,9 +41,15 @@ import java.util.Map;
 public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> implements ISysUserService {
 
     @Autowired
-    private IBaseLocationService baseLocationService;
+    private BaseLocationMapper baseLocationMapper;
     @Autowired
-    private IFarmService farmService;
+    private FarmMapper farmMapper;
+
+    @Autowired
+    private SysUserMapper userMapper;
+
+    @Autowired
+    private SysAccountMultilevelMapper sysAccountMultilevelMapper;
 
     @Override
     public Result pageAll(Map map) {
@@ -73,7 +85,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         String farmId = (String)map.get("farmId");
         if (checkFarm(farmId))
             return new Result(10001,"牧场信息为空",false);
-        return new Result(ResultCode.SUCCESS,baseLocationService.list(new QueryWrapper<BaseLocation>().eq("farm_id",farmId).groupBy("location_type").orderByAsc("location_type")));
+        return new Result(ResultCode.SUCCESS,baseLocationMapper.selectList(new QueryWrapper<BaseLocation>().eq("farm_id",farmId).groupBy("location_type").orderByAsc("location_type")));
     }
 
     @Override
@@ -87,27 +99,86 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         String farmId = (String) map.get("farmId");
         if (checkFarm(farmId))
             return new Result(10001,"牧场信息为空",false);
-
         QueryWrapper<SysUser> wrapper = new QueryWrapper<>();
         if (ObjectUtil.isEmpty(pageNum) || pageNum<1)
             pageNum = 1;
         if (ObjectUtil.isEmpty(pageSize) || pageSize<1 )
             pageNum = 10;
-        wrapper.eq("farm_id",farmId);
+//        wrapper.eq("farm_id",farmId);
         wrapper.eq(ObjectUtil.isNotEmpty(job),"job",job);
         wrapper.eq(ObjectUtil.isNotEmpty(workLocation),"work_location",workLocation);
         wrapper.eq(StringUtils.isNotBlank(workLocationType),"work_location_type",workLocationType);
         if (StringUtils.isNotBlank(searchStr))
-            wrapper.and(i -> i.like("user_name",searchStr).or().like("user_phone",searchStr));
-        wrapper.orderByDesc("id");
-        IPage<SysUser> page = this.page(new Page<>(pageNum, pageSize), wrapper);
-        return new Result(ResultCode.SUCCESS,page);
+            wrapper.and(i -> i.like("user_name",searchStr).or().like("user_id",searchStr));
+
+        Page<UserAccountVo> userAccountVoPage = new Page<>(pageNum,pageSize);
+        IPage<UserAccountVo> userAccountVoIPage =  userMapper.pageAccount(userAccountVoPage,wrapper,farmId);
+
+        return new Result(ResultCode.SUCCESS,userAccountVoIPage);
+    }
+
+    @Override
+    public Result addAccount(Map<String, Object> map) {
+        Integer id = (Integer)map.get("id");
+        String account = (String)map.get("account");
+        String password = (String)map.get("password");
+
+        SysUser sysUser = this.getById(id);
+        Integer countAccount = sysAccountMultilevelMapper.selectCount(new QueryWrapper<SysAccountMultilevel>().eq("account",account));
+        if (countAccount >0){
+            return new Result(10001,"该账号已存在",false);
+        }
+        Integer countUser = sysAccountMultilevelMapper.selectCount(new QueryWrapper<SysAccountMultilevel>().eq("user_id",id));
+        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(Integer.parseInt(sysUser.getFarmId()));
+        sysAccountMultilevel.setFarmIds(sysUser.getFarmId());
+        sysAccountMultilevel.setType(sysUser.getJob());
+        sysAccountMultilevel.setWorkLocation(sysUser.getWorkLocation());
+        sysAccountMultilevel.setWorkLocationType(sysUser.getWorkLocationType());
+        sysAccountMultilevel.setPhone(sysUser.getUserPhone());
+        sysAccountMultilevel.setWorkName(sysUser.getDepartment());
+        sysAccountMultilevel.setPapersCode(sysUser.getCardNum());
+        sysAccountMultilevel.setPapersType(sysUser.getCardType());
+        sysAccountMultilevel.setUserId(id);
+        sysAccountMultilevelMapper.insert(sysAccountMultilevel);
+        return new Result(10000,"添加成功",true);
+    }
+
+    @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());
+    }
+
+    @Override
+    public Result updateAccount(Map<String, Object> map) {
+        Integer id = (Integer)map.get("id");
+        String account = (String)map.get("account");
+        String password = (String)map.get("password");
+        Integer countAccount = sysAccountMultilevelMapper.selectCount(new QueryWrapper<SysAccountMultilevel>().eq("account",account));
+        if (countAccount >1){
+            return new Result(10001,"改账号已存在",false);
+        }
+        SysAccountMultilevel sysAccountMultilevel = new SysAccountMultilevel();
+        sysAccountMultilevel.setAccount(account);
+        sysAccountMultilevel.setPassword(password);
+        sysAccountMultilevelMapper.update(sysAccountMultilevel,new UpdateWrapper<SysAccountMultilevel>().eq("user_id",id));
+        return new Result(10000,"修改成功",true);
     }
 
     private boolean checkFarm(String farmId){
         if (StringUtils.isBlank(farmId) )
             return true;
-        Farm byId = farmService.getById(farmId);
+        Farm byId = farmMapper.selectById(farmId);
         if (ObjectUtil.isEmpty(byId))
             return true;
         return false;

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

@@ -30,5 +30,14 @@
         <result column="work_location" property="workLocation" />
         <result column="work_location_type" property="workLocationType" />
     </resultMap>
+    <select id="pageAccount" resultType="com.huimv.receive.entity.vo.UserAccountVo">
+SELECT sys_user.`user_id`,sys_user.`id`,sys_user.`user_name`,sys_user.`job`, sys_user.`work_location`, sys_user.`work_location_type` ,
+	sys_account_multilevel.`account`,sys_account_multilevel.`password`
+FROM `sys_user`
+
+ LEFT JOIN `sys_account_multilevel`   ON `sys_user`.id = `sys_account_multilevel`.user_id
+   ${ew.customSqlSegment} AND`sys_account_multilevel`.farm_id = #{farmId}  and  `sys_account_multilevel`.user_id  IS NOT NULL
+ ORDER  BY sys_account_multilevel.id DESC
+    </select>
 
 </mapper>