fix:修改首页统计接口不能根据登录人所属组织查询bug

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/monitordevice/service/impl/MonitorDeviceServiceImpl.java

@@ -46,6 +46,9 @@ import vip.xiaonuo.coldchain.modular.monitordevice.service.MonitorDeviceService;
 import vip.xiaonuo.coldchain.modular.monitordevicetype.entity.CountEntity;
 import vip.xiaonuo.coldchain.modular.monitordevicetype.entity.MonitorDeviceType;
 import vip.xiaonuo.coldchain.modular.monitordevicetype.service.MonitorDeviceTypeService;
+import vip.xiaonuo.coldchain.modular.monitortarget.entity.MonitorTarget;
+import vip.xiaonuo.coldchain.modular.monitortarget.param.TargetStatus;
+import vip.xiaonuo.coldchain.modular.monitortarget.service.MonitorTargetService;
 import vip.xiaonuo.coldchain.modular.monitortargetregion.service.MonitorTargetRegionService;
 import vip.xiaonuo.common.enums.CommonDeleteFlagEnum;
 import vip.xiaonuo.common.enums.CommonSortOrderEnum;
@@ -74,6 +77,8 @@ public class MonitorDeviceServiceImpl extends ServiceImpl<MonitorDeviceMapper, M
     private MonitorDeviceTypeService monitorDeviceTypeService;
     @Resource
     private MonitorTargetRegionService monitorTargetRegionService;
+    @Resource
+    private MonitorTargetService monitorTargetService;
 
     private String bucketName;
 
@@ -323,15 +328,20 @@ public class MonitorDeviceServiceImpl extends ServiceImpl<MonitorDeviceMapper, M
 
     @Override
     public CountEntity getIndexCount() {
+        TargetStatus targetCount = monitorTargetService.getTargetCount(null);
         CountEntity countEntity = new CountEntity();
-        countEntity.setDeviceCount((int) count());
-        LambdaQueryWrapper<MonitorDevice> onlineDeviceQueryWrapper = new LambdaQueryWrapper<>();
-        onlineDeviceQueryWrapper.eq(MonitorDevice::getStatus, MonitorDeviceStatusEnum.NORMAL.getValue()).eq(MonitorDevice::getDeleteFlag, CommonDeleteFlagEnum.NOT_DELETE);
-        LambdaQueryWrapper<MonitorDevice> offlineDeviceIdQueryWrapper = new LambdaQueryWrapper<>();
-        offlineDeviceIdQueryWrapper.eq(MonitorDevice::getStatus, MonitorDeviceStatusEnum.UNUSED.getValue()).eq(MonitorDevice::getDeleteFlag, CommonDeleteFlagEnum.NOT_DELETE);
-        countEntity.setOnlineDeviceCount((int) count(onlineDeviceQueryWrapper));
+        countEntity.setDeviceCount((int) targetCount.getTotal());
+//        LambdaQueryWrapper<MonitorDevice> onlineDeviceQueryWrapper = new LambdaQueryWrapper<>();
+//        onlineDeviceQueryWrapper.eq(MonitorDevice::getStatus, MonitorDeviceStatusEnum.NORMAL.getValue()).eq(MonitorDevice::getDeleteFlag, CommonDeleteFlagEnum.NOT_DELETE);
+//        LambdaQueryWrapper<MonitorDevice> offlineDeviceIdQueryWrapper = new LambdaQueryWrapper<>();
+//        offlineDeviceIdQueryWrapper.eq(MonitorDevice::getStatus, MonitorDeviceStatusEnum.UNUSED.getValue()).eq(MonitorDevice::getDeleteFlag, CommonDeleteFlagEnum.NOT_DELETE);
+        countEntity.setOnlineDeviceCount((int) targetCount.getOnline());
+        countEntity.setOfflineDeviceCount((int) targetCount.getOffline());
         Integer sensorCount = 0;
-        List<MonitorDevice> monitorDeviceList = list();
+        SaBaseLoginUser loginUser = StpLoginUserUtil.getLoginUser();
+        LambdaQueryWrapper<MonitorDevice> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(MonitorDevice::getDeleteFlag, CommonDeleteFlagEnum.NOT_DELETE).eq(MonitorDevice::getCreateOrg,loginUser.getOrgId());
+        List<MonitorDevice> monitorDeviceList = list(queryWrapper);
         for (MonitorDevice monitorDevice : monitorDeviceList) {
             sensorCount += monitorDevice.getSensorCount();
         }

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/monitortarget/mapper/MonitorTargetMapper.java

@@ -25,5 +25,5 @@ import java.util.List;
  * @date 2024/11/13 16:56
  **/
 public interface MonitorTargetMapper extends BaseMapper<MonitorTarget> {
-    List<StatusCount> getCountByStatus(String name);
+    List<StatusCount> getCountByStatus(String name,String orgId);
 }

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/monitortarget/mapper/mapping/MonitorTargetMapper.xml

@@ -5,6 +5,7 @@
     <select id="getCountByStatus" resultType="vip.xiaonuo.coldchain.modular.monitortarget.entity.StatusCount">
         select status, count(`status`) as count
         from `monitor_target`
+        where `CREATE_ORG` = #{orgId}
         <if test="name != null">
             where name like '%${name}%'
             and delete_flag = 'NOT_DELETE'

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/monitortarget/service/impl/MonitorTargetServiceImpl.java

@@ -173,7 +173,8 @@ public class MonitorTargetServiceImpl extends ServiceImpl<MonitorTargetMapper, M
 
     @Override
     public TargetStatus getTargetCount(String name) {
-        List<StatusCount> countByStatusList = monitorTargetMapper.getCountByStatus(name);
+        SaBaseLoginUser loginUser = StpLoginUserUtil.getLoginUser();
+        List<StatusCount> countByStatusList = monitorTargetMapper.getCountByStatus(name,loginUser.getOrgId());
         Long total = 0L;
         Long online = 0L;
         Long offline = 0L;

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/monitortargetregion/service/impl/MonitorTargetRegionServiceImpl.java

@@ -222,7 +222,11 @@ public class MonitorTargetRegionServiceImpl extends ServiceImpl<MonitorTargetReg
 
     @Override
     public Integer getUsedSensorCount() {
-        return (int)count();
+        SaBaseLoginUser loginUser = StpLoginUserUtil.getLoginUser();
+        LambdaQueryWrapper<MonitorTargetRegion> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(MonitorTargetRegion::getDeleteFlag,CommonDeleteFlagEnum.NOT_DELETE)
+                .eq(MonitorTargetRegion::getCreateOrg,loginUser.getOrgId());
+        return (int)count(queryWrapper);
     }
 
     @Override

snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/param/SysUserEditParam.java

@@ -49,7 +49,6 @@ public class SysUserEditParam {
 
     /** 职位id */
     @Schema(description = "职位id", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotBlank(message = "positionId不能为空")
     private String positionId;
 
     /** 职级 */

snowy-web-app/src/main/resources/application.properties

@@ -27,7 +27,7 @@ spring.servlet.multipart.max-file-size=100MB
 
 # mysql
 spring.datasource.dynamic.datasource.master.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.dynamic.datasource.master.url=jdbc:mysql://jfcloud-k6-mysql:3306/rkmonitor?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&useInformationSchema=true
+spring.datasource.dynamic.datasource.master.url=jdbc:mysql://jfcloud-k6-mysql:3306/coldchain?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&useInformationSchema=true
 spring.datasource.dynamic.datasource.master.username=root
 spring.datasource.dynamic.datasource.master.password=Root123...
 spring.datasource.dynamic.strict=true