elink-star
/
esua-epdc-cloud
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

提交部分代码

feature/dangjian
yujintao 6 years ago
parent
1f3de9cce1
commit
ee36d552a0
13 changed files with 207 additions and 78 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 19
      esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java
  2. 31
      esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java
  3. 15
      esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java
  4. 11
      esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
  5. 7
      esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml
  6. 18
      esua-epdc/epdc-gateway/pom.xml
  7. 16
      esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/ScheduleJobKpiService.java
  8. 5
      esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/ScheduleJobKpiServiceImpl.java
  9. 34
      esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/KpiRuleTask.java
  10. 6
      esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/pom.xml
  11. 14
      esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiMetaDataController.java
  12. 17
      esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java
  13. 92
      esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java

19
esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java
View File

@ -133,6 +133,7 @@ public class SysDeptController {
public Result<CompleteDeptDTO> getCompleteDept(@PathVariable("gridId") String gridId) {
return sysDeptService.getCompleteDept(gridId);
}
/**
* 通过网格ID获取该网格所有上级机构
*
@ -207,8 +208,24 @@ public class SysDeptController {
* @date 2019/12/12 17:26
*/
@GetMapping("listAllGridId")
@ApiOperation("获取所有下属网格ID集合")
public Result listAllGridId() {
return sysDeptService.listAllGridId();
}
/**
* 按部门类型，分页查询部门列表
*
* @param typeKey 部门类型
* @param pageSize 页容量
* @param pageIndex 页码
* @return com.elink.esua.epdc.commons.tools.utils.Result
* @author work@yujt.net.cn
* @date 2019/12/17 16:03
*/
@GetMapping("pageDeptIdByTypeKey/{typeKey}/{pageSize}/{pageIndex}")
public Result<List<Long>> pageDeptIdByTypeKey(@PathVariable("typeKey") String typeKey,
@PathVariable("pageSize") Integer pageSize,
@PathVariable("pageIndex") Integer pageIndex) {
return sysDeptService.pageDeptIdByTypeKey(typeKey, pageSize, pageIndex);
}
}

31
esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java
View File

@ -136,16 +136,29 @@ public interface SysDeptDao extends BaseDao<SysDeptEntity> {
* @Description
* @Date 2019/12/4 20:22
**/
List<UserSysDeptInfoResultDTO> selectListUserSysDeptInfo(UserSysDeptInfoFormDTO formDTO);
List<UserSysDeptInfoResultDTO> selectListUserSysDeptInfo(UserSysDeptInfoFormDTO formDTO);
/***
* 查询所有网格
* @param
* @return java.util.List<java.lang.Long>
* @author qushutong
* @date 2019/12/12 18:12
*/
/***
* 查询所有网格
* @param
* @return java.util.List<java.lang.Long>
* @author qushutong
* @date 2019/12/12 18:12
*/
List<Long> selectListAllGridId();
/**
* 按部门类型，分页查询部门列表
*
* @param typeKey 部门类型
* @param pageSize 页容量
* @param pageIndex 页码
* @return java.util.List<java.lang.Long>
* @author work@yujt.net.cn
* @date 2019/12/17 16:11
*/
List<Long> pageDeptIdByTypeKey(@Param("typeKey") String typeKey,
@Param("pageSize") Integer pageSize,
@Param("pageIndex") Integer pageIndex);
}

15
esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java
View File

@ -174,12 +174,21 @@ public interface SysDeptService extends BaseService<SysDeptEntity> {
/***
* 获取所有网格
* @param
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<java.lang.Long>>
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < java.lang.Long>>
* @author qushutong
* @date 2019/12/12 17:29
*/
Result listAllGridId();
/**
* 按部门类型，分页查询部门列表
*
* @param typeKey 部门类型
* @param pageSize 页容量
* @param pageIndex 页码
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < java.lang.Long>>
* @author work@yujt.net.cn
* @date 2019/12/17 16:05
*/
Result<List<Long>> pageDeptIdByTypeKey(String typeKey, Integer pageSize, Integer pageIndex);
}

