修改表单接口，新增一键生成账号接口，添加定时任务

jyzb-biz/src/main/java/com/junmp/jyzb/controller/EquipmentTypeController.java

@@ -52,7 +52,7 @@ public class EquipmentTypeController {
         return ApiRes.success(equipmentTypeService.changeEquipmentState(req));
     }
 
-    @PostMapping(path="/",name="查询类别列表#enable")
+    @PostMapping(path="/ShowEquipmentList",name="查询类别列表#enable")
     @ApiOperation("查询类别列表")
     public ApiRes<List<EquipmentTypeDto>> ShowEquipmentList(@RequestBody QueryEquipmentTypeReq req) {
         return ApiRes.success(equipmentTypeService.getEquipmentList(req));

jyzb-biz/src/main/java/com/junmp/jyzb/controller/PoliceController.java

@@ -32,6 +32,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 
@@ -313,7 +314,7 @@ public class PoliceController {
     }
 
     @PostMapping(path = "/oneClickAccountCreation",name = "一键生成账号（运维，管理，审核）#logType=30")
-    public ApiRes<Boolean> oneClickAccountCreation(@RequestBody PubOrg pubOrg){
+    public ApiRes<Boolean> oneClickAccountCreation(@RequestBody PubOrg pubOrg) throws IOException {
         return ApiRes.success(policemanService.oneClickAccountCreation(pubOrg));
     }
 

jyzb-biz/src/main/java/com/junmp/jyzb/controller/PublicController.java

@@ -2,7 +2,9 @@ package com.junmp.jyzb.controller;
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.AES;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.junmp.jyzb.api.bean.dto.UploadPolicePhotoDto;
 import com.junmp.jyzb.api.bean.query.DbAccessReq;
 import com.junmp.jyzb.api.bean.query.PolicemanReq;
@@ -13,10 +15,19 @@ import com.junmp.jyzb.entity.Policeman;
 import com.junmp.jyzb.entity.PubOrg;
 import com.junmp.jyzb.service.PolicemanService;
 import com.junmp.jyzb.service.PubOrgService;
+import com.junmp.jyzb.service.PublicService;
 import com.junmp.jyzb.utils.FileUtil;
+import com.junmp.v2.common.bean.request.ValidationApi;
 import com.junmp.v2.common.bean.response.ApiRes;
+import com.junmp.v2.common.enums.StatusEnum;
 import com.junmp.v2.common.exception.base.ServiceException;
 import com.junmp.v2.common.exception.enums.DefaultBizExceptionEnum;
+import com.junmp.v2.common.util.BeanPlusUtil;
+import com.junmp.v2.dict.api.bean.req.SysDictItemReq;
+import com.junmp.v2.dict.api.exception.DictException;
+import com.junmp.v2.dict.api.exception.DictExceptionEnum;
+import com.junmp.v2.dict.entity.SysDictItem;
+import com.junmp.v2.dict.service.SysDictItemService;
 import com.junmp.v2.file.api.bean.req.SysFileInfoReq;
 import com.junmp.v2.file.api.bean.res.SysFileInfoResp;
 import com.junmp.v2.file.biz.entity.SysFileInfo;
@@ -24,6 +35,7 @@ import com.junmp.v2.file.biz.service.SysFileInfoService;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.compress.utils.IOUtils;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -56,6 +68,9 @@ public class PublicController {
     @Resource
     private PolicemanService policemanService;
 
+    @Resource
+    private PublicService publicService;
+
 
     private final static String DB_URL_TEMPLATE = "jdbc:mysql://{}:{}/{}?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&nullCatalogMeansCurrent=true";
 
@@ -86,4 +101,14 @@ public class PublicController {
         return ApiRes.success(policemanService.uploadPolicePhoto(picture,req));
     }
 
+    @PostMapping(
+            name = "添加字典类型#logType=30",
+            path = {"/sys/dictType"}
+    )
+    public ApiRes<Long> addDictType(@RequestBody @Validated({ValidationApi.add.class}) SysDictItemReq req) {
+
+        return ApiRes.success(publicService.addDictType(req));
+    }
+
+
 }

jyzb-biz/src/main/java/com/junmp/jyzb/mapper/PolicemanMapper.java

@@ -63,5 +63,5 @@ public interface PolicemanMapper extends BaseMapper<Policeman> {
 
     List<UserDto> alignUserInfo(@Param("orgId") Long orgId, @Param("date")String date);
 
-    List<UserDto> oneClickAccountCreation(@Param("orgId") Long orgId);
+    List<UserDto> oneClickAccountCreation(@Param("orgId") Long orgId,@Param("account")String account,@Param("roleId")Long roleId);
 }
\ No newline at end of file

jyzb-biz/src/main/java/com/junmp/jyzb/service/PolicemanService.java

@@ -22,6 +22,7 @@ import com.junmp.v2.sys.api.bean.user.req.SysUserReq;
 import com.junmp.v2.sys.api.bean.user.req.UserOrgReq;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.io.IOException;
 import java.util.List;
 
 public interface PolicemanService extends IService<Policeman> {
@@ -123,5 +124,5 @@ public interface PolicemanService extends IService<Policeman> {
 
     List<UserDto> alignUserInfo(PolicemanReq req);
 
-    boolean oneClickAccountCreation(PubOrg pubOrg);
+    boolean oneClickAccountCreation(PubOrg pubOrg) throws IOException;
 }

jyzb-biz/src/main/java/com/junmp/jyzb/service/PublicService.java

+package com.junmp.jyzb.service;
+
+import com.junmp.v2.dict.api.bean.req.SysDictItemReq;
+
+public interface PublicService {
+    Long addDictType(SysDictItemReq req);
+}

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/PolicemanServiceImpl.java

@@ -61,6 +61,14 @@ import com.junmp.v2.sys.user.service.SysUserService;
 import com.sun.org.apache.bcel.internal.generic.SWITCH;
 import liquibase.pro.packaged.O;
 import lombok.extern.slf4j.Slf4j;
+import org.elasticsearch.action.search.SearchRequest;
+import org.elasticsearch.action.search.SearchResponse;
+import org.elasticsearch.client.RequestOptions;
+import org.elasticsearch.client.RestHighLevelClient;
+import org.elasticsearch.common.unit.TimeValue;
+import org.elasticsearch.index.query.QueryBuilders;
+import org.elasticsearch.search.SearchHit;
+import org.elasticsearch.search.builder.SearchSourceBuilder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -68,6 +76,7 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
+import java.io.IOException;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
@@ -118,6 +127,8 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
     private SysUserRoleService sysUserRoleService;
 
     @Resource
+    private RestHighLevelClient client;
+    @Resource
     private PoliceFaceService policeFaceService;
 
     @Resource
@@ -538,7 +549,7 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
         mqDto.setApi("InfoChange");
         //更改类别，1为类型
         mqDto.setType(5);
-        mqDto.setMessage("Adding policemanInfo");
+        mqDto.setMessage("Updating policemanInfo");
         //警员添加成功之后，往消息队列推送人员更新的消息
         MQ.SendMsg("warehouseMsg",req.getOrgId().toString(),mqDto);
         return this.updateById(policeman);
@@ -2057,17 +2068,83 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public boolean oneClickAccountCreation(PubOrg pubOrg) {
+    public boolean oneClickAccountCreation(PubOrg pubOrg) throws IOException {
         //一次性创建一个组织机构下的三种系统账号（运维，仓管员，审核员）
         //先判断一下前端是否传递组织机构编号（如果传递，指定创建该组织机构下的三种账号）
         List<String> userAccountList=new ArrayList<>();
         userAccountList.add("yw");
         userAccountList.add("sh");
         userAccountList.add("gl");
-
+        List<Long> userRoleList=new ArrayList<>();
+        userRoleList.add(1663372027127402498L);
+        userRoleList.add(1663372320355389441L);
+        userRoleList.add(1528003832557232130L);
+        List<SysUserRole> sysUserRoleList=new ArrayList<>() ;
+        List<SysUserOrg> sysUserOrgList=new ArrayList<>() ;
+        SysUser sysUser = new SysUser();
+        boolean ywExists = false;
+        boolean shExists = false;
+        boolean glExists = false;
         if (ObjectUtil.isNull(pubOrg.getOrgCode()) || pubOrg.getOrgCode().trim().isEmpty()){
             //如果没有组织机构编号，需要判断全部组织机构下面是否已经存在对应的账号，如果存在则不创建账号，否则创建指定账号
-            List<UserDto> userDtos = policemanMapper.oneClickAccountCreation(null);
+            //将未被禁用的组织机构全部查询出来
+//            List<PubOrg> orgList = pubOrgService.list(new LambdaQueryWrapper<PubOrg>().eq(PubOrg::getDelFlag, 1).eq(PubOrg::getStatusFlag, 1));
+            List<PubOrg> orgList=searchAll(0, 3000);
+
+            List<UserDto> userDtoYW = policemanMapper.oneClickAccountCreation(null,userAccountList.get(0)+"33%",userRoleList.get(0));
+            List<UserDto> userDtosSH = policemanMapper.oneClickAccountCreation(null,userAccountList.get(1)+"33%",userRoleList.get(1));
+            List<UserDto> userDtosGL = policemanMapper.oneClickAccountCreation(null,userAccountList.get(2)+"33%",userRoleList.get(2));
+            List<CompletableFuture<Void>> futures = new ArrayList<>();
+            List<CompletableFuture<Void>> futures1 = new ArrayList<>();
+            List<CompletableFuture<Void>> futures2 = new ArrayList<>();
+
+            for (PubOrg one: orgList) {
+                CompletableFuture<Void> future = CompletableFuture.runAsync(() -> {
+                    Map<String, List<?>> map = addRoleAndOrgYW(userDtoYW, one, ywExists, sysUser,
+                            sysUserOrgList, userRoleList, userAccountList, sysUserRoleList);
+                    List<SysUserOrg> userlist1 = (List<SysUserOrg>) map.get("sysUserOrgList");
+                    sysUserOrgList.addAll(userlist1);
+                    List<SysUserRole> roleList1 = (List<SysUserRole>) map.get("sysUserRoleList");
+                    sysUserRoleList.addAll(roleList1);
+                });
+
+                futures.add(future);
+            }
+            CompletableFuture.allOf(futures.toArray(new CompletableFuture[0])).join();
+
+
+            for (PubOrg one: orgList) {
+                CompletableFuture<Void> future = CompletableFuture.runAsync(() -> {
+                    Map<String, List<?>> map = addRoleAndOrgSH(userDtosSH, one, shExists, sysUser,
+                            sysUserOrgList, userRoleList, userAccountList, sysUserRoleList);
+                    List<SysUserOrg> userlist1 = (List<SysUserOrg>) map.get("sysUserOrgList");
+                    sysUserOrgList.addAll(userlist1);
+                    List<SysUserRole> roleList1 = (List<SysUserRole>) map.get("sysUserRoleList");
+                    sysUserRoleList.addAll(roleList1);
+                });
+
+                futures1.add(future);
+            }
+            CompletableFuture.allOf(futures1.toArray(new CompletableFuture[0])).join();
+
+
+            for (PubOrg one: orgList) {
+                CompletableFuture<Void> future = CompletableFuture.runAsync(() -> {
+                    Map<String, List<?>> map = addRoleAndOrgGL(userDtosGL, one, glExists, sysUser,
+                            sysUserOrgList, userRoleList, userAccountList, sysUserRoleList);
+                    List<SysUserOrg> userlist1 = (List<SysUserOrg>) map.get("sysUserOrgList");
+                    sysUserOrgList.addAll(userlist1);
+                    List<SysUserRole> roleList1 = (List<SysUserRole>) map.get("sysUserRoleList");
+                    sysUserRoleList.addAll(roleList1);
+                });
+
+                futures2.add(future);
+            }
+
+            // 等待所有异步任务完成
+            CompletableFuture.allOf(futures2.toArray(new CompletableFuture[0])).join();
+
+
         }else {
             //如果有组织机构编号，则判断该组织机构下面是否已经存在账号，如果存在，则不进行创建，否则进行创建
             PubOrg one = pubOrgService.getOne(new LambdaQueryWrapper<PubOrg>()
@@ -2075,35 +2152,206 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
             if (ObjectUtil.isNull(one)){
                 throw new ServiceException(OrgExceptionEnum.ORG_NOT_EXIST);
             }
-            List<UserDto> userDtos = policemanMapper.oneClickAccountCreation(one.getOrgId());
+            List<UserDto> userDtos = policemanMapper.oneClickAccountCreation(one.getOrgId(),null,null);
 
             if (CollectionUtil.isEmpty(userDtos)){
                 for (int i = 0; i < userAccountList.size(); i++) {
-                    SysUser sysUser= new SysUser();
-                    sysUser.setNickName(userAccountList.get(i)+one.getOrgCode());
-                    sysUser.setRealName(userAccountList.get(i)+one.getOrgCode());
-                    sysUser.setAccount(userAccountList.get(i)+one.getOrgCode());
+                    sysUser.setUserId(null);
+                    //创建用户信息
+                    Long userId = addUser(sysUser, userAccountList.get(i), one);
+                    //创建关联表数据
+                    SysUserOrg sysUserOrg = new SysUserOrg();
+                    sysUserOrg.setOrgId(one.getOrgId());
+                    sysUserOrg.setUserId(userId);
+                    sysUserOrgList.add(sysUserOrg);
+                    //创建角色表数据
+                    SysUserRole sysUserRole = new SysUserRole();
+                    sysUserRole.setRoleId(userRoleList.get(i));
+                    sysUserRole.setUserId(userId);
+                    sysUserRole.setCreateTime(DateTimeUtil.getCurrentDateTime());
+                    sysUserRoleList.add(sysUserRole);
+                }
+
+            }else {
+                Map<String, List<?>> mapYw = addRoleAndOrgYW(userDtos, one, ywExists, sysUser,
+                         sysUserOrgList, userRoleList, userAccountList, sysUserRoleList);
+                List<SysUserOrg> userlist1=(List<SysUserOrg>)mapYw.get("sysUserOrgList");
+                sysUserOrgList.addAll(userlist1);
+                List<SysUserRole> roleList1 =(List<SysUserRole>) mapYw.get("sysUserRoleList");
+                sysUserRoleList.addAll(roleList1);
+
+                Map<String, List<?>> mapSh = addRoleAndOrgSH(userDtos, one,  shExists, sysUser,
+                        sysUserOrgList, userRoleList, userAccountList, sysUserRoleList);
+                List<SysUserOrg> userlist2=(List<SysUserOrg>)mapSh.get("sysUserOrgList");
+                sysUserOrgList.addAll(userlist2);
+                List<SysUserRole> roleList2 =(List<SysUserRole>) mapSh.get("sysUserRoleList");
+                sysUserRoleList.addAll(roleList2);
+
+                Map<String, List<?>> mapGl = addRoleAndOrgGL(userDtos, one,  glExists, sysUser,
+                        sysUserOrgList, userRoleList, userAccountList, sysUserRoleList);
+                List<SysUserOrg> userlist3=(List<SysUserOrg>)mapGl.get("sysUserOrgList");
+                sysUserOrgList.addAll(userlist3);
+                List<SysUserRole> roleList3 =(List<SysUserRole>) mapGl.get("sysUserRoleList");
+                sysUserRoleList.addAll(roleList3);
+
+            }
+
+            sysUserOrgService.saveBatch(sysUserOrgList);
+            sysUserRoleService.saveBatch(sysUserRoleList);
+
+        }
+
+        return true;
+    }
+    private Map<String,List<?>> addRoleAndOrgYW(List<UserDto> userDtos,PubOrg one,Boolean ywExists,SysUser sysUser,
+                                              List<SysUserOrg> sysUserOrgList,List<Long> userRoleList,
+                                              List<String> userAccountList,List<SysUserRole> sysUserRoleList){
+        Map<String,List<?>> map=new HashMap<>();
+        for (UserDto user:userDtos) {
+            if (user.getAccount().equals("yw"+one.getOrgCode())){
+                ywExists=true;
+                break;
+            }
+        }
+        if (!ywExists){
+            sysUser.setUserId(null);
+            Long userId = addUser(sysUser, userAccountList.get(0), one);
+            //创建关联表数据
+            SysUserOrg sysUserOrg = new SysUserOrg();
+            sysUserOrg.setOrgId(one.getOrgId());
+            sysUserOrg.setUserId(userId);
+            sysUserOrgList.add(sysUserOrg);
+            //创建角色表数据
+            SysUserRole sysUserRole = new SysUserRole();
+            sysUserRole.setRoleId(userRoleList.get(0));
+            sysUserRole.setUserId(userId);
+            sysUserRole.setCreateTime(DateTimeUtil.getCurrentDateTime());
+            sysUserRoleList.add(sysUserRole);
+        }
+        map.put("sysUserRoleList",sysUserRoleList);
+        map.put("sysUserOrgList",sysUserOrgList);
+        return map;
+    }
+
+    private Map<String,List<?>> addRoleAndOrgSH(List<UserDto> userDtos,PubOrg one,Boolean shExists,SysUser sysUser,
+                                                List<SysUserOrg> sysUserOrgList,List<Long> userRoleList,
+                                                List<String> userAccountList,List<SysUserRole> sysUserRoleList){
+        Map<String,List<?>> map=new HashMap<>();
+        for (UserDto user:userDtos) {
+            if (user.getAccount().equals("sh"+one.getOrgCode())){
+                shExists=true;
+                break;
+            }
+        }
+        if (!shExists){
+            sysUser.setUserId(null);
+            Long userId = addUser(sysUser, userAccountList.get(1) , one);
+            //创建关联表数据
+            SysUserOrg sysUserOrg = new SysUserOrg();
+            sysUserOrg.setOrgId(one.getOrgId());
+            sysUserOrg.setUserId(userId);
+            sysUserOrgList.add(sysUserOrg);
+            //创建角色表数据
+            SysUserRole sysUserRole = new SysUserRole();
+            sysUserRole.setRoleId(userRoleList.get(1));
+            sysUserRole.setUserId(userId);
+            sysUserRole.setCreateTime(DateTimeUtil.getCurrentDateTime());
+            sysUserRoleList.add(sysUserRole);
+        }
+        map.put("sysUserRoleList",sysUserRoleList);
+        map.put("sysUserOrgList",sysUserOrgList);
+        return map;
+    }
+
+    private Map<String,List<?>> addRoleAndOrgGL(List<UserDto> userDtos,PubOrg one,Boolean glExists,SysUser sysUser,
+                                                   List<SysUserOrg> sysUserOrgList,List<Long> userRoleList,
+                                                   List<String> userAccountList,List<SysUserRole> sysUserRoleList){
+        Map<String,List<?>> map=new HashMap<>();
+        for (UserDto user:userDtos) {
+            if (user.getAccount().equals("gl"+one.getOrgCode())){
+                glExists = true;
+                break;
+            }
+
+        }
+        if (!glExists){
+            sysUser.setUserId(null);
+            Long userId = addUser(sysUser, userAccountList.get(2), one);
+            //创建关联表数据
+            SysUserOrg sysUserOrg = new SysUserOrg();
+            sysUserOrg.setOrgId(one.getOrgId());
+            sysUserOrg.setUserId(userId);
+            sysUserOrgList.add(sysUserOrg);
+            //创建角色表数据
+            SysUserRole sysUserRole = new SysUserRole();
+            sysUserRole.setRoleId(userRoleList.get(2));
+            sysUserRole.setUserId(userId);
+            sysUserRole.setCreateTime(DateTimeUtil.getCurrentDateTime());
+            sysUserRoleList.add(sysUserRole);
+        }
+        map.put("sysUserRoleList",sysUserRoleList);
+        map.put("sysUserOrgList",sysUserOrgList);
+        return map;
+    }
+
+    private Long addUser(SysUser sysUser,String i,PubOrg pubOrg){
+        if (i.equals("yw")) {
+            sysUser.setNickName(pubOrg.getDName()+"运维人员");
+            sysUser.setRealName(pubOrg.getDName()+"运维人员");
+        }
+        if (i.equals("sh")) {
+            sysUser.setNickName(pubOrg.getDName()+"审核员");
+            sysUser.setRealName(pubOrg.getDName()+"审核员");
+        }
+        if (i.equals("gl")) {
+            sysUser.setNickName(pubOrg.getDName()+"仓管员");
+            sysUser.setRealName(pubOrg.getDName()+"仓管员");
+        }
+
+        sysUser.setAccount(i+pubOrg.getOrgCode());
         SysUserCreateFactory.fillAddSysUser(sysUser);
         sysUser.setAvatar(FileConstant.DEFAULT_AVATAR_FILE_ID);
         sysUser.setDelFlag(LogicDelEnum.N.getCode());
         sysUser.setCreateTime(DateTime.now());
         sysUser.setUpdateTime(DateTime.now());
         sysUserService.save(sysUser);
-                    sysUserOrgService.add(sysUser.getUserId(), one.getOrgId(), null);
-                }
-            }else {
-                for (UserDto user:userDtos) {
-                    boolean flag=false;
-                    if (user.getAccount().equals("yw"+one.getOrgCode()) || user.getAccount().equals("sh"+one.getOrgCode())||user.getAccount().equals("gl"+one.getOrgCode())){
-                        flag=true;
+        return sysUser.getUserId();
     }
 
-                }
-            }
+    public List<PubOrg> searchAll(Integer pageNum, Integer pageSize ) throws IOException {
+
+        if (pageNum < 0) pageNum = 0;
+
+        SearchRequest request = new SearchRequest("org_pinyin");
+        SearchSourceBuilder builder = new SearchSourceBuilder();
 
+        builder.from(pageNum);
+        builder.size(pageSize);
+
+        // 添加过滤条件，只获取 delFlag 为 1 的数据
+        builder.postFilter(QueryBuilders.termQuery("delFlag", 1));
+        builder.timeout(new TimeValue(60, TimeUnit.SECONDS));
+
+        request.source(builder);
+        SearchResponse searchResponse = client.search(request, RequestOptions.DEFAULT);
+
+        List<PubOrg> pubOrgList = new ArrayList<>();
+        for (SearchHit documentFields : searchResponse.getHits().getHits()) {
+            Map<String, Object> sourceAsMap = documentFields.getSourceAsMap();
+            PubOrg pubOrg = this.fromMap(sourceAsMap);
+
+            // 添加到结果列表
+            pubOrgList.add(pubOrg);
         }
 
-        return false;
+        return pubOrgList;
+    }
+    public static PubOrg fromMap(Map<String, Object> map) {
+        PubOrg pubOrg = new PubOrg();
+        BeanPlusUtil.copyProperties(map, pubOrg);
+//        pubOrg.setOrgName((String) map.get("orgName"));
+        // 可以设置其他字段...
+        return pubOrg;
     }
 
 }

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/PublicServiceImpl.java

+package com.junmp.jyzb.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.junmp.jyzb.service.PublicService;
+import com.junmp.v2.common.enums.StatusEnum;
+import com.junmp.v2.common.util.BeanPlusUtil;
+import com.junmp.v2.dict.api.bean.req.SysDictItemReq;
+import com.junmp.v2.dict.api.exception.DictException;
+import com.junmp.v2.dict.api.exception.DictExceptionEnum;
+import com.junmp.v2.dict.entity.SysDictItem;
+import com.junmp.v2.dict.service.SysDictItemService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+@Service
+@Slf4j
+public class PublicServiceImpl implements PublicService {
+
+    @Resource
+    private SysDictItemService sysDictItemService;
+
+    public Long addDictType(SysDictItemReq req){
+        SysDictItem sysDictType = (SysDictItem) BeanPlusUtil.toBean(req, SysDictItem.class);
+        LambdaQueryWrapper<SysDictItem> eq = new LambdaQueryWrapper<SysDictItem>().eq(SysDictItem::getDictId, req.getItemText()).eq(SysDictItem::getItemText, req.getDictId());
+
+        boolean flag = sysDictItemService.count(eq) > 0L;
+        if (flag) {
+            throw new DictException(DictExceptionEnum.DICT_NAME_REPEAT);
+        } else {
+            sysDictType.setStatusFlag(StatusEnum.ENABLE.getCode());
+            sysDictItemService.save(sysDictType);
+        }
+        return sysDictType.getDictItemId();
+    }
+
+}

jyzb-biz/src/main/resources/mapper/PolicemanMapper.xml

@@ -360,13 +360,26 @@ WHERE o.org_id IN
     </select>
     <select id="oneClickAccountCreation" resultType="com.junmp.jyzb.api.bean.dto.FetchingDataDto.UserDto">
         select t.*,uo.org_id FROM (
-          SELECT u.* FROM `sys_user_copy1` u  where u.account like "gl33%" or  u.account like "yw33%" or  u.account like "sh33%") as t
-          join sys_user_org_copy1 uo on t.user_id=uo.user_id
+          SELECT u.* FROM `sys_user` u
+          <if test="account==null">
+              where u.account like "gl33%" or  u.account like "yw33%" or  u.account like "sh33%"
+          </if>
+          <if test="account != null and account != ''">
+              where u.account like #{account}
+          </if>
+          ) as t
+          join sys_user_org uo on t.user_id=uo.user_id
             <if test="orgId != null and orgId != ''">
                 and uo.org_id=#{orgId}
             </if>
-          join sys_user_role_copy1 ur on t.user_id=ur.user_id
-          join sys_role r on ur.role_id=r.role_id and r.role_id in ("1528003832557232130","1663372320355389441","1663372027127402498")
+          join sys_user_role ur on t.user_id=ur.user_id
+          join sys_role r on ur.role_id=r.role_id
+            <if test="roleId==null">
+                and r.role_id in ("1528003832557232130","1663372320355389441","1663372027127402498")
+            </if>
+            <if test="roleId != null and roleId != ''">
+                and r.role_id =#{roleId}
+            </if>
         order by uo.org_id
     </select>
 

jyzb-process/src/main/java/com/junmp/junmpProcess/controller/BpmnController.java

@@ -86,7 +86,7 @@ public class BpmnController  {
     }
     @ApiOperation("创建新表单")
     @PostMapping("createForm")
-    public ApiRes<Boolean> createForm(@RequestBody FormReq formReq) {
+    public ApiRes<String> createForm(@RequestBody FormReq formReq) {
         return ApiRes.success(WorkProcessService.createNewForm(formReq));
     }
     @ApiOperation("终止流程")

jyzb-process/src/main/java/com/junmp/junmpProcess/service/Bussiness/WorkProcessService.java

@@ -25,7 +25,7 @@ public interface WorkProcessService {
      *
      * @return
      */
-    Boolean createNewForm(FormReq processVO) ;
+    String createNewForm(FormReq processVO) ;
 
     /**
      * 终止流程实例

jyzb-process/src/main/java/com/junmp/junmpProcess/service/Bussiness/impl/WorkProcessServiceImpl.java

@@ -274,7 +274,7 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
     * @Params:
     * @Return
     */
-    public Boolean createNewForm(FormReq req)  {
+    public String createNewForm(FormReq req)  {
 
         ProcessTemplates processTemplates = ProcessTemplates.builder().build();
         String templateId = idWorker.nextId()+"";
@@ -284,10 +284,10 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
         processTemplates.setRemark(req.getRemark());
         processTemplates.setIsStop(false);
         Date date= new Date();
-
+        processTemplates.setConfig(req.getConfig());
         processTemplates.setUpdated(date);
         processTemplateService.save(processTemplates);
-        return true;
+        return processTemplates.getTemplateId();
     }
 
 
@@ -399,7 +399,7 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
         processTemplates.setFormName(process.getFormName());
         processTemplates.setRemark(process.getRemark());
         processTemplates.setUpdated(new Date());
-
+        processTemplates.setConfig(process.getConfig());
         return processTemplateService.updateById(processTemplates);//更新表单明细表信息
 
 

jyzb-process/src/main/java/com/junmp/junmpProcess/service/impl/SysFormServiceImpl.java

@@ -62,6 +62,7 @@ public class SysFormServiceImpl extends ServiceImpl<ProcessTemplatesMapper, Proc
         processTemplates.setIsStop(true);
         Date date= new Date();
         processTemplates.setUpdated(date);
+        processTemplates.setConfig(req.getConfig());
         processTemplateService.save(processTemplates);
         return templateId;
     }