云搜数据分析

common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/hnkshrwEntity/HnTbStRygxRw.java

+package com.founder.commonutils.model.newPublicEntity.hnkshrwEntity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author zyc
+ * @since 2021-09-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("ksh_st_rygx_rw")
+@ApiModel(value="可视化任务对象", description="")
+public class HnTbStRygxRw implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "任务名称")
+    @TableField("RWMC")
+    private String rwmc;
+
+    @TableField("RWID")
+    @TableId(value = "RWID", type = IdType.UUID)
+    @ApiModelProperty(value = "任务id")
+    private String rwid;
+
+    @ApiModelProperty(value = "excel名称")
+    @TableField("EXCEL_NAME")
+    private String excelName;
+
+    @ApiModelProperty(value = "excelId")
+    @TableField("EXCEL_ID")
+    private String excelId;
+
+    @ApiModelProperty(value = "excel名称")
+    @TableField("CREATE_NAME")
+    private String createName;
+
+    @ApiModelProperty(value = "excel创建时间")
+    @TableField("EXCEL_CREATE_TIME")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date excelCreateTime;
+
+    @ApiModelProperty(value = "数据量")
+    @TableField("DATA_COUNT")
+    private String dataCount;
+
+    @ApiModelProperty(value = "excel后缀")
+    @TableField("EXCEL_POSTFIX")
+    private String excelPostfix;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField("TASK_CREATE_TIME")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date taskCreateTime;
+
+    @ApiModelProperty(value = "父id")
+    @TableField("PARENT_ID")
+    private String parentId;
+
+    @ApiModelProperty(value = "子数据")
+    @TableField(exist = false)
+    private List<HnTbStRygxRw> children;
+}

common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/hnkshrwEntity/HnTbStRygxRwDTO.java

+package com.founder.commonutils.model.newPublicEntity.hnkshrwEntity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author zyc
+ * @since 2021-09-08
+ */
+@Data
+@ApiModel(value="HnTbStRygxRwDTO", description="")
+public class HnTbStRygxRwDTO {
+
+    @ApiModelProperty(value = "任务id")
+    private String rwid;
+
+    @ApiModelProperty(value = "子集")
+    private List<RygxExcelDTO> child;
+
+    @ApiModelProperty(value = "任务名称")
+    private String rwmc;
+
+    @ApiModelProperty(value = "创建人名字")
+    private String createName;
+
+    @ApiModelProperty(value = "时间")
+    private Date taskCreateTime;
+
+}

common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/hnkshrwEntity/RygxExcelDTO.java