11
esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
View File

@ -15,6 +15,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
import com.elink.esua.epdc.commons.tools.constant.Constant;
import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
import com.elink.esua.epdc.commons.tools.constant.NumConstant;
import com.elink.esua.epdc.commons.tools.constant.OrganizationTypeConstant;
import com.elink.esua.epdc.commons.tools.enums.SuperAdminEnum;
import com.elink.esua.epdc.commons.tools.exception.ErrorCode;
@ -511,4 +512,14 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
return null;
}
@Override
public Result<List<Long>> pageDeptIdByTypeKey(String typeKey, Integer pageSize, Integer pageIndex) {
if (null == pageSize || null == pageIndex || pageSize < NumConstant.ONE || pageIndex < NumConstant.ONE) {
return new Result().error("参数错误");
}
pageIndex = pageIndex - NumConstant.ONE;
List<Long> deptIdList = baseDao.pageDeptIdByTypeKey(typeKey, pageSize, pageIndex);
return new Result().ok(deptIdList);
}
}

7
esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml
View File

@ -203,4 +203,11 @@
WHERE
sd.type_key = 'grid_party'
</select>
<select id="pageDeptIdByTypeKey" resultType="java.lang.Long">
SELECT d.id FROM sys_dept d
WHERE d.type_key = #{typeKey} AND d.del_flag = '0'
ORDER BY d.create_date ASC
LIMIT #{pageIndex},#{pageSize}
</select>
</mapper>

18
esua-epdc/epdc-gateway/pom.xml
View File

