Merge branch 'develop' of http://gitlab.sothing.top/843502640/jyzb_platformV2 into develop-zhaojw

.gitignore

@@ -109,3 +109,6 @@ Thumbs.db
 /jyzb-boot/src/main/resources/application-local.yml
 /pom.xml
 /pom.xml
+/jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/OrderMainServiceImpl.java.orig
+/jyzb-biz/pom.xml
+/.idea/compiler.xml

.idea/compiler.xml

@@ -9,9 +9,9 @@
         <outputRelativeToContentRoot value="true" />
         <module name="jyzb-common" />
         <module name="jyzb-process" />
+        <module name="jyzb-api" />
         <module name="jyzb-biz" />
         <module name="jyzb-boot" />
-        <module name="jyzb-api" />
       </profile>
     </annotationProcessing>
     <bytecodeTargetLevel target="9">

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/OrderDetailDto.java

@@ -25,6 +25,8 @@ public class OrderDetailDto implements Serializable {
 
     private String supplierName;
 
+    private String warehouseId;
+
     /**
      * 计划数量
      */

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/DetailListReq.java

@@ -38,4 +38,6 @@ public class DetailListReq implements Serializable {
 
     private BigDecimal price;
 
+    private String warehouseId;
+
 }

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/UpdateOrderReq.java

@@ -44,7 +44,7 @@ public class UpdateOrderReq extends BaseRequest implements Serializable {
     /**
      * 发物单位
      */
-    @IsNumber(message = "startOrgId必须是数字",groups = {add.class})
+//    @IsNumber(message = "startOrgId必须是数字",groups = {add.class})
     private String  startOrgId;
     /**
      * 发物单位名称

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/UpdatePolicemanReq.java

@@ -7,6 +7,7 @@ import lombok.EqualsAndHashCode;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.util.Date;
+import java.util.List;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -28,24 +29,23 @@ public class UpdatePolicemanReq extends BaseRequest {
     @NotBlank(message = "警员编号不能为空", groups = {add.class,edit.class})
     private String policeCode;
 
-    @NotBlank(message = "性别不能为空", groups = {add.class,edit.class})
-    private String sex;
 
     @NotBlank(message = "人脸信息不能为空", groups = {detail.class})
     private String faceInfo;
 
-    //是否同步生成账号  1已生成，0未生成
-    private Integer isCreatedAccount;
 
     private String doorCode;
 
+    private String account;
+
     private String password;
 
     private String photo;
 
-    @NotBlank(message = "电话不能为空", groups = {add.class,edit.class})
     private String phone;
 
+    private String tel;
+
     private Date createTime;
 
     private Date updateTime;
@@ -58,7 +58,14 @@ public class UpdatePolicemanReq extends BaseRequest {
     @NotNull(message = "状态不能为空", groups = {updateStatus.class})
     private Integer state;
 
-    private String fileContent;
+    /**
+     * 0警员，1辅警
+     */
+    private Integer identity;
 
+    /**
+     * 角色id列表
+     */
+    private List<Long> rolesList;
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file

jyzb-biz/pom.xml

@@ -122,5 +122,11 @@
             <groupId>com.junmp.jyzb</groupId>
             <artifactId>jyzb-process</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-core</artifactId>
+            <version>3.5.2</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 </project>

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

@@ -203,7 +203,7 @@ public class PoliceController {
     }
 
     //将警员和user一一对应并且关系表也一一对应
-    @PostMapping("UpdatePoliceUser")
+    @PostMapping("/UpdatePoliceUser")
     @ApiOperation("将警员关系一一对应")
     public ApiRes<Boolean> UpdatePoliceUser(){
         return ApiRes.success(policemanService.UpdatePoliceUser());

jyzb-biz/src/main/java/com/junmp/jyzb/entity/OrderDetail.java

@@ -43,6 +43,9 @@ import java.util.Date;
         @TableField("equipment_supplier_name")
         private String supplierName;
 
+        @TableField("warehouse_id")
+        private String warehouseId;
+
         @TableField("plan_num")
         private Integer planNum;
 
@@ -73,4 +76,5 @@ import java.util.Date;
         private String updateUser;
 
 
+
 }

jyzb-biz/src/main/java/com/junmp/jyzb/entity/Policeman.java

@@ -2,6 +2,7 @@ package com.junmp.jyzb.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.junmp.jyzb.entity.Cabinet;
+import com.junmp.v2.sys.user.entity.SysUser;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
@@ -38,15 +39,9 @@ public class Policeman implements Serializable {
     @TableField(value = "police_code")
     private String policeCode;
 
-    @TableField(value = "sex")
-    private String sex;
-
     @TableField(value = "face_info",updateStrategy  = FieldStrategy.IGNORED)
     private String faceInfo;
 
-    @TableField(value = "isCreatedAccount")
-    private Integer isCreatedAccount;
-
     @TableField(value = "door_code")
     private String doorCode;
 
@@ -59,6 +54,12 @@ public class Policeman implements Serializable {
     @TableField(value = "phone",updateStrategy = FieldStrategy.IGNORED)
     private String phone;
 
+    @TableField(value = "tel",updateStrategy = FieldStrategy.IGNORED)
+    private String tel;
+
+
+//    private  SysUser  uesrList;
+
     @TableField(fill = FieldFill.INSERT, value = "create_time")
     private Date createTime;
 
@@ -68,8 +69,8 @@ public class Policeman implements Serializable {
     @TableField(value = "id_card")
     private String idCard;
 
-    @TableField(value = "update_user")
-    private String updateUser;
+//    @TableField(value = "update_user")
+//    private String updateUser;
 
     @TableField(value = "state")
     private Integer state;
@@ -77,8 +78,11 @@ public class Policeman implements Serializable {
     @TableField(value = "user_id",updateStrategy  = FieldStrategy.IGNORED)
     private Long UserId;
 
-    @TableField(value = "file_content")
-    private String fileContent;
+    /**
+     * 0表示警员，1表示辅警
+     */
+    @TableField(value = "identity")
+    private Integer identity;
 
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file

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

@@ -3,6 +3,7 @@ package com.junmp.jyzb.service.impl;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.junmp.junmpProcess.dto.StartProcessInstanceDTO;
@@ -33,6 +34,7 @@ import com.junmp.v2.dict.entity.SysDictItem;
 import com.junmp.v2.dict.service.SysDictItemService;
 import com.junmp.v2.office.api.OfficeExcelApi;
 import com.junmp.v2.office.api.bean.ExcelExportParam;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.amqp.core.Queue;
 import org.springframework.amqp.rabbit.core.RabbitAdmin;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
@@ -90,7 +92,7 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
         List<String> list=new ArrayList<>();
         OrderMain order = new OrderMain();
         BeanPlusUtil.copyProperties(req, order);
-        //设置单据单号（订单号）
+        //设置单据单号
         OrderNum orderNum = setOrderCode(req);
         String codeValue=String.format("%04d",orderNum.getNum());
         order.setOrderCode(orderNum.getBussinessType()+"-"+orderNum.getYear()+"-"+orderNum.getMonth()+"-"+orderNum.getDay()+"-"+codeValue);
@@ -315,12 +317,9 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
     public PageResult<OrderMainDto> getOrderPage(OrderMainReq req) {
         Page<OrderMain> page = new Page<>();
         //排序字段处理，将驼峰改成和数据库同步的字段名
-        String column = req.getColumn();
-        String order = req.getOrder();
-        if (ObjectUtil.isNotNull(column) && !column.trim().isEmpty()
-                && ObjectUtil.isNotNull(order) && !order.trim().isEmpty()){
-            req.setColumn(column.replaceAll("[A-Z]", "_$0").toLowerCase());
-        }
+        Map<String, String> orderSort = getOrderSort(req.getColumn(), req.getOrder());
+        req.setColumn(orderSort.get("column"));
+        req.setOrder(orderSort.get("order"));
         //根据查询条件得到单据
         IPage<OrderMain> outOrderPage = orderMainMapper.getOrderPage(PageFactory.getDefaultPage(req.getPageNo(), req.getPageSize()),req);
         page.setRecords(outOrderPage.getRecords());
@@ -346,10 +345,23 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
         OrderMain orderMain = orderMainExist(req.getId());
         OrderDto orderDto = new OrderDto();
         BeanPlusUtil.copyProperties(orderMain,orderDto);
+        List<OrderDetail> list=new ArrayList<>();
+        //排序字段处理，将驼峰改成和数据库同步的字段名
         //将详细信息存入列表属性中
         //通过任务单id查询对应的详细信息
-        List<OrderDetail> list = orderDetailService.list(new LambdaQueryWrapper<OrderDetail>()
-                .eq(OrderDetail::getOrderId, req.getId()));
+        if (ObjectUtil.isEmpty(req.getColumn()) && ObjectUtil.isEmpty(req.getOrder())) {
+            list = orderDetailService.list(new LambdaQueryWrapper<OrderDetail>()
+                    .eq(OrderDetail::getOrderId, req.getId())
+                    .orderByDesc(OrderDetail::getCreateTime));
+        } else {
+            Map<String, String> orderSort = getOrderSort(req.getColumn(), req.getOrder());
+            req.setColumn(orderSort.get("column"));
+            req.setOrder(orderSort.get("order"));
+//            list=orderDetailService.list(new LambdaQueryWrapper<OrderDetail>()
+//                    .eq(OrderDetail::getOrderId, req.getId())
+//                    .orderBy(true, StringUtils.isNotEmpty(req.getColumn()),
+//                            OrderItem.desc(req.getColumn()).withOrder("desc".equalsIgnoreCase(req.getOrder()) ? OrderItem.desc() : OrderItem.asc())));
+        }
         List<OrderDetailDto> orderDetailDtoList=new ArrayList<>();
         for (OrderDetail orderDetail:list) {
             OrderDetailDto orderDetailDto = new OrderDetailDto();
@@ -605,4 +617,19 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
 
     }
 
+    //排序字段处理，将驼峰改成和数据库同步的字段名
+    public Map<String,String> getOrderSort(String column,String order){
+        Map<String,String> map=new HashMap<>();
+        //排序字段处理，将驼峰改成和数据库同步的字段名
+        if (ObjectUtil.isNotNull(column) && !column.trim().isEmpty() &&
+                (order.equalsIgnoreCase("asc")|| order.equalsIgnoreCase("desc")) && !order.trim().isEmpty()){
+            //修改字段，和数据库字段进行统一
+            column=column.replaceAll("[A-Z]", "_$0").toLowerCase();
+            order=order.toLowerCase();
+        }
+        map.put("column",column);
+        map.put("order",order);
+        return map;
+    }
+
 }

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

 package com.junmp.jyzb.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateTime;
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.junmp.junmpProcess.exception.WorkFlowException;
 import com.junmp.jyzb.api.bean.dto.PoliceFingerDto;
 import com.junmp.jyzb.api.bean.dto.PolicemanDto;
 import com.junmp.jyzb.api.bean.query.CabinetReq;
@@ -18,21 +22,28 @@ import com.junmp.jyzb.service.*;
 import com.junmp.jyzb.utils.*;
 import com.junmp.v2.auth.password.BcryptPasswordStoredEncrypt;
 import com.junmp.v2.common.bean.dict.SimpleDict;
+import com.junmp.v2.common.bean.response.ApiRes;
+import com.junmp.v2.common.enums.LogicDelEnum;
 import com.junmp.v2.common.exception.base.ServiceException;
 import com.junmp.v2.common.util.BeanPlusUtil;
 import com.junmp.v2.db.api.factory.PageFactory;
 import com.junmp.v2.db.api.factory.PageResultFactory;
 import com.junmp.v2.db.api.page.PageResult;
+import com.junmp.v2.file.api.constant.FileConstant;
 import com.junmp.v2.sys.api.bean.user.SysUserDto;
 import com.junmp.v2.sys.api.bean.user.UserSelectTreeNode;
 import com.junmp.v2.sys.api.bean.user.req.SysUserReq;
 import com.junmp.v2.sys.api.bean.user.req.UserOrgReq;
 import com.junmp.v2.sys.user.entity.SysUser;
 import com.junmp.v2.sys.user.entity.SysUserOrg;
+import com.junmp.v2.sys.user.factory.SysUserCreateFactory;
 import com.junmp.v2.sys.user.service.SysUserOrgService;
 import com.junmp.v2.sys.user.service.SysUserService;
 import liquibase.pro.packaged.L;
+import liquibase.pro.packaged.O;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.catalina.User;
+import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -91,65 +102,48 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
     public String AddPoliceman(UpdatePolicemanReq req) {
         //查询传入的组织机构id是否存在
         pubOrgService.PubOrgExist(req.getOrgId());
-        //查询是否有重复的policeCode
-        List<Policeman> list = list(new LambdaQueryWrapper<Policeman>()
-                .eq(ObjectUtil.isNotEmpty(req.getPoliceCode()), Policeman::getPoliceCode, req.getPoliceCode()));
-        if (list.size() > 0) {
-            throw new ServiceException(PolicemanExceptionEnum.POLICECODE_IS_EXISTS);
-        }
-        if (!req.getSex().equals("男") &&!req.getSex().equals("女")){
-            throw new ServiceException(CabinetExceptionEnum.PARAMETER_ERROR);
+        //绑定账号
+        SysUser sysUser = add(req);
+        //判断是否添加角色，进行绑定
+        if (req.getRolesList().size()==0){
+
         }
-        //密码加密，bcrypt加密方式
-        BcryptPasswordStoredEncrypt passwordStoredEncrypt = new BcryptPasswordStoredEncrypt();
-        String encrypt = passwordStoredEncrypt.encrypt(req.getPassword());
         Policeman policeman = new Policeman();
         BeanPlusUtil.copyProperties(req, policeman);
-        policeman.setPassword(encrypt);
-        policeman.setIsCreatedAccount(1);
+        policeman.setPassword(sysUser.getPassword());
         policeman.setState(1);
+        policeman.setUserId(sysUser.getUserId());
         save(policeman);
-       //绑定账号
-        Long userId = PoliceBindUser(policeman);
+
         return policeman.getId();
     }
 
+
     /**
      * 警员绑定账号
      *
      * @param
      * @return
      */
-    public Long PoliceBindUser(Policeman policeman) {
-        SysUser user = new SysUser();
-        BeanPlusUtil.copyProperties(policeman, user);
-        //判断数据库中是否已经存在账号，如果存在则抛出异常提示账号已存在
-        //密码加密，bcrypt加密方式
-        user.setPassword(policeman.getPassword());
-        user.setAccount(policeman.getPoliceCode());
+    public SysUser add(UpdatePolicemanReq req) {
+        //判断是否有重复的账号
         SysUser one = sysUserService.getOne(new LambdaQueryWrapper<SysUser>()
-                .eq(SysUser::getAccount, user.getAccount())
-                .eq(SysUser::getPassword, user.getPassword()));
+                .eq(SysUser::getAccount, req.getAccount()));
         if (ObjectUtil.isNotNull(one)){
             throw new ServiceException(UserExceptionEnum.USER_IS_EXIST);
         }
-
-        //存储到数据库
-        //判断传入的sex是什么，需要做处理
-        if (policeman.getSex().equals("男")) {
-            user.setSex("M");
-        } else {
-            user.setSex("F");
-        }
-        user.setRealName(policeman.getName());
-        user.setNickName(policeman.getName());
-        sysUserService.save(user);
-        //创建到关系表中
-        SysUserOrg sysUserOrg = new SysUserOrg();
-        sysUserOrg.setUserId(user.getUserId());
-        sysUserOrg.setOrgId(policeman.getOrgId());
-        sysUserOrgService.save(sysUserOrg);
-        return user.getUserId();
+        SysUser sysUser= new SysUser();
+        BeanPlusUtil.copyProperties(req,sysUser);
+        sysUser.setNickName(req.getName());
+        sysUser.setRealName(req.getName());
+        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(), req.getOrgId(), null);
+        return sysUser;
     }
 
 
@@ -247,9 +241,7 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
      */
     @Override
     public boolean UpdatePolice(UpdatePolicemanReq req) {
-        if (!req.getSex().equals("男") &&!req.getSex().equals("女")){
-            throw new ServiceException(CabinetExceptionEnum.PARAMETER_ERROR);
-        }
+
         Policeman policeman = new Policeman();
         BeanPlusUtil.copyProperties(req, policeman);
         //查询传入的组织机构id是否存在
@@ -538,7 +530,6 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
             //如果查询不到，表示该账号不是警员的，直接删除就行，不需要做任何操作
             return true;
         }
-        police.setIsCreatedAccount(0);
         police.setUserId(null);
         police.setPassword(null);
         return updateById(police);
@@ -594,44 +585,30 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
     @Transactional(rollbackFor = Exception.class)
     public boolean UpdatePoliceUser() {
         List<Policeman> list = list();
-        List<SysUserReq> collect = list.stream().map(policeman -> {
-                    SysUserReq sysUserReq = new SysUserReq();
-                    BeanPlusUtil.copyProperties(policeman,sysUserReq);
-                    sysUserReq.setAccount(policeman.getPoliceCode());
-                    if (ObjectUtil.isNotNull(policeman.getPassword())){
-                        sysUserReq.setPassword(policeman.getPassword());
-                    }else {
-                        BcryptPasswordStoredEncrypt passwordStoredEncrypt = new BcryptPasswordStoredEncrypt();
-                        String encrypt = passwordStoredEncrypt.encrypt("123456");
-                        sysUserReq.setPassword(encrypt);
-                    }
-                    if (policeman.getSex().equals("男") || policeman.getSex().equalsIgnoreCase("man")) {
-                        sysUserReq.setSex("M");
-                    } else {
-                        sysUserReq.setSex("F");
-                    }
-                    sysUserReq.setNickName(policeman.getName());
-                    sysUserReq.setRealName(policeman.getName());
-                    sysUserService.add(sysUserReq);
-                    return sysUserReq;
-                })
-                .collect(Collectors.toList());
-
-
-//        sysUserService.saveBatch(collect);
-//        List<Long> userIdList = collect.stream().map(SysUser::getUserId).collect(Collectors.toList());
-//        List<String> accountList = collect.stream().map(SysUser::getAccount).collect(Collectors.toList());
-//
-//        policemanMapper.updateBatchUserIdByAccountList(userIdList, accountList);
-//        List<Policeman> list1 = list();
-//        List<SysUserOrg> collect1 = list1.stream().map(policeman -> {
-//                    SysUserOrg sysUserOrg = new SysUserOrg();
-//                    BeanPlusUtil.copyProperties(policeman, sysUserOrg);
-//                    return sysUserOrg;
-//                })
-//                .collect(Collectors.toList());
-//        sysUserOrgService.saveBatch(collect1);
-        return false;
+        List<Policeman> policemanList=new ArrayList<>();
+        list.forEach(policeman -> {
+            //如果警员存在账号，则跳过循环，继续下一条警员的信息
+            if (ObjectUtil.isNotNull(policeman.getUserId())){
+                return;
+            }
+            SysUser sysUser= new SysUser();
+            sysUser.setPhone(policeman.getPhone());
+            sysUser.setTel(policeman.getTel());
+            //没有账号，默认是警员的编号
+            sysUser.setAccount(policeman.getPoliceCode());
+            sysUser.setNickName(policeman.getName());
+            sysUser.setRealName(policeman.getName());
+            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(), policeman.getOrgId(), null);
+            policeman.setUserId(sysUser.getUserId());
+            policemanList.add(policeman);
+        });
+        return updateBatchById(policemanList);
     }
 
 }