保安员新增接口修改

Administrator

2021-08-14 1873f191396f695be20ed184ce936f4bcf34393f

保安员新增接口修改

 src/main/java/org/springblade/modules/experience/controller/ExperienceController.java

@@ -100,23 +100,25 @@
     */
    @PostMapping("/saveOrUpdate")
    public R save(@Valid @RequestBody Map<String,Object> experience ) {
        String securityid = experience.get("securityid").toString();
        //先删除原有的从业信息
        experienceService.delbyCardId(securityid);
        //重新新增从业信息
        List<Experience> experiences = (List<Experience>)experience.get("userPractitionersInfo");
        int count = 0;
        if (experiences.size()>0){
            for(int i = 0;i<experiences.size();i++){
                Experience e = JSON.parseObject(JSON.toJSONString(experiences.get(i)),Experience.class);
                experienceService.save(e);
                count++;
            }
            if(count<1){
                return R.status(false);
        if (experience.size()>0) {
            String securityid = experience.get("securityid").toString();
            //先删除原有的从业信息
            experienceService.delbyCardId(securityid);
            //重新新增从业信息
            List<Experience> experiences = (List<Experience>) experience.get("userPractitionersInfo");
            int count = 0;
            if (experiences.size() > 0) {
                for (int i = 0; i < experiences.size(); i++) {
                    Experience e = JSON.parseObject(JSON.toJSONString(experiences.get(i)), Experience.class);
                    experienceService.save(e);
                    count++;
                }
                if (count < 1) {
                    return R.status(false);
                }
            }
        }
        return R.status(true);
        return R.status(false);
    }

    /**

 src/main/java/org/springblade/modules/system/controller/UserController.java

@@ -17,6 +17,7 @@
package org.springblade.modules.system.controller;


import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
@@ -40,10 +41,14 @@
import org.springblade.core.tool.constant.RoleConstant;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.StringPool;
import org.springblade.modules.experience.entity.Experience;
import org.springblade.modules.experience.service.IExperienceService;
import org.springblade.modules.system.entity.Role;
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.excel.UserExcel;
import org.springblade.modules.system.excel.UserImporter;
import org.springblade.modules.system.node.TreeNode;
import org.springblade.modules.system.service.IRoleService;
import org.springblade.modules.system.service.IUserService;
import org.springblade.modules.system.vo.DeptVO;
import org.springblade.modules.system.vo.UserVO;
@@ -73,6 +78,11 @@
public class UserController {

    private final IUserService userService;


    private final IRoleService roleService;

    private final IExperienceService experienceService;

    /**
     * 查询单条
@@ -153,11 +163,59 @@
    @ApiOperationSupport(order = 4)
    @ApiOperation(value = "新增或修改", notes = "传入User")
    //@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
    public R submit(@Valid @RequestBody User user) throws Exception {
    public R submit(@Valid @RequestBody User user){
        CacheUtil.clear(USER_CACHE);
        return R.status(userService.submit(user));
    }



    /**
     * 保安员新增
     */
    @PostMapping("/securitySave")
    public R securitySave(@Valid @RequestBody Map<String,Object> userMap){
        //获取user
        User user = JSON.parseObject(JSON.toJSONString(userMap.get("user")),User.class);
        //判断是否为空
        if (null!=user.getHold()){
            //持证
            if (user.getHold().equals("1")){
                //分配保安角色
                Role role = new Role();
                role.setRoleAlias("保安");
                Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
                user.setRoleId(oneRole.getId().toString());
            }
            //未持证
            if (user.getHold().equals("2")){
                //分配未持证保安角色
                Role role = new Role();
                role.setRoleAlias("未持证保安");
                Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
                user.setRoleId(oneRole.getId().toString());
            }
        }
        //用户新增
        boolean status = userService.save(user);
        //获取从业记录
        List<Experience> experiences = (List<Experience>) userMap.get("userPractitionersInfo");
        if (experiences.size()>0){
            int count = 0;
            for (int i = 0; i < experiences.size(); i++) {
                Experience e = JSON.parseObject(JSON.toJSONString(experiences.get(i)), Experience.class);
                e.setSecurityid(user.getId().toString());
                experienceService.save(e);
                count++;
            }
            if (count < 1) {
                return R.status(false);
            }
        }
        //判断是否持证是否为空
        return R.status(status);
    }

    /**
     * 修改
     */