修改站点数量

fiveep-persistence/src/main/resources/mapper/mysql/SiteMapper.xml

@@ -20,7 +20,9 @@
         <result column="enable" property="enable" />
     </resultMap>
     <select id="selectCount" resultType="java.lang.Integer">
-        select count(1)
+        select count(*)
+        from (
+        select us.id
         from user_site as us
         inner join device_status as ds
         on us.site_Id = ds.site_id
@@ -35,6 +37,9 @@
                 and ds.device_status = #{siteStatus}
             </if>
         </where>
+        group by us.site_id
+        ) as t
+
     </select>
     <select id="list" resultType="com.bizmatics.model.Site">
         select s.id,s.site_name,s.site_address,s.company_code,s.user_name,s.phone,s.station_area_id,s.route_id,

fiveep-service/src/main/java/com/bizmatics/service/UserSiteService.java

@@ -1,7 +1,7 @@
 package com.bizmatics.service;
 
-import com.bizmatics.model.UserSite;
 import com.bizmatics.common.mvc.base.CrudService;
+import com.bizmatics.model.UserSite;
 
 /**
  * <p>
@@ -13,4 +13,6 @@ import com.bizmatics.common.mvc.base.CrudService;
  */
 public interface UserSiteService extends CrudService<UserSite> {
 
+
+    Integer count(Integer userId);
 }

fiveep-service/src/main/java/com/bizmatics/service/impl/SiteServiceImpl.java

@@ -14,6 +14,7 @@ import com.bizmatics.persistence.mapper.DeviceMapper;
 import com.bizmatics.persistence.mapper.SiteMapper;
 import com.bizmatics.service.DeviceService;
 import com.bizmatics.service.SiteService;
+import com.bizmatics.service.UserSiteService;
 import com.bizmatics.service.enums.DeviceStatusCode;
 import com.bizmatics.service.util.SessionLocal;
 import com.bizmatics.service.vo.DeviceCountVO;
@@ -46,6 +47,9 @@ public class SiteServiceImpl extends AbstractCrudService<SiteMapper, Site> imple
     private DeviceService deviceService;
     @Autowired
     private AlarmPowerMapper alarmPowerMapper;
+    @Autowired
+    private UserSiteService userSiteService;
+
     @Override
     public DeviceCountVO selectCount() {
         Integer userId = SessionLocal.getUserId();
@@ -54,6 +58,7 @@ public class SiteServiceImpl extends AbstractCrudService<SiteMapper, Site> imple
         deviceCountVO.setOffLineCount(baseMapper.selectCount(userId,null,DeviceStatusCode.OFFLINE.getValue()));
         deviceCountVO.setDeviceCount(baseMapper.selectCount(userId,null,DeviceStatusCode.DEVICE.getValue()));
         deviceCountVO.setFaultCount(baseMapper.selectCount(userId,null,DeviceStatusCode.FAULT.getValue()));
+        deviceCountVO.setCount(userSiteService.count(userId));
         return deviceCountVO;
     }
 

fiveep-service/src/main/java/com/bizmatics/service/impl/UserSiteServiceImpl.java

@@ -1,5 +1,7 @@
 package com.bizmatics.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.bizmatics.model.UserSite;
 import com.bizmatics.persistence.mapper.UserSiteMapper;
 import com.bizmatics.service.UserSiteService;
@@ -17,4 +19,10 @@ import org.springframework.stereotype.Service;
 @Service
 public class UserSiteServiceImpl extends AbstractCrudService<UserSiteMapper, UserSite> implements UserSiteService {
 
+    @Override
+    public Integer count(Integer userId) {
+        LambdaQueryWrapper<UserSite> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(UserSite::getUserId,userId);
+        return this.count(queryWrapper);
+    }
 }