修改消息推送接口

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

@@ -206,4 +206,6 @@ public class InventoryReq extends BaseRequest {
 
     private String bussinessType;
 
+    private String number;
+
 }

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

@@ -25,5 +25,6 @@ public class QueryEquipmentTypeReq  {
     private String name;
     private String typeIds;
     private String sizeIds;
+    private String typeId;
 }
 

jyzb-api/src/main/java/com/junmp/jyzb/api/exception/enums/InventoryExceptionEnum.java

@@ -14,6 +14,7 @@ public enum InventoryExceptionEnum implements IExceptionEnum {
     ORDER_HAS_START(CommonConstant.DEFAULT_BIZ_ERROR_CODE,"单据已经开始，请勿重复操作"),
     RUNNINGORDER_EXIST(CommonConstant.DEFAULT_BIZ_ERROR_CODE,"已存在盘点单据"),
     ORDER_CLOSED(CommonConstant.DEFAULT_BIZ_ERROR_CODE,"单据已结算，无法重复操作"),
+    INVERTORY_IS_NULL(CommonConstant.DEFAULT_USER_ERROR_CODE,"导入的装备为空"),
     /**
      * 装备不存在
      */

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

@@ -94,5 +94,7 @@ public class EquipmentSize implements Serializable {
     @TableField(value = "instructions")
     private String instructions;
 
+    @TableField(exist = false)
+    private String typeName;
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file

jyzb-biz/src/main/java/com/junmp/jyzb/listener/GlobalEndListener.java

@@ -302,7 +302,7 @@ import static com.junmp.junmpProcess.common.CommonConstants.*;
                     }
                     sendReq.setPriority("0");
                     sendReq.setSendTime(DateTime.now());
-                    messageApi.sendMessage(sendReq);
+                    messageApi.sendMessageNoToken(sendReq);
                     messageApi.queryCount(new MessageReq());
                     /*推送发送未读数量*/
                     MessageReq req1 = new MessageReq();

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

@@ -38,4 +38,6 @@ public interface EquipmentSizeMapper extends BaseMapper<EquipmentSize> {
     List<String> searchByTypeIds(@Param("list") List<String> typeIdsList);
 
     List<SizeDto> alignSizeInfo(@Param("date") String date);
+
+    List<EquipmentSize> distinctByName(@Param("list") List<EquipmentSize> locationList);
 }
\ No newline at end of file

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

@@ -87,9 +87,7 @@ public interface InventorySummaryMapper  extends BaseMapper<InventorySummary> {
 
     int selectSumByItemsCount(@Param("req") InventoryReq req);
 
-    List<InventoryDto> GetDetailByTerms(@Param("req") InventoryReq req,
-                                        @Param("pageNo") Long pageNo,
-                                        @Param("pageSize") Long pageSize);
+    List<InventoryDto> GetDetailByTerms(@Param("req") InventoryReq req);
 
     void useViewOrgIdInSubordinate(@Param("sql") String sql);
 

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

@@ -32,6 +32,8 @@ public interface EquipmentSizeService extends IService<EquipmentSize> {
 
     List<SizeDto> alignSizeInfo(UpdateEquipmentSizeReq req);
 
+    List<EquipmentSize> distinctByName(List<EquipmentSize> sizeList);
+
 
     //根据typeId拿到装备typeIds
 //    List<String> selectByTypeIds(List<String> typeIdsList);

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

@@ -220,7 +220,7 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl
         if (CollectionUtil.isNotEmpty(msgs)){
             msgs.forEach(msg->
                     {
-                        messageApi.sendMessage(msg);
+                        messageApi.sendMessageNoToken(msg);
 
                     }
 

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

@@ -144,7 +144,7 @@ public class BussinessInventoryServiceImpl extends ServiceImpl<BussinessInventor
             if (CollectionUtil.isNotEmpty(msgs)){
                 msgs.forEach(msg->
                         {
-                            messageApi.sendMessage(msg);
+                            messageApi.sendMessageNoToken(msg);
                         }
 
                 );
@@ -426,6 +426,33 @@ public class BussinessInventoryServiceImpl extends ServiceImpl<BussinessInventor
             bussinessInventoryDetailService.saveBatch(BDList);
         }
         warehouseService.updateById(warehouse);
+
+        //盘点进行中，需要为所有人员推送信息
+        MessageSendReq sendReq = new MessageSendReq();
+        String historyAssign = bi.getHistoryAssign();
+        List<String> userIdsList=new ArrayList<>();
+        if (ObjectUtil.isNotEmpty(historyAssign)){
+            userIdsList = Arrays.asList(historyAssign.split(","));
+        }
+        for (String userId:userIdsList) {
+            sendReq.setReceiveUserIds(userId);
+            sendReq.setMsgTitle("盘点提醒");
+            sendReq.setMsgContent("盘库单:【"+bi.getOrderNum()+"】正在进行盘点，仓库:"+bi.getWarehouseName()+"已锁定");
+            sendReq.setPriority("0");
+            sendReq.setSendTime(DateTime.now());
+            messageApi.sendMessageNoToken(sendReq);
+
+        }
+        /*推送发送未读数量*/
+        for(String userId:userIdsList){
+            MessageReq req1 = new MessageReq();
+            req1.setReadFlag(0);
+            req1.setReceiveUserId(Long.parseLong(userId));
+            Integer count1 = messageApi.queryCount(req1);
+            messageApi.pushMsgToUser(userId,count1);
+        }
+
+
         if (bi!=null)
         {
             bi.setInventoryState("running");
@@ -514,27 +541,7 @@ public class BussinessInventoryServiceImpl extends ServiceImpl<BussinessInventor
         uniqueOrgIDsList.add(BI.getOrgId());
         //查询组织机构下面的所有仓管员的useId
         List<InvExpireReq> userIdsList=inventoryMapper.selectUserListByOrgs(uniqueOrgIDsList,"1663372320355389441");
-        //盘点进行中，需要为所有人员推送信息
-        MessageSendReq sendReq = new MessageSendReq();
 
-//        for (InvExpireReq userIds:userIdsList) {
-//            sendReq.setReceiveUserIds(userIds.getUserId());
-//            sendReq.setMsgTitle("盘点提醒");
-//            sendReq.setMsgContent("盘库单:【"+BI.getOrderNum()+"】正在进行盘点，仓库:"+BI.getWarehouseName()+"已锁定");
-//            sendReq.setPriority("0");
-//            sendReq.setSendTime(DateTime.now());
-//            messageApi.sendMessage(sendReq);
-//
-//        }
-//
-//        /*推送发送未读数量*/
-//        for(InvExpireReq userIds:userIdsList){
-//            MessageReq req1 = new MessageReq();
-//            req1.setReadFlag(0);
-//            req1.setReceiveUserId(Long.parseLong(userIds.getUserId()));
-//            Integer count1 = messageApi.queryCount(req1);
-//            messageApi.pushMsgToUser(userIds.getUserId(),count1);
-//        }
 
         return true;
     }

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

@@ -238,6 +238,12 @@ public class EquipmentSizeServiceImpl extends ServiceImpl<EquipmentSizeMapper, E
         return equipmentSizeMapper.alignSizeInfo(date);
     }
 
+    @Override
+    public List<EquipmentSize> distinctByName(List<EquipmentSize> sizeList) {
+
+        return equipmentSizeMapper.distinctByName(sizeList);
+    }
+
 
     public List<String> selectByTypeIds(List<String> typeIdsList){
         List<String> list1=new ArrayList<>();

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

@@ -549,6 +549,7 @@ public class EquipmentTypeServiceImpl extends ServiceImpl<EquipmentTypeMapper, E
         wrapper.ne(EquipmentType::getId, "00000000-0000-0000-0000-000000000000");
         wrapper.eq(ObjectUtil.isNotEmpty(req.getType()), EquipmentType::getType,req.getType() );
         wrapper.like(ObjectUtil.isNotEmpty(req.getName()), EquipmentType::getName,req.getName() );
+        wrapper.eq(ObjectUtil.isNotEmpty(req.getTypeId()),EquipmentType::getId,req.getTypeId());
             wrapper.orderByDesc(EquipmentType::getCreateTime);
             return wrapper;
 

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

@@ -21,6 +21,7 @@ import com.junmp.jyzb.api.bean.vo.InventoryVo;
 import com.junmp.jyzb.api.exception.enums.CabinetBoxExceptionEnum;
 import com.junmp.jyzb.api.exception.enums.CabinetExceptionEnum;
 import com.junmp.jyzb.api.exception.enums.InventoryExceptionEnum;
+import com.junmp.jyzb.api.exception.enums.PubOrgExceptionEnum;
 import com.junmp.jyzb.entity.*;
 
 import com.junmp.jyzb.mapper.InventorySummaryMapper;
@@ -256,8 +257,12 @@ public class InventoryServiceImpl extends ServiceImpl<InventoryMapper, Inventory
     public PageResult<InventoryDto> GetDetailByTerms(InventoryReq req) {
 //        //根据条件查询仓库下的所有装备
         int size=inventorySummaryMapper.selectSumByItemsCount(req);
-        List<InventoryDto> returnList=inventorySummaryMapper.GetDetailByTerms(req,(req.getPageNo()-1)*req.getPageSize(),req.getPageSize());
+
         Page<InventoryDto> page1 = PageFactory.getDefaultPage(req.getPageNo(), req.getPageSize());
+        Long a=(req.getPageNo()-1)*req.getPageSize();
+        req.setPageNo((req.getPageNo()-1)*req.getPageSize());
+
+        List<InventoryDto> returnList=inventorySummaryMapper.GetDetailByTerms(req);
         page1.setRecords(returnList);
         page1.setTotal(size);
         return PageResultFactory.createPageResult(page1);
@@ -678,6 +683,40 @@ public class InventoryServiceImpl extends ServiceImpl<InventoryMapper, Inventory
     @Override
     public boolean EqsImport(InventoryReq req) {
         List<InventoryReq> eqsList = req.getEqsList();
+        PubOrg pubOrg = new PubOrg();
+        if (CollectionUtil.isNotEmpty(eqsList)){
+            pubOrg = pubOrgService.getOne(new LambdaQueryWrapper<PubOrg>()
+                    .eq(PubOrg::getOrgName, eqsList.get(0).getOrgName())
+                    .or()
+                    .eq(PubOrg::getDName, eqsList.get(0).getOrgName()));
+        }else {
+            throw new ServiceException(InventoryExceptionEnum.INVERTORY_IS_NULL);
+        }
+        //创建4个对应的map去数据库进行查询
+        Map<String,String> locationMap=new HashMap<>();
+        Map<String,String> typeMap=new HashMap<>();
+        Map<String,String> sizeMap=new HashMap<>();
+        Map<String,String> supplierMap=new HashMap<>();
+        for (InventoryReq inv:eqsList) {
+            locationMap.putIfAbsent(inv.getLocationName(),inv.getLocationName());
+            typeMap.putIfAbsent(inv.getTypeName(),inv.getTypeName());
+            sizeMap.putIfAbsent(inv.getSizeName(),inv.getSizeName()+"-"+inv.getTypeName());
+            supplierMap.putIfAbsent(inv.getSupplierName(),inv.getSupplierName());
+        }
+        List<String> locationList = new ArrayList<>(locationMap.values());
+        List<EquipmentSize> sizeList = new ArrayList<>();
+        for (String item:typeMap.values()) {
+            String[] parts = item.split("-");
+            String sizeName = parts[0].trim();
+            String typeName = parts[1].trim();
+            EquipmentSize equipmentSize = new EquipmentSize();
+            equipmentSize.setName(sizeName);
+            equipmentSize.setTypeName(typeName);
+            sizeList.add(equipmentSize);
+        }
+        List<String> typeList = new ArrayList<>(sizeMap.values());
+        List<String> supplierList = new ArrayList<>(supplierMap.values());
+        List<EquipmentSize> equipmentSizeList = equipmentSizeService.distinctByName(sizeList);
 
         return false;
     }

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

@@ -361,7 +361,7 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
         if (CollectionUtil.isNotEmpty(msgs)){
             msgs.forEach(msg->
                     {
-                        messageApi.sendMessage(msg);
+                        messageApi.sendMessageNoToken(msg);
                     }
 
             );

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

@@ -1752,7 +1752,7 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
         if (CollectionUtil.isNotEmpty(msgs)){
             msgs.forEach(msg->
                     {
-                        messageApi.sendMessage(msg);
+                        messageApi.sendMessageNoToken(msg);
                     }
 
             );

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

@@ -116,7 +116,7 @@ public class PublicServiceImpl implements PublicService {
                 sendReq.setMsgContent("消息更新");
                 sendReq.setPriority("1");
                 sendReq.setSendTime(DateTime.now());
-                messageApi.sendMessage(sendReq);
+                messageApi.sendMessageNoToken(sendReq);
             }
         });
         return true;

jyzb-biz/src/main/java/com/junmp/jyzb/task/InvExpireMsg.java

@@ -116,7 +116,7 @@ public class InvExpireMsg implements JobAction {
                             invExpireReq.getSizeName()+"装备已经过质保期,数量为"+invExpireReq.getSumExpireNumber());
                     sendReq.setPriority("0");
                     sendReq.setSendTime(DateTime.now());
-                    messageApi.sendMessage(sendReq);
+                    messageApi.sendMessageNoToken(sendReq);
                 }
             }
         }

jyzb-biz/src/main/java/com/junmp/jyzb/task/InvOverDueMsg.java

@@ -92,7 +92,7 @@ public class InvOverDueMsg implements JobAction {
                 sendReq.setMsgContent("单据id为："+orderMain.getId()+"的领用单已超期，请及时查看处理");
                 sendReq.setPriority("0");
                 sendReq.setSendTime(DateTime.now());
-                messageApi.sendMessage(sendReq);
+                messageApi.sendMessageNoToken(sendReq);
                 userIdsList.add(orderMain.getReturnUserId());
             }
 

jyzb-biz/src/main/java/com/junmp/jyzb/task/InvThresholdMsg.java

@@ -81,7 +81,7 @@ public class InvThresholdMsg implements JobAction {
             sendReq.setMsgContent(inventorySummary.getLocationName()+"仓库下的"+inventorySummary.getTypeName()+"号型为"+inventorySummary.getSizeName()+"的物资低于阈值");
             sendReq.setPriority("0");
             sendReq.setSendTime(DateTime.now());
-            messageApi.sendMessage(sendReq);
+            messageApi.sendMessageNoToken(sendReq);
         }
         messageApi.queryCount(new MessageReq());
         /*推送发送未读数量*/

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

@@ -493,8 +493,10 @@
                 sum(case when location_type=1 then stock_number else 0 end)as djgstockNumber,
                 sum(case when location_type=1 then outbound_number else 0 end)as djgoutboundNumber,
                 sum(destruction_number)as destructionNumber,
-                sum(expire_number)as expireNumber,sum(broken_number)as brokenNumber,
-                sum(fix_number)as fixNumber,sum(use_number)as useNumber
+                sum(expire_number)as expireNumber,
+                sum(broken_number)as brokenNumber,
+                sum(fix_number)as fixNumber,
+                sum(use_number)as useNumber
                 FROM base_inventory_summary where SUBSTRING( org_code, 1, #{length} ) = #{req.findCode}
                 <if test="length != 12">
                     <if test="req.levelType == 0">

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

@@ -96,4 +96,8 @@
                    and update_time > #{date}
                 </if>
     </select>
+  <select id="distinctByName" resultType="com.junmp.jyzb.entity.EquipmentSize">
+
+  </select>
+
 </mapper>
\ No newline at end of file

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

@@ -807,7 +807,7 @@
         i.production_date,i.warranty_period,i.maintenance_period, i.term_state,i.property,
         i.area_id,
         bs.name as supplier_name,
-        (select instructions FROM base_equipment_type where id=#{req.typeId}) as instructions,
+        es.instructions as instructions,
         (select photo FROM base_equipment_type where id=#{req.typeId}) as type_photo,
         es.photo as size_photo
         FROM base_warehouse_inventory wi
@@ -841,10 +841,11 @@
             and i.maintenance_period=#{req.maintenancePeriod}
         </if>
         ORDER BY wi.type_id,i.size_id
-        <if test="pageNo != null and pageNo != '' and pageSize != null and pageSize != '' ">
-            limit #{pageNo},#{pageSize}
+        <if test="req.pageNo != null and req.pageSize != null">
+        limit #{req.pageNo},#{req.pageSize}
         </if>
 
+
     </select>
     <select id="selectOrgIds" resultType="java.lang.Long">
         SELECT

jyzb-boot/src/main/resources/application-prod.yml

@@ -36,7 +36,7 @@ knife4j:
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://192.168.1.128:3306/db_jyzb?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&nullCatalogMeansCurrent=true
+    url: jdbc:mysql://192.168.1.128:3306/db_jyzb_test?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&nullCatalogMeansCurrent=true
     username: root
     password: 123456
 

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

@@ -215,7 +215,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
             if (CollectionUtil.isNotEmpty(msgs)){
                 msgs.forEach(msg->
                         {
-                            messageApi.sendMessage(msg);
+                            messageApi.sendMessageNoToken(msg);
                         }
 
                 );
@@ -307,7 +307,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
             sendReq.setMsgContent("您提交的审批【"+mainProcess.getName()+"】被驳回，原因:"+comments);
             sendReq.setPriority("0");
             sendReq.setSendTime(DateTime.now());
-            messageApi.sendMessage(sendReq);
+            messageApi.sendMessageNoToken(sendReq);
             messageApi.queryCount(new MessageReq());
 //            /*推送发送未读数量*/
 //            MessageReq req1 = new MessageReq();