修改警员装备表接口以及新增单警柜上报出入库数据实体类

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

@@ -7,7 +7,7 @@ public class FinalTjOrgPoliceDto {
     private String policeId;
     private String policeName;
     private String policeCode;
-    private Integer number;
-    private Integer inStockNum;
-    private Integer outStockNum;
+    private Integer num;
+    private Integer inNum;
+    private Integer outNum;
 }

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

@@ -12,4 +12,7 @@ public class TjOrgPoliceDto {
     private String typeName;
     private String locationId;
     private String locationName;
+    private Integer num;
+    private Integer inNum;
+    private Integer outNum;
 }

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

-package com.junmp.jyzb.api.bean.req;
-
-import com.junmp.jyzb.api.bean.query.InventoryReq;
-import lombok.Data;
-
-import java.util.Date;
-import java.util.List;
-
-@Data
-public class CabinetInOutRecordsReq {
-    //组织机构id
-    private Long orgId;
-
-    //组织机构名称
-    private String orgName;
-    //表示装备
-    private String device;
-
-    //出入设备:0手持机/1单警柜/2通道
-    private Integer deviceType;
-
-    /**
-     * 单警柜id
-     */
-    private String locationId;
-    //单警柜名称
-    private String locationName;
-
-    /**
-     * 箱门id
-     */
-    private String cabinetboxId;
-    //操作时间
-    private Date useTIme;
-    /**
-     * 操作人员
-     */
-    private String userName;
-    /**
-     * 出入装备集合
-     */
-    private List<InventoryReq> inventoryList;
-
-}

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

@@ -4,6 +4,7 @@ import com.junmp.jyzb.api.bean.dto.InventorySumDto;
 import com.junmp.jyzb.api.bean.dto.TjDto.*;
 import com.junmp.jyzb.api.bean.query.TjReq.TjOrgCountReq;
 import com.junmp.jyzb.api.bean.query.TjReq.TjOrgEqsReq;
+import com.junmp.jyzb.api.bean.query.TjReq.TjOrgPoliceReq;
 import com.junmp.jyzb.api.bean.query.TjReq.TjOrgPriceReq;
 import com.junmp.jyzb.api.bean.query.WarehouseReq;
 import com.junmp.jyzb.entity.Temp.HumidityAndtemperature;