@ -99,12 +99,12 @@
<!-- gateway routes -->
<gateway.routes.epdc-auth-server.uri>lb://epdc-auth-server</gateway.routes.epdc-auth-server.uri>
<!--<gateway.routes.epdc-admin-server.uri>lb://epdc-admin-server</gateway.routes.epdc-admin-server.uri>-->
<gateway.routes.epdc-admin-server.uri>http://127.0.0.1:9092</gateway.routes.epdc-admin-server.uri>
<gateway.routes.epdc-admin-server.uri>lb://epdc-admin-server</gateway.routes.epdc-admin-server.uri>
<!-- <gateway.routes.epdc-admin-server.uri>http://127.0.0.1:9092</gateway.routes.epdc-admin-server.uri>-->
<gateway.routes.epdc-activiti-server.uri>lb://epdc-activiti-server
</gateway.routes.epdc-activiti-server.uri>
<!--<gateway.routes.epdc-api-server.uri>lb://epdc-api-server</gateway.routes.epdc-api-server.uri>-->
<gateway.routes.epdc-api-server.uri>http://127.0.0.1:9040</gateway.routes.epdc-api-server.uri>
<gateway.routes.epdc-api-server.uri>http://127.0.0.1:9040</gateway.routes.epdc-api-server.uri>
<gateway.routes.epdc-app-server.uri>lb://epdc-app-server</gateway.routes.epdc-app-server.uri>
<!-- <gateway.routes.epdc-app-server.uri>http://127.0.0.1:9058</gateway.routes.epdc-app-server.uri>-->
<gateway.routes.epdc-heart-server.uri>lb://epdc-heart-server</gateway.routes.epdc-heart-server.uri>
@ -126,8 +126,10 @@
<gateway.routes.epdc-demo-server.uri>lb://epdc-demo-server</gateway.routes.epdc-demo-server.uri>
<gateway.routes.epdc-group-server.uri>http://127.0.0.1:9063</gateway.routes.epdc-group-server.uri>
<!--<gateway.routes.epdc-group-server.uri>lb://epdc-group-server</gateway.routes.epdc-group-server.uri>-->
<gateway.routes.epdc-websocket-server.uri>lb://epdc-websocket-server</gateway.routes.epdc-websocket-server.uri>
<gateway.routes.epdc-kpi-server.uri>lb://epdc-kpi-server</gateway.routes.epdc-kpi-server.uri>
<gateway.routes.epdc-websocket-server.uri>lb://epdc-websocket-server
</gateway.routes.epdc-websocket-server.uri>
<!-- <gateway.routes.epdc-kpi-server.uri>lb://epdc-kpi-server</gateway.routes.epdc-kpi-server.uri>-->
<gateway.routes.epdc-kpi-server.uri>http://127.0.0.1:9069</gateway.routes.epdc-kpi-server.uri>
<!-- nacos -->
<nacos.register-enabled>false</nacos.register-enabled>
<nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
@ -165,7 +167,8 @@
<gateway.routes.epdc-user-server.uri>lb://epdc-user-server</gateway.routes.epdc-user-server.uri>
<gateway.routes.epdc-demo-server.uri>lb://epdc-demo-server</gateway.routes.epdc-demo-server.uri>
<gateway.routes.epdc-group-server.uri>lb://epdc-group-server</gateway.routes.epdc-group-server.uri>
<gateway.routes.epdc-websocket-server.uri>lb://epdc-websocket-server</gateway.routes.epdc-websocket-server.uri>
<gateway.routes.epdc-websocket-server.uri>lb://epdc-websocket-server
</gateway.routes.epdc-websocket-server.uri>
<gateway.routes.epdc-kpi-server.uri>lb://epdc-kpi-server</gateway.routes.epdc-kpi-server.uri>
<!-- nacos -->
@ -200,7 +203,8 @@
<gateway.routes.epdc-user-server.uri>lb://epdc-user-server</gateway.routes.epdc-user-server.uri>
<gateway.routes.epdc-demo-server.uri>lb://epdc-demo-server</gateway.routes.epdc-demo-server.uri>
<gateway.routes.epdc-group-server.uri>lb://epdc-group-server</gateway.routes.epdc-group-server.uri>
<gateway.routes.epdc-websocket-server.uri>lb://epdc-websocket-server</gateway.routes.epdc-websocket-server.uri>
<gateway.routes.epdc-websocket-server.uri>lb://epdc-websocket-server
</gateway.routes.epdc-websocket-server.uri>
<gateway.routes.epdc-kpi-server.uri>lb://epdc-kpi-server</gateway.routes.epdc-kpi-server.uri>
<!-- redis配置 -->

16
esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/ScheduleJobKpiService.java
View File

