Merge remote-tracking branch 'origin/dev_temp' into dev_temp

epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   data-report-server:
     container_name: data-report-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.122
+    image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.123
 
     ports:
       - "8109:8109"

epmet-module/data-report/data-report-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <version>0.3.122</version>
+    <version>0.3.123</version>
     <artifactId>data-report-server</artifactId>
 
     <parent>

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/backdoor/BackDoorController.java

@@ -1,6 +1,5 @@
 package com.epmet.datareport.controller.backdoor;
 
-import com.epmet.commons.tools.utils.Result;
 import com.epmet.datareport.service.backdoor.BackDoorService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -16,9 +15,22 @@ public class BackDoorController {
     @Autowired
     private BackDoorService backDoorService;
 
-    @PostMapping("backdoor")
-    public Object backDoor(@RequestHeader("Data-Type")String dataType, @RequestHeader("AppId")String appId, @RequestHeader("target")String target, @RequestBody(required = false) Object o){
-        return backDoorService.backDoor(dataType,appId,target,o);
+    /**
+     * desc: 重定向到target 方法，适用于外部鉴权接口的查询 比如大屏的查询接口
+     *
+     * @param dataType
+     * @param appId
+     * @param target
+     * @param targetParam
+     * @return java.lang.String
+     * @author LiuJanJun
+     * @date 2020/10/23 1:44 下午
+     */
+    @PostMapping("redirect/external")
+    public Object backDoor(@RequestHeader(value = "Data-Type", defaultValue = "real", required = false) String dataType,
+                           @RequestHeader("AppId") String appId, @RequestHeader("target") String target,
+                           @RequestBody(required = false) Object targetParam) {
+        return backDoorService.redirect(dataType, appId, target, targetParam);
     }
 
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/backdoor/BackDoorService.java

@@ -1,13 +1,11 @@
 package com.epmet.datareport.service.backdoor;
 
-import com.epmet.commons.tools.utils.Result;
-
 /**
  * @Author zxc
  * @DateTime 2020/10/21 5:17 下午
  */
 public interface BackDoorService {
 
-    Object backDoor(String dataType, String appId, String target, Object o);
+    Object redirect(String dataType, String appId, String target, Object o);
 
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/backdoor/impl/BackDoorServiceImpl.java

@@ -1,11 +1,10 @@
 package com.epmet.datareport.service.backdoor.impl;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.utils.HttpClientManager;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.datareport.constant.*;
+import com.epmet.datareport.constant.FactConstant;
 import com.epmet.datareport.service.backdoor.BackDoorService;
 import com.epmet.dto.result.AppIdInfoResultDTO;
 import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
@@ -28,24 +27,23 @@ public class BackDoorServiceImpl implements BackDoorService {
     private EpmetCommonServiceOpenFeignClient commonServiceOpenFeignClient;
 
     @Override
-    public Object backDoor(String dataType, String appId, String target, Object o) {
+    public Object redirect(String dataType, String appId, String target, Object targetParam) {
         Result<AppIdInfoResultDTO> appIdInfoResultDTOResult = commonServiceOpenFeignClient.appIdInfo(appId);
-        if (!appIdInfoResultDTOResult.success()){
+        if (!appIdInfoResultDTOResult.success()) {
             throw new RenException("获取accessToken失败......");
         }
         AppIdInfoResultDTO data = appIdInfoResultDTOResult.getData();
         String url = FactConstant.URL.concat(target);
-        Map<String,String> headerMap = new HashMap<>(16);
-        headerMap.put("AccessToken",data.getAccessToken());
-        headerMap.put("AppId",data.getAppId());
-        headerMap.put("AuthType","jwt");
+        Map<String, String> headerMap = new HashMap<>(16);
+        headerMap.put("AccessToken", data.getAccessToken());
+        headerMap.put("AppId", data.getAppId());
+        headerMap.put("AuthType", "jwt");
         headerMap.put("Data-Type",dataType);
-        Result<String> stringResult = HttpClientManager.getInstance().sendPostByJSONAndHeader(url, JSON.toJSONString(o),headerMap);
+        Result<String> stringResult = HttpClientManager.getInstance().sendPostByJSONAndHeader(url, JSON.toJSONString(targetParam), headerMap);
         log.info(JSON.toJSONString(stringResult));
         if (!stringResult.success()){
             throw new RenException("请求【"+url+"】失败......"+stringResult.error());
         }
-        JSONObject jsonObject = JSON.parseObject(stringResult.getData());
-        return jsonObject;
+        return JSON.parseObject(stringResult.getData());
     }
 }

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml

@@ -30,13 +30,23 @@
          DESC
     </select>
 
+    <resultMap id="projectDetail" type="com.epmet.project.dto.result.ProjectDetailResultDTO">
+        <result property="eventContent" column="eventContent"/>
+        <result property="eventTitle" column="eventTitle"/>
+        <result property="eventSource" column="eventSource"/>
+        <collection property="imgUrlList" ofType="java.lang.String">
+            <constructor>
+                <arg column="imgUrl"/>
+            </constructor>
+        </collection>
+    </resultMap>
     <!-- 项目详情 -->
-    <select id="projectDetail" resultType="com.epmet.project.dto.result.ProjectDetailResultDTO">
+    <select id="projectDetail" resultMap="projectDetail">
         SELECT
             dd.event_title AS eventTitle,
             dd.EVENT_CONTENT AS eventContent,
             dd.EVENT_SOURCE AS eventSource,
-            GROUP_CONCAT( did.EVENT_IMG_URL ) AS imgUrlList
+            did.EVENT_IMG_URL AS imgUrl
         FROM
             screen_difficulty_data dd
             LEFT JOIN screen_difficulty_img_data did ON did.EVENT_ID = dd.EVENT_ID

epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/utils/externalapp/ExtAppJwtTokenUtils.java

@@ -90,4 +90,8 @@ public class ExtAppJwtTokenUtils {
         return createToken(claim, secret);
     }
 
+    public static void main(String[] args) {
+        genTestToken();
+    }
+
 }

epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-project-server:
     container_name: gov-project-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:0.3.51
+    image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:0.3.52
     ports:
       - "8102:8102"
     network_mode: host # 使用现有网络

epmet-module/gov-project/gov-project-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <version>0.3.51</version>
+    <version>0.3.52</version>
     <parent>
         <artifactId>gov-project</artifactId>
         <groupId>com.epmet</groupId>

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectTraceController.java

@@ -186,7 +186,6 @@ public class ProjectTraceController {
 	 * @Description 项目跟踪-项目处理进展列表
 	 **/
 	@PostMapping("processlistnotrule")
-	@RequirePermission(requirePermission = RequirePermissionEnum.WORK_PROJECT_TRACE_DETAIL)
 	public Result<List<ProcesslistResultDTO>> processListNotRule(@RequestBody ProcessListFormDTO formDTO) {
 		ValidatorUtils.validateEntity(formDTO);
 		return new Result<List<ProcesslistResultDTO>>().ok(projectProcessService.progressList(formDTO));