+package com.founder.commonutils.model.newPublicEntity.hnkshrwEntity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+@Data
+@ApiModel(value="RygxExcelDTO", description="")
+public class RygxExcelDTO {
+    @ApiModelProperty(value = "excel名字")
+    private String excelName;
+
+    @ApiModelProperty(value = "excelid")
+    private String excelId;
+
+    @ApiModelProperty(value = "excel创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date excelCreateTime;
+
+    @ApiModelProperty(value = "数据量")
+    private String dataCount;
+}

common/common_utils/src/main/java/com/founder/commonutils/model/vo/TokenInfo.java

+package com.founder.commonutils.model.vo;
+
+import com.google.gson.annotations.SerializedName;
+import lombok.Data;
+
+@Data
+public class TokenInfo {
+    @SerializedName("access_token")
+    private String accessToken;
+
+    @SerializedName("refresh_token")
+    private String refreshToken;
+
+    @SerializedName("token_type")
+    private String tokenType;
+
+    @SerializedName("scope")
+    private String scope;
+
+    /**
+     * 过期时间
+     */
+    @SerializedName("expires_in")
+    private int expiresIn;
+}

common/common_utils/src/main/java/com/founder/commonutils/util/StInterfaceUtil.java

+package com.founder.commonutils.util;
+
+import com.founder.commonutils.model.vo.TokenInfo;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import org.apache.http.HttpException;
+import org.apache.http.HttpResponse;
+import org.apache.http.NameValuePair;
+import org.apache.http.client.ClientProtocolException;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.client.utils.URIBuilder;
+import org.apache.http.conn.ssl.AllowAllHostnameVerifier;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.http.conn.ssl.SSLContexts;
+import org.apache.http.conn.ssl.TrustSelfSignedStrategy;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.message.BasicNameValuePair;
+import org.apache.http.protocol.HTTP;
+import org.apache.http.util.EntityUtils;
+
+import javax.net.ssl.SSLContext;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.security.KeyManagementException;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.util.ArrayList;
+import java.util.List;
+
+public class StInterfaceUtil
+{
+    // APIG 业务面浮动IP (需要根据实际情况修改)
+    private static final String APIG_MICROGW_FLOAT_IP = "68.26.19.197";
+
+    // API获取AppToken的URI
+    private static final String ACCESS_TOKEN_URI = "/v1/apigw/oauth2/token";
+
+    private static final String DATA_FORMAT = "yyyy-MM-dd HH:mm:ss";
+
+
+    /**
+     * 获取Token信息
+     *
+     * @param appKey    用户凭证中的 AppKey
+     * @param secretKey 用户凭证中的 SecretKey
+     * @return TokenInfo Token信息
+     */
+    public static TokenInfo getToken(String appKey, String secretKey) throws HttpException
+    {
+        // 添加请求体内容
+        List<NameValuePair> pairs = new ArrayList<NameValuePair>();
+        pairs.add(new BasicNameValuePair("grant_type", "client_credentials"));
+        pairs.add(new BasicNameValuePair("client_id", appKey));
+        pairs.add(new BasicNameValuePair("client_secret", secretKey));
+
+        return request(pairs);
+    }
+
+
+
+    public static TokenInfo request(List<NameValuePair> data) throws HttpException
+    {
+        TokenInfo tokenInfoInfo = new TokenInfo();
+
+        SSLContext sslContext;
+        CloseableHttpClient client;
+        try
+        {
+            // 创建Http客户端，设置信任自签名证书
+            sslContext = SSLContexts.custom().loadTrustMaterial(null, new TrustSelfSignedStrategy()).useTLS().build();
+            SSLConnectionSocketFactory sslSocketFactory = new SSLConnectionSocketFactory(sslContext,
+                    new AllowAllHostnameVerifier());
+            client = HttpClients.custom().setSSLSocketFactory(sslSocketFactory).build();
+
+            // 创建POST请求,添加URL
+            URIBuilder uriBuilder = new URIBuilder("https://" + APIG_MICROGW_FLOAT_IP + ":8343" + ACCESS_TOKEN_URI);
+            HttpPost httpPost = new HttpPost(uriBuilder.build());
+
+            httpPost.setEntity(new UrlEncodedFormEntity(data, "UTF-8"));
+            // 添加请求头
+            httpPost.setHeader(HTTP.CONTENT_TYPE, "application/x-www-form-urlencoded");
+
+            // 发送请求
+            HttpResponse response = client.execute(httpPost);
+
+            // 解析响应内容
+            if (response.getStatusLine().getStatusCode() == 200)
+            {
+                String tokenStr = EntityUtils.toString((response).getEntity());
+
+                tokenInfoInfo = toObject(tokenStr, TokenInfo.class);
+            }
+            else
+            {
+                throw new HttpException(response.getStatusLine() + EntityUtils.toString((response).getEntity()));
+            }
+        }
+        catch (NoSuchAlgorithmException e)
+        {
+            e.printStackTrace();
+        }
+        catch (KeyManagementException e)
+        {
+            e.printStackTrace();
+        }
+        catch (KeyStoreException e)
+        {
+            e.printStackTrace();
+        }
+        catch (URISyntaxException e)
+        {
+            e.printStackTrace();
+        }
+        catch (ClientProtocolException e)
+        {
+            e.printStackTrace();
+        }
+        catch (IOException e)
+        {
+            e.printStackTrace();
+        }
+        return tokenInfoInfo;
+    }
+
+    private static <T> T toObject(String json, Class<T> valueType)
+    {
+        Gson gson = new GsonBuilder().setDateFormat(DATA_FORMAT).serializeNulls().create();
+        return gson.fromJson(json, valueType);
+    }
+}

service/publicapi/src/main/java/com/founder/publicapi/controller/YunSouController/HnTbStRygxRwController.java

+package com.founder.publicapi.controller.YunSouController;
+
+
+import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.founder.commonutils.model.newPublicEntity.hnkshrwEntity.HnTbStRygxRw;
+import com.founder.commonutils.model.newPublicEntity.hnkshrwEntity.HnTbStRygxRwDTO;
+import com.founder.commonutils.model.newPublicEntity.hnkshrwEntity.RygxExcelDTO;
+import com.founder.commonutils.model.newPublicEntity.result.Result;
+import com.founder.commonutils.util.StringUtil;
+import com.founder.publicapi.service.HnTbStRygxRwService;
+import com.founder.servicebase.logs.OperLog;
+import com.founder.servicebase.logs.OperationType;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 前端控制器
+ * </p>
+ *
+ * @author zyc
+ * @since 2021-09-08
+ */
+@RestController
+@RequestMapping("/hnkshrw")
+@Api(tags = "湖南可视化任务接口管理")
+public class HnTbStRygxRwController {
+
+    @Autowired
+    HnTbStRygxRwService hnKshRwService;
+
+
+    /**
+     * 创建任务
+     * @param taskName 任务名称
+     * @param username 用户名
+     * @return
+     */
+    @PostMapping("createTask")
+    @ApiOperation(value = "数据分析_创建任务")
+    @OperLog(message = "数据分析_创建任务", operation = OperationType.ADD)
+    public Result createTask(@RequestParam("taskName") String taskName, @RequestParam("username") String username) {
+        HnTbStRygxRw hnTbStRygxRw = new HnTbStRygxRw();
+        String rwid = IdUtil.simpleUUID();
+        hnTbStRygxRw.setRwid(rwid);
+        hnTbStRygxRw.setCreateName(username);
+        hnTbStRygxRw.setRwmc(taskName);
+        hnTbStRygxRw.setTaskCreateTime(new Date());
+        hnKshRwService.save(hnTbStRygxRw);
+        return Result.ok().data("taskId", rwid);
+    }
+
+    /**
+     * 获取任务列表
+     * @param taskName
+     * @param startTime
+     * @param endTime
+     * @param currentPage
+     * @param pageSize
+     * @param username
+     * @return
+     */
+    @PostMapping("getTaskInfo")
+    @ApiOperation(value = "数据分析_获取任务列表")
+    @OperLog(message = "数据分析_获取任务列表", operation = OperationType.QUERY)
+    public Result getTaskInfo(@RequestParam(name = "taskName", required = false) String taskName,
+                              @RequestParam(name = "startTime", required = false)@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime startTime,
+                              @RequestParam(name = "endTime", required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")LocalDateTime endTime,
+                              @RequestParam(name = "currentPage", defaultValue = "1") Integer currentPage,
+                              @RequestParam(name = "pageSize", defaultValue = "5") Integer pageSize,
+                              @RequestParam(name = "username",required = false) String username) {
+        QueryWrapper<HnTbStRygxRw> wrapper = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(taskName)) {
+            wrapper.like("RWMC", taskName);
+        }
+        if (ObjectUtil.isNotNull( startTime) && ObjectUtil.isNotNull(endTime)) {
+            wrapper.apply("TASK_CREATE_TIME between'" +  startTime.toString() + "' and '" + endTime.toString() +"'" );
+        } else if (ObjectUtil.isNotNull( startTime)) {
+            wrapper.apply("TASK_CREATE_TIME >= '" + startTime.toString() +"'" );
+        } else if (ObjectUtil.isNotNull(endTime)) {
+            wrapper.apply("TASK_CREATE_TIME <= '" + endTime.toString() +"'" );
+        }
+        wrapper.eq(!StringUtil.isEmpty(username),"CREATE_NAME", username);
+        wrapper.eq("PARENT_ID","0");
+        wrapper.orderByDesc("TASK_CREATE_TIME");
+        Page page = new Page(currentPage,pageSize);
+        IPage<HnTbStRygxRw> iPage = hnKshRwService.page(page, wrapper);
+        List<HnTbStRygxRw> records = iPage.getRecords();
+        List<HnTbStRygxRwDTO> resultList = new ArrayList<>();
+        for (HnTbStRygxRw record : records) {
+            String rwid = record.getRwid();
+            List<RygxExcelDTO> list = hnKshRwService.queryTaskChildren(rwid, ObjectUtil.isNull(startTime)? null:startTime.toString(),ObjectUtil.isNull(endTime)? null:endTime.toString());
+            HnTbStRygxRwDTO dto = new HnTbStRygxRwDTO();
+            dto.setRwid(rwid);
+            dto.setRwmc(record.getRwmc());
+            dto.setCreateName(record.getCreateName());
+            dto.setChild(list);
+            dto.setTaskCreateTime(record.getTaskCreateTime());
+            resultList.add(dto);
+        }
+        return Result.ok().data("data",resultList).data("total",iPage.getTotal());
+    }
+
+
+}
+

service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/HnTbStRygxMapper.java

+package com.founder.publicapi.mapper.mysqlMapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.founder.commonutils.model.newPublicEntity.hnkshEntity.HnTbStRygx;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * Mapper 接口
+ * </p>
+ *
+ * @author zyc
+ * @since 2021-09-08
+ */
+public interface HnTbStRygxMapper extends BaseMapper<HnTbStRygx> {
+
+    List<HnTbStRygx> getSfzhList(@Param("teamNum") Integer teamNum, @Param("taskId") String taskId);
+
+    List<Map<String, Object>> getXmAndSfzhBySfzh(@Param("sfzh") String sfzh, @Param("taskId") String taskId);
+
+    List<HnTbStRygx> getInfoBySfzh(@Param("sfzh") String sfzh, @Param("nameList") List<String> nameList, @Param("taskId") String taskId);
+
+    List<HnTbStRygx> getAllSfzhList();
+
+    List<HnTbStRygx> getGroupNameByRwid(@Param("taskId") String taskId);
+
+    List<String> getBimgIsNullByTaskId(@Param("taskId")String taskId);
+
+    List<String> getImgIsNullByTaskId(@Param("taskId")String taskId);
+}

service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/HnTbStRygxRwMapper.java

+package com.founder.publicapi.mapper.mysqlMapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.founder.commonutils.model.newPublicEntity.hnkshrwEntity.HnTbStRygxRw;
+import com.founder.commonutils.model.newPublicEntity.hnkshrwEntity.RygxExcelDTO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zyc
+ * @since 2021-09-08
+ */
+public interface HnTbStRygxRwMapper extends BaseMapper<HnTbStRygxRw> {
+
+
+    List<RygxExcelDTO> queryTaskChildren(@Param("rwid") String rwid, @Param("startTime")String startTime, @Param("endTime")String endTime);
+}

service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/HnTbStRygxMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.founder.publicapi.mapper.mysqlMapper.HnTbStRygxMapper">
+<!--    select xmlagg(xmlparse(content name or ',' wellformed) order by name).getclobval() as name, sfzh-->
+    <select id="getSfzhList" resultType="com.founder.commonutils.model.newPublicEntity.hnkshEntity.HnTbStRygx">
+        select concat(group_concat(name order by name),',')name,sfzh
+        from ksh_st_rygx
+        where rwid = #{taskId}
+          and sfzh in (select sfzh
+                       from ksh_st_rygx
+                       where rwid = #{taskId}
+                       group by sfzh
+                       having count(*) >= #{teamNum})
+        group by sfzh
+    </select>
+
+    <select id="getXmAndSfzhBySfzh" resultType="java.util.Map">
+        select xm as "xm", sfzh as "sfzh"
+        from ksh_st_rygx
+        where sfzh = #{sfzh}
+          and rwid = #{taskId}
+        group by xm, sfzh
+    </select>
+
+
+    <select id="getInfoBySfzh" resultType="com.founder.commonutils.model.newPublicEntity.hnkshEntity.HnTbStRygx">
+        select
+        name,description,xm,xb,mz,sfzh,bj,zhpf,
+        trim( TRAILING ',' FROM RTRIM( CONCAT  (
+        case when tzz != '0' then '同住址,' else '' end ,
+        case when thh != '0' then '同户号,'  else ''end ,
+        case when hy != '0' then '婚姻,' else '' end ,
+        case when lj != '0' then '邻居,'  else '' end ,
+        case when tjg != '0' then '同机构,'  else '' end ,
+        case when tltcc != '0' then '铁路同乘车,' else '' end ,
+        case when tzj != '0' then '同值机,' else '' end ,
+        case when tcrj != '0' then '同出入境,'  else ''end ,
+        case when tcwz != '0' then '同车违章,'  else ''end ,
+        case when tary != '0' then '同案人员,'  else ''end ,
+        case when tzs != '0' then '同住宿,'  else ''end ,
+        case when zttary != '0' then '在逃同案人员' when zttcx != '0' then '在逃同撤销'  else ''end
+        ))) as value
+        from ksh_st_rygx where rwid = #{taskId} and sfzh = #{sfzh} and name in
+        <foreach collection="nameList" open="(" close=")" separator="," item="item">
+            #{item}
+        </foreach>
+    </select>
+
+    <!-- <select id="getAllSfzhList" resultType="java.lang.String">
+         SELECT DISTINCT sfzh
+         from ksh_st_rygx
+         where sfzh in (select sfzh from ksh_st_rygx GROUP BY sfzh having count(*) > 1)
+     </select>-->
+
+
+    <select id="getAllSfzhList" resultType="com.founder.commonutils.model.newPublicEntity.hnkshEntity.HnTbStRygx">
+        select name,
+               xmlagg(xmlparse(content sfzh || ',' wellformed) order by sfzh).getclobval() sfzh
+        from ksh_st_rygx
+        group by name
+    </select>
+    <select id="getGroupNameByRwid" resultType="com.founder.commonutils.model.newPublicEntity.hnkshEntity.HnTbStRygx">
+        select name,description from ksh_st_rygx where rwid = #{taskId}
+    </select>
+
+    <select id="getBimgIsNullByTaskId" resultType="java.lang.String">
+        select sfzh from ksh_st_rygx where rwid = #{taskId} and bimg is null group by sfzh
+    </select>
+    <select id="getImgIsNullByTaskId" resultType="java.lang.String">
+        select name from ksh_st_rygx where rwid = #{taskId} and img is null group by name
+    </select>
+</mapper>

service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/HnTbStRygxRwMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.founder.publicapi.mapper.mysqlMapper.HnTbStRygxRwMapper">
+
+
+    <select id="queryTaskChildren" resultType="com.founder.commonutils.model.newPublicEntity.hnkshrwEntity.RygxExcelDTO">
+        SELECT
+        EXCEL_NAME,
+        EXCEL_ID,
+        EXCEL_CREATE_TIME,
+        DATA_COUNT
+        FROM  ksh_st_rygx_rw
+        WHERE 1=1
+        <if test="rwid != null and rwid != ''">
+            and PARENT_ID = #{rwid , jdbcType=VARCHAR}
+        </if>
+        ORDER BY EXCEL_CREATE_TIME DESC
+    </select>
+</mapper>

service/publicapi/src/main/java/com/founder/publicapi/service/HnTbStRygxRwService.java

+package com.founder.publicapi.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.founder.commonutils.model.newPublicEntity.hnkshrwEntity.HnTbStRygxRw;
+import com.founder.commonutils.model.newPublicEntity.hnkshrwEntity.RygxExcelDTO;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author zyc
+ * @since 2021-09-08
+ */
+public interface HnTbStRygxRwService extends IService<HnTbStRygxRw> {
+
+    List<RygxExcelDTO> queryTaskChildren(String rwid, String startTime, String endTime);
+}

service/publicapi/src/main/java/com/founder/publicapi/service/HnTbStRygxService.java

+package com.founder.publicapi.service;
+
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.founder.commonutils.model.newPublicEntity.hnkshEntity.HnTbStRygx;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author zyc
+ * @since 2021-09-08
+ */
+public interface HnTbStRygxService extends IService<HnTbStRygx> {
+
+    List<Map<String, Object>> getRythInfo(Integer teamNum,String taskId);
+
+    void getAndSaveImg(List<Map<String, Object>> rythInfoList, String taskId, Integer teamNum) throws Exception;
+
+    List<HnTbStRygx> getGroupNameByRwid(String taskId);
+}

service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/HnTbStRygxRwServiceImpl.java

+package com.founder.publicapi.service.serviceimpl;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.founder.commonutils.model.newPublicEntity.hnkshrwEntity.HnTbStRygxRw;
+import com.founder.commonutils.model.newPublicEntity.hnkshrwEntity.RygxExcelDTO;
+import com.founder.publicapi.mapper.mysqlMapper.HnTbStRygxRwMapper;
+import com.founder.publicapi.service.HnTbStRygxRwService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author zyc
+ * @since 2021-09-08
+ */
+@Service
+public class HnTbStRygxRwServiceImpl extends ServiceImpl<HnTbStRygxRwMapper, HnTbStRygxRw> implements HnTbStRygxRwService {
+
+
+    @Override
+    public List<RygxExcelDTO> queryTaskChildren(String rwid, String startTime, String endTime) {
+        return baseMapper.queryTaskChildren(rwid,startTime,endTime);
+    }
+}

service/publicapi/src/main/resources/bootstrap-dev.properties

@@ -22,6 +22,14 @@ spring.datasource.qgdb.username=ENC(e7qsvm7EnrdHG04YnaTMsw==)
 spring.datasource.qgdb.password=ENC(XPnOn0zoWMgOG8gIws+Bh7JITC3mMqSn)
 spring.datasource.qgdb.type=com.alibaba.druid.pool.DruidDataSource
 
+
+#\u6570\u636E\u5206\u6790\u4E0A\u4F20\u7684\u8DEF\u5F84
+hnkshFilePath=/data/excel/kshExcel/
+#\u6570\u636E\u5206\u6790\u4E0B\u8F7D\u7684\u8DEF\u5F84
+hnkshDownloadFilePath = http://47.92.48.137:1009/excel/kshExcel/
+#\u6570\u636E\u5206\u6790\u4E0B\u8F7D\u6A21\u677F\u7684\u8DEF\u5F84
+hnkshDownloadExcelTemplatePath = http://47.92.48.137:1009/excel/kshExcel/ExcelTemplate.xls
+
 #\u5377\u5B97\u4E0A\u4F20\u7684\u8DEF\u5F84
 approvalFilePath = /data/excel/approvalWord/
 #\u65B0\u589E\u5377\u5B97\u5927\u6570\u636E\u6A21\u578B\u4E0B\u8F7D\u8DEF\u5F84
@@ -57,15 +65,15 @@ logging.level.org.springframework.data.mongodb.core=DEBUG
 spring.data.mongodb.second.uri=mongodb://localhost:27017/whale
 #poi\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u05B7
 addressPoiUrl=http://220.26.6.1:8088/PGIS_S_Address/fullSearch
-#记录日志的线下地址
+#\uFFFD\uFFFD\u00BC\uFFFD\uFFFD\u05BE\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u00B5\uFFFD\u05B7
 logUrl=http://39.99.155.173:8764/yhczrz/savaYhczrz
-#记录日志的token
+#\uFFFD\uFFFD\u00BC\uFFFD\uFFFD\u05BE\uFFFD\uFFFDtoken
 logtoken=Basic 9b6c45cfcf3a4a629e3ed90fa3e5d058
-#xzxtlog=true /false   ture 表示开启日志，false表示关闭日志，默认是ture
+#xzxtlog=true /false   ture \uFFFD\uFFFD\u02BE\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u05BE\uFFFD\uFFFDfalse\uFFFD\uFFFD\u02BE\uFFFD\u0631\uFFFD\uFFFD\uFFFD\u05BE\uFFFD\uFFFD\u012C\uFFFD\uFFFD\uFFFD\uFFFDture
 xzxtlog =false
-#全国常口地址
+#\u022B\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u06B5\uFFFD\u05B7
 ckUrl=http://xzxtzhyyreport:20010/qgck/getRyxxByQgck
-# Es地址
+# Es\uFFFD\uFFFD\u05B7
 spring.elasticsearch.jest.uris=http://155.1.11.17:24100
 trainpath=xz_pk_gakx.train1
 mhxxessyb=xz_pk_gakx.flight2

service/publicapi/src/main/resources/bootstrap-prod.properties

@@ -22,6 +22,14 @@ spring.datasource.qgdb.username=ENC(AcwX02W3j68cs+8BTDI9Sw==)
 spring.datasource.qgdb.password=ENC(kB78UiJzT7X+gn2hy9HnYO8JZJhfBnVQ)
 spring.datasource.qgdb.type=com.alibaba.druid.pool.DruidDataSource
 
+#\u6570\u636E\u5206\u6790\u4E0A\u4F20\u7684\u8DEF\u5F84
+hnkshFilePath=/data/excel/kshExcel/
+#\u6570\u636E\u5206\u6790\u4E0B\u8F7D\u7684\u8DEF\u5F84
+hnkshDownloadFilePath = http://47.92.48.137:1009/excel/kshExcel/
+#\u6570\u636E\u5206\u6790\u4E0B\u8F7D\u6A21\u677F\u7684\u8DEF\u5F84
+hnkshDownloadExcelTemplatePath = http://47.92.48.137:1009/excel/kshExcel/ExcelTemplate.xls
+
+
 #\u5377\u5B97\u4E0A\u4F20\u7684\u8DEF\u5F84
 approvalFilePath = /data/excel/approvalWord/
 #\u65B0\u589E\u5377\u5B97\u5927\u6570\u636E\u6A21\u578B\u4E0B\u8F7D\u8DEF\u5F84
@@ -56,15 +64,15 @@ spring.data.mongodb.second.uri=mongodb://fz:wc%40thailand@155.1.11.213:28001/wha
 logging.level.org.springframework.data.mongodb.core=DEBUG
 #poi\u68C0\u7D22\u5730\u5740
 addressPoiUrl=http://220.26.6.1:8088/PGIS_S_Address/fullSearch
-#记录日志的线上地址
+#\uFFFD\uFFFD\u00BC\uFFFD\uFFFD\u05BE\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u03F5\uFFFD\u05B7
 logUrl=http://10.142.16.177:9026/yhczrz/savaYhczrz
-#记录日志的token
+#\uFFFD\uFFFD\u00BC\uFFFD\uFFFD\u05BE\uFFFD\uFFFDtoken
 logtoken=Basic 9b6c45cfcf3a4a629e3ed90fa3e5d058
-#xzxtlog=true /false   ture 表示开启日志，false表示关闭日志，默认是ture
+#xzxtlog=true /false   ture \uFFFD\uFFFD\u02BE\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u05BE\uFFFD\uFFFDfalse\uFFFD\uFFFD\u02BE\uFFFD\u0631\uFFFD\uFFFD\uFFFD\u05BE\uFFFD\uFFFD\u012C\uFFFD\uFFFD\uFFFD\uFFFDture
 xzxtlog =false
-#全国常口地址
+#\u022B\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u06B5\uFFFD\u05B7
 ckUrl=http://xzxtzhyyreport:20010/qgck/getRyxxByQgck
-# Es地址
+# Es\uFFFD\uFFFD\u05B7
 spring.elasticsearch.jest.uris=http://155.1.11.17:24100
 trainpath=xz_pk_gakx.train1
 mhxxessyb=xz_pk_gakx.flight2