@@ -144,28 +145,28 @@ public class TjController {
     /**
      * --------------------------------------人员统计报表-------------------------------------------
      */
-//    @PostMapping("/TjOrgPolice")
-//    @ApiOperation("/人员统计报表")
-//    public ApiRes<PageResult<TjOrgPoliceDto>> TjOrgPolice(@RequestBody TjOrgPoliceReq req){
-//        return ApiRes.success(tjService.TjOrgPolice(req));
-//    }
-//    @PostMapping("/TjOrgPoliceSum")
-//    @ApiOperation("/人员统计报表汇总")
-//    public ApiRes<FinalTjOrgPoliceDto> TjOrgPoliceSum(@RequestBody TjOrgPoliceReq req){
-//        return ApiRes.success(tjService.TjOrgPoliceSum(req));
-//    }
-//
-//    //财务统计报表（点击+后里面的数据）
-//    @PostMapping("/TjOrgPoliceDetailPage")
-//    @ApiOperation("/查询组织机构下的人员统计明细")
-//    public ApiRes<PageResult<TjOrgPoliceDto>> TjOrgPoliceDetailPage(@RequestBody TjOrgPoliceReq req){
-//        return ApiRes.success(tjService.TjOrgPoliceDetailPage(req));
-//    }
-//    @PostMapping("/TjOrgPoliceDetailList")
-//    @ApiOperation("/查询组织机构下的人员统计明细")
-//    public ApiRes<List<TjOrgPoliceDto>> TjOrgPoliceDetailList(@RequestBody TjOrgPoliceReq req){
-//        return ApiRes.success(tjService.TjOrgPoliceDetailList(req));
-//    }
+    @PostMapping("/TjOrgPolice")
+    @ApiOperation("/人员统计报表")
+    public ApiRes<PageResult<TjOrgPoliceDto>> TjOrgPolice(@RequestBody TjOrgPoliceReq req){
+        return ApiRes.success(tjService.TjOrgPolice(req));
+    }
+    @PostMapping("/TjOrgPoliceSum")
+    @ApiOperation("/人员统计报表汇总")
+    public ApiRes<FinalTjOrgPoliceDto> TjOrgPoliceSum(@RequestBody TjOrgPoliceReq req){
+        return ApiRes.success(tjService.TjOrgPoliceSum(req));
+    }
+
+    //人员统计报表（点击+后里面的数据）
+    @PostMapping("/TjOrgPoliceDetailPage")
+    @ApiOperation("/查询组织机构下的人员统计明细")
+    public ApiRes<PageResult<TjOrgPoliceDto>> TjOrgPoliceDetailPage(@RequestBody TjOrgPoliceReq req){
+        return ApiRes.success(tjService.TjOrgPoliceDetailPage(req));
+    }
+    @PostMapping("/TjOrgPoliceDetailList")
+    @ApiOperation("/查询组织机构下的人员统计明细")
+    public ApiRes<List<TjOrgPoliceDto>> TjOrgPoliceDetailList(@RequestBody TjOrgPoliceReq req){
+        return ApiRes.success(tjService.TjOrgPoliceDetailList(req));
+    }
 
 
 

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

@@ -78,8 +78,8 @@ public class PoliceEquipment implements Serializable {
     /**
      * 装备存放位置
      */
-    @TableField(value = "storage_location",updateStrategy = FieldStrategy.IGNORED)
-    private String storageLocation;
+    @TableField(value = "location_name",updateStrategy = FieldStrategy.IGNORED)
+    private String locationName;
 
     //装备单价
     @TableField("price")

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

 package com.junmp.jyzb.mapper;
 
+import com.junmp.jyzb.api.bean.dto.TjDto.FinalTjOrgPoliceDto;
+import com.junmp.jyzb.api.bean.dto.TjDto.TjOrgPoliceDto;
+import com.junmp.jyzb.api.bean.query.TjReq.TjOrgPoliceReq;
 import com.junmp.jyzb.entity.PoliceEquipment;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
 * @author lxh专属坐骑
@@ -11,6 +17,15 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 */
 public interface PoliceEquipmentMapper extends BaseMapper<PoliceEquipment> {
 
+    int getCount(@Param("req") TjOrgPoliceReq req);
+
+    List<TjOrgPoliceDto> TjOrgPolice(@Param("req") TjOrgPoliceReq req,@Param("pageNo") Long pageNo,@Param("pageSize") Long pageSize);
+
+    FinalTjOrgPoliceDto TjOrgPoliceSum(@Param("req") TjOrgPoliceReq req);
+
+    int TjOrgPoliceDetailSum(@Param("req") TjOrgPoliceReq req);
+
+    List<TjOrgPoliceDto> TjOrgPoliceDetail(@Param("req") TjOrgPoliceReq req,@Param("pageNo") Long pageNo,@Param("pageSize") Long pageSize);
 }
 
 

jyzb-biz/src/main/java/com/junmp/jyzb/rabbitmq/CabinetLogReceiver.java

 package com.junmp.jyzb.rabbitmq;
 
-import com.junmp.jyzb.api.bean.req.CabinetInOutRecordsReq;
+import com.alibaba.fastjson.JSON;
+import com.junmp.jyzb.api.bean.query.InAndOutRecordReq.CabinetLogsRecordReq;
 import com.junmp.jyzb.api.bean.req.RabbitMqOrderReq;
 import com.junmp.jyzb.service.InventorySummaryService;
 import com.rabbitmq.client.Channel;
@@ -21,21 +22,19 @@ public class CabinetLogReceiver {
     @Resource
     private InventorySummaryService inventorySummaryService;
 
-    @RabbitListener(queues = "11111")//监听队列名
-    private void a(CabinetInOutRecordsReq req, Channel channel, @Header(AmqpHeaders.DELIVERY_TAG) long deliveryTag){
+    @RabbitListener(queues = "CabinetLogsRecord")//监听队列名
+    private void a(String msg, Channel channel, @Header(AmqpHeaders.DELIVERY_TAG) long deliveryTag){
 
         try {
-            System.out.println("req = " + req);
+            System.out.println("msg = " + msg);
+            // 手动确认消息
+            channel.basicAck(deliveryTag, false);
+            CabinetLogsRecordReq req = JSON.parseObject(msg, CabinetLogsRecordReq.class);
             //将消息进行消费
             Boolean result = inventorySummaryService.cabinetInOutRecords(req);
-            if (result){
-                // 手动确认消息
-                channel.basicAck(deliveryTag, false);
-            }else {
-                channel.basicNack(deliveryTag, false, true);
-            }
+
         } catch (Exception e) {
-            // 处理消息过程中发生异常，拒绝消息并将其重新放回队列
+            // 处理消息过程中发生异常，拒绝消息并将其重新放回队列ms
             try {
                 channel.basicNack(deliveryTag, false, true);
             } catch (IOException ex) {

jyzb-biz/src/main/java/com/junmp/jyzb/rabbitmq/OutInLogsByCabinetReceiver.java

 package com.junmp.jyzb.rabbitmq;
 
 import com.alibaba.fastjson.JSON;
+import com.junmp.jyzb.api.bean.query.InAndOutRecordReq.CabinetLogsRecordReq;
 import com.junmp.jyzb.api.bean.query.InAndOutRecordReq.OutInLogsReq;
+import com.junmp.jyzb.service.LogSummaryService;
 import com.rabbitmq.client.Channel;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
 import org.springframework.amqp.support.AmqpHeaders;
 import org.springframework.messaging.handler.annotation.Header;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.Resource;
 import java.io.IOException;
 
 /**
@@ -16,6 +19,9 @@ import java.io.IOException;
 @Component
 public class OutInLogsByCabinetReceiver {
 
+    @Resource
+    private LogSummaryService logSummaryService;
+
     @RabbitListener(queues = "CabinetLogsRecord")//监听队列名
     private void a(String msg, Channel channel, @Header(AmqpHeaders.DELIVERY_TAG) long deliveryTag){
 
@@ -23,9 +29,9 @@ public class OutInLogsByCabinetReceiver {
             System.out.println("msg = " + msg);
             // 手动确认消息
             channel.basicAck(deliveryTag, false);
-            OutInLogsReq req = JSON.parseObject(msg, OutInLogsReq.class);
+            CabinetLogsRecordReq req = JSON.parseObject(msg, CabinetLogsRecordReq.class);
             //将消息进行消费
-//            Boolean result = logSummaryService.processInventoryRecords(req);
+            Boolean result = logSummaryService.processOutInRecords(req);
 
         } catch (Exception e) {
             // 处理消息过程中发生异常，拒绝消息并将其重新放回队列ms

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

 package com.junmp.jyzb.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.junmp.jyzb.api.bean.dto.FetchingDataDto.EquipmentDto;
 import com.junmp.jyzb.api.bean.dto.InventorySumDto;
-import com.junmp.jyzb.api.bean.dto.NormalInOutDto;
-import com.junmp.jyzb.api.bean.query.InventoryReq;
+import com.junmp.jyzb.api.bean.query.InAndOutRecordReq.CabinetLogsRecordReq;
 import com.junmp.jyzb.api.bean.query.InventorySumReq;
 import com.junmp.jyzb.api.bean.query.SelectTotalNumReq;
-import com.junmp.jyzb.api.bean.req.CabinetInOutRecordsReq;
-import com.junmp.jyzb.api.bean.req.RabbitMqOrderReq;
 import com.junmp.jyzb.entity.InventorySummary;
 import com.junmp.v2.db.api.page.PageResult;
-import liquibase.pro.packaged.L;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 
@@ -35,7 +28,7 @@ public interface InventorySummaryService extends IService<InventorySummary> {
     Boolean updateSummaryInsByOrder(Long orgId);
 
     //处理单警柜返回单据结果
-    Boolean cabinetInOutRecords(CabinetInOutRecordsReq req);
+    Boolean cabinetInOutRecords(CabinetLogsRecordReq req);
 
     //根据组织机构id/单警柜id/仓库id查询出库存汇总数量以及金额
     List<InventorySummary> getTotalNumberAndPrice(InventorySumReq req);

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

 package com.junmp.jyzb.service;
 
+import com.junmp.jyzb.api.bean.query.InAndOutRecordReq.CabinetLogsRecordReq;
 import com.junmp.jyzb.api.bean.query.InAndOutRecordReq.OutInLogsReq;
 import com.junmp.jyzb.api.bean.query.LogSummaryReq;
 import com.junmp.jyzb.entity.LogSummary;
@@ -18,4 +19,6 @@ public interface LogSummaryService extends IService<LogSummary> {
     //本地主机返回出入库结果
     Boolean processInventoryRecords(OutInLogsReq req);
 
+    //单警柜返回出入库结果
+    Boolean processOutInRecords(CabinetLogsRecordReq req);
 }

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

@@ -5,6 +5,7 @@ import com.junmp.jyzb.api.bean.dto.TjDto.*;
 import com.junmp.jyzb.api.bean.query.InventoryReq;
 import com.junmp.jyzb.api.bean.query.TjReq.TjOrgCountReq;
 import com.junmp.jyzb.api.bean.query.TjReq.TjOrgEqsReq;
+import com.junmp.jyzb.api.bean.query.TjReq.TjOrgPoliceReq;
 import com.junmp.jyzb.api.bean.query.TjReq.TjOrgPriceReq;
 import com.junmp.v2.db.api.page.PageResult;
 
@@ -14,7 +15,6 @@ public interface TjService {
 
     List<TjOrgEqsDto> showOrgEqsList(InventoryReq req);
 
-//    List<TjOrgEqsDto> test(InventoryReq req);
     FinalTjOrgEqsDto test(TjOrgEqsReq req);
 
     //装备统计报表
@@ -46,4 +46,12 @@ public interface TjService {
     List<TjOrgCountDto> TjOrgCountByType(TjOrgCountReq req);
 
     List<TjOutAndInDto> TjOutAndInCount(TjOrgCountReq req);
+
+    PageResult<TjOrgPoliceDto> TjOrgPolice(TjOrgPoliceReq req);
+
+    FinalTjOrgPoliceDto TjOrgPoliceSum(TjOrgPoliceReq req);
+
+    PageResult<TjOrgPoliceDto> TjOrgPoliceDetailPage(TjOrgPoliceReq req);
+
+    List<TjOrgPoliceDto> TjOrgPoliceDetailList(TjOrgPoliceReq req);
 }

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

@@ -9,10 +9,10 @@ import com.junmp.jyzb.api.bean.dto.FetchingDataDto.EquipmentDto;
 import com.junmp.jyzb.api.bean.dto.InventorySumDto;
 import com.junmp.jyzb.api.bean.dto.NormalInOutDto;
 import com.junmp.jyzb.api.bean.dto.WarehouseDto;
+import com.junmp.jyzb.api.bean.query.InAndOutRecordReq.CabinetLogsRecordReq;
 import com.junmp.jyzb.api.bean.query.InventoryReq;
 import com.junmp.jyzb.api.bean.query.InventorySumReq;
 import com.junmp.jyzb.api.bean.query.SelectTotalNumReq;
-import com.junmp.jyzb.api.bean.req.CabinetInOutRecordsReq;
 import com.junmp.jyzb.api.bean.req.RabbitMqOrderReq;
 import com.junmp.jyzb.api.exception.enums.CabinetExceptionEnum;
 import com.junmp.jyzb.entity.*;
@@ -203,26 +203,26 @@ public class InventorySummaryServiceImpl  extends ServiceImpl<InventorySummaryMa
     //单警柜返回数据
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Boolean cabinetInOutRecords(CabinetInOutRecordsReq req) {
+    public Boolean cabinetInOutRecords(CabinetLogsRecordReq req) {
         //批量修改装备信息
-        List<InventoryReq> inventoryList = req.getInventoryList();
+//        List<InventoryReq> inventoryList = req.getInventoryList();
         boolean a=true;
-        List<Inventory> inventoryLogsList=new ArrayList<>();
-        for (InventoryReq inventoryReq:inventoryList) {
-            Inventory inventory = new Inventory();
-            BeanPlusUtil.copyProperties(inventoryReq,inventory);
-            boolean result = inventoryService.saveOrUpdate(inventory);
-            inventoryLogsList.add(inventory);
-            if (!result){
-                a=false;
-                break;
-            }
-        }
+//        List<Inventory> inventoryLogsList=new ArrayList<>();
+//        for (InventoryReq inventoryReq:inventoryList) {
+//            Inventory inventory = new Inventory();
+//            BeanPlusUtil.copyProperties(inventoryReq,inventory);
+//            boolean result = inventoryService.saveOrUpdate(inventory);
+//            inventoryLogsList.add(inventory);
+//            if (!result){
+//                a=false;
+//                break;
+//            }
+//        }
         //修改summary表中数据
 //        boolean b = updateSummaryInsByCabinet(req.getLocationId());
         //添加日志记录、
-        Boolean c = insertCabinetLog(req,inventoryLogsList);
-        return (a  && c);
+//        Boolean c = insertCabinetLog(req,inventoryLogsList);
+        return (a  );
     }
 
 
@@ -247,7 +247,7 @@ public class InventorySummaryServiceImpl  extends ServiceImpl<InventorySummaryMa
     }
 
     //添加单警柜出入库记录日志
-    public Boolean insertCabinetLog(CabinetInOutRecordsReq req,List<Inventory> inventoryLogsList){
+    public Boolean insertCabinetLog(CabinetLogsRecordReq req,List<Inventory> inventoryLogsList){
 
         LogSummary logSummary = new LogSummary();
         BeanPlusUtil.copyProperties(req,logSummary);
@@ -258,7 +258,7 @@ public class InventorySummaryServiceImpl  extends ServiceImpl<InventorySummaryMa
             LogDetail logDetail = new LogDetail();
             BeanPlusUtil.copyProperties(inventory,logDetail);
             logDetail.setInventoryId(inventory.getId());
-            logDetail.setCabinetboxId(req.getLocationId());
+//            logDetail.setCabinetboxId(req.getLocationId());
             logDetail.setOutInState(inventory.getLocationState());
             logDetail.setSummaryId(logSummary.getId());
             logDetailList.add(logDetail);

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

@@ -215,7 +215,12 @@ public class LogSummaryServiceImpl extends ServiceImpl<LogSummaryMapper, LogSumm
         return a && b && c && c1 && d;
     }
 
-//    对出入库记录进行分类汇总存储()
+    @Override
+    public Boolean processOutInRecords(CabinetLogsRecordReq req) {
+        return null;
+    }
+
+    //    对出入库记录进行分类汇总存储()
     public List<NormalInOutDto> saveInOutRecords(OutInLogsReq req) {
         //返回结果，用于日常出入库时计算更新库存汇总表
         List<SummaryLogReq> logSummaryList = req.getLogList();

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

@@ -8,6 +8,7 @@ import com.junmp.jyzb.api.bean.dto.TjDto.*;
 import com.junmp.jyzb.api.bean.query.InventoryReq;
 import com.junmp.jyzb.api.bean.query.TjReq.TjOrgCountReq;
 import com.junmp.jyzb.api.bean.query.TjReq.TjOrgEqsReq;
+import com.junmp.jyzb.api.bean.query.TjReq.TjOrgPoliceReq;
 import com.junmp.jyzb.api.bean.query.TjReq.TjOrgPriceReq;
 import com.junmp.jyzb.mapper.*;
 import com.junmp.jyzb.service.EquipmentSizeService;
@@ -38,6 +39,9 @@ public class TjServiceImpl implements TjService {
     @Resource
     private LogSummaryMapper logSummaryMapper;
 
+    @Resource
+    private PoliceEquipmentMapper policeEquipmentMapper;
+
 
     //装备统计报表
     @Override
@@ -414,4 +418,50 @@ public class TjServiceImpl implements TjService {
         List<TjOutAndInDto> returnList=logSummaryMapper.TjOutAndInCount(req);
         return returnList;
     }
+
+
+
+    @Override
+    public PageResult<TjOrgPoliceDto> TjOrgPolice(TjOrgPoliceReq req) {
+        int size=policeEquipmentMapper.getCount(req);
+        if (ObjectUtil.isNull(req.getPageNo()) && ObjectUtil.isNull(req.getPageSize())) {
+            req.setPageNo(1L);
+            req.setPageSize(10L);
+        }
+        List<TjOrgPoliceDto> list= policeEquipmentMapper.TjOrgPolice(req,(req.getPageNo()-1)* req.getPageSize(),req.getPageSize());
+        Page<TjOrgPoliceDto> page = PageFactory.getDefaultPage(req.getPageNo(), req.getPageSize());
+        page.setTotal(size);
+        page.setRecords(list);
+        return PageResultFactory.createPageResult(page);
+    }
+
+    @Override
+    public FinalTjOrgPoliceDto TjOrgPoliceSum(TjOrgPoliceReq req) {
+        FinalTjOrgPoliceDto finalTjOrgPoliceDto=policeEquipmentMapper.TjOrgPoliceSum(req);
+        if (ObjectUtil.isNotNull(finalTjOrgPoliceDto)){
+            return finalTjOrgPoliceDto;
+        }else {
+            return new FinalTjOrgPoliceDto();
+        }
+    }
+
+    @Override
+    public PageResult<TjOrgPoliceDto> TjOrgPoliceDetailPage(TjOrgPoliceReq req) {
+        if (ObjectUtil.isNull(req.getPageNo()) && ObjectUtil.isNull(req.getPageSize())) {
+            req.setPageNo(1L);
+            req.setPageSize(10L);
+        }
+        int size = policeEquipmentMapper.TjOrgPoliceDetailSum(req);
+        List<TjOrgPoliceDto> returnList=policeEquipmentMapper.TjOrgPoliceDetail(req,(req.getPageNo()-1)* req.getPageSize(),req.getPageSize());
+        Page<TjOrgPoliceDto> page = PageFactory.getDefaultPage(req.getPageNo(), req.getPageSize());
+        page.setTotal(size);
+        page.setRecords(returnList);
+        return PageResultFactory.createPageResult(page);
+    }
+
+    @Override
+    public List<TjOrgPoliceDto> TjOrgPoliceDetailList(TjOrgPoliceReq req) {
+        List<TjOrgPoliceDto> returnList=policeEquipmentMapper.TjOrgPoliceDetail(req,null,null);
+        return returnList;
+    }
 }

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

@@ -20,4 +20,7 @@
         num,org_id,equipment_name,
         update_time,create_time
     </sql>
+    <select id="TjOrgPolice" resultType="com.junmp.jyzb.api.bean.dto.TjDto.TjOrgPoliceDto">
+
+    </select>
 </mapper>