Browse Source
# Conflicts: # epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/project/ProjectController.java # epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/ProjectService.java # epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java # epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/EpmetCommonServiceOpenFeignClient.java # epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/fallback/EpmetCommonServiceOpenFeignClientFallback.java # epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectProcessService.java # epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.javamaster
jianjun
5 years ago
68 changed files with 1273 additions and 264 deletions
@ -0,0 +1,31 @@ |
|||
package com.epmet.evaluationindex.screen.dto.form; |
|||
|
|||
import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; |
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* @Author zxc |
|||
* @DateTime 2020/10/22 |
|||
*/ |
|||
@Data |
|||
public class CompartmentByBizTypeFormDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = -3354778434424878413L; |
|||
|
|||
public interface CompartmentByBizType extends CustomerClientShowGroup {} |
|||
|
|||
/** |
|||
* 机关ID |
|||
*/ |
|||
@NotBlank(message = "机关ID不能为空",groups = {CompartmentByBizType.class}) |
|||
private String agencyId; |
|||
|
|||
/** |
|||
* 业务类型 |
|||
*/ |
|||
@NotBlank(message = "bizType不能为空", groups = {CompartmentByBizType.class}) |
|||
private String bizType; |
|||
} |
|||
@ -0,0 +1,37 @@ |
|||
package com.epmet.evaluationindex.screen.dto.form; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* desc:下级组织单项排行分数 form |
|||
* |
|||
* @DateTime 2020/8/20 9:54 上午 |
|||
*/ |
|||
@Data |
|||
public class SubSingleIndexRankFormDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = -2920561669035794486L; |
|||
@NotBlank(message = "客户ID不能为空") |
|||
private String customerId; |
|||
/** |
|||
* 机关ID |
|||
*/ |
|||
@NotBlank(message = "机关ID不能为空") |
|||
private String agencyId; |
|||
@NotBlank(message = "指标code不能为空") |
|||
private String indexCode; |
|||
|
|||
/** |
|||
* 默认查询前几名 |
|||
*/ |
|||
private Integer topNum; |
|||
|
|||
private String monthId; |
|||
private String orgType; |
|||
private String sort; |
|||
|
|||
|
|||
} |
|||
@ -0,0 +1,22 @@ |
|||
package com.epmet.evaluationindex.screen.dto.form; |
|||
|
|||
import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; |
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* @Author zxc |
|||
* @DateTime 2020/10/22 10:52 上午 |
|||
*/ |
|||
@Data |
|||
public class TreeByTypeFormDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = -1438758394814978472L; |
|||
|
|||
public interface TreeByType extends CustomerClientShowGroup{} |
|||
|
|||
@NotBlank(message = "bizType不能为空",groups = TreeByType.class) |
|||
private String bizType; |
|||
} |
|||
@ -0,0 +1,73 @@ |
|||
package com.epmet.project.dto.result; |
|||
|
|||
import lombok.Data; |
|||
import lombok.NoArgsConstructor; |
|||
|
|||
import java.io.Serializable; |
|||
import java.util.ArrayList; |
|||
import java.util.List; |
|||
|
|||
/** |
|||
* @Author zxc |
|||
* @DateTime 2020/10/23 10:13 上午 |
|||
*/ |
|||
@Data |
|||
public class ProjectDetailResultDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = 2450826789942547426L; |
|||
|
|||
/** 【事件 = 项目】 |
|||
* 事件标题 |
|||
*/ |
|||
private String eventTitle; |
|||
|
|||
/** |
|||
* 事件内容 |
|||
*/ |
|||
private String eventContent; |
|||
|
|||
/** |
|||
* 事件来源 |
|||
*/ |
|||
private String eventSource; |
|||
|
|||
/** |
|||
* 事件图片集合 |
|||
*/ |
|||
private List<String> imgUrlList; |
|||
|
|||
/** |
|||
* 项目进展 |
|||
*/ |
|||
private List<ProjectProcessResultDTO> processList; |
|||
|
|||
/** |
|||
* 当前跟进部门 |
|||
*/ |
|||
private List<String> departmentNameList; |
|||
/** |
|||
* 当前跟进部门 |
|||
*/ |
|||
private List<com.epmet.dto.result.ProjectDetailResultDTO.DepartmentNameListBean> departmentList; |
|||
|
|||
@NoArgsConstructor |
|||
@Data |
|||
public static class DepartmentNameListBean { |
|||
/** |
|||
* 部门名 |
|||
*/ |
|||
private String departmentName; |
|||
/** |
|||
* 工作人员 |
|||
*/ |
|||
private List<String> staffList; |
|||
} |
|||
|
|||
public ProjectDetailResultDTO() { |
|||
this.eventTitle = ""; |
|||
this.eventContent = ""; |
|||
this.eventSource = ""; |
|||
this.imgUrlList = new ArrayList<>(); |
|||
this.processList = new ArrayList<>(); |
|||
} |
|||
} |
|||
@ -0,0 +1,77 @@ |
|||
/** |
|||
* Copyright 2018 人人开源 https://www.renren.io
|
|||
* <p> |
|||
* This program is free software: you can redistribute it and/or modify |
|||
* it under the terms of the GNU General Public License as published by |
|||
* the Free Software Foundation, either version 3 of the License, or |
|||
* (at your option) any later version. |
|||
* <p> |
|||
* This program is distributed in the hope that it will be useful, |
|||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|||
* GNU General Public License for more details. |
|||
* <p> |
|||
* You should have received a copy of the GNU General Public License |
|||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
*/ |
|||
|
|||
package com.epmet.project.dto.result; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
|
|||
/** |
|||
* 项目跟踪-项目处理进展列表-接口返参 |
|||
* |
|||
* @author sun |
|||
*/ |
|||
@Data |
|||
public class ProjectProcessResultDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
/** |
|||
* 项目Id |
|||
*/ |
|||
private String projectId = ""; |
|||
|
|||
/** |
|||
* 项目处理进展Id |
|||
*/ |
|||
private String processId = ""; |
|||
|
|||
/** |
|||
* 处理进展名称 |
|||
*/ |
|||
private String processName = ""; |
|||
|
|||
/** |
|||
* 处理进展时间 |
|||
*/ |
|||
private Long processTime; |
|||
|
|||
/** |
|||
* 处理进展时间 字符串 |
|||
*/ |
|||
//@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
|||
//private String processTimeStr;
|
|||
|
|||
/** |
|||
* 处理部门 |
|||
*/ |
|||
private String departmentName = ""; |
|||
|
|||
/** |
|||
* 公开答复 |
|||
*/ |
|||
private String publicReply = ""; |
|||
|
|||
/** |
|||
* 内部备注 |
|||
*/ |
|||
private String internalRemark = ""; |
|||
|
|||
|
|||
} |
|||
@ -0,0 +1,37 @@ |
|||
package com.epmet.datareport.controller.backdoor; |
|||
|
|||
import com.epmet.datareport.service.backdoor.BackDoorService; |
|||
import org.springframework.beans.factory.annotation.Autowired; |
|||
import org.springframework.web.bind.annotation.*; |
|||
|
|||
/** |
|||
* @Author zxc |
|||
* @DateTime 2020/10/21 5:17 下午 |
|||
*/ |
|||
@RestController |
|||
@RequestMapping("backdoor") |
|||
public class BackDoorController { |
|||
|
|||
@Autowired |
|||
private BackDoorService backDoorService; |
|||
|
|||
/** |
|||
* 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(value = "env", defaultValue = "test", required = false) String env, |
|||
@RequestHeader("AppId") String appId, @RequestHeader("target") String target, |
|||
@RequestBody(required = false) Object targetParam) { |
|||
return backDoorService.redirect(dataType, appId, target, targetParam,env); |
|||
} |
|||
|
|||
} |
|||
@ -0,0 +1,11 @@ |
|||
package com.epmet.datareport.service.backdoor; |
|||
|
|||
/** |
|||
* @Author zxc |
|||
* @DateTime 2020/10/21 5:17 下午 |
|||
*/ |
|||
public interface BackDoorService { |
|||
|
|||
Object redirect(String dataType, String appId, String target, Object o,String env); |
|||
|
|||
} |
|||
@ -0,0 +1,50 @@ |
|||
package com.epmet.datareport.service.backdoor.impl; |
|||
|
|||
import com.alibaba.fastjson.JSON; |
|||
import com.epmet.commons.tools.enums.EnvEnum; |
|||
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.FactConstant; |
|||
import com.epmet.datareport.service.backdoor.BackDoorService; |
|||
import com.epmet.dto.result.AppIdInfoResultDTO; |
|||
import com.epmet.feign.EpmetCommonServiceOpenFeignClient; |
|||
import lombok.extern.slf4j.Slf4j; |
|||
import org.springframework.beans.factory.annotation.Autowired; |
|||
import org.springframework.stereotype.Service; |
|||
|
|||
import java.util.HashMap; |
|||
import java.util.Map; |
|||
|
|||
/** |
|||
* @Author zxc |
|||
* @DateTime 2020/10/21 5:17 下午 |
|||
*/ |
|||
@Service |
|||
@Slf4j |
|||
public class BackDoorServiceImpl implements BackDoorService { |
|||
|
|||
@Autowired |
|||
private EpmetCommonServiceOpenFeignClient commonServiceOpenFeignClient; |
|||
|
|||
@Override |
|||
public Object redirect(String dataType, String appId, String target, Object targetParam, String env) { |
|||
Result<AppIdInfoResultDTO> appIdInfoResultDTOResult = commonServiceOpenFeignClient.appIdInfo(appId); |
|||
if (!appIdInfoResultDTOResult.success()) { |
|||
throw new RenException("获取accessToken失败......"); |
|||
} |
|||
AppIdInfoResultDTO data = appIdInfoResultDTOResult.getData(); |
|||
String url = EnvEnum.getEnum(env).getUrl().concat(target); |
|||
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(targetParam), headerMap); |
|||
log.info(JSON.toJSONString(stringResult)); |
|||
if (!stringResult.success()){ |
|||
throw new RenException("请求【"+url+"】失败......"+stringResult.error()); |
|||
} |
|||
return JSON.parseObject(stringResult.getData()); |
|||
} |
|||
} |
|||
@ -0,0 +1,14 @@ |
|||
package com.epmet.datareport.service.evaluationindex.screen; |
|||
|
|||
import com.epmet.dto.form.ProcessListFormDTO; |
|||
import com.epmet.project.dto.result.ProjectDetailResultDTO; |
|||
|
|||
/** |
|||
* @Author zxc |
|||
* @DateTime 2020/10/23 1:26 下午 |
|||
*/ |
|||
public interface ScreenDifficultyDataService { |
|||
|
|||
ProjectDetailResultDTO projectDetail(ProcessListFormDTO processListFormDTO); |
|||
|
|||
} |
|||
@ -0,0 +1,31 @@ |
|||
package com.epmet.datareport.service.evaluationindex.screen.impl; |
|||
|
|||
import com.epmet.commons.dynamic.datasource.annotation.DataSource; |
|||
import com.epmet.constant.DataSourceConstant; |
|||
import com.epmet.datareport.dao.evaluationindex.screen.ScreenDifficultyDataDao; |
|||
import com.epmet.datareport.service.evaluationindex.screen.ScreenDifficultyDataService; |
|||
import com.epmet.dto.form.ProcessListFormDTO; |
|||
import com.epmet.project.dto.result.ProjectDetailResultDTO; |
|||
import lombok.extern.slf4j.Slf4j; |
|||
import org.springframework.beans.factory.annotation.Autowired; |
|||
import org.springframework.stereotype.Service; |
|||
|
|||
/** |
|||
* @Author zxc |
|||
* @DateTime 2020/10/23 1:26 下午 |
|||
*/ |
|||
@Service |
|||
@Slf4j |
|||
@DataSource(DataSourceConstant.EVALUATION_INDEX) |
|||
public class ScreenDifficultyDataServiceImpl implements ScreenDifficultyDataService { |
|||
|
|||
@Autowired |
|||
private ScreenDifficultyDataDao screenDifficultyDataDao; |
|||
|
|||
@DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true) |
|||
@Override |
|||
public ProjectDetailResultDTO projectDetail(ProcessListFormDTO processListFormDTO) { |
|||
ProjectDetailResultDTO projectDetailResultDTO = screenDifficultyDataDao.projectDetail(processListFormDTO.getProjectId()); |
|||
return projectDetailResultDTO; |
|||
} |
|||
} |
|||
@ -0,0 +1,13 @@ |
|||
package com.epmet.dto.form; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
|
|||
@Data |
|||
public class GetJwtAccessTokenFormDTO { |
|||
|
|||
@NotBlank(message = "AppId不能为空") |
|||
private String appId; |
|||
|
|||
} |
|||
@ -0,0 +1,32 @@ |
|||
package com.epmet.dto.result; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* @Author zxc |
|||
* @DateTime 2020/10/21 5:30 下午 |
|||
*/ |
|||
@Data |
|||
public class AppIdInfoResultDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = 4556971930323763712L; |
|||
|
|||
/** |
|||
* 应用ID |
|||
*/ |
|||
private String appId; |
|||
|
|||
/** |
|||
* 客户ID |
|||
*/ |
|||
private String customerId; |
|||
|
|||
/** |
|||
* 密钥 |
|||
*/ |
|||
private String secret; |
|||
|
|||
private String accessToken; |
|||
} |
|||
@ -0,0 +1,16 @@ |
|||
package com.epmet.dto.result; |
|||
|
|||
import lombok.AllArgsConstructor; |
|||
import lombok.Data; |
|||
import lombok.NoArgsConstructor; |
|||
|
|||
@Data |
|||
@AllArgsConstructor |
|||
@NoArgsConstructor |
|||
public class GetJwtAccessTokenResultDTO { |
|||
|
|||
private String customerId; |
|||
private String token; |
|||
private Long ts; |
|||
|
|||
} |
|||
@ -0,0 +1,41 @@ |
|||
package com.epmet.dto.result; |
|||
|
|||
import lombok.Data; |
|||
import lombok.NoArgsConstructor; |
|||
|
|||
import java.io.Serializable; |
|||
import java.util.List; |
|||
|
|||
/** |
|||
* @Author zxc |
|||
* @DateTime 2020/10/26 9:36 上午 |
|||
*/ |
|||
@Data |
|||
public class ProcessAndCurrentDeptResultDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = 2977695657920536933L; |
|||
|
|||
private List<ProcesslistResultDTO> processList; |
|||
|
|||
/** |
|||
* 当前跟进部门 |
|||
*/ |
|||
private List<String> departmentNameList; |
|||
/** |
|||
* 当前跟进部门 |
|||
*/ |
|||
private List<ProjectDetailResultDTO.DepartmentNameListBean> departmentList; |
|||
|
|||
@NoArgsConstructor |
|||
@Data |
|||
public static class DepartmentNameListBean { |
|||
/** |
|||
* 部门名 |
|||
*/ |
|||
private String departmentName; |
|||
/** |
|||
* 工作人员 |
|||
*/ |
|||
private List<String> staffList; |
|||
} |
|||
} |
|||
Loading…
Reference in new issue