Pārlūkot izejas kodu

更改电压上下限和功率因数上限更新3

jichaobo 3 gadi atpakaļ
vecāks
revīzija
16e9464a29

+ 2 - 1
fiveep-persistence/src/main/java/com/bizmatics/persistence/mapper/RtSwitchDataMapper.java

@@ -20,7 +20,8 @@ import java.util.Map;
 public interface RtSwitchDataMapper extends CrudMapper<RtSwitchData> {
 
 
-    Map<String,Object> getOneMap(@Param("siteId") Integer siteId);
+    Map<String,Object> getOneMap(@Param("userId") Integer userId,
+                                 @Param("siteId") Integer siteId);
 
     Map<String,Object> getLoopStatusMap(@Param("siteId") Integer siteId);
 

+ 3 - 0
fiveep-persistence/src/main/resources/mapper/mysql/RtSwitchDataMapper.xml

@@ -49,6 +49,9 @@
             <if test="siteId != null and siteId != 0">
                 and us.site_id = #{siteId}
             </if>
+            <if test="userId != null and userId != 0">
+                and us.user_id = #{userId}
+            </if>
         </where>
     </select>
 

+ 3 - 1
fiveep-service/src/main/java/com/bizmatics/service/impl/RtSwitchDataServiceImpl.java

@@ -6,6 +6,7 @@ import com.bizmatics.persistence.mapper.AlarmPowerMapper;
 import com.bizmatics.persistence.mapper.RtSwitchDataMapper;
 import com.bizmatics.service.RtSwitchDataService;
 import com.bizmatics.common.mvc.base.AbstractCrudService;
+import com.bizmatics.service.util.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -25,8 +26,9 @@ public class RtSwitchDataServiceImpl extends AbstractCrudService<RtSwitchDataMap
 
     @Override
     public List<Map<String, Object>> getOne(Integer siteId) {
+        Integer userId = SecurityUtils.getLoginUser().getUser().getUserId().intValue();
         List<Map<String, Object>> list = new ArrayList<>();
-        Map<String, Object> rsdMap = baseMapper.getOneMap(siteId);
+        Map<String, Object> rsdMap = baseMapper.getOneMap(userId,siteId);
         Optional.ofNullable(rsdMap).ifPresent(rad -> {
             for (String name:rad.keySet()) {
                 Map<String,Object> map = new HashMap<>();