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

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/InventorySumReq.java

@@ -102,4 +102,6 @@ public class InventorySumReq extends BaseRequest {
      */
     private String price;
 
+    private Integer type;
+
 }

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

@@ -7,6 +7,7 @@ import lombok.Data;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.util.Date;
+import java.util.List;
 
 @Data
 public class UpdatePoliceFingerReq extends BaseRequest {
@@ -20,21 +21,20 @@ public class UpdatePoliceFingerReq extends BaseRequest {
     /**
      * 警员id
      */
-    @NotBlank(message = "警员id不能为空",groups = {add.class, delete.class,edit.class})
+    @NotBlank(message = "警员id不能为空",groups = {add.class, delete.class,edit.class,detail.class})
     @ApiModelProperty(value = "警员id")
     private String policeId;
 
     /**
      * 指纹名称
      */
-    @NotBlank(message = "指纹名称不能为空",groups = {add.class})
     @ApiModelProperty(value = "指纹名称")
     private String name;
 
     /**
      * 指纹信息
      */
-    @NotBlank(message = "指纹信息不能为空",groups = {add.class, edit.class})
+    @NotBlank(message = "指纹信息不能为空",groups = {add.class, edit.class,detail.class})
     @ApiModelProperty(value = "指纹信息")
     private String fingerInfo;
 
@@ -49,4 +49,12 @@ public class UpdatePoliceFingerReq extends BaseRequest {
      */
     @ApiModelProperty(value = "更新时间")
     private Date updateTime;
+
+    /**
+     * 指纹编号
+     */
+    @NotBlank(message = "指纹编号不能为空",groups = {detail.class})
+    private String fingerNum;
+
+    private List<UpdatePoliceFingerReq> fingerList;
 }

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

@@ -12,5 +12,4 @@ import java.io.File;
 public class UploadPolicePhotoReq {
 
     private String policeId;
-    private MultipartFile picture;
 }

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

@@ -91,8 +91,6 @@ public class InventoryController {
         return ApiRes.success(inventoryService.GetInvInfoByEpc(req));
     }
 
-
-
     //根据组织机构id/单警柜id/仓库id查询出库存的汇总信息(page)
     @PostMapping("/GetEquipmentInfo")
     @ApiOperation("根据条件查询库存汇总信息")

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

@@ -39,6 +39,13 @@ public class PolicemanFingerController implements PolicemanFingerDoc {
         return ApiRes.success(policeFingerService.updateFingerInfo(req)) ;
 
     }
+    @PostMapping("/insertOrUpdateFingerInfo")
+    @ApiOperation("新增或者修改指纹信息")
+    public ApiRes<Boolean> insertOrUpdateFingerInfo(@RequestBody  @Validated(ValidationApi.detail.class) UpdatePoliceFingerReq req) {
+        return ApiRes.success(policeFingerService.insertOrUpdateFingerInfo(req)) ;
+
+    }
+
 
     @PostMapping("/searchFingerInfo")
     @ApiOperation("查找指纹信息")

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

@@ -25,6 +25,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.compress.utils.IOUtils;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import javax.imageio.ImageIO;
@@ -78,11 +79,11 @@ public class PublicController {
     }
 
 
-
+    //上传人脸照片
     @PostMapping("/uploadPolicePhoto")
-    public UploadPolicePhotoDto uploadPolicePhoto(@RequestBody UploadPolicePhotoReq req) {
+    public UploadPolicePhotoDto uploadPolicePhoto(@RequestPart("picture") MultipartFile picture, UploadPolicePhotoReq req) {
 
-        return policemanService.uploadPolicePhoto(req);
+        return policemanService.uploadPolicePhoto(picture,req);
     }
 
 }

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

@@ -47,4 +47,6 @@ public interface PoliceFingerService extends IService<PoliceFinger> {
      * @return
      */
     PageResult<PoliceFinger> findPage(PolicemanFingerReq req);
+
+    boolean insertOrUpdateFingerInfo(UpdatePoliceFingerReq req);
 }

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

@@ -20,6 +20,7 @@ import com.junmp.v2.db.api.page.PageResult;
 import com.junmp.v2.sys.api.bean.user.SysUserDto;
 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.util.List;
 
@@ -106,7 +107,7 @@ public interface PolicemanService extends IService<Policeman> {
     //查询组织机构为null的警员
     List<PolicemanDto> getPoliceWithoutOrg();
 
-    UploadPolicePhotoDto uploadPolicePhoto(UploadPolicePhotoReq req);
+    UploadPolicePhotoDto uploadPolicePhoto(MultipartFile picture,UploadPolicePhotoReq req);
 
     boolean reSetPassword(SysUserReq req);
 

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

@@ -484,6 +484,7 @@ public class InventorySummaryServiceImpl  extends ServiceImpl<InventorySummaryMa
         if (ObjectUtil.isNotEmpty(req.getSizeNames()) && req.getSizeNames().size()>0) {
             wrapper.and(qw -> req.getSizeNames().forEach(sizeName -> qw.or().eq(InventorySummary::getSizeName, sizeName)));
         }
+//        wrapper.groupBy()
         if (ObjectUtil.isNotEmpty(req.getColumn())&&!req.getColumn().equals("create_time"))
         {
             wrapper.last("order by " + req.getColumn() + " " + req.getOrder());

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

 package com.junmp.jyzb.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
 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.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.junmp.jyzb.api.bean.query.PolicemanFingerReq;
@@ -22,7 +25,10 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import com.junmp.jyzb.mapper.PoliceFingerMapper;
+import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 @Service
@@ -89,6 +95,57 @@ public class PoliceFingerServiceImpl extends ServiceImpl<PoliceFingerMapper, Pol
         return PageResultFactory.createPageResult(page);
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean insertOrUpdateFingerInfo(UpdatePoliceFingerReq req) {
+        List<UpdatePoliceFingerReq> fingerList = req.getFingerList();
+        List<PoliceFinger> addList=new ArrayList<>();
+        List<PoliceFinger> updateList=new ArrayList<>();
+        //判断指纹信息是否存在，如果存在，则直接进行更新
+        List<PoliceFinger> list = list(Wrappers.<PoliceFinger>lambdaQuery()
+                .eq(PoliceFinger::getPoliceId, req.getPoliceId()));
+        if (CollectionUtil.isNotEmpty(list)){//不为空直接遍历进行更新
+            for (UpdatePoliceFingerReq fl:fingerList) {
+                boolean flag=false;
+                for (PoliceFinger pf:list) {
+                    if (fl.getFingerNum().equals(pf.getFingerNum())){
+                        flag=true;
+                        pf.setUpdateTime(DateTimeUtil.getCurrentDateTime());
+                        updateList.add(pf);
+                        break;
+                    }
+                }
+                if (!flag){//表示该指纹是新的，需要进行添加
+                    PoliceFinger finger = new PoliceFinger();
+                    BeanPlusUtil.copyProperties(fl,finger);
+                    finger.setUpdateTime(DateTimeUtil.getCurrentDateTime());
+                    finger.setCreateTime(DateTimeUtil.getCurrentDateTime());
+                    finger.setName("指纹"+fl.getFingerNum());
+                    addList.add(finger);
+                }
+            }
+        }else {//如果为空，直接进行新增
+            for (UpdatePoliceFingerReq fl:fingerList) {
+                PoliceFinger finger = new PoliceFinger();
+                BeanPlusUtil.copyProperties(fl,finger);
+                finger.setUpdateTime(DateTimeUtil.getCurrentDateTime());
+                finger.setCreateTime(DateTimeUtil.getCurrentDateTime());
+                finger.setName("指纹"+fl.getFingerNum());
+                addList.add(finger);
+            }
+        }
+        boolean a=true;
+        if (CollectionUtil.isNotEmpty(addList)){
+            a = saveBatch(addList);
+        }
+        boolean b=true;
+        if (CollectionUtil.isNotEmpty(updateList)){
+            b = updateBatchById(updateList);
+        }
+        return a && b;
+
+    }
+
 
     //查询的各种条件信息
     private LambdaQueryWrapper<PoliceFinger> createWrapper(PolicemanFingerReq req) {

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

@@ -60,6 +60,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
@@ -1284,7 +1285,7 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public UploadPolicePhotoDto uploadPolicePhoto(UploadPolicePhotoReq req) {
+    public UploadPolicePhotoDto uploadPolicePhoto(MultipartFile picture,UploadPolicePhotoReq req) {
 
         //查询警员表，判断该警员是否已经存在警员照片
         // 如果存在，则查询file表将该数据进行删除，再调用上传文件接口，将返回的文件信息以及地址更新存储到警员表最终返回警员id和照片地址
@@ -1305,7 +1306,7 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
         sysFileInfoReq.setFileBucket("jyzb");
         sysFileInfoReq.setFileLocation(3);
         sysFileInfoReq.setFileObjectName("policePhoto/"+pubOrg.getOrgCode()+"/");
-        SysFileInfoResp sysFileInfoResp = sysFileInfoService.uploadFile(req.getPicture(), sysFileInfoReq);
+        SysFileInfoResp sysFileInfoResp = sysFileInfoService.uploadFile(picture, sysFileInfoReq);
         policeman.setFileId(sysFileInfoResp.getFileId());
         policeman.setPhoto(sysFileInfoResp.getAccessUrl());
         //更新警员