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/PolicemanFingerReq.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.util.Date;
 
@@ -21,6 +22,7 @@ public class PolicemanFingerReq extends BaseRequest {
     /**
      * 警员id
      */
+    @NotBlank(message = "警员id不能为空",groups = {edit.class})
     @ApiModelProperty(value = "警员id")
     private String policeId;
 

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

+package com.junmp.jyzb.api.bean.req;
+
+import com.junmp.v2.common.bean.request.BaseRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+@Data
+public class UpdatePoliceFingerReq extends BaseRequest {
+    /**
+     * 指纹id
+     */
+    @NotNull(message = "指纹id不能为空",groups = {delete.class,edit.class})
+    @ApiModelProperty(value = "指纹id")
+    private Integer id;
+
+    /**
+     * 警员id
+     */
+    @NotBlank(message = "警员id不能为空",groups = {add.class, delete.class,edit.class})
+    @ApiModelProperty(value = "警员id")
+    private String policeId;
+
+    /**
+     * 指纹名称
+     */
+    @NotBlank(message = "指纹名称不能为空",groups = {add.class})
+    @ApiModelProperty(value = "指纹名称")
+    private String name;
+
+    /**
+     * 指纹信息
+     */
+    @NotBlank(message = "指纹信息不能为空",groups = {add.class, edit.class})
+    @ApiModelProperty(value = "指纹信息")
+    private String fingerInfo;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+}

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

 package com.junmp.jyzb.controller;
 
 import com.junmp.jyzb.api.bean.query.PolicemanFingerReq;
+import com.junmp.jyzb.api.bean.req.UpdatePoliceFingerReq;
 import com.junmp.jyzb.doc.PolicemanFingerDoc;
 import com.junmp.jyzb.entity.PoliceFinger;
 import com.junmp.jyzb.service.PoliceFingerService;
+import com.junmp.v2.common.bean.request.ValidationApi;
 import com.junmp.v2.common.bean.response.ApiRes;
 import com.junmp.v2.db.api.page.PageResult;
 import io.swagger.annotations.Api;
@@ -26,27 +28,27 @@ public class PolicemanFingerController implements PolicemanFingerDoc {
 
     @PostMapping("/AddFingerInfo")
     @ApiOperation("添加指纹信息")
-    public ApiRes<Boolean> addFingerInfo(@RequestBody @Validated(PolicemanFingerReq.edit.class) PolicemanFingerReq req) {
+    public ApiRes<Boolean> addFingerInfo(@RequestBody @Validated(ValidationApi.add.class) UpdatePoliceFingerReq req) {
         return ApiRes.success(policeFingerService.addFingerInfo(req)) ;
 
     }
 
     @PostMapping("/UpdateFingerInfo")
     @ApiOperation("修改指纹信息")
-    public ApiRes<Boolean> updateFingerInfo(@RequestBody @Validated(PolicemanFingerReq.edit.class) PolicemanFingerReq req) {
+    public ApiRes<Boolean> updateFingerInfo(@RequestBody @Validated(ValidationApi.edit.class) UpdatePoliceFingerReq req) {
         return ApiRes.success(policeFingerService.updateFingerInfo(req)) ;
 
     }
 
     @PostMapping("/searchFingerInfo")
     @ApiOperation("查找指纹信息")
-    public ApiRes<List<PoliceFinger>> searchFingerInfo(@RequestBody @Validated(PolicemanFingerReq.edit.class) PolicemanFingerReq req) {
+    public ApiRes<List<PoliceFinger>> searchFingerInfo(@RequestBody @Validated(ValidationApi.edit.class) PolicemanFingerReq req) {
         return ApiRes.success(policeFingerService.searchFingerInfo(req));
     }
 
     @PostMapping("/DeleteFingerInfo")
     @ApiOperation("删除警员指纹信息")
-    public ApiRes<Boolean> deletePoliceFinger(@RequestBody @Validated(PolicemanFingerReq.edit.class) PolicemanFingerReq req) {
+    public ApiRes<Boolean> deletePoliceFinger(@RequestBody @Validated(ValidationApi.delete.class) UpdatePoliceFingerReq req) {
         return ApiRes.success(policeFingerService.deleteFinger(req));
     }
 

jyzb-biz/src/main/java/com/junmp/jyzb/doc/PolicemanFingerDoc.java

@@ -2,6 +2,7 @@ package com.junmp.jyzb.doc;
 
 
 import com.junmp.jyzb.api.bean.query.PolicemanFingerReq;
+import com.junmp.jyzb.api.bean.req.UpdatePoliceFingerReq;
 import com.junmp.jyzb.entity.PoliceFinger;
 import com.junmp.v2.common.bean.response.ApiRes;
 import com.junmp.v2.db.api.page.PageResult;
@@ -13,16 +14,16 @@ import java.util.List;
 @Api(value = "警员指纹管理",tags = "警员指纹管理接口")
 public interface PolicemanFingerDoc {
     @ApiOperation(value = "添加指纹信息", tags = "警员指纹管理接口")
-    ApiRes<Boolean> addFingerInfo(PolicemanFingerReq req);
+    ApiRes<Boolean> addFingerInfo(UpdatePoliceFingerReq req);
 
     @ApiOperation(value = "修改指纹信息", tags = "警员指纹管理接口")
-    ApiRes<Boolean> updateFingerInfo(PolicemanFingerReq req);
+    ApiRes<Boolean> updateFingerInfo(UpdatePoliceFingerReq req);
 
     @ApiOperation(value = "查找指纹信息", tags = "警员指纹管理接口")
     ApiRes<List<PoliceFinger>> searchFingerInfo(PolicemanFingerReq req);
 
     @ApiOperation(value = "删除指纹信息", tags = "警员指纹管理接口")
-    ApiRes<Boolean> deletePoliceFinger(PolicemanFingerReq req);
+    ApiRes<Boolean> deletePoliceFinger(UpdatePoliceFingerReq req);
 
     @ApiOperation(value = "分页", tags = "警员指纹管理接口")
     ApiRes<PageResult<PoliceFinger>> page(PolicemanFingerReq req);

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

@@ -32,7 +32,6 @@ public class Policeman implements Serializable {
     @TableField(value = "org_id_int")
     private Long orgId;
 
-
     @TableField(value = "department_id")
     private Long departmentId;
 

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

@@ -2,6 +2,7 @@ package com.junmp.jyzb.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.junmp.jyzb.api.bean.query.PolicemanFingerReq;
+import com.junmp.jyzb.api.bean.req.UpdatePoliceFingerReq;
 import com.junmp.jyzb.entity.PoliceFinger;
 import com.junmp.v2.db.api.page.PageResult;
 
@@ -16,14 +17,14 @@ public interface PoliceFingerService extends IService<PoliceFinger> {
      * @param req
      * @return
      */
-    boolean addFingerInfo(PolicemanFingerReq req);
+    boolean addFingerInfo(UpdatePoliceFingerReq req);
 
     /**
      * 更新指纹信息
      * @param req
      * @return
      */
-    boolean updateFingerInfo(PolicemanFingerReq req);
+    boolean updateFingerInfo(UpdatePoliceFingerReq req);
 
     /**
      * 查询指纹信息列表
@@ -37,7 +38,7 @@ public interface PoliceFingerService extends IService<PoliceFinger> {
      * @param req
      * @return
      */
-    boolean deleteFinger(PolicemanFingerReq req);
+    boolean deleteFinger(UpdatePoliceFingerReq req);
 
 
     /**

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

@@ -49,10 +49,6 @@ public class CabinetServiceImpl extends ServiceImpl<CabinetMapper, Cabinet> impl
     private PolicemanService policemanService;
 
 
-
-
-
-
     private List<String> getAllOrgId(CabinetReq req, String includeLowerLevel) {
         List<String> allOrg = new ArrayList<>();
         if (includeLowerLevel.equals("false")) {

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

@@ -76,7 +76,7 @@ public class InventoryServiceImpl extends ServiceImpl<InventoryMapper, Inventory
         String queryType = inMsg.get("queryType").toString();
         String idMsg = inMsg.get("typeId").toString();
 
-        //根据传入的queryType来辨别要查询什么信�
+        //根据传入的queryType来辨别要查询什么信息
         if (queryType.equals("org") || queryType.equals("warehouse") || queryType.equals("cabinet")){
             Map<String,Object> returnMsg = getLocationEquipmentInfo(queryType,idMsg);
             return new ResponseResult(HttpStatus.SUCCESS, ReturnMsg.PASS,returnMsg);
@@ -180,11 +180,11 @@ public class InventoryServiceImpl extends ServiceImpl<InventoryMapper, Inventory
     public ResponseResult setInventoryMsg(){
         inventoryMapper.deleteAllMsg(); //清空数据库中已存在的信息
 
-        inventoryMapper.setOrgInventory(); //放入组织机构信息汇�
+        inventoryMapper.setOrgInventory(); //放入组织机构信息汇总
 
-        inventoryMapper.setCabinetInventory(); //放入组织机构信息汇�
+        inventoryMapper.setCabinetInventory(); //放入组织机构信息汇总
 
-        inventoryMapper.setWarehouseInventory(); //放入组织机构信息汇�
+        inventoryMapper.setWarehouseInventory(); //放入组织机构信息汇总
         return new ResponseResult(HttpStatus.SUCCESS, ReturnMsg.PASS);
     }
 

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

@@ -5,9 +5,13 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.junmp.jyzb.api.bean.query.PolicemanFingerReq;
+import com.junmp.jyzb.api.bean.req.UpdatePoliceFingerReq;
+import com.junmp.jyzb.api.exception.enums.PolicemanExceptionEnum;
 import com.junmp.jyzb.entity.PoliceFinger;
 import com.junmp.jyzb.api.exception.enums.PolicemanFingerExceptionEnum;
+import com.junmp.jyzb.entity.Policeman;
 import com.junmp.jyzb.service.PoliceFingerService;
+import com.junmp.jyzb.service.PolicemanService;
 import com.junmp.jyzb.utils.DateTimeUtil;
 import com.junmp.v2.common.exception.base.ServiceException;
 import com.junmp.v2.common.util.BeanPlusUtil;
@@ -20,19 +24,21 @@ import javax.annotation.Resource;
 import com.junmp.jyzb.mapper.PoliceFingerMapper;
 
 import java.util.List;
-import java.util.Map;
 
 @Service
 @Slf4j
 public class PoliceFingerServiceImpl extends ServiceImpl<PoliceFingerMapper, PoliceFinger> implements PoliceFingerService {
 
     @Resource
-    private PoliceFingerMapper policeFingerMapper;
+    private PolicemanService policemanService;
 
 
     //新增指纹信息
     @Override
-    public boolean addFingerInfo(PolicemanFingerReq req) {
+    public boolean addFingerInfo(UpdatePoliceFingerReq req) {
+        //判断警员是否存在
+        PoliceExist(req.getPoliceId());
+
         PoliceFinger policeFinger = getOne(new LambdaQueryWrapper<PoliceFinger>()
                 .eq(ObjectUtil.isNotEmpty(req.getPoliceId()),PoliceFinger::getPoliceId,req.getPoliceId())
                 .eq(ObjectUtil.isNotEmpty(req.getFingerInfo()),PoliceFinger::getFingerInfo,req.getFingerInfo()));
@@ -42,27 +48,15 @@ public class PoliceFingerServiceImpl extends ServiceImpl<PoliceFingerMapper, Pol
         }
         PoliceFinger policeFinger1=new PoliceFinger();
         BeanPlusUtil.copyProperties(req, policeFinger1);
-        //创建时间
-        policeFinger1.setCreateTime(DateTimeUtil.getCurrentDateTime());
-        //更新时间
-        policeFinger1.setUpdateTime(DateTimeUtil.getCurrentDateTime());
-
         return this.save(policeFinger1);
     }
 
     //修改指纹信息
     @Override
-    public boolean updateFingerInfo(PolicemanFingerReq req) {
-        PoliceFinger one = getOne(new LambdaQueryWrapper<PoliceFinger>()
-                .eq(ObjectUtil.isNotEmpty(req.getId()), PoliceFinger::getId, req.getId()));
-        //指纹id错误，指纹信息不存在
-        if (ObjectUtil.isNull(one)){
-            throw new ServiceException(PolicemanFingerExceptionEnum.POLICEMAN_FINGER_NOTEXISTS);
-        }
-        BeanPlusUtil.copyProperties(req,one);
-        //更新时间
-        one.setUpdateTime(DateTimeUtil.getCurrentDateTime());
-        return this.updateById(one);
+    public boolean updateFingerInfo(UpdatePoliceFingerReq req) {
+        PoliceFinger policeFinger = PolicemanFingerExist(req.getId(), req.getPoliceId());
+        BeanPlusUtil.copyProperties(req,policeFinger);
+        return this.updateById(policeFinger);
     }
 
     //查询指纹信息
@@ -75,15 +69,11 @@ public class PoliceFingerServiceImpl extends ServiceImpl<PoliceFingerMapper, Pol
 
     //    删除指纹信息
     @Override
-    public boolean deleteFinger(PolicemanFingerReq req) {
-        req.getId();
-        PoliceFinger one = getOne(new LambdaQueryWrapper<PoliceFinger>()
-                .eq(ObjectUtil.isNotNull(req.getId()), PoliceFinger::getId, req.getId())
-                .eq(ObjectUtil.isNotNull(req.getPoliceId()), PoliceFinger::getPoliceId, req.getPoliceId()));
-        if (ObjectUtil.isNull(one)){
-            throw new ServiceException(PolicemanFingerExceptionEnum.POLICEMAN_FINGER_NOTEXISTS);
-        }
-        return removeById(one);
+    public boolean deleteFinger(UpdatePoliceFingerReq req) {
+        //判断警员是否存在
+        PoliceExist(req.getPoliceId());
+        PoliceFinger policeFinger = PolicemanFingerExist(req.getId(), req.getPoliceId());
+        return removeById(policeFinger);
     }
 
     /**
@@ -116,4 +106,24 @@ public class PoliceFingerServiceImpl extends ServiceImpl<PoliceFingerMapper, Pol
         wrapper.orderByDesc(PoliceFinger::getUpdateTime);
         return wrapper;
     }
+
+    //判断警员是否存在
+    public boolean PoliceExist(String id){
+        Policeman one = policemanService.getOne(new LambdaQueryWrapper<Policeman>()
+                .eq(Policeman::getId, id));
+        if (ObjectUtil.isNull(one)){
+            throw new ServiceException(PolicemanExceptionEnum.POLICEMAN_NOT_EXIST);
+        }
+        return true;
+    }
+    //判断指纹信息是否存在
+    public PoliceFinger PolicemanFingerExist(Integer fingerId,String policeId){
+        PoliceFinger one = getOne(new LambdaQueryWrapper<PoliceFinger>()
+                .eq(PoliceFinger::getId,fingerId)
+                .eq(PoliceFinger::getPoliceId, policeId));
+        if (ObjectUtil.isNull(one)){
+            throw new ServiceException(PolicemanFingerExceptionEnum.POLICEMAN_FINGER_NOTEXISTS);
+        }
+        return one;
+    }
 }