更新基础数据通知本地主机（上传到rabbitmq），修改密码接口平台与单警柜融合成一个接口，修改报表数据未显示完整或错误bug

app-log/log_error.log

@@ -800,3 +800,4 @@ java.lang.NullPointerException: null
 
 2024-01-24 13:36:09.864 ERROR 24988 --- [main] easy-es                                  : Easy-Es supported elasticsearch and restHighLevelClient jar version is:7.14.0 ,Please resolve the dependency conflict!
 2024-01-24 13:40:02.387 ERROR 24988 --- [http-nio-10030-exec-1] c.j.j.b.c.handle.GlobalExceptionHandler  : >授权异常>>获取token失败，请检查header和param中是否传递了用户token
+2024-01-24 13:44:45.405 ERROR 24988 --- [http-nio-10030-exec-5] c.j.j.b.c.handle.GlobalExceptionHandler  : >授权异常>>获取token失败，请检查header和param中是否传递了用户token

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

@@ -71,7 +71,7 @@ public class UpdateDeivceConfigReq implements Serializable {
 
     private Integer deviceType;
 
-    //是否暂存标记，true暂存，false，不暂存
+    //是否暂存标记，true暂存，false不暂存直接下发到本地主机
     private Boolean flag;
 
     //rabbitmq消息有关参数

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

@@ -44,6 +44,7 @@ public class UpdatePolicemanReq extends BaseRequest {
     private String account;
 
     private String password;
+    private String newPassword;
 
     private Long fileId;
 

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

@@ -76,4 +76,7 @@ public class UpdateWarehouseDevReq {
     //rabbitmq消息有关参数
     private Integer type;
 
+    //是否暂存（true表示暂存不会下发到本地主机，如果为空或者是为false则表示直接下发通知到本地主机）
+    private Boolean flag;
+
 }

jyzb-biz/src/main/java/com/junmp/jyzb/config/rabbitMQ/TopicRabbitConfig.java

@@ -19,8 +19,8 @@ import java.util.concurrent.CompletableFuture;
 public class TopicRabbitConfig {
 
     private static final String EXCHANGE = "topicExchange";
-    private static final String ORG_ROUTING_KEY_PREFIX = "org.";
-    private static final String CABINET_ROUTING_KEY_PREFIX = "cabinet.";
+    private static final String ORG_ROUTING_KEY_PREFIX = "org";
+    private static final String CABINET_ROUTING_KEY_PREFIX = "cabinet";
 
     @Resource
     private PubOrgService pubOrgService;
@@ -56,11 +56,11 @@ public class TopicRabbitConfig {
 
         for (PubOrg org : orgList) {
             // Create a unique queue for each organization
-            Queue orgQueue = new Queue(org.getOrgId().toString());
+            Queue orgQueue = new Queue(org.getOrgId().toString(),true,false,false);
 
             // Bind the queue to the exchange with the routing key specific to the organization
             Binding orgBinding = BindingBuilder.bind(orgQueue).to(topicExchange)
-                    .with(ORG_ROUTING_KEY_PREFIX + org.getOrgId());
+                    .with(ORG_ROUTING_KEY_PREFIX);
             rabbitAdmin.declareQueue(orgQueue);
             rabbitAdmin.declareBinding(orgBinding);
             bindings.add(orgBinding);
@@ -68,11 +68,11 @@ public class TopicRabbitConfig {
 
         for (Cabinet cabinet : cabinetList) {
             // Create a unique queue for each cabinet
-            Queue cabinetQueue = new Queue(cabinet.getCabinetNum().toString());
+            Queue cabinetQueue = new Queue(cabinet.getCabinetNum().toString(),true,false,false);
 
             // Bind the queue to the exchange with the routing key specific to the cabinet
             Binding cabinetBinding = BindingBuilder.bind(cabinetQueue).to(topicExchange)
-                    .with(CABINET_ROUTING_KEY_PREFIX + cabinet.getCabinetNum());
+                    .with(CABINET_ROUTING_KEY_PREFIX);
             rabbitAdmin.declareQueue(cabinetQueue);
             rabbitAdmin.declareBinding(cabinetBinding);
             bindings.add(cabinetBinding);

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

@@ -35,25 +35,25 @@ public class DeviceConfigController {
     @Resource
     private WarehouseDevService warehouseDevService;
 
-    //新增配置
+    //新增配置(通道和本地主机配置)
     @PostMapping(path="/addDeviceConfig",name="新增配置#logType=30")
     @ApiOperation("新增配置")
     public ApiRes<Long> addDeviceConfig(@RequestBody UpdateDeivceConfigReq req){
         return ApiRes.success(deviceConfigService.addDeviceConfig(req));
     }
-    //修改配置
+    //修改配置(通道和本地主机配置)
     @PostMapping(path="/updateDeviceConfig",name="修改配置#logType=30")
     @ApiOperation("修改配置")
     public ApiRes<Boolean> updateDeviceConfig(@RequestBody UpdateDeivceConfigReq req){
         return ApiRes.success(deviceConfigService.updateDeviceConfig(req));
     }
-    //查询配置Page
+    //查询配置Page(通道和本地主机配置)
     @PostMapping(path="/showDeviceConfigPage",name="查询配置Page#enable")
     @ApiOperation("查询配置Page")
     public ApiRes<PageResult<DeviceConfig>> showDeviceConfigPage(@RequestBody QueryDeviceConfigReq req){
         return ApiRes.success(deviceConfigService.showDeviceConfigPage(req));
     }
-    //查询配置List
+    //查询配置List(通道和本地主机配置)
     @PostMapping(path="/showDeviceConfigList",name="查询配置List#enable")
     @ApiOperation("查询配置List")
     public ApiRes<List<DeviceConfig>> showDeviceConfigList(@RequestBody QueryDeviceConfigReq req){

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

@@ -85,11 +85,11 @@ public class PoliceController {
         return ApiRes.success(b);
     }
     //添加人脸和指纹照片或修改
-    @PostMapping(path="/addFaceAndfinger",name="添加警员人脸照片和指纹照片#logType=30")
-    @ApiOperation("添加警员人脸照片和指纹照片")
-    public ApiRes<Boolean> addFaceAndfinger(@RequestBody UpdatePolicemanReq req){
-        return ApiRes.success(policemanService.addFaceAndfinger(req));
-    }
+//    @PostMapping(path="/addFaceAndfinger",name="添加警员人脸照片和指纹照片#logType=30")
+//    @ApiOperation("添加警员人脸照片和指纹照片")
+//    public ApiRes<Boolean> addFaceAndfinger(@RequestBody UpdatePolicemanReq req){
+//        return ApiRes.success(policemanService.addFaceAndfinger(req));
+//    }
 
 
     @PostMapping(path="/ChangeUserState",name="修改账号状态#logType=30")
@@ -138,7 +138,7 @@ public class PoliceController {
     //修改密码
     @PostMapping(path="/updatePassword",name="修改密码#logType=30")
     @ApiOperation("修改密码")
-    public ApiRes<Boolean> updatePassword(@RequestBody @Validated(SysUserReq.updatePwd.class) SysUserReq req){
+    public ApiRes<Boolean> updatePassword(@RequestBody UpdatePolicemanReq req){
         return ApiRes.success(policemanService.updatePassword(req));
     }
 

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

@@ -41,14 +41,6 @@ public class TjController {
      * ------------------------------------装备统计报表--------------------------------------------
      */
 
-    /**
-     * 根据组织机构统计装备的报表数据（外层数据）
-     */
-//    @PostMapping("/TjOrgEqs")
-//    @ApiOperation("/装备统计报表")
-//    public ApiRes<PageResult<TjOrgEqsDto>> TjOrgEqs(@RequestBody TjOrgEqsReq req){
-//        return ApiRes.success(tjService.TjOrgEqs(req));
-//    }
 
     /**
   * 根据组织机构统计装备的报表数据（外层数据）
@@ -65,12 +57,6 @@ public class TjController {
         return ApiRes.success(tjService.TjOrgDataSum(req));
     }
 
-    //第二层数据
-//    @PostMapping("/TjOrgEqsSecondList")
-//    @ApiOperation("装备统计报表二层数据")
-//    public ApiRes<List<TjOrgEqsDto>> TjOrgEqsSecondList(@RequestBody TjOrgEqsReq req){
-//     return ApiRes.success(tjService.TjOrgEqsSecondList(req));
-//    }
 
     //第二层数据
     @PostMapping("/TjOrgEqsDetail")
@@ -90,12 +76,6 @@ public class TjController {
         return ApiRes.success(tjService.TjOrgEqsDetailList(req));
     }
 
-    @PostMapping("/test1")
-    @ApiOperation("测试")
-    public ApiRes<PageResult<TjOrgEqsDto>> test1(@RequestBody TjOrgEqsReq req){
-        return ApiRes.success(tjService.test1(req));
-    }
-
     @PostMapping(path="/TjOrgEqsExport",name="装备报表导出#logType=30")
     @ApiOperation("装备报表导出")
     public void TjOrgEqsExport(@RequestBody TjOrgEqsReq req){

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

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

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

@@ -107,7 +107,7 @@ public interface PolicemanService extends IService<Policeman> {
     List<Policeman> GetPoliceWithoutOrg();
 
     //添加人脸和指纹照片或修改
-    boolean addFaceAndfinger(UpdatePolicemanReq req);
+//    boolean addFaceAndfinger(UpdatePolicemanReq req);
 
     //查询组织机构为null的警员
     List<PolicemanDto> getPoliceWithoutOrg();
@@ -116,7 +116,7 @@ public interface PolicemanService extends IService<Policeman> {
 
     boolean reSetPassword(SysUserReq req);
 
-    boolean updatePassword(SysUserReq req);
+    boolean updatePassword(UpdatePolicemanReq req);
 
     List<PoliceDto> alignPoliceInfo(PolicemanReq req);
 

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

@@ -17,8 +17,7 @@ public interface TjService {
 
     FinalTjOrgEqsDto test(TjOrgEqsReq req);
 
-    //装备统计报表
-//    PageResult<TjOrgEqsDto> TjOrgEqs(TjOrgEqsReq req);
+
     //装备统计报表
     PageResult<TjOrgEqsDto> GetTjData(TjOrgEqsReq req);
 
@@ -53,14 +52,13 @@ public interface TjService {
 
     FinalTjOrgPoliceDto TjOrgPoliceSum(TjOrgPoliceReq req);
 
-//    PageResult<TjOrgPoliceDto> TjOrgPoliceDetailPage(TjOrgPoliceReq req);
+
 
     List<TjOrgPoliceDto> TjOrgPoliceDetailList(TjOrgPoliceReq req);
 
-//    List<TjOrgEqsDto> TjOrgEqsSecondList(TjOrgEqsReq req);
 
     List<TjOrgEqsDto> GetTjDataDetail(TjOrgEqsReq req);
-    PageResult<TjOrgEqsDto> test1(TjOrgEqsReq req);
+
 
     FinalTjOrgEqsDto TjOrgDataSum(TjOrgEqsReq req);
 

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

@@ -5,6 +5,7 @@ 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.dto.FetchingDataDto.DeviceConfigInfoDto;
+import com.junmp.jyzb.api.bean.dto.MQDto;
 import com.junmp.jyzb.api.bean.query.QueryDeviceConfigReq;
 import com.junmp.jyzb.api.bean.req.UpdateDeivceConfigReq;
 import com.junmp.jyzb.api.bean.req.UpdateWarehouseDevReq;
@@ -52,13 +53,15 @@ public class DeviceConfigServiceImpl extends ServiceImpl<DeviceConfigMapper, Dev
         deviceConfig.setCreateTime(DateTimeUtil.getCurrentDateTime());
         deviceConfig.setUpdateTime(DateTimeUtil.getCurrentDateTime());
         save(deviceConfig);
-        String exchangeName="orderExchange";
+        String exchangeName="warehouseMsg";
         //判断是否暂存，将消息下发给本地主机
-        if(!req.getFlag()){
-            req.setApi("InfoChange");
-            req.setType(8);
-            req.setMsg("DeviceConfigChange");
-            MQ.SendMsg(exchangeName,req.getOrgId().toString(),req);
+        MQDto mqDto = new MQDto();
+        //如果为空或者为false，则将直接发送给本地主机
+        if(ObjectUtil.isNull(req.getFlag()) ||!req.getFlag()){
+            mqDto.setApi("InfoChange");
+            mqDto.setType(8);
+            mqDto.setMessage("Adding deviceConfigInfo");
+            MQ.SendMsg(exchangeName,req.getOrgId().toString(),mqDto);
         }
         return deviceConfig.getId() ;
     }
@@ -68,13 +71,15 @@ public class DeviceConfigServiceImpl extends ServiceImpl<DeviceConfigMapper, Dev
         DeviceConfig deviceConfig = new DeviceConfig();
         BeanPlusUtil.copyProperties(req,deviceConfig);
         deviceConfig.setUpdateTime(DateTimeUtil.getCurrentDateTime());
-        String exchangeName="orderExchange";
+        String exchangeName="warehouseMsg";
         //判断是否暂存，将消息下发给本地主机
-        if(!req.getFlag()){
-            req.setApi("InfoChange");
-            req.setType(8);
-            req.setMsg("DeviceConfigChange");
-            MQ.SendMsg(exchangeName,req.getOrgId().toString(),req);
+        MQDto mqDto = new MQDto();
+        //如果为空或者为false，则将直接发送给本地主机
+        if(ObjectUtil.isNull(req.getFlag()) ||!req.getFlag()){
+            mqDto.setApi("InfoChange");
+            mqDto.setType(8);
+            mqDto.setMessage("Updating deviceConfigInfo");
+            MQ.SendMsg(exchangeName,req.getOrgId().toString(),mqDto);
         }
         return updateById(deviceConfig);
     }

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

@@ -139,7 +139,7 @@ public class EquipmentSizeServiceImpl extends ServiceImpl<EquipmentSizeMapper, E
         //更改类别，1为号型
         mqDto.setType(1);
         mqDto.setMessage("Adding sizeInfo");
-        MQ.sendToExchange(exchangeName,"org.*",mqDto);
+        MQ.sendToExchange(exchangeName,"org",mqDto);
 
         return sizeID+"||"+code;
     }
@@ -184,7 +184,7 @@ public class EquipmentSizeServiceImpl extends ServiceImpl<EquipmentSizeMapper, E
         //更改类别，1为号型
         mqDto.setType(1);
         mqDto.setMessage("Updating sizeInfo");
-        MQ.sendToExchange(exchangeName,"org.*",mqDto);
+        MQ.sendToExchange(exchangeName,"org",mqDto);
 
         return this.updateById(size);
     }
@@ -234,6 +234,7 @@ public class EquipmentSizeServiceImpl extends ServiceImpl<EquipmentSizeMapper, E
         return equipmentSizeMapper.alignSizeInfo(date);
     }
 
+
     public List<String> selectByTypeIds(List<String> typeIdsList){
         List<String> list1=new ArrayList<>();
         List<String> list2=new ArrayList<>();
@@ -282,4 +283,7 @@ public class EquipmentSizeServiceImpl extends ServiceImpl<EquipmentSizeMapper, E
 //        wrapper.orderByAsc(EquipmentSize::getCode);
         return wrapper;
     }
+
+
+
 }
\ No newline at end of file

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

@@ -143,7 +143,7 @@ public class EquipmentTypeServiceImpl extends ServiceImpl<EquipmentTypeMapper, E
             //更改类别，1为类型
             mqDto.setType(2);
             mqDto.setMessage("Adding typeInfo");
-            MQ.sendToExchange(exchangeName,"org.*",mqDto);
+            MQ.sendToExchange(exchangeName,"org",mqDto);
 
             return  String.valueOf(newcode);
         } else {
@@ -248,7 +248,7 @@ public class EquipmentTypeServiceImpl extends ServiceImpl<EquipmentTypeMapper, E
             //更改类别，1为类型
             mqDto.setType(2);
             mqDto.setMessage("Updating typeInfo");
-            MQ.sendToExchange(exchangeName,"org.*",mqDto);
+            MQ.sendToExchange(exchangeName,"org",mqDto);
             return this.updateById(type);
         } else {
             String msg="以下供应商不存在：" +String.join(",", chekResult);

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

@@ -58,6 +58,7 @@ import com.junmp.v2.sys.user.factory.SysUserCreateFactory;
 import com.junmp.v2.sys.user.service.SysUserOrgService;
 import com.junmp.v2.sys.user.service.SysUserRoleService;
 import com.junmp.v2.sys.user.service.SysUserService;
+import liquibase.pro.packaged.O;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -209,8 +210,13 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
         {
             cabinets.forEach(t-> MQ.SendMsg("cabinetMsg",t.getCabinetNum(),"policeChange"));
         }
+        MQDto mqDto = new MQDto();
+        mqDto.setApi("InfoChange");
+        //更改类别，1为类型
+        mqDto.setType(5);
+        mqDto.setMessage("Adding policemanInfo");
         //警员添加成功之后，往消息队列推送人员更新的消息
-        MQ.SendMsg("warehouseMsg",req.getOrgId().toString(),"policeChange");//推送至仓库主机
+        MQ.SendMsg("warehouseMsg",req.getOrgId().toString(),mqDto);//推送至仓库主机
         return policeman.getId();
     }
 
@@ -276,7 +282,13 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
             cabinets.forEach(t-> MQ.SendMsg("cabinetMsg",t.getCabinetNum(),"policeChange"));
         }
         //警员添加成功之后，往消息队列推送人员更新的消息
-        MQ.SendMsg("warehouseMsg",req.getOrgId().toString(),"policeChange");//推送至仓库主机
+        MQDto mqDto = new MQDto();
+        mqDto.setApi("InfoChange");
+        //更改类别，1为类型
+        mqDto.setType(5);
+        mqDto.setMessage("Adding policemanInfo");
+        //警员添加成功之后，往消息队列推送人员更新的消息
+        MQ.SendMsg("warehouseMsg",req.getOrgId().toString(),mqDto);
 
 
         return policeman.getId();
@@ -521,8 +533,13 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
         {
             cabinets.forEach(t-> MQ.SendMsg("cabinetMsg",t.getCabinetNum(),"policeChange"));
         }
-
-        MQ.SendMsg("warehouseMsg",req.getOrgId().toString(),"policeChange");//推送至仓库主机
+        MQDto mqDto = new MQDto();
+        mqDto.setApi("InfoChange");
+        //更改类别，1为类型
+        mqDto.setType(5);
+        mqDto.setMessage("Adding policemanInfo");
+        //警员添加成功之后，往消息队列推送人员更新的消息
+        MQ.SendMsg("warehouseMsg",req.getOrgId().toString(),mqDto);
         return this.updateById(policeman);
 
 
@@ -540,19 +557,7 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
     public boolean UpdatePolice(UpdatePolicemanReq req) {
         //判断警员是否存在
         Policeman one = PoliceExist(req.getId());
-        IStoredEncryptApi storedEncryptApi = (IStoredEncryptApi) SpringUtil.getBean(IStoredEncryptApi.class);
-        //如果不为空则表示修改警员密码
-        if (req.getPassword()!=null && !req.getPassword().trim().isEmpty()) {
-            String newPassword = storedEncryptApi.encrypt(req.getPassword());
-            //同时修改警员密码
-            req.setPassword(newPassword);
-            //修改警员密码的同时修改账号表中的密码
-            sysUserService.update(new SysUser(),
-                    new LambdaUpdateWrapper<SysUser>().eq(SysUser::getUserId, one.getUserId())
-                            .set(SysUser::getPassword, newPassword)
-                            .set(SysUser::getUpdateTime, DateTimeUtil.getCurrentDateTime())
-            );
-        }
+
         //查询传入的组织机构id是否存在
         PubOrg pubOrg = pubOrgService.PubOrgExist(req.getOrgId());
         //判断传入的修改的警员编号与本身编号一致，如果一致则无所谓，如果不一致则需要判断修改的警员编号是否已经存在
@@ -589,7 +594,13 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
             cabinets.forEach(t-> MQ.SendMsg("cabinetMsg",t.getCabinetNum(),"policeChange"));
         }
         //警员添加成功之后，往消息队列推送人员更新的消息
-        MQ.SendMsg("warehouseMsg",req.getOrgId().toString(),"policeChange");//推送至仓库主机
+        MQDto mqDto = new MQDto();
+        mqDto.setApi("InfoChange");
+        //更改类别，1为类型
+        mqDto.setType(5);
+        mqDto.setMessage("Adding policemanInfo");
+        //警员添加成功之后，往消息队列推送人员更新的消息
+        MQ.SendMsg("warehouseMsg",req.getOrgId().toString(),mqDto);
         return updateById(one);
     }
     /**
@@ -635,7 +646,13 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
             cabinets.forEach(t-> MQ.SendMsg("cabinetMsg",t.getCabinetNum(),"policeChange"));
         }
 
-        MQ.SendMsg("warehouseMsg",req.getOrgId().toString(),"policeChange");//推送至仓库主机
+        MQDto mqDto = new MQDto();
+        mqDto.setApi("InfoChange");
+        //更改类别，1为类型
+        mqDto.setType(5);
+        mqDto.setMessage("Adding policemanInfo");
+        //警员添加成功之后，往消息队列推送人员更新的消息
+        MQ.SendMsg("warehouseMsg",req.getOrgId().toString(),mqDto);
         return updateById(policeInfo);
     }
 
@@ -716,7 +733,13 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
         if (!cabinets.isEmpty()) {
             cabinets.forEach(t -> MQ.SendMsg("cabinetMsg", t.getCabinetNum(), "policeChange"));
         }
-        req.getDataList().forEach(t -> MQ.SendMsg("warehouseMsg", t.getOrgId(), "policeChange"));// 推送至仓库主机
+        MQDto mqDto = new MQDto();
+        mqDto.setApi("InfoChange");
+        //更改类别，1为类型
+        mqDto.setType(5);
+        mqDto.setMessage("Adding policemanInfo");
+        //警员添加成功之后，往消息队列推送人员更新的消息
+        req.getDataList().forEach(t -> MQ.SendMsg("warehouseMsg", t.getOrgId(), mqDto));// 推送至仓库主机
         return true;
     }
 
@@ -939,6 +962,7 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
         }
         SysUser sysUser = sysUserService.getById(req.getUserId());
         sysUser.setStatusFlag(req.getState());
+
         return sysUserService.updateById(sysUser);
 
     }
@@ -1814,12 +1838,12 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
     }
 
     //添加人脸和指纹照片或修改
-    @Override
-    public boolean addFaceAndfinger(UpdatePolicemanReq req) {
-        //人脸
-        boolean a=true;
-        boolean flag=false;
-        Policeman one = getById(req.getId());
+//    @Override
+//    public boolean addFaceAndfinger(UpdatePolicemanReq req) {
+//        //人脸
+//        boolean a=true;
+//        boolean flag=false;
+//        Policeman one = getById(req.getId());
 
 //        if (one.getFaceInfo()!=null && !one.getFaceInfo().isEmpty()){
 //            flag=true;
@@ -1836,59 +1860,59 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
 //            a = updateById(one);
 //        }
 
-        //指纹
-        List<PoliceFinger> addFingerList=new ArrayList<>();
-        List<PoliceFinger> delFingerList=new ArrayList<>();
-        //库中存储的指纹信息
-        List<PoliceFinger> fingerList = policeFingerService.list(new LambdaQueryWrapper<PoliceFinger>()
-                .eq(PoliceFinger::getPoliceId, req.getId()));
-        List<String> fingerInfoList = req.getFingerList();
-        Set<String> set1 = new HashSet<>();
-        for (PoliceFinger finger : fingerList) {
-            set1.add(finger.getFingerInfo());
-        }
-        if (fingerList.size()>0){
-            if (fingerInfoList.size()>0){
-                for (String finger : fingerInfoList) {
-                    if (!set1.contains(finger)) {
-                        PoliceFinger finger1 = new PoliceFinger();
-                        finger1.setFingerInfo(finger);
-                        finger1.setPoliceId(req.getId());
-                        finger1.setCreateTime(DateTimeUtil.getCurrentDateTime());
-                        addFingerList.add(finger1);
-                    }
-                }
-                for (PoliceFinger finger : fingerList) {
-                    if (!fingerInfoList.contains(finger.getFingerInfo())) {
-                        delFingerList.add(finger);
-                    }
-                }
-            }else {
-                delFingerList.addAll(fingerList);
-            }
-        }else {
-            if (fingerInfoList.size()>0){
-                for (String finger:fingerInfoList) {
-                    PoliceFinger finger1 = new PoliceFinger();
-                    finger1.setFingerInfo(finger);
-                    finger1.setPoliceId(req.getId());
-                    finger1.setCreateTime(DateTimeUtil.getCurrentDateTime());
-                    addFingerList.add(finger1);
-                }
-            }
-        }
-        boolean c=true;
-        if (addFingerList.size()>0){
-            flag=true;
-            c=policeFingerService.saveBatch(addFingerList);
-        }
-        boolean d=true;
-        if (delFingerList.size()>0){
-            flag=true;
-            d=policeFingerService.removeByIds(delFingerList);
-        }
-        return (a  && c && d);
-    }
+//        //指纹
+//        List<PoliceFinger> addFingerList=new ArrayList<>();
+//        List<PoliceFinger> delFingerList=new ArrayList<>();
+//        //库中存储的指纹信息
+//        List<PoliceFinger> fingerList = policeFingerService.list(new LambdaQueryWrapper<PoliceFinger>()
+//                .eq(PoliceFinger::getPoliceId, req.getId()));
+//        List<String> fingerInfoList = req.getFingerList();
+//        Set<String> set1 = new HashSet<>();
+//        for (PoliceFinger finger : fingerList) {
+//            set1.add(finger.getFingerInfo());
+//        }
+//        if (fingerList.size()>0){
+//            if (fingerInfoList.size()>0){
+//                for (String finger : fingerInfoList) {
+//                    if (!set1.contains(finger)) {
+//                        PoliceFinger finger1 = new PoliceFinger();
+//                        finger1.setFingerInfo(finger);
+//                        finger1.setPoliceId(req.getId());
+//                        finger1.setCreateTime(DateTimeUtil.getCurrentDateTime());
+//                        addFingerList.add(finger1);
+//                    }
+//                }
+//                for (PoliceFinger finger : fingerList) {
+//                    if (!fingerInfoList.contains(finger.getFingerInfo())) {
+//                        delFingerList.add(finger);
+//                    }
+//                }
+//            }else {
+//                delFingerList.addAll(fingerList);
+//            }
+//        }else {
+//            if (fingerInfoList.size()>0){
+//                for (String finger:fingerInfoList) {
+//                    PoliceFinger finger1 = new PoliceFinger();
+//                    finger1.setFingerInfo(finger);
+//                    finger1.setPoliceId(req.getId());
+//                    finger1.setCreateTime(DateTimeUtil.getCurrentDateTime());
+//                    addFingerList.add(finger1);
+//                }
+//            }
+//        }
+//        boolean c=true;
+//        if (addFingerList.size()>0){
+//            flag=true;
+//            c=policeFingerService.saveBatch(addFingerList);
+//        }
+//        boolean d=true;
+//        if (delFingerList.size()>0){
+//            flag=true;
+//            d=policeFingerService.removeByIds(delFingerList);
+//        }
+//        return (a  && c && d);
+//    }
 
     //查询组织机构为null的警员
     @Override
@@ -1950,6 +1974,8 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
         if (ObjectUtil.isNotNull(one)){
             one.setPassword(password);
             updateById(one);
+            //那么我直接将消息推送到相应单警柜以及本地主机
+
         }
         return true;
     }
@@ -1957,18 +1983,29 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
     //修改密码
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public boolean updatePassword(SysUserReq req) {
-        Policeman one = getOne(new LambdaQueryWrapper<Policeman>()
-                .eq(Policeman::getUserId, req.getUserId()));
+    public boolean updatePassword(UpdatePolicemanReq req) {
+        IStoredEncryptApi storedEncryptApi = (IStoredEncryptApi) SpringUtil.getBean(IStoredEncryptApi.class);
+        Policeman one=new Policeman();
+        if (ObjectUtil.isNotNull(req.getId()) && ObjectUtil.isNotNull(req.getUserId())){
+            one = getOne(new LambdaQueryWrapper<Policeman>()
+                    .eq(Policeman::getId, req.getId()).eq(Policeman::getUserId,req.getUserId()));
+        } else if (ObjectUtil.isNotNull(req.getId()) && ObjectUtil.isNull(req.getUserId())){
+            one = getOne(new LambdaQueryWrapper<Policeman>()
+                    .eq(Policeman::getId, req.getId()));
+        }else if (ObjectUtil.isNotNull(req.getUserId()) && ObjectUtil.isNull(req.getId())){
+            one = getOne(new LambdaQueryWrapper<Policeman>()
+                    .eq(Policeman::getUserId, req.getUserId()));
+        }
         if (ObjectUtil.isNotNull(one)){
-            IStoredEncryptApi storedEncryptApi = (IStoredEncryptApi)SpringUtil.getBean(IStoredEncryptApi.class);
             //如果不为空则表示修改警员密码
-            String newPassword = storedEncryptApi.encrypt(req.getPassword());
+            String newPassword = storedEncryptApi.encrypt(req.getNewPassword());
             //同时修改警员密码
             one.setPassword(newPassword);
             updateById(one);
         }
-        sysUserService.editPassword(req);
+        SysUserReq sysUserReq = new SysUserReq();
+        BeanPlusUtil.copyProperties(req,sysUserReq);
+        sysUserService.editPassword(sysUserReq);
         return true;
     }
 

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

@@ -70,7 +70,7 @@ public class SupplierServiceImpl extends ServiceImpl<SupplierMapper, Supplier> i
         //更改类别，1为类型
         mqDto.setType(3);
         mqDto.setMessage("Adding supplierInfo");
-        MQ.sendToExchange(exchangeName,"org.*",mqDto);
+        MQ.sendToExchange(exchangeName,"org",mqDto);
         this.save(supplier);
 
         return ID;
@@ -99,7 +99,7 @@ public class SupplierServiceImpl extends ServiceImpl<SupplierMapper, Supplier> i
         //更改类别，1为类型
         mqDto.setType(3);
         mqDto.setMessage("Updating supplierInfo");
-        MQ.sendToExchange(exchangeName,"org.*",mqDto);
+        MQ.sendToExchange(exchangeName,"org",mqDto);
         return this.updateById(supplier);
     }
 

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

@@ -132,12 +132,6 @@ public class TjServiceImpl implements TjService {
         return null;
     }
 
-//    @Override
-//    public List<TjOrgEqsDto> test(InventoryReq req) {
-//        List<TjOrgEqsDto> tJOrgEqsDtoList = inventorySummaryMapper.test(req);
-//        List<TjOrgEqsDto> dynamicViewList = inventorySummaryMapper.selectDynamicView();
-//        return dynamicViewList;
-//    }
 
 
     @Override
@@ -147,13 +141,6 @@ public class TjServiceImpl implements TjService {
         //（下一层数据组织机构数据）
        List<String> orgList= inventorySummaryMapper.getTotalData(String.valueOf(req.getOrgId()));
        List<TjOrgEqsDto> allData=new ArrayList<>();
-//        for (String orgId:orgList) {
-//
-//            TjOrgEqsDto OrgData=inventorySummaryMapper.GetInvSum( orgId,
-//                    req.getTypeIdsList().isEmpty() ? null : req.getTypeIdsAsString(),
-//                    req.getSizeNameList().isEmpty() ? null : req.getSizesAsString());
-//            allData.add(OrgData);
-//        }
 
         List<CompletableFuture<TjOrgEqsDto>> futures = orgList.stream()
                 .map(orgId -> CompletableFuture.supplyAsync(() -> {
@@ -291,21 +278,9 @@ public class TjServiceImpl implements TjService {
 
         //先拿到符合条件的组织机构，再遍历组织机构组成数据
 
-//        List<TjOrgEqsDto> allData=new ArrayList<>();
-//        if (ObjectUtil.isNull(req.getLevel()) && req.getLevelNum()==0){
             List<TjOrgEqsDto> allData=inventorySummaryMapper.getTotalDataDetail(String.valueOf(req.getOrgId()),req.getTypeIdsList(),req.getSizeNameList(),req.getLevelNum(),req.getLevel());
 
-//        //直属下级
-//        else if (req.getLevel()==1 && req.getLevelNum()==1){
-////            allData=inventorySummaryMapper.getTotalDataDetail(String.valueOf(req.getOrgId()),req.getTypeIdsList(),req.getSizeNameList(),req.getLevelNum(),req.getLevel());
-//
-//        }
-//        //本级数据
-//        else if (req.getLevel()==0 && req.getLevelNum()==1){
-////            allData=inventorySummaryMapper.getTotalDataDetail(String.valueOf(req.getOrgId()),req.getTypeIdsList(),req.getSizeNameList(),req.getLevelNum(),req.getLevel());
-//
-//        }
-//        allData.addAll(OrgData);//把本级数据加进去
+
         if (req.getRemoveEmpty())//如果需要删除数据为0的话，前端传true，否则保留数据为0
         {
             allData.removeIf(tjOrgEqsDto -> tjOrgEqsDto.getTotalNumber() == 0);
@@ -316,78 +291,9 @@ public class TjServiceImpl implements TjService {
         return allData;
     }
 
-//    @Override
-//    public PageResult<TjOrgEqsDto> TjOrgEqs(TjOrgEqsReq req) {
-//        //我得先将typeid传递的最下层的装备idlist拿到
-////        List<String> typeIdsList = equipmentSizeService.selectByTypeIds(req.getTypeIdsList());
-////        List<String> sizeNameList = req.getSizeNameList();
-//        //将前端传递的值进行处理并且执行存储过程
-//        String sql="and (org_id="+req.getOrgId()+" or org_parent_id = "+req.getOrgId()+")";
-//        String sql1 = setSql(req);
-////        System.out.println("sql = " + sql);
-//        //执行存储过程
-//        inventorySummaryMapper.useViewOrgeqs(sql,req.getOrgId(),sql1);
-//        //查询视图
-//        List<TjOrgEqsDto> tjOrgEqsDtoList = inventorySummaryMapper.selectViewOrgeqsSum();
-//        //查询出来的组织机构进行判断，如果该组织机构下的装备装备总数为0，那么将该组织机构从list中移除
-//        tjOrgEqsDtoList.removeIf(tjOrgEqsDto -> tjOrgEqsDto.getTotalNumber() == 0);
-//        //将组织机构进行排序后再进行返回
-//        Comparator<TjOrgEqsDto> orgComparator = createOrgComparator();
-//        Collections.sort(tjOrgEqsDtoList, orgComparator);
-//
-//        if (ObjectUtil.isNull(req.getPageNo()) && ObjectUtil.isNull(req.getPageSize())) {
-//            req.setPageNo(1L);
-//            req.setPageSize(10L);
-//        }
-//        Page<TjOrgEqsDto> page = PageFactory.getDefaultPage(req.getPageNo(), req.getPageSize());
-//        long startIndex = (req.getPageNo() - 1) * req.getPageSize();
-//        long endIndex = Math.min(startIndex + req.getPageSize(), tjOrgEqsDtoList.size());
-//        List<TjOrgEqsDto> subList = tjOrgEqsDtoList.subList((int)startIndex, (int)endIndex);
-////        List<TjOrgEqsDto> subList = tjOrgEqsDtoList.subList((int) ((req.getPageNo()-1)*req.getPageSize()), req.getPageSize().intValue());
-//        page.setRecords(subList);
-//        page.setTotal(tjOrgEqsDtoList.size());
-////        finalTjOrgEqsDto.setTjOrgEqsDto(tjOrgEqsDtoList);
-//        return PageResultFactory.createPageResult(page);
-//    }
-
-//    @Override
-//    public List<TjOrgEqsDto> TjOrgEqsSecondList(TjOrgEqsReq req) {
-//
-//        List<TjOrgEqsDto> tjOrgEqsDtoList=new ArrayList<>();
-//        String sql="and (org_id="+req.getOrgId()+" or org_parent_id = "+req.getOrgId()+")";
-//        String sql1 = setSql(req);
-//        if (req.getOrgId().compareTo(req.getParentOrgId())==0){
-//
-//            inventorySummaryMapper.useViewOrgIdInLevel(sql,req.getOrgId());
-//
-//        }else {
-//
-//            inventorySummaryMapper.useViewOrgIdInSubordinate(sql);
-//
-//        }
-//        //查询视图
-//        tjOrgEqsDtoList = inventorySummaryMapper.selectViewOrgeqsSum();
-//        if (CollectionUtil.isNotEmpty(tjOrgEqsDtoList)){
-//            //查询出来的组织机构进行判断，如果该组织机构下的装备装备总数为0，那么将该组织机构从list中移除
-//            tjOrgEqsDtoList.removeIf(tjOrgEqsDto -> tjOrgEqsDto.getTotalNumber() == 0);
-//            //将组织机构进行排序后再进行返回
-//            Comparator<TjOrgEqsDto> orgComparator = createOrgComparator();
-//            Collections.sort(tjOrgEqsDtoList, orgComparator);
-//        }
-//        return tjOrgEqsDtoList;
-//    }
 
 
 
-    @Override
-    public PageResult<TjOrgEqsDto> test1(TjOrgEqsReq req) {
-        List<Long> orgIds=inventorySummaryMapper.selectOrgIds(req.getOrgId());
-        for (Long orgId:orgIds) {
-
-        }
-        return null;
-    }
-
     //装备统计数据导出
     @Override
     public void TjOrgEqsExport(TjOrgEqsReq req) {
@@ -484,98 +390,7 @@ public class TjServiceImpl implements TjService {
         return returnList;
     }
 //------------------------------------------------财务统计报表--------------------------------------------------------
-    //财务统计报表
-//    @Override
-//    public PageResult<TjOrgPriceDto> TjOrgPrice(TjOrgPriceReq req) {
-//        //根据条件查询财务汇总表
-//        List<TjOrgPriceDto> tjOrgPriceDtoList=priceSumSummaryMapper.TjOrgPrice(req.getOrgId(), req.getYear(),
-//                req.getTypeIdsList(),req.getSizeNameList());
-//        //对组织机构进行排序
-//        Comparator<TjOrgPriceDto> orgComparator = createOrgComparator();
-//        Collections.sort(tjOrgPriceDtoList, orgComparator);
-//        Page<TjOrgPriceDto> page = PageFactory.getDefaultPage(req.getPageNo(), req.getPageSize());
-//        if (ObjectUtil.isNull(req.getPageNo()) && ObjectUtil.isNull(req.getPageSize())) {
-//            req.setPageNo(1L);
-//            req.setPageSize(10L);
-//        }
-//        long startIndex = (req.getPageNo() - 1) * req.getPageSize();
-//        long endIndex = Math.min(startIndex + req.getPageSize(), tjOrgPriceDtoList.size());
-//        List<TjOrgPriceDto> subList = tjOrgPriceDtoList.subList((int) startIndex, (int)endIndex);
-////        List<TjOrgPriceDto> subList = tjOrgPriceDtoList.subList((int) ((req.getPageNo()-1)*req.getPageSize()), req.getPageSize().intValue());
-//        page.setTotal(tjOrgPriceDtoList.size());
-//        page.setRecords(subList);
-//        return PageResultFactory.createPageResult(page);
-//    }
 
-    @Override
-//    public PageResult<TjOrgPriceDto> TjOrgPrice(TjOrgPriceReq req) {
-//        PubOrg pubOrg = pubOrgService.PubOrgExist(req.getOrgId());
-//        //先拿到符合条件的组织机构，再遍历组织机构组成数据
-//        //（下一层数据组织机构数据）
-//        List<String> orgList= inventorySummaryMapper.getTotalData(String.valueOf(req.getOrgId()));
-//        List<TjOrgPriceDto> tjOrgPriceDtoList=new ArrayList<>();
-//        //根据条件查询财务汇总表
-//
-//        List<CompletableFuture<TjOrgPriceDto>> futures = orgList.stream()
-//                .map(orgId -> CompletableFuture.supplyAsync(() ->
-//                        priceSumSummaryMapper.TjOrgPrice(orgId, req.getYear(),req.getTypeIdsList(),req.getSizeNameList() )
-//                ))
-//                .collect(Collectors.toList());
-//// 等待所有 CompletableFuture 完成
-//        CompletableFuture<Void> allOf = CompletableFuture.allOf(futures.toArray(new CompletableFuture[0]));
-//
-//        allOf.thenRun(()->{
-//            for (CompletableFuture<TjOrgPriceDto> future : futures) {
-//                try{
-//                    TjOrgPriceDto OrgData = future.get();
-//                    if (OrgData!=null){
-//                        OrgData.setAddNum(ObjectUtil.isNull(OrgData.getAddNum())?0:OrgData.getAddNum());
-//                        OrgData.setEndNum(ObjectUtil.isNull(OrgData.getEndNum())?0:OrgData.getEndNum());
-//                        OrgData.setStartNum(ObjectUtil.isNull(OrgData.getStartNum())?0:OrgData.getStartNum());
-//                        OrgData.setDestoryNum(ObjectUtil.isNull(OrgData.getDestoryNum())?0:OrgData.getDestoryNum());
-//                        OrgData.setStartPrice(ObjectUtil.isNull(OrgData.getStartPrice())?BigDecimal.ZERO:OrgData.getStartPrice());
-//                        OrgData.setEndPrice(ObjectUtil.isNull(OrgData.getEndPrice())?BigDecimal.ZERO:OrgData.getEndPrice());
-//                        OrgData.setAddPrice(ObjectUtil.isNull(OrgData.getAddPrice())?BigDecimal.ZERO:OrgData.getAddPrice());
-//                        OrgData.setDestoryPrice(ObjectUtil.isNull(OrgData.getDestoryPrice())?BigDecimal.ZERO:OrgData.getDestoryPrice());
-//                        tjOrgPriceDtoList.add(OrgData);
-//                    }
-//                }catch (InterruptedException | ExecutionException e){
-//
-//                }
-//            }
-//        });
-//        // 等待所有 CompletableFuture 完成
-//        allOf.join();
-//
-//        if (req.getOrgId()!=1369509498032808905L){
-//
-//            TjOrgPriceDto OrgData=priceSumSummaryMapper.TjOrgPriceLeve4(req.getOrgId(), req.getYear(),req.getTypeIdsList(),
-//                    req.getSizeNameList(),pubOrg.getLevelFlag());
-//            tjOrgPriceDtoList.add(OrgData);
-//        }
-//
-//        //查询出来的组织机构进行判断，如果该组织机构下的装备装备总数为0，那么将该组织机构从list中移除
-//        if (req.getRemoveEmpty()){
-//            tjOrgPriceDtoList.removeIf(tjOrgEqsDto -> tjOrgEqsDto.getStartNum() == 0 && tjOrgEqsDto.getEndNum() == 0
-//                    && tjOrgEqsDto.getDestoryNum()==0);
-//        }
-//
-//        //对组织机构进行排序
-//        Comparator<TjOrgPriceDto> orgComparator = createOrgComparator();
-//        Collections.sort(tjOrgPriceDtoList, orgComparator);
-//        Page<TjOrgPriceDto> page = PageFactory.getDefaultPage(req.getPageNo(), req.getPageSize());
-//        if (ObjectUtil.isNull(req.getPageNo()) && ObjectUtil.isNull(req.getPageSize())) {
-//            req.setPageNo(1L);
-//            req.setPageSize(10L);
-//        }
-//        long startIndex = (req.getPageNo() - 1) * req.getPageSize();
-//        long endIndex = Math.min(startIndex + req.getPageSize(), tjOrgPriceDtoList.size());
-//        List<TjOrgPriceDto> subList = tjOrgPriceDtoList.subList((int) startIndex, (int)endIndex);
-////        List<TjOrgPriceDto> subList = tjOrgPriceDtoList.subList((int) ((req.getPageNo()-1)*req.getPageSize()), req.getPageSize().intValue());
-//        page.setTotal(tjOrgPriceDtoList.size());
-//        page.setRecords(subList);
-//        return PageResultFactory.createPageResult(page);
-//    }
 
     public PageResult<TjOrgPriceDto> TjOrgPrice(TjOrgPriceReq req) {
         PubOrg pubOrg = pubOrgService.PubOrgExist(req.getOrgId());
@@ -591,34 +406,13 @@ public class TjServiceImpl implements TjService {
 // 等待所有 CompletableFuture 完成
         CompletableFuture<Void> allOf = CompletableFuture.allOf(futures.toArray(new CompletableFuture[0]));
 //
-//        // 等待所有 CompletableFuture 完成
+        // 等待所有 CompletableFuture 完成
         allOf.join();
 
         tjOrgPriceDtoList = futures.stream()
                 .map(CompletableFuture::join)
                 .collect(Collectors.toList());
-//        allOf.thenRun(()->{
-//            for (CompletableFuture<TjOrgPriceDto> future : futures) {
-//                try{
-//                    TjOrgPriceDto OrgData = future.get();
-//                    if (OrgData!=null){
-//                        OrgData.setAddNum(ObjectUtil.isNull(OrgData.getAddNum())?0:OrgData.getAddNum());
-//                        OrgData.setEndNum(ObjectUtil.isNull(OrgData.getEndNum())?0:OrgData.getEndNum());
-//                        OrgData.setStartNum(ObjectUtil.isNull(OrgData.getStartNum())?0:OrgData.getStartNum());
-//                        OrgData.setDestoryNum(ObjectUtil.isNull(OrgData.getDestoryNum())?0:OrgData.getDestoryNum());
-//                        OrgData.setStartPrice(ObjectUtil.isNull(OrgData.getStartPrice())?BigDecimal.ZERO:OrgData.getStartPrice());
-//                        OrgData.setEndPrice(ObjectUtil.isNull(OrgData.getEndPrice())?BigDecimal.ZERO:OrgData.getEndPrice());
-//                        OrgData.setAddPrice(ObjectUtil.isNull(OrgData.getAddPrice())?BigDecimal.ZERO:OrgData.getAddPrice());
-//                        OrgData.setDestoryPrice(ObjectUtil.isNull(OrgData.getDestoryPrice())?BigDecimal.ZERO:OrgData.getDestoryPrice());
-//                        tjOrgPriceDtoList.add(OrgData);
-//                    }
-//                }catch (InterruptedException | ExecutionException e){
-//
-//                }
-//            }
-//        });
-//        // 等待所有 CompletableFuture 完成
-//        allOf.join();
+
 
         if (req.getOrgId()!=1369509498032808905L){
             //获取本级数据
@@ -627,12 +421,14 @@ public class TjServiceImpl implements TjService {
             OrgDataSelf.setLevel(0);
             OrgDataSelf.setOrgName(OrgDataSelf.getOrgName()+"本级");
             OrgDataSelf.setDName(OrgDataSelf.getDName()+"本级");
+            OrgDataSelf = fillingEqsEmptyData(OrgDataSelf);
             //获取下级数据
             TjOrgPriceDto OrgData=priceSumSummaryMapper.TjOrgPriceLeve4(req.getOrgId(), req.getYear(),req.getTypeIdsList(),
                     req.getSizeNameList(),pubOrg.getLevelFlag());
             OrgData.setLevel(1);
             OrgData.setOrgName(OrgData.getOrgName()+"直属下级");
             OrgData.setDName(OrgData.getDName()+"直属下级");
+            OrgData=fillingEqsEmptyData(OrgData);
             tjOrgPriceDtoList.add(OrgData);//把直属下级数据加进去
             tjOrgPriceDtoList.add(OrgDataSelf);//把本级数据加进去
         }
@@ -660,76 +456,19 @@ public class TjServiceImpl implements TjService {
         return PageResultFactory.createPageResult(page);
     }
 
-//    @Override
-//    public FinalTjOrgPriceDto TjOrgPriceSum(TjOrgPriceReq req) {
-//        PubOrg pubOrg = pubOrgService.PubOrgExist(req.getOrgId());
-//        FinalTjOrgPriceDto finalTjOrgPriceDto = new FinalTjOrgPriceDto();
-//        finalTjOrgPriceDto.setAddNum(0);
-//        finalTjOrgPriceDto.setStartNum(0);
-//        finalTjOrgPriceDto.setEndNum(0);
-//        finalTjOrgPriceDto.setDestoryNum(0);
-//        finalTjOrgPriceDto.setAddPrice(BigDecimal.ZERO);
-//        finalTjOrgPriceDto.setStartPrice(BigDecimal.ZERO);
-//        finalTjOrgPriceDto.setEndPrice(BigDecimal.ZERO);
-//        finalTjOrgPriceDto.setDestoryPrice(BigDecimal.ZERO);
-//        List<String> orgList= inventorySummaryMapper.getTotalData(String.valueOf(req.getOrgId()));
-//        List<TjOrgPriceDto> tjOrgPriceDtoList=new ArrayList<>();
-//        //根据条件查询财务汇总表
-//        List<CompletableFuture<TjOrgPriceDto>> futures = orgList.stream()
-//                .map(orgId -> CompletableFuture.supplyAsync(() ->
-//                        priceSumSummaryMapper.TjOrgPrice(orgId, req.getYear(),req.getTypeIdsList(),req.getSizeNameList() )
-//                ))
-//                .collect(Collectors.toList());
-//
-//        CompletableFuture<Void> allOf = CompletableFuture.allOf(futures.toArray(new CompletableFuture[0]));
-//        allOf.thenRun(()->{
-//            for (CompletableFuture<TjOrgPriceDto> future : futures) {
-//                try{
-//                    TjOrgPriceDto OrgData = future.get();
-//                    if (OrgData!=null){
-//                        OrgData.setAddNum(ObjectUtil.isNull(OrgData.getAddNum())?0:OrgData.getAddNum());
-//                        OrgData.setEndNum(ObjectUtil.isNull(OrgData.getEndNum())?0:OrgData.getEndNum());
-//                        OrgData.setStartNum(ObjectUtil.isNull(OrgData.getStartNum())?0:OrgData.getStartNum());
-//                        OrgData.setDestoryNum(ObjectUtil.isNull(OrgData.getDestoryNum())?0:OrgData.getDestoryNum());
-//                        OrgData.setStartPrice(ObjectUtil.isNull(OrgData.getStartPrice())?BigDecimal.ZERO:OrgData.getStartPrice());
-//                        OrgData.setEndPrice(ObjectUtil.isNull(OrgData.getEndPrice())?BigDecimal.ZERO:OrgData.getEndPrice());
-//                        OrgData.setAddPrice(ObjectUtil.isNull(OrgData.getAddPrice())?BigDecimal.ZERO:OrgData.getAddPrice());
-//                        OrgData.setDestoryPrice(ObjectUtil.isNull(OrgData.getDestoryPrice())?BigDecimal.ZERO:OrgData.getDestoryPrice());
-//                        tjOrgPriceDtoList.add(OrgData);
-//                    }
-//                }catch (InterruptedException | ExecutionException e){
-//
-//                }
-//            }
-//        });
-//        // 等待所有 CompletableFuture 完成
-//        allOf.join();
-//        if (req.getOrgId()!=1369509498032808905L){
-//            TjOrgPriceDto OrgData=priceSumSummaryMapper.TjOrgPriceLeve4(req.getOrgId(), req.getYear(),req.getTypeIdsList(),
-//                    req.getSizeNameList(),pubOrg.getLevelFlag());
-//            tjOrgPriceDtoList.add(OrgData);
-//        }
-//
-//        for (TjOrgPriceDto tj:tjOrgPriceDtoList) {
-//            tj.setAddNum(ObjectUtil.isNull(tj.getAddNum())?0:tj.getAddNum());
-//            tj.setStartNum(ObjectUtil.isNull(tj.getStartNum())?0:tj.getStartNum());
-//            tj.setEndNum(ObjectUtil.isNull(tj.getEndNum())?0:tj.getEndNum());
-//            tj.setDestoryNum(ObjectUtil.isNull(tj.getDestoryNum())?0:tj.getDestoryNum());
-//            tj.setStartPrice(ObjectUtil.isNull(tj.getStartPrice())?BigDecimal.ZERO:tj.getStartPrice());
-//            tj.setAddPrice(ObjectUtil.isNull(tj.getAddPrice())?BigDecimal.ZERO:tj.getAddPrice());
-//            tj.setEndPrice(ObjectUtil.isNull(tj.getEndPrice())?BigDecimal.ZERO:tj.getEndPrice());
-//            tj.setDestoryPrice(ObjectUtil.isNull(tj.getDestoryPrice())?BigDecimal.ZERO:tj.getDestoryPrice());
-//            finalTjOrgPriceDto.setAddNum(finalTjOrgPriceDto.getAddNum()+tj.getAddNum());
-//            finalTjOrgPriceDto.setStartNum(finalTjOrgPriceDto.getStartNum()+tj.getStartNum());
-//            finalTjOrgPriceDto.setEndNum(finalTjOrgPriceDto.getEndNum()+tj.getEndNum());
-//            finalTjOrgPriceDto.setDestoryNum(finalTjOrgPriceDto.getDestoryNum()+tj.getDestoryNum());
-//            finalTjOrgPriceDto.setAddPrice(finalTjOrgPriceDto.getAddPrice().add(tj.getAddPrice()));
-//            finalTjOrgPriceDto.setStartPrice(finalTjOrgPriceDto.getStartPrice().add(tj.getStartPrice()));
-//            finalTjOrgPriceDto.setEndPrice(finalTjOrgPriceDto.getEndPrice().add(tj.getEndPrice()));
-//            finalTjOrgPriceDto.setDestoryPrice(finalTjOrgPriceDto.getDestoryPrice().add(tj.getDestoryPrice()));
-//        }
-//        return finalTjOrgPriceDto;
-//    }
+    //添加null数据，将null改成0以防空指针
+    public TjOrgPriceDto fillingEqsEmptyData(TjOrgPriceDto OrgData){
+        OrgData.setAddNum(ObjectUtil.isNull(OrgData.getAddNum())?0:OrgData.getAddNum());
+        OrgData.setEndNum(ObjectUtil.isNull(OrgData.getEndNum())?0:OrgData.getEndNum());
+        OrgData.setStartNum(ObjectUtil.isNull(OrgData.getStartNum())?0:OrgData.getStartNum());
+        OrgData.setDestoryNum(ObjectUtil.isNull(OrgData.getDestoryNum())?0:OrgData.getDestoryNum());
+        OrgData.setStartPrice(ObjectUtil.isNull(OrgData.getStartPrice())?BigDecimal.ZERO:OrgData.getStartPrice());
+        OrgData.setEndPrice(ObjectUtil.isNull(OrgData.getEndPrice())?BigDecimal.ZERO:OrgData.getEndPrice());
+        OrgData.setAddPrice(ObjectUtil.isNull(OrgData.getAddPrice())?BigDecimal.ZERO:OrgData.getAddPrice());
+        OrgData.setDestoryPrice(ObjectUtil.isNull(OrgData.getDestoryPrice())?BigDecimal.ZERO:OrgData.getDestoryPrice());
+        return OrgData;
+    }
+
     @Override
     public FinalTjOrgPriceDto TjOrgPriceSum(TjOrgPriceReq req) {
         PubOrg pubOrg = pubOrgService.PubOrgExist(req.getOrgId());
@@ -766,25 +505,19 @@ public class TjServiceImpl implements TjService {
             OrgDataSelf.setLevel(0);
             OrgDataSelf.setOrgName(OrgDataSelf.getOrgName()+"本级");
             OrgDataSelf.setDName(OrgDataSelf.getDName()+"本级");
+            OrgDataSelf = fillingEqsEmptyData(OrgDataSelf);
             //获取下级数据
             TjOrgPriceDto OrgData=priceSumSummaryMapper.TjOrgPriceLeve4(req.getOrgId(), req.getYear(),req.getTypeIdsList(),
                     req.getSizeNameList(),pubOrg.getLevelFlag());
             OrgData.setLevel(1);
             OrgData.setOrgName(OrgData.getOrgName()+"直属下级");
             OrgData.setDName(OrgData.getDName()+"直属下级");
+            OrgData=fillingEqsEmptyData(OrgData);
             tjOrgPriceDtoList.add(OrgData);//把直属下级数据加进去
             tjOrgPriceDtoList.add(OrgDataSelf);//把本级数据加进去
         }
 
         for (TjOrgPriceDto tj:tjOrgPriceDtoList) {
-            tj.setAddNum(ObjectUtil.isNull(tj.getAddNum())?0:tj.getAddNum());
-            tj.setStartNum(ObjectUtil.isNull(tj.getStartNum())?0:tj.getStartNum());
-            tj.setEndNum(ObjectUtil.isNull(tj.getEndNum())?0:tj.getEndNum());
-            tj.setDestoryNum(ObjectUtil.isNull(tj.getDestoryNum())?0:tj.getDestoryNum());
-            tj.setStartPrice(ObjectUtil.isNull(tj.getStartPrice())?BigDecimal.ZERO:tj.getStartPrice());
-            tj.setAddPrice(ObjectUtil.isNull(tj.getAddPrice())?BigDecimal.ZERO:tj.getAddPrice());
-            tj.setEndPrice(ObjectUtil.isNull(tj.getEndPrice())?BigDecimal.ZERO:tj.getEndPrice());
-            tj.setDestoryPrice(ObjectUtil.isNull(tj.getDestoryPrice())?BigDecimal.ZERO:tj.getDestoryPrice());
             finalTjOrgPriceDto.setAddNum(finalTjOrgPriceDto.getAddNum()+tj.getAddNum());
             finalTjOrgPriceDto.setStartNum(finalTjOrgPriceDto.getStartNum()+tj.getStartNum());
             finalTjOrgPriceDto.setEndNum(finalTjOrgPriceDto.getEndNum()+tj.getEndNum());
@@ -797,6 +530,7 @@ public class TjServiceImpl implements TjService {
         return finalTjOrgPriceDto;
     }
 
+
     @Override
     public List<TjOrgPriceDto> TjOrgPriceDetail(TjOrgPriceReq req) {
         List<TjOrgPriceDto> tjOrgPriceDtoList = priceSumSummaryMapper.TjOrgPriceTotalNum(req.getOrgId(), req.getYear(),
@@ -808,16 +542,6 @@ public class TjServiceImpl implements TjService {
         return tjOrgPriceDtoList;
     }
 
-//    public List<TjOrgPriceDto> TjOrgPriceDetail(TjOrgPriceReq req) {
-//        List<TjOrgPriceDto> tjOrgPriceDtoList = priceSumSummaryMapper.TjOrgPriceTotalNum(req.getOrgId(), req.getYear(),
-//                req.getTypeIdsList(),req.getSizeNameList(),req.getLevelNum());
-//        if (req.getRemoveEmpty()){
-//            tjOrgPriceDtoList.removeIf(tjOrgEqsDto -> tjOrgEqsDto.getStartNum() == 0 && tjOrgEqsDto.getEndNum() == 0
-//                    && tjOrgEqsDto.getDestoryNum()==0);
-//        }
-//        return tjOrgPriceDtoList;
-//    }
-
 
     //查看财务统计详情
     @Override
@@ -929,22 +653,6 @@ public class TjServiceImpl implements TjService {
         PubOrg pubOrg = pubOrgService.PubOrgExist(req.getOrgId());
         List<String> orgList= inventorySummaryMapper.getTotalData(String.valueOf(req.getOrgId()));
         List<TjOrgCountDto> tjOrgCountList=new ArrayList<>();
-//        tjOrgCountList =equipmentCountSummaryMapper.TjOrgCount1(orgList,
-//                req.getTypeIdsList(),req.getSizeNameList(),req.getYear(),req.getTypeParentId(),req.getMonthList());
-//        for (String orgId:orgList) {
-//            TjOrgCountDto orgData =equipmentCountSummaryMapper.TjOrgCount(orgId,
-//                    req.getTypeIdsList(),req.getSizeNameList(),req.getYear(),req.getTypeParentId(),req.getMonthList());
-//
-//
-//            if (orgData!=null)
-//            {
-//                orgData.setNumber(ObjectUtil.isNull(orgData.getNumber())?0:orgData.getNumber());
-//                orgData.setUseCount(ObjectUtil.isNull(orgData.getUseCount())?0:orgData.getUseCount());
-//                orgData.setFixCount(ObjectUtil.isNull(orgData.getFixCount())?0:orgData.getFixCount());
-//                tjOrgCountList.add(orgData);
-//            }
-//
-//        }
 
         List<CompletableFuture<TjOrgCountDto>> futures = orgList.stream()
                 .map(orgId -> CompletableFuture.supplyAsync(() ->
@@ -957,29 +665,10 @@ public class TjServiceImpl implements TjService {
         CompletableFuture<Void> allOf = CompletableFuture.allOf( futures.toArray(new CompletableFuture[0]));
 
 
-//        allOf.join();
-//        tjOrgCountList = futures.stream()
-//                .map(CompletableFuture::join)
-//                .collect(Collectors.toList());
-        // 处理每个 CompletableFuture 的结果
-        allOf.thenRun(() -> {
-            for (CompletableFuture<TjOrgCountDto> future : futures) {
-                try {
-                    TjOrgCountDto orgData = future.get(); // 获取 CompletableFuture 的结果
-                    if (orgData != null) {
-                        orgData.setNumber(ObjectUtil.isNull(orgData.getNumber()) ? 0 : orgData.getNumber());
-                        orgData.setUseCount(ObjectUtil.isNull(orgData.getUseCount()) ? 0 : orgData.getUseCount());
-                        orgData.setFixCount(ObjectUtil.isNull(orgData.getFixCount()) ? 0 : orgData.getFixCount());
-                        tjOrgCountList.add(orgData);
-                    }
-                } catch (InterruptedException | ExecutionException e) {
-                    // 处理异常
-                }
-            }
-        });
-
- //等待所有 CompletableFuture 完成
         allOf.join();
+        tjOrgCountList = futures.stream()
+                .map(CompletableFuture::join)
+                .collect(Collectors.toList());
 
         if (req.getOrgId()!=1369509498032808905L){
             TjOrgCountDto OrgDataSelf=equipmentCountSummaryMapper.TjOrgCountSelf(req.getOrgId(),
@@ -988,12 +677,14 @@ public class TjServiceImpl implements TjService {
             OrgDataSelf.setLevel(0);
             OrgDataSelf.setOrgName(OrgDataSelf.getOrgName()+"本级");
             OrgDataSelf.setDName(OrgDataSelf.getDName()+"本级");
+            OrgDataSelf=fillingPriceEmptyData(OrgDataSelf);
             TjOrgCountDto OrgData =equipmentCountSummaryMapper.TjOrgCountleve4(req.getOrgId(),
                     req.getTypeIdsList(),req.getSizeNameList(),req.getYear(),req.getTypeParentId(),
                     req.getMonthList(),pubOrg.getLevelFlag());
             OrgData.setLevel(1);
             OrgData.setOrgName(OrgData.getOrgName()+"直属下级");
             OrgData.setDName(OrgData.getDName()+"直属下级");
+            OrgData=fillingPriceEmptyData(OrgData);
             tjOrgCountList.add(OrgData);
             tjOrgCountList.add(OrgDataSelf);
         }
@@ -1026,6 +717,13 @@ public class TjServiceImpl implements TjService {
         page.setRecords(subList);
         return PageResultFactory.createPageResult(page);
     }
+    //添加null数据，将null改成0以防空指针
+    public TjOrgCountDto fillingPriceEmptyData(TjOrgCountDto orgData){
+        orgData.setNumber(ObjectUtil.isNull(orgData.getNumber()) ? 0 : orgData.getNumber());
+        orgData.setUseCount(ObjectUtil.isNull(orgData.getUseCount()) ? 0 : orgData.getUseCount());
+        orgData.setFixCount(ObjectUtil.isNull(orgData.getFixCount()) ? 0 : orgData.getFixCount());
+        return orgData;
+    }
 
     @Override
     public FinalTjOrgCountDto TjOrgCountSum(TjOrgCountReq req) {
@@ -1037,15 +735,6 @@ public class TjServiceImpl implements TjService {
         PubOrg pubOrg = pubOrgService.PubOrgExist(req.getOrgId());
         List<String> orgList= inventorySummaryMapper.getTotalData(String.valueOf(req.getOrgId()));
         List<TjOrgCountDto> tjOrgCountList=new ArrayList<>();
-//        for (String orgId:orgList) {
-//            TjOrgCountDto orgData =equipmentCountSummaryMapper.TjOrgCount(orgId,
-//                    req.getTypeIdsList(),req.getSizeNameList(),req.getYear(),req.getTypeParentId(),
-//                    req.getMonthList());
-//            orgData.setNumber(ObjectUtil.isNull(orgData.getNumber())?0:orgData.getNumber());
-//            orgData.setUseCount(ObjectUtil.isNull(orgData.getUseCount())?0:orgData.getUseCount());
-//            orgData.setFixCount(ObjectUtil.isNull(orgData.getFixCount())?0:orgData.getFixCount());
-//            tjOrgCountList.add(orgData);
-//        }
 
         List<CompletableFuture<TjOrgCountDto>> futures = orgList.stream()
                 .map(orgId -> CompletableFuture.supplyAsync(() ->
@@ -1058,25 +747,11 @@ public class TjServiceImpl implements TjService {
         CompletableFuture<Void> allOf = CompletableFuture.allOf(
                 futures.toArray(new CompletableFuture[0])
         );
-        // 处理每个 CompletableFuture 的结果
-        allOf.thenRun(() -> {
-            for (CompletableFuture<TjOrgCountDto> future : futures) {
-                try {
-                    TjOrgCountDto orgData = future.get(); // 获取 CompletableFuture 的结果
-                    if (orgData != null) {
-                        orgData.setNumber(ObjectUtil.isNull(orgData.getNumber()) ? 0 : orgData.getNumber());
-                        orgData.setUseCount(ObjectUtil.isNull(orgData.getUseCount()) ? 0 : orgData.getUseCount());
-                        orgData.setFixCount(ObjectUtil.isNull(orgData.getFixCount()) ? 0 : orgData.getFixCount());
-                        tjOrgCountList.add(orgData);
-                    }
-                } catch (InterruptedException | ExecutionException e) {
-                    // 处理异常
-                }
-            }
-        });
 
-// 等待所有 CompletableFuture 完成
         allOf.join();
+        tjOrgCountList = futures.stream()
+                .map(CompletableFuture::join)
+                .collect(Collectors.toList());
 
         if (req.getOrgId()!=1369509498032808905L){
             TjOrgCountDto OrgDataSelf=equipmentCountSummaryMapper.TjOrgCountSelf(req.getOrgId(),
@@ -1085,12 +760,14 @@ public class TjServiceImpl implements TjService {
             OrgDataSelf.setLevel(0);
             OrgDataSelf.setOrgName(OrgDataSelf.getOrgName()+"本级");
             OrgDataSelf.setDName(OrgDataSelf.getDName()+"本级");
+            OrgDataSelf=fillingPriceEmptyData(OrgDataSelf);
             TjOrgCountDto OrgData =equipmentCountSummaryMapper.TjOrgCountleve4(req.getOrgId(),
                     req.getTypeIdsList(),req.getSizeNameList(),req.getYear(),req.getTypeParentId(),
                     req.getMonthList(),pubOrg.getLevelFlag());
             OrgData.setLevel(1);
             OrgData.setOrgName(OrgData.getOrgName()+"直属下级");
             OrgData.setDName(OrgData.getDName()+"直属下级");
+            OrgData=fillingPriceEmptyData(OrgData);
             tjOrgCountList.add(OrgData);
             tjOrgCountList.add(OrgDataSelf);
         }

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

@@ -3,6 +3,7 @@ package com.junmp.jyzb.service.impl;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.junmp.jyzb.api.bean.dto.FetchingDataDto.WarehouseDevInfoDto;
+import com.junmp.jyzb.api.bean.dto.MQDto;
 import com.junmp.jyzb.api.bean.req.UpdateWarehouseDevReq;
 import com.junmp.jyzb.entity.WarehouseDev;
 import com.junmp.jyzb.service.WarehouseDevService;
@@ -42,13 +43,17 @@ public class WarehouseDevServiceImpl extends ServiceImpl<WarehouseDevMapper, War
         warehouseDev.setCreateTime(DateTimeUtil.getCurrentDateTime());
         warehouseDev.setUpdateTime(DateTimeUtil.getCurrentDateTime());
         warehouseDevService.save(warehouseDev);
-        String exchangeName="orderExchange";
-        //判断是否暂存，将消息下发给本地主机
-        req.setApi("InfoChange");
-        req.setType(6);
-        req.setMsg("warehouseDevChange");
-        MQ.SendMsg(exchangeName,req.getOrgId().toString(),req);
 
+        String exchangeName="warehouseMsg";
+        //判断是否暂存，将消息下发给本地主机
+        MQDto mqDto = new MQDto();
+        //如果为空或者为false，则将直接发送给本地主机
+        if(ObjectUtil.isNull(req.getFlag()) ||!req.getFlag()){
+            mqDto.setApi("InfoChange");
+            mqDto.setType(6);
+            mqDto.setMessage("Adding warehouseDevInfo");
+            MQ.SendMsg(exchangeName,req.getOrgId().toString(),mqDto);
+        }
         return warehouseDev.getId();
     }
 
@@ -57,12 +62,16 @@ public class WarehouseDevServiceImpl extends ServiceImpl<WarehouseDevMapper, War
         WarehouseDev warehouseDev = new WarehouseDev();
         BeanPlusUtil.copyProperties(req,warehouseDev);
         warehouseDev.setUpdateTime(DateTimeUtil.getCurrentDateTime());
-        String exchangeName="orderExchange";
+        String exchangeName="warehouseMsg";
         //判断是否暂存，将消息下发给本地主机
-        req.setApi("InfoChange");
-        req.setType(6);
-        req.setMsg("warehouseDevChange");
-        MQ.SendMsg(exchangeName,req.getOrgId().toString(),req);
+        MQDto mqDto = new MQDto();
+        //如果为空或者为false，则将直接发送给本地主机
+        if(ObjectUtil.isNull(req.getFlag()) ||!req.getFlag()){
+            mqDto.setApi("InfoChange");
+            mqDto.setType(6);
+            mqDto.setMessage("Updating warehouseDevInfo");
+            MQ.SendMsg(exchangeName,req.getOrgId().toString(),mqDto);
+        }
         return warehouseDevService.updateById(warehouseDev);
     }
 

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

@@ -63,13 +63,12 @@ public class WarehouseServiceImpl extends ServiceImpl<WarehouseMapper,Warehouse>
         warehouse.setCreateTime(DateTimeUtil.getCurrentDateTime());
         warehouse.setUpdateTime(DateTimeUtil.getCurrentDateTime());
         save(warehouse);
-        String exchangeName="topicExchange";
         MQDto mqDto = new MQDto();
         mqDto.setApi("InfoChange");
         //更改类别，1为类型
         mqDto.setType(4);
         mqDto.setMessage("Adding warehouseInfo");
-        MQ.sendToExchange(exchangeName,"org."+warehouse.getOrgId(),mqDto);
+        MQ.SendMsg("warehouseMsg",req.getOrgId().toString(),mqDto);//推送至仓库主机
         return warehouse.getId();
     }
 
@@ -109,13 +108,12 @@ public class WarehouseServiceImpl extends ServiceImpl<WarehouseMapper,Warehouse>
         Warehouse warehouse = new Warehouse();
         BeanPlusUtil.copyProperties(req,warehouse);
         warehouse.setUpdateTime(DateTimeUtil.getCurrentDateTime());
-        String exchangeName="topicExchange";
         MQDto mqDto = new MQDto();
         mqDto.setApi("InfoChange");
         //更改类别，1为类型
         mqDto.setType(4);
         mqDto.setMessage("Updating warehouseInfo");
-        MQ.sendToExchange(exchangeName,"org."+warehouse.getOrgId(),mqDto);
+        MQ.SendMsg("warehouseMsg",req.getOrgId().toString(),mqDto);//推送至仓库主机
         return this.updateById(warehouse);
     }
 

jyzb-biz/src/main/java/com/junmp/jyzb/utils/RabbitMQSendMsg.java

@@ -35,20 +35,22 @@ public class RabbitMQSendMsg {
     }
 
 
+
     // 发布消息到交换机，根据不同的主题和消息内容
     public void publishOrgMessage(String orgId, String message) {
         String routingKey = "org." + orgId;
         rabbitTemplate.convertAndSend("topicExchange", routingKey, message);
     }
-    public void sendToExchange(String exchangeName,String routingKey,Object msg){
-        String jsonString = JSON.toJSONString(msg);
-        rabbitTemplate.convertAndSend(exchangeName,routingKey,jsonString);
-    }
 
     public void publishCabinetMessage(String cabinetId, String message) {
         String routingKey = "cabinet." + cabinetId;
         rabbitTemplate.convertAndSend("topicExchange", routingKey, message);
     }
+
+    public void sendToExchange(String exchangeName,String routingKey,Object msg){
+        String jsonString = JSON.toJSONString(msg);
+        rabbitTemplate.convertAndSend(exchangeName,routingKey,jsonString);
+    }
     //推送消息（广播式推送）
     public void sendFanoutMsg(String exchangeName, List<String> names,Object msg){
         //exchangeName交换机名称，name单警柜或本地仓库，msg发送的消息

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

@@ -64,9 +64,9 @@
         (SELECT `org_name` FROM `pub_org` WHERE org_id=#{orgId}) as org_name,
         (SELECT `d_name` FROM `pub_org` WHERE org_id=#{orgId}) as d_name,
         MAX(t.`year`) AS `year`,
-        SUM(t.use_count) AS use_count,
-        SUM(t.fix_count) AS fix_count,
-        sum(CASE WHEN t.month = MONTH(CURRENT_DATE()) THEN t.number ELSE 0 END) AS number
+        COALESCE(SUM(t.use_count),0) AS use_count,
+        coalesce(SUM(t.fix_count),0 )AS fix_count,
+        coalesce(sum(CASE WHEN t.month = MONTH(CURRENT_DATE()) THEN t.number ELSE 0 END),0) AS number
         FROM (
         SELECT
         vecs.`year`,
@@ -496,9 +496,9 @@
     </select>
 
     <select id="TjOrgCountTotalNum" resultType="com.junmp.jyzb.api.bean.dto.TjDto.TjOrgCountDto">
-        SELECT MAX( t.`year` ) AS `year`,SUM( t.use_count ) AS use_count,SUM( t.fix_count ) AS fix_count,
+        SELECT MAX( t.`year` ) AS `year`,coalesce(SUM( t.use_count ) ,0)AS use_count,coalesce(SUM( t.fix_count ),0) AS fix_count,
                size_id,size_name,type_id,type_name,
-               sum( CASE WHEN t.MONTH = MONTH ( CURRENT_DATE ()) THEN t.number ELSE 0 END ) AS number
+               coalesce(sum( CASE WHEN t.MONTH = MONTH ( CURRENT_DATE ()) THEN t.number ELSE 0 END ),0) AS number
         FROM
             (
                 SELECT
@@ -517,7 +517,7 @@
                 WHERE
                     YEAR = #{year}
                     and `po`.`del_flag` = 1
-                    <if test="level =null or level=''" >
+                    <if test="level ==null" >
                         and (po.org_id =#{orgId} or (`po`.org_parent_ids like  CONCAT('%', #{orgId}, '%')
                         <if test="levelNum !=0">
                             AND SUBSTRING(`po`.`org_code`, 5, 2) = '00'
@@ -526,7 +526,7 @@
                         and (`po`.level_flag>(select level_flag FROM pub_org where org_id=#{orgId} )+#{levelNum} or
                         `po`.level_flag=(select level_flag FROM pub_org where org_id=#{orgId} ))
                     </if>
-                    <if test="level=1">
+                    <if test="level==1">
                         and (po.org_id !=#{orgId} and (`po`.org_parent_ids like  CONCAT('%', #{orgId}, '%')
                         <if test="levelNum !=0">
                             AND SUBSTRING(`po`.`org_code`, 5, 2) = '00'
@@ -535,7 +535,7 @@
                         and (`po`.level_flag>(select level_flag FROM pub_org where org_id=#{orgId} )+#{levelNum} or
                         `po`.level_flag=(select level_flag FROM pub_org where org_id=#{orgId} ))
                     </if>
-                    <if test="level = 0 ">
+                    <if test="level == 0 ">
                         and po.org_id =#{orgId}
                     </if>
                 GROUP BY

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

@@ -498,7 +498,7 @@
         WHERE
 
             `po`.`del_flag` = 1
-          <if test="level =null or level=''" >
+          <if test="level ==null" >
               and (po.org_id =#{orgId} or (`po`.org_parent_ids like  CONCAT('%', #{orgId}, '%')
               <if test="levelNum !=0">
                   AND SUBSTRING(`po`.`org_code`, 5, 2) = '00'
@@ -507,7 +507,7 @@
               and (`po`.level_flag>(select level_flag FROM pub_org where org_id=#{orgId} )+#{levelNum} or
               `po`.level_flag=(select level_flag FROM pub_org where org_id=#{orgId} ))
           </if>
-          <if test="level=1">
+          <if test="level==1">
               and (po.org_id !=#{orgId} and (`po`.org_parent_ids like  CONCAT('%', #{orgId}, '%')
               <if test="levelNum !=0">
                   AND SUBSTRING(`po`.`org_code`, 5, 2) = '00'
@@ -516,8 +516,8 @@
               and (`po`.level_flag>(select level_flag FROM pub_org where org_id=#{orgId} )+#{levelNum} or
               `po`.level_flag=(select level_flag FROM pub_org where org_id=#{orgId} ))
           </if>
-          <if test="level = 0 ">
-              and po.org_id =#{orgId}
+          <if test="level == 0 ">
+              and po.org_id = #{orgId}
           </if>
 
         <if test="typeIdsList!=null and typeIdsList.size() > 0">

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

@@ -415,7 +415,7 @@
         WHERE
         vpss.MONTH = ( SELECT MIN( MONTH ) FROM vie_price_sum_summary WHERE YEAR = #{year} )
         and `po`.`del_flag` = 1
-        <if test="level =null or level=''" >
+        <if test="level ==null " >
             and (po.org_id =#{orgId} or (`po`.org_parent_ids like  CONCAT('%', #{orgId}, '%')
             <if test="levelNum !=0">
                 AND SUBSTRING(`po`.`org_code`, 5, 2) = '00'
@@ -424,7 +424,7 @@
             and (`po`.level_flag>(select level_flag FROM pub_org where org_id=#{orgId} )+#{levelNum} or
             `po`.level_flag=(select level_flag FROM pub_org where org_id=#{orgId} ))
         </if>
-        <if test="level=1">
+        <if test="level==1">
             and (po.org_id !=#{orgId} and (`po`.org_parent_ids like  CONCAT('%', #{orgId}, '%')
             <if test="levelNum !=0">
                 AND SUBSTRING(`po`.`org_code`, 5, 2) = '00'
@@ -433,7 +433,7 @@
             and (`po`.level_flag>(select level_flag FROM pub_org where org_id=#{orgId} )+#{levelNum} or
             `po`.level_flag=(select level_flag FROM pub_org where org_id=#{orgId} ))
         </if>
-        <if test="level = 0 ">
+        <if test="level == 0 ">
             and po.org_id =#{orgId}
         </if>
         <if test="typeIdsList!=null and typeIdsList.size() > 0">
@@ -461,7 +461,7 @@
         WHERE
         vpss.MONTH = ( SELECT MIN( MONTH ) FROM vie_price_sum_summary WHERE YEAR = #{year} )
         and `po`.`del_flag` = 1
-        <if test="level =null or level=''" >
+        <if test="level ==null " >
         and (po.org_id =#{orgId} or (`po`.org_parent_ids like  CONCAT('%', #{orgId}, '%')
         <if test="levelNum !=0">
             AND SUBSTRING(`po`.`org_code`, 5, 2) = '00'
@@ -470,7 +470,7 @@
         and (`po`.level_flag>(select level_flag FROM pub_org where org_id=#{orgId} )+#{levelNum} or
         `po`.level_flag=(select level_flag FROM pub_org where org_id=#{orgId} ))
         </if>
-        <if test="level=1">
+        <if test="level==1">
             and (po.org_id !=#{orgId} and (`po`.org_parent_ids like  CONCAT('%', #{orgId}, '%')
             <if test="levelNum !=0">
                 AND SUBSTRING(`po`.`org_code`, 5, 2) = '00'
@@ -479,7 +479,7 @@
             and (`po`.level_flag>(select level_flag FROM pub_org where org_id=#{orgId} )+#{levelNum} or
             `po`.level_flag=(select level_flag FROM pub_org where org_id=#{orgId} ))
         </if>
-        <if test="level = 0 ">
+        <if test="level == 0 ">
             and po.org_id =#{orgId}
         </if>
         <if test="typeIdsList!=null and typeIdsList.size() > 0">

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

@@ -45,7 +45,6 @@ spring:
       indent_output: false
     property-naming-strategy: com.fasterxml.jackson.databind.PropertyNamingStrategy$PascalCaseStrategy
 
-
   flyway:
     enable: ture
     locations: classpath:db/migration
@@ -63,6 +62,7 @@ mybatis-plus:
     lazy-loading-enabled: true
     multiple-result-sets-enabled: true
     map-underscore-to-camel-case: true #开启驼峰命名
+#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #控制台打印sql语句
   global-config:
     banner: false
     enable-sql-runner: true