gateway docker 打包部署去除，新增填报水库信息接口

zhongrj

2023-08-22 5a3ad0aa9e5605d6ace8bda6acbb0642005bd24d

gateway  docker 打包部署去除，新增填报水库信息接口

 skjcmanager/skjcmanager-gateway/pom.xml

@@ -92,15 +92,15 @@
                    </buildArgs>
                    <skip>false</skip>
                </configuration>
                <executions>
                    <execution>
                        <id>default</id>
                        <goals>
                            <goal>build</goal>
                            <goal>push</goal>
                        </goals>
                    </execution>
                </executions>
<!--                <executions>-->
<!--                    <execution>-->
<!--                        <id>default</id>-->
<!--                        <goals>-->
<!--                            <goal>build</goal>-->
<!--                            <goal>push</goal>-->
<!--                        </goals>-->
<!--                    </execution>-->
<!--                </executions>-->
            </plugin>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbAttResBaseController.java

@@ -11,6 +11,9 @@
import org.springblade.core.tool.utils.StringUtil;
import org.springframework.web.bind.annotation.*;

import java.util.List;
import java.util.Map;


/**
 * @ClassName AttResBaseController
@@ -30,6 +33,19 @@


    /**
     * 查询所有水库填报的状态信息
     * @param resGuid
     * @return
     */
    @ApiOperation(value = "中台水库-查询所有水库填报的状态信息", notes = "中台水库-查询所有水库填报的状态信息")
    @GetMapping(value = "/getAllWaterFillInfoByResGuid")
    public R getAllWaterFillInfoByResGuid(String resGuid) {
        List<Map<String,Object>> list = tbAttResBaseService.getAllWaterFillInfoByResGuid(resGuid);
        return R.data(list);
    }


    /**
     * 查询水库填报详情信息
     * @param guid
     * @return

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbAttResBaseMapper.java

@@ -1,8 +1,12 @@
package cn.gistack.sm.sjztmd.mapper;

import cn.gistack.sm.sjztmd.entity.TbAttResBase;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;

import java.util.List;
import java.util.Map;


/**
@@ -21,4 +25,22 @@


    int updateByGuid(@Param("tbAttResBase") TbAttResBase tbAttResBase);

    /**
     * 查询水库基础填报数据
     * @param resGuid
     * @param tableName
     * @return
     */
    @DS("zt")
    List<Map<String, Object>> getTbAttResBaseInfo(@Param("resGuid") String resGuid,@Param("tableName") String tableName);

    /**
     * 查询水库其他填报数据
     * @param resGuid
     * @param tableName
     * @return
     */
    @DS("zt")
    List<Map<String, Object>> getTbInfo(@Param("resGuid") String resGuid,@Param("tableName") String tableName);
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbAttResBaseMapper.xml

@@ -59,4 +59,13 @@
        WHERE "guid" = #{tbAttResBase.guid}
    </update>

    <!--查询水库基础填报数据-->
    <select id="getTbAttResBaseInfo" resultType="java.util.Map">
        SELECT 'tb_att_res_base' AS name,ifnull("check_state",-1) as value FROM "tb_att_res_base" WHERE "guid" = #{resGuid}
    </select>

    <!--查询水库其他填报数据-->
    <select id="getTbInfo" resultType="java.util.Map">
        SELECT #{tableName} AS name,ifnull("check_state",-1) as name FROM "tb_att_res_water_delivery" WHERE "res_guid" = #{resGuid}
    </select>
</mapper>

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/ITbAttResBaseService.java

@@ -4,6 +4,9 @@
import cn.gistack.sm.sjztmd.entity.TbAttResBase;
import com.baomidou.mybatisplus.extension.service.IService;

import java.util.List;
import java.util.Map;

/**
 * @ClassName IAttResBaseService
 * @Description TODO
@@ -33,4 +36,11 @@
     * @return
     */
    boolean auditByGuid(TbAttResBase tbAttResBase);

    /**
     * 查询所有水库填报的状态信息
     * @param resGuid
     * @return
     */
    List<Map<String, Object>> getAllWaterFillInfoByResGuid(String resGuid);
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResBaseServiceImpl.java

@@ -1,6 +1,8 @@
package cn.gistack.sm.sjztmd.service.impl;

import cn.gistack.common.config.MyThreadPoolConfig;
import cn.gistack.sm.feedback.service.IFeedbackService;
import cn.gistack.sm.intelligentCall.vo.CallTaskStatistic;
import cn.gistack.sm.sjztmd.entity.TbAttResBase;
import cn.gistack.sm.sjztmd.mapper.TbAttResBaseMapper;
import cn.gistack.sm.sjztmd.service.ITbAttResBaseService;
@@ -12,7 +14,10 @@
import org.springframework.stereotype.Service;

import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.*;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ThreadPoolExecutor;

