Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/dto/IndexDto.java

@@ -22,4 +22,7 @@ public class IndexDto {
     private int  count;
     private String equipmentsIdx;
     private String equipmentIndexName; // 指标名称【风机状态名称】
+    private String longitude; // 经度
+    private String latitude; // 纬度
+    private String frontModule;
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/resources/mapper/StationBasicMapper.xml

@@ -112,7 +112,7 @@
         station_basic.station_type stationType,
         station_basic.station_flag stationFlag,
         station_basic.area_code areaCode,
-        station_basic.jumpPath,
+        station_basic.jump_path,
         station_basic.risk_level riskLevel,
         station_basic.belong_area belongArea,
         station_coordinate.longitude,

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/StationBasicController.java

@@ -175,7 +175,7 @@ public class StationBasicController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "场站地图数据", notes = "场站地图数据")
     @GetMapping(value = "/listforMap")
-    public ResponseModel<List<StationInfoDto>> getStationList(@RequestParam(value = "areaCode", required = false) String areaCode,@RequestParam(value = "type", required = false) String type) {
+    public ResponseModel<List<StationInfoDto>> getStationList(@RequestParam(value = "areaCode", required = false) String areaCode,@RequestParam(value = "type", required = false,defaultValue = "qj") String type) {
         return ResponseHelper.buildResponse(stationBasicServiceImpl.getStationList(areaCode,type));
     }
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/DeviceController.java

@@ -39,7 +39,7 @@ public class DeviceController extends BaseController {
     MonitorFanIndicatorImpl monitorFanIndicatorImpl;
 
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
-    @ApiOperation(value = "获取告警数据")
+    @ApiOperation(value = "获取每个风机实时告警数据")
     @GetMapping("/nationwide")
     public ResponseModel<ResultsData> getNationWideInfo(@RequestParam(value = "current") int current,@RequestParam
                     (value = "size") int size,@RequestParam(value = "stationBasicId") String stationBasicId,@RequestParam(value = "equipmentNumber" , required = false ) String equipmentNumber) {
@@ -49,6 +49,14 @@ public class DeviceController extends BaseController {
 
 
 
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "获取历史告警数据")
+    @GetMapping("/historyNationwide")
+    public ResponseModel<ResultsData> getLSNationWideInfo(@RequestParam(value = "current") int current,@RequestParam
+            (value = "size") int size,@RequestParam(value = "stationBasicId") String stationBasicId,@RequestParam(value = "equipmentNumber" , required = false ) String equipmentNumber) {
+        ResultsData resultsData=monitorFanIndicatorImpl.getLsNationWideInfo( current,  size,  stationBasicId,  equipmentNumber);
+        return ResponseHelper.buildResponse(resultsData);
+    }
 
 
 

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/MonitorFanIdxController.java

@@ -38,12 +38,13 @@ public class MonitorFanIdxController extends BaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "根据设备编号、网关ID、前段展示模块查询表数据")
     @GetMapping("/getFanIdxInfoByPage")
-    public ResponseModel<IPage<MonitorFanIndicator>> getFanIdxInfoByPage(@RequestParam(value = "equipmentNumber", required = false) String equipmentNumber,
-                                                                         @RequestParam(value = "gateway", required = false) String gateway,
-                                                                         @RequestParam(value = "frontModule", required = false) String frontModule,
-                                                                         @RequestParam(value = "current", required = false) int current,
-                                                                         @RequestParam(value = "size", required = false) int size) {
-        return ResponseHelper.buildResponse(monitorFanIndicator.getFanIdxInfoByPage(equipmentNumber, gateway, frontModule, current, size));
+    public ResponseModel<IPage<IndexDto>> getFanIdxInfoByPage(@RequestParam(value = "equipNum", required = false) String equipNum,
+                                                              @RequestParam(value = "stationId", required = false) String stationId,
+                                                              @RequestParam(value = "frontModule", required = false) String frontModule,
+                                                              @RequestParam(value = "systemType", required = false) String systemType,
+                                                              @RequestParam(value = "current", required = false) int current,
+                                                              @RequestParam(value = "size", required = false) int size) {
+        return ResponseHelper.buildResponse(monitorFanIndicator.getFanIdxInfoByPage(equipNum, stationId, frontModule, current, size, systemType));
     }
 
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
@@ -71,4 +72,12 @@ public class MonitorFanIdxController extends BaseController {
         return ResponseHelper.buildResponse(monitorFanIndicator.getFanStatusStatistics(stationId));
     }
 
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "风机布置图 - 风机基础信息")
+    @GetMapping("/getFanBasicInfoByEquipNum")
+    public ResponseModel<IndexDto> getFanBasicInfoByEquipNum(@RequestParam(value = "equipNum", required = false) String equipNum,
+                                                             @RequestParam(value = "stationId", required = false) String stationId) {
+        return ResponseHelper.buildResponse(monitorFanIndicator.getFanBasicInfoByEquipNum(equipNum, stationId));
+    }
+
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/MonitoringMapController.java

@@ -8,6 +8,7 @@ import com.yeejoin.amos.boot.module.jxiop.api.entity.StationBasic;
 import com.yeejoin.amos.boot.module.jxiop.api.mapper.StationBasicMapper;
 import com.yeejoin.amos.boot.module.jxiop.api.service.IMapRegionService;
 import com.yeejoin.amos.boot.module.jxiop.biz.dto.RegionNationWideDto;
+import com.yeejoin.amos.boot.module.jxiop.biz.dto.ResultsData;
 import com.yeejoin.amos.boot.module.jxiop.biz.dto.SocialContributionDto;
 import com.yeejoin.amos.boot.module.jxiop.biz.entity.Test;
 import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.MonitoringServiceImpl;
@@ -48,9 +49,9 @@ public class MonitoringMapController extends BaseController {
     }
 
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
-    @ApiOperation(value = "获取社会贡献")
-    @GetMapping("/getTotalSocialContribution")
-    public void getTotalSocialContribution() {
-//        return ResponseHelper.buildResponse(monitoringServiceImpl.getTotalSocialContribution());
+    @ApiOperation(value = "获取区域电量指标完成情况")
+    @GetMapping("/getCompletionOfPowerIndicatorsByProvinceName")
+    public ResponseModel<ResultsData> getCompletionOfPowerIndicatorsByProvinceName(@RequestParam(required = true) int current, @RequestParam(required = true) int size, @RequestParam(required = true) String provinceName) {
+        return ResponseHelper.buildResponse(monitoringServiceImpl.getCompletionOfPowerIndicatorsByProvinceName(current,size,provinceName));
     }
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/dto/CompletionOfPowerIndicatorsDto.java

+package com.yeejoin.amos.boot.module.jxiop.biz.dto;
+
+import lombok.Data;
+
+@Data
+public class CompletionOfPowerIndicatorsDto {
+
+    //场站名称
+    private String stationName;
+    //装机容量
+    private String installCapactity;
+    //风速或者辐照度
+    private String windSpeedOrIrradiance;
+    //    有功功率
+    private String activePower;
+    //日发电量
+    private String dailyPower;
+    //月发电量
+    private String monthlyPower;
+    //年发电量
+    private String annualPower;
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/IMonitorFanIndicator.java

@@ -16,4 +16,5 @@ public interface IMonitorFanIndicator {
    void UpdateMonitorFanIndicator(List<IndexDto> list);
 
     ResultsData getNationWideInfo( int current, int size,  String stationBasicId, String equipmentNumber);
+    ResultsData getLsNationWideInfo( int current, int size,  String stationBasicId, String equipmentNumber);
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/MonitorFanIndicatorImpl.java

@@ -16,6 +16,8 @@ import com.yeejoin.amos.boot.module.jxiop.api.mapper.StationBasicMapper;
 import com.yeejoin.amos.boot.module.jxiop.biz.dto.ColModel;
 import com.yeejoin.amos.boot.module.jxiop.biz.dto.DataGridMock;
 import com.yeejoin.amos.boot.module.jxiop.biz.dto.ResultsData;
+import com.yeejoin.amos.boot.module.jxiop.biz.entity.SjglZsjZsbtz;
+import com.yeejoin.amos.boot.module.jxiop.biz.entity.TpriDmpDatabook;
 import com.yeejoin.amos.boot.module.jxiop.biz.utils.InfluxDButils;
 import com.yeejoin.amos.boot.module.jxiop.biz.service.IMonitorFanIndicator;
 import com.yeejoin.amos.component.robot.BadRequest;
@@ -90,7 +92,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         List<IndexDto> list1 = influxDButils.getListData(querysqlcountn,IndexDto.class);
         page.setRecords(list);
         //构建平台数据
-        DataGridMock DataGridMock=new DataGridMock(current, list1.get(0).getCount(),  false,  current, list);
+        DataGridMock DataGridMock=new DataGridMock(current,  list1!=null?list1.get(0).getCount():0,  false,  current, list);
         ColModel colModelequipmentNumber=new ColModel("equipmentNumber", "equipmentNumber", "风机号", "风机号", "dataGrid",  "equipmentNumber");
         ColModel colModelvalueLabel=new ColModel("valueLabel", "valueLabel", "事件描述", "事件描述", "dataGrid",  "valueLabel");
         ColModel colModelcreatedTime=new ColModel("createdTime", "createdTime", "发生时间", "发生时间", "dataGrid",  "createdTime");
@@ -104,12 +106,67 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         return resultsData;
     }
 
-    public IPage<MonitorFanIndicator> getFanIdxInfoByPage(String equipmentNumber, String gateway, String frontModule, int current, int size) {
-        Page<MonitorFanIndicator> page = new Page<>(current, size);
-        Integer integer = monitorFanIndicatorregionMapper.queryByPageTotal(equipmentNumber, gateway, frontModule);
-        List<MonitorFanIndicator> monitorFanIndicators = monitorFanIndicatorregionMapper.queryByPage(page.getSize(), equipmentNumber, gateway, frontModule, (current - 1) * size);
-        page.setTotal(integer);
-        page.setRecords(monitorFanIndicators);
+    @Override
+    public ResultsData getLsNationWideInfo(int current, int size, String stationBasicId, String equipmentNumber) {
+        StationBasic stationBasic =stationBasicMapper.selectById(stationBasicId);
+        String gateway=stationBasic.getFanGatewayId();
+        Page<IndexDto> page = new Page<IndexDto>();
+        page.setCurrent(current);
+        page.setSize(size);
+        String table=gateway;
+        StringBuffer querysql = new StringBuffer("SELECT createdTime ,gatewayId,address,valueLabel,equipmentSpecificName,value FROM iot_data_%s  WHERE isAlarm='1'   and value!='0.0'  and  gatewayId=  %s ORDER BY time  desc   LIMIT %d OFFSET %d  ");
+        StringBuffer querysqlcount = new StringBuffer("SELECT count(value) FROM iot_data_%s  WHERE isAlarm='1'   and value!='0.0'  and  gatewayId=   %s ");
+        if(StringUtils.isNotEmpty(equipmentNumber)){
+            String date = " '%s' and equipmentSpecificName=~/.*%s风机.*/ ";
+            gateway= String.format(date,gateway,equipmentNumber);
+        }else{
+            gateway=String.format("'%s'",gateway);
+        }
+        String  querysqln= String.format(querysql.toString(),table,gateway, (int)page.getSize(),(int)(page.getCurrent() - 1)*page.getSize());
+        String  querysqlcountn= String.format(querysqlcount.toString(),table,gateway);
+        //每个分机的指标数据
+        List<IndexDto> list = influxDButils.getListData(querysqln,IndexDto.class);
+        List<IndexDto> list1 = influxDButils.getListData(querysqlcountn,IndexDto.class);
+        page.setRecords(list);
+        //构建平台数据
+        DataGridMock DataGridMock=new DataGridMock(current, list1!=null?list1.get(0).getCount():0,  false,  current, list);
+        ColModel colModelequipmentNumber=new ColModel("equipmentNumber", "equipmentSpecificName", "风机号", "风机号", "dataGrid",  "equipmentNumber");
+        ColModel colModelvalueLabel=new ColModel("valueLabel", "valueLabel", "事件描述", "事件描述", "dataGrid",  "valueLabel");
+        ColModel colModelcreatedTime=new ColModel("createdTime", "createdTime", "发生时间", "发生时间", "dataGrid",  "createdTime");
+        ColModel colModelvalue=new ColModel("value", "value", "告警值", "告警值", "dataGrid",  "value");
+        List<ColModel> listColModel=new ArrayList<>();
+        listColModel.add(colModelequipmentNumber);
+        listColModel.add(colModelvalueLabel);
+        listColModel.add(colModelcreatedTime);
+        listColModel.add(colModelvalue);
+        ResultsData resultsData=new ResultsData(DataGridMock,listColModel);
+        return resultsData;
+    }
+
+
+
+
+
+
+
+
+
+    public IPage<IndexDto> getFanIdxInfoByPage(String equipNum, String stationId, String frontModule, int current, int size, String systemType) {
+        StationBasic stationBasic = getOneByStationNumber(stationId);
+        Page<IndexDto> page = new Page<>(current, size);
+        String sql = "";
+        if (StringUtils.isNotEmpty(systemType)) {
+            sql = String.format("SELECT equipmentIndexName, value, frontModule FROM \"indicators_%s\" WHERE equipmentNumber = '%s' and frontModule =~/%s/ and systemType =~/%s/ ", stationBasic.getFanGatewayId(), equipNum, frontModule, systemType);
+        } else {
+            sql = String.format("SELECT equipmentIndexName, value, frontModule FROM \"indicators_%s\" WHERE equipmentNumber = '%s' and frontModule =~/%s/", stationBasic.getFanGatewayId(), equipNum, frontModule);
+        }
+        List<IndexDto> influxDBList = influxDButils.getListData(sql, IndexDto.class);
+        List<IndexDto> collect = influxDBList.stream()
+                .skip((long) (current - 1) * size)
+                .limit(size)
+                .collect(Collectors.toList());
+        page.setTotal(influxDBList.size());
+        page.setRecords(collect);
         return page;
     }
 
@@ -196,4 +253,16 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         Map<String, Long> collect = influxDBList.stream().collect(Collectors.groupingBy(IndexDto::getEquipmentIndexName, Collectors.counting()));
         return collect;
     }
+
+    public IndexDto getFanBasicInfoByEquipNum(String equipNum, String stationId) {
+        StationBasic stationBasic = getOneByStationNumber(stationId);
+        String sql = String.format("SELECT equipmentNumber, equipmentSpecificName, equipmentIndexName  FROM \"indicators_%s\" WHERE equipmentNumber = '%s' and value = 'true' order by time desc limit 1", stationBasic.getFanGatewayId(), equipNum);
+        List<IndexDto> influxDBList = influxDButils.getListData(sql, IndexDto.class);
+        if (CollectionUtils.isNotEmpty(influxDBList)) {
+            String equipmentSpecificName = influxDBList.get(0).getEquipmentSpecificName();
+            influxDBList.get(0).setEquipmentSpecificName(equipmentSpecificName.substring(0, equipmentSpecificName.indexOf("#")));
+            return influxDBList.get(0);
+        }
+        return new IndexDto();
+    }
 }
\ No newline at end of file

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/MonitoringServiceIMQTTmpl.java

@@ -5,28 +5,20 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.jxiop.api.entity.Region;
 import com.yeejoin.amos.boot.module.jxiop.api.entity.StationBasic;
-import com.yeejoin.amos.boot.module.jxiop.api.entity.StationCoordinate;
 import com.yeejoin.amos.boot.module.jxiop.api.mapper.RegionMapper;
 import com.yeejoin.amos.boot.module.jxiop.api.mapper.StationBasicMapper;
-import com.yeejoin.amos.boot.module.jxiop.api.mapper.StationCoordinateMapper;
-import com.yeejoin.amos.boot.module.jxiop.biz.dto.IndicatorsDto;
-import com.yeejoin.amos.boot.module.jxiop.biz.dto.RegionNationWideDto;
 import com.yeejoin.amos.boot.module.jxiop.biz.dto.SocialContributionDto;
-import com.yeejoin.amos.boot.module.jxiop.biz.utils.InfluxDButils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
-import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.component.emq.EmqKeeper;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
-import java.util.stream.Collectors;
 
 @Async
 @Service
@@ -42,10 +34,12 @@ public class MonitoringServiceIMQTTmpl {
     @Autowired
     CommonServiceImpl commonServiceImpl;
     @Autowired
+    RegionMapper regionMapper;
+    @Autowired
     EmqKeeper emqKeeper;
 
 
-    @Scheduled(cron = "*/10 * * * * *")
+    @Scheduled(cron = "0 0/1 * * * *")
     public void getTotalSocialContribution() {
         Page<SocialContributionDto> socialContributionDtoPage = new Page<SocialContributionDto>();
         logger.error("--------------------------社会贡献定时执行----------------------------------------------");
@@ -57,9 +51,13 @@ public class MonitoringServiceIMQTTmpl {
         stationBasicList.forEach(stationBasic -> {
             totalSocialContribution.updateAndGet(v -> v + commonServiceImpl.getTotalByIndicatior(stationBasic.getFanGatewayId(), "年发电量"));
         });
+        //二氧化碳贡献数
         SocialContributionDto co2 = new SocialContributionDto();
+        //标准煤贡献度
         SocialContributionDto coal = new SocialContributionDto();
+        //碳粉尘计算公式
         SocialContributionDto toner = new SocialContributionDto();
+        //二氧化硫贡献度
         SocialContributionDto so2 = new SocialContributionDto();
         /** 社会贡献原始计算公式，后边的数据已经经过处理
          //二氧化碳计算公式  *10000*832/10000/1000/1000
@@ -90,4 +88,58 @@ public class MonitoringServiceIMQTTmpl {
         }
     }
 
+
+    @Scheduled(cron = "0/30 * * * * *")
+    public void getCompletionOfPowerIndicatorsByProvinceName() {
+        Page<SocialContributionDto> socialContributionDtoPage = new Page<SocialContributionDto>();
+        logger.error("--------------------------区域实时数据消息开始发送----------------------------------------------");
+        List<SocialContributionDto> socialContributionDtoList = new ArrayList<>();
+        Region region = this.regionMapper.selectOne(new QueryWrapper<Region>().eq("level", 1).eq("region_name", "江苏省"));
+        List<StationBasic> stationBasicList = stationBasicMapper.selectList(new QueryWrapper<StationBasic>().like("belong_area", region.getRegionCode()));
+        //日发电量
+        AtomicReference<Double> dailyPower = new AtomicReference<>(0.0);
+        //月发电量
+        AtomicReference<Double> monthlyPower = new AtomicReference<>(0.0);
+        //年发电量
+        AtomicReference<Double> annualPower = new AtomicReference<>(0.0);
+        //年发电量完成比例
+        Double completionRatio = 23.11;
+        //年利用小时数
+        AtomicReference<Double> useHours = new AtomicReference<>(0.01);
+        stationBasicList.forEach(stationBasic -> {
+            dailyPower.updateAndGet(v -> v + commonServiceImpl.getTotalByIndicatior(stationBasic.getFanGatewayId(), "日发电量"));
+            monthlyPower.updateAndGet(v -> v + commonServiceImpl.getTotalByIndicatior(stationBasic.getFanGatewayId(), "月发电量"));
+            annualPower.updateAndGet(v -> v + commonServiceImpl.getTotalByIndicatior(stationBasic.getFanGatewayId(), "年发电量"));
+            useHours.updateAndGet(v -> v + commonServiceImpl.getTotalByIndicatior(stationBasic.getFanGatewayId(), "日工作时间"));
+        });
+        SocialContributionDto dailyPowerdto = new SocialContributionDto();
+        dailyPowerdto.setTitle(dailyPower.get());
+        dailyPowerdto.setUnit("万kWh");
+        SocialContributionDto monthlyPowerdto = new SocialContributionDto();
+        monthlyPowerdto.setTitle(monthlyPower.get());
+        monthlyPowerdto.setUnit("万kWh");
+        SocialContributionDto annualPowerdto = new SocialContributionDto();
+        annualPowerdto.setTitle(annualPower.get());
+        annualPowerdto.setUnit("万kWh");
+        SocialContributionDto completionRatioDto = new SocialContributionDto();
+        completionRatioDto.setTitle(completionRatio);
+        completionRatioDto.setUnit("%");
+        SocialContributionDto useHoursDto = new SocialContributionDto();
+        useHoursDto.setTitle(useHours.get());
+        useHoursDto.setUnit("h");
+        socialContributionDtoList.add(dailyPowerdto);
+        socialContributionDtoList.add(monthlyPowerdto);
+        socialContributionDtoList.add(annualPowerdto);
+        socialContributionDtoList.add(completionRatioDto);
+        socialContributionDtoList.add(useHoursDto);
+        socialContributionDtoPage.setRecords(socialContributionDtoList);
+        socialContributionDtoPage.setTotal(100);
+        socialContributionDtoPage.setCurrent(1);
+        try {
+            emqKeeper.getMqttClient().publish("completionofpowerindicator_topic", JSON.toJSON(socialContributionDtoPage).toString().getBytes("UTF-8"), 1, true);
+            logger.info("-----------------发送区域实时生产数据消息=================== 成功！" + JSON.toJSONString(socialContributionDtoPage));
+        } catch (Exception exception) {
+            logger.error("-----------------发送区域实时生产数据消息=================== 失败！");
+        }
+    }
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/MonitoringServiceImpl.java

@@ -10,9 +10,7 @@ import com.yeejoin.amos.boot.module.jxiop.api.entity.StationCoordinate;
 import com.yeejoin.amos.boot.module.jxiop.api.mapper.RegionMapper;
 import com.yeejoin.amos.boot.module.jxiop.api.mapper.StationBasicMapper;
 import com.yeejoin.amos.boot.module.jxiop.api.mapper.StationCoordinateMapper;
-import com.yeejoin.amos.boot.module.jxiop.biz.dto.IndicatorsDto;
-import com.yeejoin.amos.boot.module.jxiop.biz.dto.RegionNationWideDto;
-import com.yeejoin.amos.boot.module.jxiop.biz.dto.SocialContributionDto;
+import com.yeejoin.amos.boot.module.jxiop.biz.dto.*;
 import com.yeejoin.amos.boot.module.jxiop.biz.utils.InfluxDButils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -59,7 +57,6 @@ public class MonitoringServiceImpl {
     CommonServiceImpl commonServiceImpl;
 
 
-
     /**
      * 根据场站编号获取该场站的装机容量
      *
@@ -135,4 +132,41 @@ public class MonitoringServiceImpl {
         return regionNationWideDtoList;
     }
 
+
+    public ResultsData getCompletionOfPowerIndicatorsByProvinceName(int current, int size, String provinceName) {
+        Region region = this.regionMapper.selectOne(new QueryWrapper<Region>().eq("level", 1).eq("region_name", provinceName));
+        List<StationBasic> stationBasicList = stationBasicMapper.selectList(new QueryWrapper<StationBasic>().like("belong_area", region.getRegionCode()));
+        List<ColModel> colModels = new ArrayList<>();
+        List<CompletionOfPowerIndicatorsDto> completionOfPowerIndicatorsDtoList = new ArrayList<>();
+        ColModel colModelStatitonName = new ColModel("stationName", "stationName", "场站", "场站", "dataGrid", "stationName");
+        ColModel colModelInstallCapactity = new ColModel("installCapactity", "installCapactity", "装机容量", "装机容量", "dataGrid", "installCapactity");
+        ColModel colModelWindSpeedOrIrradiance = new ColModel("windSpeedOrIrradiance", "windSpeedOrIrradiance", "风度/辐照度", "风度/辐照度", "dataGrid", "windSpeedOrIrradiance");
+        ColModel colModelActivePower = new ColModel("activePower", "activePower", "有功", "有功", "dataGrid", "activePower");
+        ColModel colModelDailyPower = new ColModel("dailyPower", "dailyPower", "日发电量", "日发电量", "dataGrid", "dailyPower");
+        ColModel colModelMonthlyPower = new ColModel("monthlyPower", "monthlyPower", "月发电量", "月发电量", "dataGrid", "monthlyPower");
+        ColModel colModelAnnualPower = new ColModel("annualPower", "annualPower", "年发电量", "年发电量", "dataGrid", "annualPower");
+        colModels.add(colModelStatitonName);
+        colModels.add(colModelInstallCapactity);
+        colModels.add(colModelWindSpeedOrIrradiance);
+        colModels.add(colModelActivePower);
+        colModels.add(colModelDailyPower);
+        colModels.add(colModelMonthlyPower);
+        colModels.add(colModelAnnualPower);
+        //遍历列表
+        stationBasicList.forEach(stationBasic -> {
+         CompletionOfPowerIndicatorsDto completionOfPowerIndicatorsDto = new CompletionOfPowerIndicatorsDto();
+         completionOfPowerIndicatorsDto.setStationName(stationBasic.getStationName());
+         completionOfPowerIndicatorsDto.setInstallCapactity(String.valueOf(getStationCaPACITYL(stationBasic.getStationNumber())));
+         completionOfPowerIndicatorsDto.setWindSpeedOrIrradiance(String.valueOf(commonServiceImpl.getAvgvalueByIndicatior(stationBasic.getFanGatewayId(),"30秒平均风速")));
+         completionOfPowerIndicatorsDto.setActivePower(String.valueOf(commonServiceImpl.getTotalByIndicatior(stationBasic.getFanGatewayId(),"有功功率")));
+         completionOfPowerIndicatorsDto.setDailyPower(String.valueOf(commonServiceImpl.getTotalByIndicatior(stationBasic.getFanGatewayId(),"日发电量")));
+         completionOfPowerIndicatorsDto.setMonthlyPower(String.valueOf(commonServiceImpl.getTotalByIndicatior(stationBasic.getFanGatewayId(),"月发电量")));
+         completionOfPowerIndicatorsDto.setAnnualPower(String.valueOf(commonServiceImpl.getTotalByIndicatior(stationBasic.getFanGatewayId(),"年发电量")));
+         completionOfPowerIndicatorsDtoList.add(completionOfPowerIndicatorsDto);
+        });
+        Integer allsize = completionOfPowerIndicatorsDtoList.size();
+        DataGridMock dataGridMock = new DataGridMock(current, allsize, false, allsize/size+1,completionOfPowerIndicatorsDtoList);
+        ResultsData resultsData = new ResultsData(dataGridMock, colModels);
+        return resultsData;
+    }
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/resources/application.properties

@@ -66,8 +66,8 @@ privilege.fegin.name=AMOS-API-PRIVILEGE
 feign.client.config.default.connect-timeout=20000
 feign.client.config.default.read-timeout=20000
 #场站实时数据
-station.task.cron=0/10 * * * * ?
+station.task.cron=* * */10 * * ?
 #是否切片
-station.isok=true
+station.isok=false
 #风机更新数据切片量
-station.section=10
+station.section=1000
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/enums/ImageSizeEnums.java

+package com.yeejoin.amos.boot.module.tzs.api.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+
+@AllArgsConstructor
+@Getter
+public enum ImageSizeEnums {
+
+    /**
+     * 导出监管码、96333码尺寸
+     */
+    // 监管码-大
+    JG_BIG("JG_BIG", "bigBg.png", 350, 350, 60, 720, 190, 0, 0, 780, 680),
+    // 监管码-中
+    JG_MID("JG_MID", "centreBg.png", 230, 230, 40, 480, 170, 0, 0, 520, 525),
+    // 监管码-小
+    JG_MIN("JG_MIN", "smallBg.png", 170, 170, 30, 360, 110, 0, 0, 380, 355),
+    // 96333电梯码
+    DT("DT", "dt.png", 170, 170, 30, 30, 110, 0, 0, 330, 355);
+
+    String code;
+    String bgPath;
+    Integer with;
+    Integer height;
+    Integer size;
+    Integer imagesX;
+    Integer imagesY;
+    Integer text1X;
+    Integer text1Y;
+    Integer text2X;
+    Integer text2Y;
+
+
+    public static ImageSizeEnums getEnumByCode(String code) {
+        for (ImageSizeEnums value : ImageSizeEnums.values()) {
+            if (value.getCode().equals(code)) {
+                return value;
+            }
+        }
+        return null;
+    }
+
+}

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/feign/IdxFeignService.java

@@ -84,6 +84,7 @@ public interface IdxFeignService {
     FeignClientResult<String> submit(@RequestParam(value = "pageId") long pageId,
                                      @RequestParam(value = "taskId",required = false) String taskId,
                                      @RequestParam(value = "planInstanceId", required = false) String planInstanceId,
+                                     @RequestParam(value = "bizField", required = false) String bizField,
                                      @RequestParam(value = "topic", required = false) String topic,
                                      @RequestParam(value = "tableName", required = false) String tableName,
                                      @RequestBody Map<String, Object> kv) throws Exception;

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/resources/mapper/EquipmentCategoryMapper.xml

@@ -345,6 +345,7 @@
             <if test="dto.ORG_BRANCH_NAME != '' and dto.ORG_BRANCH_NAME != null">and ORG_BRANCH_NAME =  #{dto.ORG_BRANCH_NAME}</if>
             <if test="dto.USE_PLACE != '' and dto.USE_PLACE != null">and USE_PLACE =  #{dto.USE_PLACE}</if>
             <if test="dto.STATUS != '' and dto.STATUS != null">and STATUS =  #{dto.STATUS}</if>
+            <if test="dto.EQU_CATEGORY != '' and dto.EQU_CATEGORY != null">and EQU_CATEGORY =  #{dto.EQU_CATEGORY}</if>
             <if test="dto.USE_UNIT_CREDIT_CODE != '' and dto.USE_UNIT_CREDIT_CODE != null">and USE_UNIT_CREDIT_CODE like concat('%', #{dto.USE_UNIT_CREDIT_CODE},'%')</if>
             <if test="dto.ORG_BRANCH_CODE != '' and dto.ORG_BRANCH_CODE != null">and ORG_BRANCH_CODE like concat('%', #{dto.ORG_BRANCH_CODE},'%')</if>
             <if test='dto.ids != null'> and SEQUENCE_NBR in

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/EquipmentCategoryController.java

 package com.yeejoin.amos.boot.module.tzs.biz.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -13,13 +14,16 @@ import com.yeejoin.amos.boot.module.tzs.api.dto.EquipExportDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.EquipmentCategoryDto;
 import com.yeejoin.amos.boot.module.tzs.api.entity.CategoryOtherInfo;
 import com.yeejoin.amos.boot.module.tzs.api.entity.EquipmentCategory;
+import com.yeejoin.amos.boot.module.tzs.api.enums.ImageSizeEnums;
 import com.yeejoin.amos.boot.module.tzs.api.mapper.EquipmentCategoryMapper;
 import com.yeejoin.amos.boot.module.tzs.api.service.IEquipmentCategoryService;
 import com.yeejoin.amos.boot.module.tzs.api.vo.EquipExportVo;
 import com.yeejoin.amos.boot.module.tzs.biz.service.impl.EquipmentCategoryServiceImpl;
+import com.yeejoin.amos.boot.module.tzs.biz.utils.ImageUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpStatus;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
@@ -30,10 +34,12 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
+import java.io.*;
+import java.net.URL;
+import java.util.*;
+import java.util.stream.Collectors;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
 
 /**
  * 装备分类
@@ -55,6 +61,13 @@ public class EquipmentCategoryController extends BaseController {
 	EquipmentCategoryMapper equipmentCategoryMapper;
 
 
+	@Value("${regulatory_code_prefix}")
+	String REGULATORY_CODE_PREFIX ;
+	/**
+	 * 监管码背景图路径
+	 */
+	private static final String  BASE_PATH = "amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/resources/temp/";
+
 
 	/**
 	 * 新增装备分类
@@ -374,6 +387,64 @@ public class EquipmentCategoryController extends BaseController {
 	}
 
 
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/exportImage")
+	@ApiOperation(httpMethod = "GET", value = "设备监管码下载", notes = "设备监管码下载")
+	public void exportImage(HttpServletResponse response, @RequestParam("code") String code, @RequestParam("type") String type) throws IOException {
+		FileInputStream bgImgFile = null;
+		ImageSizeEnums imageSizeEnums = ImageSizeEnums.getEnumByCode(type);
+		try {
+			bgImgFile = new FileInputStream(BASE_PATH + imageSizeEnums.getBgPath());
+		} catch (FileNotFoundException e) {
+			e.printStackTrace();
+		}
+		File QrCodeFile = new File(BASE_PATH + code + ".png");
+		ImageUtils.creatQRCode(QrCodeFile, bgImgFile, imageSizeEnums.getWith(), imageSizeEnums.getHeight(), REGULATORY_CODE_PREFIX+code, "", code, imageSizeEnums.getSize(), imageSizeEnums.getImagesX(), imageSizeEnums.getImagesY(), imageSizeEnums.getText1X(), imageSizeEnums.getText1Y(), imageSizeEnums.getText2X(), imageSizeEnums.getText2Y());
+		ImageUtils.downloadResource(code + ".png", BASE_PATH + code + ".png", response);
+		QrCodeFile.delete();
+	}
+
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/exportImageZip")
+	@ApiOperation(httpMethod = "GET", value = "设备信息导出", notes = "设备信息导出")
+	public void exportImageZip(HttpServletResponse response, EquipExportDto dto, @RequestParam("type") String type) throws IOException {
+		File delete = new File(BASE_PATH + "images");
+		if (!delete.exists()) {
+			delete.mkdir();
+		}
+		ImageSizeEnums imageSizeEnums = ImageSizeEnums.getEnumByCode(type);
+		//创建list 存放图片
+		List<File> fileList = new ArrayList<>();
+		List<EquipExportVo> equipExportData = equipmentCategoryServiceImpl.getEquipExportData(dto);
+		List<EquipExportVo> unique = equipExportData.stream().collect(
+				Collectors. collectingAndThen(
+						Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> o.getSupervisoryCode() + ";" + o.getCode96333()))), ArrayList::new)
+		);
+		for (EquipExportVo equipExportDatum : unique) {
+			FileInputStream bgImgFile = new FileInputStream(BASE_PATH + imageSizeEnums.getBgPath());
+			if ("DT".equals(type) && !ObjectUtils.isEmpty(equipExportDatum.getCode96333())) {
+				File QrCodeFile = new File(BASE_PATH + "images/" + equipExportDatum.getCode96333() + ".png");
+				ImageUtils.creatQRCode(QrCodeFile, bgImgFile, imageSizeEnums.getWith(), imageSizeEnums.getHeight(), REGULATORY_CODE_PREFIX+equipExportDatum.getCode96333(), "", equipExportDatum.getCode96333(), imageSizeEnums.getSize(), imageSizeEnums.getImagesX(), imageSizeEnums.getImagesY(), imageSizeEnums.getText1X(), imageSizeEnums.getText1Y(), imageSizeEnums.getText2X(), imageSizeEnums.getText2Y());
+				fileList.add(new File(BASE_PATH + "images/" + equipExportDatum.getCode96333() + ".png"));
+			} else if (!ObjectUtils.isEmpty(equipExportDatum.getSupervisoryCode())) {
+				File QrCodeFile = new File(BASE_PATH + "images/" + equipExportDatum.getSupervisoryCode() + ".png");
+				ImageUtils.creatQRCode(QrCodeFile, bgImgFile, imageSizeEnums.getWith(), imageSizeEnums.getHeight(), REGULATORY_CODE_PREFIX+equipExportDatum.getSupervisoryCode(), "", equipExportDatum.getSupervisoryCode(), imageSizeEnums.getSize(), imageSizeEnums.getImagesX(), imageSizeEnums.getImagesY(), imageSizeEnums.getText1X(), imageSizeEnums.getText1Y(), imageSizeEnums.getText2X(), imageSizeEnums.getText2Y());
+				fileList.add(new File(BASE_PATH + "images/" + equipExportDatum.getSupervisoryCode() + ".png"));
+			}
+			bgImgFile.close();
+		}
+		File zipFile = new File(BASE_PATH + "images/imageZip.zip");
+		zipFile.createTempFile("imageZip", ".zip");
+		// 调用压缩方法
+		ImageUtils.zipFiles(fileList, zipFile);
+		ImageUtils.downloadResourceZip("imageZip.zip", BASE_PATH + "images/imageZip.zip", response);
+		zipFile.delete();
+		ImageUtils.deleteAllFilesOfDir(delete);
+		if (delete.exists()) {
+			ImageUtils.deleteAllFilesOfDir(delete);
+		}
+	}
 
 
 }

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/service/impl/RegUnitInfoServiceImpl.java

@@ -780,18 +780,19 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
 		String userIdsTask = String.join(",", task);
 		// 添加被检查企业下的人员id
 		objectMap.put("CHECKED_COMPANY_USERS", userIds);
+		objectMap.put("CHECKED_COMPANY_USER_ids", userIdsTask);
 		// 表单信息提交
-		FeignClientResult<String> submit = idxFeignService.submit(pageId, taskId, planInstanceId, topic, tableName, objectMap);
-		if ("200".equals(String.valueOf(submit.getStatus()))) {
-			JSONObject jsonObject = new JSONObject();
-			jsonObject.put("title", "企业整改");
-			jsonObject.put("userIds", userIdsTask);
-			logger.info("idx执行任务更新参数,{}",  JSONObject.toJSONString(jsonObject));
-			//FeignClientResult<JSONObject> jsonObjectFeignClientResult = idxFeignService.updateAmosTask(taskId, jsonObject);
-			updateAmosTask(taskId, jsonObject);
-			//logger.info("idx执行任务更新任务返回参数,{}",  JSONObject.toJSONString(jsonObjectFeignClientResult));
-
-		}
+		FeignClientResult<String> submit = idxFeignService.submit(pageId, taskId, planInstanceId,"CHECKED_COMPANY_USER_ids", topic, tableName, objectMap);
+	//	if ("200".equals(String.valueOf(submit.getStatus()))) {
+//			JSONObject jsonObject = new JSONObject();
+//			jsonObject.put("title", "企业整改");
+//			jsonObject.put("userIds", userIdsTask);
+//			logger.info("idx执行任务更新参数,{}",  JSONObject.toJSONString(jsonObject));
+//			//FeignClientResult<JSONObject> jsonObjectFeignClientResult = idxFeignService.updateAmosTask(taskId, jsonObject);
+//			updateAmosTask(taskId, jsonObject);
+//			//logger.info("idx执行任务更新任务返回参数,{}",  JSONObject.toJSONString(jsonObjectFeignClientResult));
+//
+//		}
 		return "ok";
 	}