配置文件修改；站点信息接口增加费用状态字段

fiveep-controller/src/main/resources/application-prod.properties

@@ -17,10 +17,11 @@ mybatis.refresh.sleep-seconds=20
 # datasource
 spring.autoconfigure.exclude=com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
 spring.datasource.dynamic.primary=usky-power
-spring.datasource.dynamic.datasource.usky-power.url=jdbc:mysql://usky-cloud-mysql:3306/usky-electricity?useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&characterEncoding=UTF-8
+#spring.datasource.dynamic.datasource.usky-power.url=jdbc:mysql://usky-cloud-mysql:3306/usky-electricity?useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&characterEncoding=UTF-8
 #spring.datasource.dynamic.datasource.usky-power.url=jdbc:mysql://101.133.214.75:3306/usky-electricity?useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&characterEncoding=UTF-8
-spring.datasource.dynamic.datasource.usky-power.username=usky
-spring.datasource.dynamic.datasource.usky-power.password=Yt#75Usky
+spring.datasource.dynamic.datasource.mast.url=jdbc:mysql://101.133.214.75:3306/usky-electricity?useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
+spring.datasource.dynamic.datasource.mast.username=usky
+spring.datasource.dynamic.datasource.mast.password=Yt#75Usky
 spring.datasource.dynamic.druid.initial-size=5
 spring.datasource.dynamic.druid.min-idle=5
 spring.datasource.dynamic.druid.max-active=30

fiveep-controller/src/main/resources/application.properties

@@ -1,5 +1,5 @@
 # common
-spring.profiles.active=test
+spring.profiles.active=prod
 spring.application.name=usky-power
 spring.main.banner-mode=off
 mybatis-plus.global-config.banner=false

fiveep-model/src/main/java/com/bizmatics/model/Site.java

@@ -126,4 +126,9 @@ public class Site implements Serializable {
      */
     private Integer tenantId;
 
+    /**
+     * 站点费用状态：ture-正常，false-异常（没有费用配置）
+     */
+    @TableField(exist = false)
+    private boolean costTypeStatus;
 }

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

@@ -11,10 +11,7 @@ import com.bizmatics.common.mvc.base.AbstractCrudService;
 import com.bizmatics.model.*;
 import com.bizmatics.model.system.SysUser;
 import com.bizmatics.model.vo.PlatformAreaVo;
-import com.bizmatics.persistence.mapper.AlarmPowerMapper;
-import com.bizmatics.persistence.mapper.DeviceMapper;
-import com.bizmatics.persistence.mapper.PlatformAreaMapper;
-import com.bizmatics.persistence.mapper.SiteMapper;
+import com.bizmatics.persistence.mapper.*;
 import com.bizmatics.persistence.mapper.system.SysUserMapper;
 import com.bizmatics.service.*;
 import com.bizmatics.service.enums.DeviceStatusCode;
@@ -64,6 +61,8 @@ public class SiteServiceImpl extends AbstractCrudService<SiteMapper, Site> imple
     private SysUserMapper userMapper;
     @Autowired
     private HtAnalogDataService htAnalogDataService;
+    @Autowired
+    private ElectricityRateConfigMapper electricityRateConfigMapper;
 
     @Override
     public DeviceCountVO selectCount() {
@@ -81,15 +80,28 @@ public class SiteServiceImpl extends AbstractCrudService<SiteMapper, Site> imple
     public List<Site> list(String name) {
         Integer userId = SecurityUtils.getLoginUser().getUser().getUserId().intValue();
         List<SysUser> tenantDaya = userMapper.getTenantId(SecurityUtils.getLoginUser().getUser().getUserId());
-        if (tenantDaya.size() < 0) {
+        if (tenantDaya.isEmpty()) {
             throw new BusinessException("无此租户，请联系管理员");
         }
         List<Site> siteList = new ArrayList<>();
-        if (tenantDaya.get(0).getUserType().equals("01")) {
+        if ("01".equals(tenantDaya.get(0).getUserType())) {
             siteList = baseMapper.listOne(name, tenantDaya.get(0).getTenantId());
-        } else if (tenantDaya.get(0).getUserType().equals("00")) {
+        } else if ("00".equals(tenantDaya.get(0).getUserType())) {
             siteList = baseMapper.list(userId, name, tenantDaya.get(0).getTenantId());
         }
+
+        // 查询是否存在费用
+        List<Integer> siteIds = siteList.stream()
+                .map(Site::getId)
+                .collect(Collectors.toList());
+
+        Set<Integer> exists = electricityRateConfigMapper.selectBatchIds(siteIds)
+                .stream()
+                .map(ElectricityRateConfig::getSiteId)
+                .collect(Collectors.toSet());
+
+        siteList.forEach(site -> site.setCostTypeStatus(exists.contains(site.getId())));
+
         return siteList;
     }