/**
 * @ClassName AttResBaseServiceImpl
@@ -27,6 +32,9 @@

    @Autowired
    private IUserClient userClient;

    @Autowired
    private MyThreadPoolConfig myThreadPoolConfig;

    /**
     * 查询水库填报详情信息
@@ -191,4 +199,105 @@
            newTbAttResBase.setLog(stringBuilder.toString());
        }
    }

    /**
     * 查询所有水库填报的状态信息
     * @param resGuid
     * @return
     */
    @Override
    public List<Map<String, Object>> getAllWaterFillInfoByResGuid(String resGuid) {
        List<Map<String, Object>> list = new ArrayList<>();
        ThreadPoolExecutor executor = myThreadPoolConfig.threadPoolExecutor();
        // 查询水库基础填报数据
        CompletableFuture<List<Map<String,Object>>> tbAttResBaseInfo = getTbAttResBaseInfo("tb_att_res_base",resGuid, executor);
        // 查询水库其他填报数据
        CompletableFuture<List<Map<String,Object>>> tbAttResBuildInfo = getTbInfo("tb_att_res_build_info",resGuid,executor);
        CompletableFuture<List<Map<String,Object>>> tbAttResEngBene = getTbInfo("tb_att_res_eng_bene",resGuid,executor);
        CompletableFuture<List<Map<String,Object>>> tbAttResInfomationProject = getTbInfo("tb_att_res_infomation_project",resGuid,executor);
        CompletableFuture<List<Map<String,Object>>> tbAttResMgrSysB = getTbInfo("tb_att_res_mgr_sys_b",resGuid,executor);
        CompletableFuture<List<Map<String,Object>>> tbAttResPowerStation = getTbInfo("tb_att_res_power_station",resGuid,executor);
        CompletableFuture<List<Map<String,Object>>> tbAttResProjectUtilize = getTbInfo("tb_att_res_project_utilize",resGuid,executor);
        CompletableFuture<List<Map<String,Object>>> tbAttResRsbNorspi = getTbInfo("tb_att_res_rsb_norspi",resGuid,executor);
        CompletableFuture<List<Map<String,Object>>> tbAttResRsbSpillway = getTbInfo("tb_att_res_rsb_spillway",resGuid,executor);
        CompletableFuture<List<Map<String,Object>>> tbAttResRsbVerspi = getTbInfo("tb_att_res_rsb_verspi",resGuid,executor);
        CompletableFuture<List<Map<String,Object>>> tbAttResSafetyMonitor = getTbInfo("tb_att_res_safety_monitor",resGuid,executor);
        CompletableFuture<List<Map<String,Object>>> tbAttResStagChar = getTbInfo("tb_att_res_stag_char",resGuid,executor);
        CompletableFuture<List<Map<String,Object>>> tbAttResWaterBlock = getTbInfo("tb_att_res_water_block",resGuid,executor);
        CompletableFuture<List<Map<String,Object>>> tbAttResWaterDelivery = getTbInfo("tb_att_res_water_delivery",resGuid,executor);
        //等待所有任务执行完成
        try {
            CompletableFuture.allOf(
                tbAttResBaseInfo,
                tbAttResBuildInfo,
                tbAttResEngBene,
                tbAttResInfomationProject,
                tbAttResMgrSysB,
                tbAttResPowerStation,
                tbAttResProjectUtilize,
                tbAttResRsbNorspi,
                tbAttResRsbSpillway,
                tbAttResRsbVerspi,
                tbAttResSafetyMonitor,
                tbAttResStagChar,
                tbAttResWaterBlock,
                tbAttResWaterDelivery).get();
            // 数据处理
            list.addAll(tbAttResBaseInfo.get());
            list.addAll(tbAttResBuildInfo.get());
            list.addAll(tbAttResEngBene.get());
            list.addAll(tbAttResInfomationProject.get());
            list.addAll(tbAttResMgrSysB.get());
            list.addAll(tbAttResPowerStation.get());
            list.addAll(tbAttResProjectUtilize.get());
            list.addAll(tbAttResRsbNorspi.get());
            list.addAll(tbAttResRsbSpillway.get());
            list.addAll(tbAttResRsbVerspi.get());
            list.addAll(tbAttResSafetyMonitor.get());
            list.addAll(tbAttResStagChar.get());
            list.addAll(tbAttResWaterBlock.get());
            list.addAll(tbAttResWaterDelivery.get());
        } catch (InterruptedException e) {
            e.printStackTrace();
        } catch (ExecutionException e) {
            e.printStackTrace();
        }
        // 返回
        return list;
    }

    /**
     * 查询水库基础填报数据
     * @param tableName
     * @param resGuid
     * @param executor
     * @return
     */
    private CompletableFuture<List<Map<String,Object>>> getTbAttResBaseInfo(String tableName,String resGuid,ThreadPoolExecutor executor){
        return CompletableFuture.supplyAsync(()->{
            // 查询所有水库填报的状态信息
            return baseMapper.getTbAttResBaseInfo(resGuid,tableName);
        },executor);
    }

    /**
     * 查询水库其他填报数据
     * @param tableName
     * @param resGuid
     * @param executor
     * @return
     */
    private CompletableFuture<List<Map<String,Object>>> getTbInfo(String tableName,String resGuid,ThreadPoolExecutor executor){
        return CompletableFuture.supplyAsync(()->{
            // 查询所有水库填报的状态信息
            List<Map<String, Object>> tbInfo = baseMapper.getTbInfo(resGuid, tableName);
            if (tbInfo.size()==0){
                Map<String, Object> map = new HashMap<>(2);
                map.put("NAME",tableName);
                map.put("VALUE",-1);
                tbInfo.add(map);
            }
            return tbInfo;
        },executor);
    }
}