Merge branch 'master' of http://git.nzklabs.com:3000/huangyuanhao/jfcloud-coldchain

snowy-admin-web/src/views/auth/login/login.vue

@@ -50,6 +50,9 @@
 			</div>
 			<!-- <div class="form_foot">没有账号?点击<router-link to="/findpwd" class="nav-link">注册</router-link></div> -->
 		</div>
+		<div class="version">
+			{{ sysBaseConfig.SNOWY_SYS_COPYRIGHT }}
+		</div>
 	</div>
 </template>
 <script setup>
@@ -248,6 +251,7 @@
 		background-image: url('/src/assets/images/login/logo_background.png');
 		background-size: cover;
 		background-position: center;
+		position: relative;
 		.login-title {
 			font-size: 30px;
 			margin-bottom: 30px;
@@ -295,5 +299,11 @@
 				}
 			}
 		}
+
+		.version {
+			position: absolute;
+			bottom: 10px;
+			font-size: 13px;
+		}
 	}
 </style>

snowy-admin-web/src/views/biz/monitor/mem/form.vue

@@ -29,7 +29,7 @@
 
 				<!-- 只做展示，不能做任何修改 -->
 				<a-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
-					<a-form-item label="型号编码" name="deviceCode">
+					<a-form-item label="型号编码">
 						<a-input v-model:value="formData.modelName" placeholder="请输入型号编码" allow-clear disabled />
 					</a-form-item>
 				</a-col>

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,8 +5,9 @@
     <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 name like '%${name}%'
             and delete_flag = 'NOT_DELETE'
         </if>
         group by status

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;
 
     /** 职级 */