@ -1,9 +1,9 @@
package com.elink.esua.epdc.service;
/**
* @author: qushutong
* @Date: 2019/12/12 16:52
* @Description: kpi 模块查原始数据
* @author: qushutong
* @Date: 2019/12/12 16:52
* @Description: kpi 模块查原始数据
*/
public interface ScheduleJobKpiService {
@ -15,4 +15,14 @@ public interface ScheduleJobKpiService {
* @date 2019/12/12 16:56
*/
void statKpiMetaData();
/**
* 启动与规则编码匹配的相关任务
*
* @param ruleCode
* @return void
* @author work@yujt.net.cn
* @date 2019/12/17 14:43
*/
void startTaskByRuleCode(String ruleCode);
}

5
esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/ScheduleJobKpiServiceImpl.java
View File

@ -18,4 +18,9 @@ public class ScheduleJobKpiServiceImpl implements ScheduleJobKpiService {
public void statKpiMetaData() {
kpiFeignClient.runKpiMateData();
}
@Override
public void startTaskByRuleCode(String ruleCode) {
}
}

34
esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/KpiRuleTask.java
View File

@ -0,0 +1,34 @@
package com.elink.esua.epdc.task;
import com.elink.esua.epdc.service.ScheduleJobKpiService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
/**
* 绩效考核规则的相关任务
*
* @author work@yujt.net.cn
* @date 2019/12/17 14:40
*/
@Component("kpiRuleTask")
public class KpiRuleTask implements ITask {
@Autowired
private ScheduleJobKpiService kpiService;
/**
* 根据规则编码执行计划任务
*
* @param ruleCode
* @return void
* @author work@yujt.net.cn
* @date 2019/12/17 14:42
*/
@Override
public void run(String ruleCode) {
if (StringUtils.isNotBlank(ruleCode)) {
kpiService.startTaskByRuleCode(ruleCode);
}
}
}

6
esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/pom.xml
View File

@ -115,7 +115,7 @@
<properties>
<spring.profiles.active>dev</spring.profiles.active>
<server.port>9987</server.port>
<server.port>9069</server.port>
<spring.redis.index>2</spring.redis.index>
<spring.redis.host>47.104.224.45</spring.redis.host>
@ -138,7 +138,7 @@
<properties>
<spring.profiles.active>test</spring.profiles.active>
<server.port>9987</server.port>
<server.port>9069</server.port>
<spring.redis.index>2</spring.redis.index>
<spring.redis.host>47.104.224.45</spring.redis.host>
@ -162,7 +162,7 @@
<spring.profiles.active>prod</spring.profiles.active>
<docker.tag>prod</docker.tag>
<server.port>9987</server.port>
<server.port>9069</server.port>
<!-- redis配置 -->
<spring.redis.index>0</spring.redis.index>
<spring.redis.host>10.5.34.164</spring.redis.host>

14
esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiMetaDataController.java
View File

@ -45,24 +45,24 @@ import java.util.Map;
@RestController
@RequestMapping("kpimetadata")
public class KpiMetaDataController {
@Autowired
private KpiMetaDataService kpiMetaDataService;
@GetMapping("page")
public Result<PageData<KpiMetaDataDTO>> page(@RequestParam Map<String, Object> params){
public Result<PageData<KpiMetaDataDTO>> page(@RequestParam Map<String, Object> params) {
PageData<KpiMetaDataDTO> page = kpiMetaDataService.page(params);
return new Result<PageData<KpiMetaDataDTO>>().ok(page);
}
@GetMapping("{id}")
public Result<KpiMetaDataDTO> get(@PathVariable("id") String id){
public Result<KpiMetaDataDTO> get(@PathVariable("id") String id) {
KpiMetaDataDTO data = kpiMetaDataService.get(id);
return new Result<KpiMetaDataDTO>().ok(data);
}
@PostMapping
public Result save(@RequestBody KpiMetaDataDTO dto){
public Result save(@RequestBody KpiMetaDataDTO dto) {
//效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
kpiMetaDataService.save(dto);
@ -70,7 +70,7 @@ public class KpiMetaDataController {
}
@PutMapping
public Result update(@RequestBody KpiMetaDataDTO dto){
public Result update(@RequestBody KpiMetaDataDTO dto) {
//效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
kpiMetaDataService.update(dto);
@ -78,7 +78,7 @@ public class KpiMetaDataController {
}
@DeleteMapping
public Result delete(@RequestBody String[] ids){
public Result delete(@RequestBody String[] ids) {
//效验数据
AssertUtils.isArrayEmpty(ids, "id");
kpiMetaDataService.delete(ids);
@ -99,7 +99,7 @@ public class KpiMetaDataController {
* @date 2019/12/16 10:17
*/
@GetMapping("buildMetaData")
public void buildMetaData(){
public void buildMetaData() {
}

17
esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java
View File

@ -28,7 +28,7 @@ public interface AdminFeignClient {
/**
* @param userSysDeptInfoFormDTO
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.epdc.result.UserSysDeptInfoResultDTO>>
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.UserSysDeptInfoResultDTO>>
* @Author yinzuomei
* @Description 获取用户数据权限下各部门基本信息
* @Date 2019/12/6 19:40
@ -66,4 +66,19 @@ public interface AdminFeignClient {
*/
@GetMapping("/sys/dept/listAllGridId")
Result<List<Long>> listAllGridId();
/**
* 按部门类型，分页查询部门列表
*
* @param typeKey 部门类型
* @param pageSize 页容量
* @param pageIndex 页码
* @return com.elink.esua.epdc.commons.tools.utils.Result
* @author work@yujt.net.cn
* @date 2019/12/17 16:03
*/
@GetMapping("/sys/dept/pageDeptIdByTypeKey/{typeKey}/{pageSize}/{pageIndex}")
Result<List<Long>> pageDeptIdByTypeKey(@PathVariable("typeKey") String typeKey,
@PathVariable("pageSize") Integer pageSize,
@PathVariable("pageIndex") Integer pageIndex);
}

92
esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java
View File

@ -19,52 +19,56 @@ import java.util.List;
*/
@Component
public class AdminFeignClientFallback implements AdminFeignClient {
/**
* @param userSysDeptInfoFormDTO
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.epdc.result.UserSysDeptInfoResultDTO>>
* @Author yinzuomei
* @Description
* @Date 2019/12/6 20:15
**/
@Override
public Result<List<UserSysDeptInfoResultDTO>> queryUserSysDeptInfo(UserSysDeptInfoFormDTO userSysDeptInfoFormDTO) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "queryUserSysDeptInfo", userSysDeptInfoFormDTO);
}
/**
* @param userSysDeptInfoFormDTO
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.UserSysDeptInfoResultDTO>>
* @Author yinzuomei
* @Description
* @Date 2019/12/6 20:15
**/
@Override
public Result<List<UserSysDeptInfoResultDTO>> queryUserSysDeptInfo(UserSysDeptInfoFormDTO userSysDeptInfoFormDTO) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "queryUserSysDeptInfo", userSysDeptInfoFormDTO);
}
/**
* @param deptId
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.ParentAndAllDeptDTO>
* @Author yinzuomei
* @Description 根据部门ID获取上级所有部门信息
* @Date 2019/12/6 19:49
**/
@Override
public Result<ParentAndAllDeptDTO> getParentAndAllDept(String deptId) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getParentAndAllDept", deptId);
}
/**
* @param deptId
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.ParentAndAllDeptDTO>
* @Author yinzuomei
* @Description 根据部门ID获取上级所有部门信息
* @Date 2019/12/6 19:49
**/
@Override
public Result<ParentAndAllDeptDTO> getParentAndAllDept(String deptId) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getParentAndAllDept", deptId);
}
/**
* @param id
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.SysDeptDTO>
* @Author yinzuomei
* @Description 根据部门id获取部门信息
* @Date 2019/12/6 20:22
**/
@Override
public Result<SysDeptDTO> getSysDeptDTO(Long id) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getSysDeptDTO", id);
}
/**
* @param id
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.SysDeptDTO>
* @Author yinzuomei
* @Description 根据部门id获取部门信息
* @Date 2019/12/6 20:22
**/
@Override
public Result<SysDeptDTO> getSysDeptDTO(Long id) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getSysDeptDTO", id);
}
/***
* 获取所有网格
* @param
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<java.lang.Long>>
* @author qushutong
* @date 2019/12/12 19:03
*/
@Override
public Result<List<Long>> listAllGridId() {
return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "listAllGridId","1");
}
/***
* 获取所有网格
* @param
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < java.lang.Long>>
* @author qushutong
* @date 2019/12/12 19:03
*/
@Override
public Result<List<Long>> listAllGridId() {
return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "listAllGridId", "1");
}
@Override
public Result<List<Long>> pageDeptIdByTypeKey(String typeKey, Integer pageSize, Integer pageIndex) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "pageDeptIdByTypeKey", typeKey, pageSize, pageIndex);
}
}

Write Preview
Loading…
Cancel
Save