luyan
/
epmet-cloud-lingshan
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branches 'dev' and 'dev_temp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_temp 

 Conflicts:
	epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
	epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/org/StatsCustomerAgencyDao.java
	epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerAgencyService.java
	epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerAgencyServiceImpl.java
	epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/StatsCustomerAgencyDao.xml
	epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java
	epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java
	epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java
	epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java
	epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
master
wxz 4 years ago
parent
95f0c539de b2d66946e4
commit
353b4a1335
10 changed files with 105 additions and 109 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. 2
      epmet-module/data-aggregator/data-aggregator-server/pom.xml
  2. 46
      epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
  3. 15
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
  4. 20
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/org/StatsCustomerAgencyDao.java
  5. 15
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerAgencyService.java
  6. 52
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/StatsCustomerAgencyDao.xml
  7. 3
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java
  8. 8
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java
  9. 1
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java
  10. 52
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java

2
epmet-module/data-aggregator/data-aggregator-server/pom.xml
View File

@ -446,7 +446,7 @@
<datasource.druid.stats.url>
<![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_data_statistical?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
</datasource.druid.stats.url>
<datasource.druid.stats.username>epmet_data_statistical_user</datasource.druid.stats.username>
<datasource.druid.stats.username>epmet_data_statistical</datasource.druid.stats.username>
<datasource.druid.stats.password>EpmEt-db-UsEr</datasource.druid.stats.password>
<!-- epmet_evaluation_index -->

46
epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
View File

@ -360,17 +360,17 @@
SELECT
orgId,
orgName,
ifnull(GROUP_COUNT,0), GROUP_COUNT
ifnull(GROUP_RATIO,0), GROUP_RATIO
ifnull(GROUP_MEMBER_COUNT,0), GROUP_MEMBER_COUNT
ifnull(GROUP_MEMBER_RATIO,0), GROUP_MEMBER_RATIO
ifnull(TOPIC_COUNT,0), TOPIC_COUNT
ifnull(TOPIC_RATIO,0), TOPIC_RATIO
ifnull(ISSUE_COUNT,0), ISSUE_COUNT
ifnull(ISSUE_RATIO,0), ISSUE_RATIO
ifnull(PROJECT_COUNT,0), PROJECT_COUNT
ifnull(PROJECT_RATIO,0), PROJECT_RATIO
ifnull(PROJECT_CLOSED_COUNT,0), PROJECT_CLOSED_COUNT
ifnull(GROUP_COUNT,0) AS GROUP_COUNT,
ifnull(GROUP_RATIO,0) AS GROUP_RATIO,
ifnull(GROUP_MEMBER_COUNT,0) AS GROUP_MEMBER_COUNT,
ifnull(GROUP_MEMBER_RATIO,0) AS GROUP_MEMBER_RATIO,
ifnull(TOPIC_COUNT,0) AS TOPIC_COUNT,
ifnull(TOPIC_RATIO,0) AS TOPIC_RATIO,
ifnull(ISSUE_COUNT,0) AS ISSUE_COUNT,
ifnull(ISSUE_RATIO,0) AS ISSUE_RATIO,
ifnull(PROJECT_COUNT,0) AS PROJECT_COUNT,
ifnull(PROJECT_RATIO,0) AS PROJECT_RATIO,
ifnull(PROJECT_CLOSED_COUNT,0) AS PROJECT_CLOSED_COUNT,
ifnull(PROJECT_CLOSED_RATIO,0) PROJECT_CLOSED_RATIO
FROM
(
@ -403,18 +403,18 @@
SELECT
orgId,
orgName,
ifnull(GROUP_COUNT,0), GROUP_COUNT
ifnull(GROUP_RATIO,0), GROUP_RATIO
ifnull(GROUP_MEMBER_COUNT,0), GROUP_MEMBER_COUNT
ifnull(GROUP_MEMBER_RATIO,0), GROUP_MEMBER_RATIO
ifnull(TOPIC_COUNT,0), TOPIC_COUNT
ifnull(TOPIC_RATIO,0), TOPIC_RATIO
ifnull(ISSUE_COUNT,0), ISSUE_COUNT
ifnull(ISSUE_RATIO,0), ISSUE_RATIO
ifnull(PROJECT_COUNT,0), PROJECT_COUNT
ifnull(PROJECT_RATIO,0), PROJECT_RATIO
ifnull(PROJECT_CLOSED_COUNT,0), PROJECT_CLOSED_COUNT
ifnull(PROJECT_CLOSED_RATIO,0) PROJECT_CLOSED_RATIO
ifnull(GROUP_COUNT,0) AS GROUP_COUNT,
ifnull(GROUP_RATIO,0) AS GROUP_RATIO,
ifnull(GROUP_MEMBER_COUNT,0) AS GROUP_MEMBER_COUNT,
ifnull(GROUP_MEMBER_RATIO,0) AS GROUP_MEMBER_RATIO,
ifnull(TOPIC_COUNT,0) AS TOPIC_COUNT,
ifnull(TOPIC_RATIO,0) AS TOPIC_RATIO,
ifnull(ISSUE_COUNT,0) AS ISSUE_COUNT,
ifnull(ISSUE_RATIO,0) AS ISSUE_RATIO,
ifnull(PROJECT_COUNT,0) AS PROJECT_COUNT,
ifnull(PROJECT_RATIO,0) AS PROJECT_RATIO,
ifnull(PROJECT_CLOSED_COUNT,0) AS PROJECT_CLOSED_COUNT,
ifnull(PROJECT_CLOSED_RATIO,0) AS PROJECT_CLOSED_RATIO
FROM
(
SELECT

15
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
View File

@ -112,6 +112,8 @@ public class DemoController {
@Autowired
private FactOriginProjectCategoryDailyService originProjectCategoryDailyService;
@Autowired
private ScreenCentralZoneDataAbsorptionService screenCentralZoneDataAbsorptionService;
@Autowired
private StatsPartyMemberVanguardService statsPartyMemberVanguardService;
@Autowired
private FactGroupActDailyService factGroupActDailyService;
@ -119,8 +121,6 @@ public class DemoController {
private FactGridGovernDailyService factGridGovernDailyService;
@Autowired
private FactAgencyGovernDailyService factAgencyGovernDailyService;
@Autowired
private ScreenCentralZoneDataAbsorptionService screenCentralZoneDataAbsorptionService;
@GetMapping("testAlarm")
public void testAlarm() {
@ -899,6 +899,11 @@ public class DemoController {
return new Result().ok(ndddYhjfService.difficultyDataExtract(param));
}
@PostMapping("centralZoneDataHub")
public Result Test(@RequestBody ScreenCentralZoneDataFormDTO param){
screenCentralZoneDataAbsorptionService.centralZoneDataHub(param);
return new Result();
}
@PostMapping("vanguard")
public Result partyMemberVanguard(@RequestBody StatsFormDTO formDTO) {
statsPartyMemberVanguardService.agencyStats(formDTO);
@ -930,10 +935,4 @@ public class DemoController {
factAgencyGovernDailyService.extractFactAgencyGovernDaily(fromDTO.getCustomerId(), fromDTO.getDateId());
return new Result();
}
@PostMapping("centralZoneDataHub")
public Result Test(@RequestBody ScreenCentralZoneDataFormDTO param){
screenCentralZoneDataAbsorptionService.centralZoneDataHub(param);
return new Result();
}
}

20
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/org/StatsCustomerAgencyDao.java
View File

@ -35,16 +35,6 @@ public interface StatsCustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
CustomerAgencyEntity getRootAgencyInfo(String customerId);
List<CustomerAgencyEntity> queryAgencyListByCustomerId(String customerId);
/**
* 查询部门所属组织信息
*
* @param deptId
* @return com.epmet.entity.evaluationindex.screen.ScreenCustomerAgencyEntity
*/
CustomerAgencyEntity selectByDeptId(String deptId);
/**
* 获取每个组织、每个网格下工作人员userId集合
*
@ -69,4 +59,14 @@ public interface StatsCustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
* @return java.lang.String
*/
List<String> selectAgencyStaffIds(@Param("customerId") String customerId,@Param("agencyId")String agencyId);
List<CustomerAgencyEntity> queryAgencyListByCustomerId(String customerId);
/**
* 查询部门所属组织信息
*
* @param deptId
* @return com.epmet.entity.evaluationindex.screen.ScreenCustomerAgencyEntity
*/
CustomerAgencyEntity selectByDeptId(String deptId);
}

15
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerAgencyService.java
View File

@ -22,6 +22,14 @@ public interface CustomerAgencyService {
CustomerAgencyEntity getRootAgencyInfo(String customerId);
/**
* 获取每个组织、每个网格下工作人员userId集合
*
* @param customerId
* @return com.epmet.dto.org.result.OrgStaffResultDTO
*/
List<OrgStaffDTO> queryOrgStaffIds(String customerId);
List<CustomerAgencyEntity> queryAgencyListByCustomerId(String customerId);
@ -41,11 +49,4 @@ public interface CustomerAgencyService {
*/
CustomerAgencyEntity getAgencyByDeptId(String deptId);
/**
* 获取每个组织、每个网格下工作人员userId集合
*
* @param customerId
* @return com.epmet.dto.org.result.OrgStaffResultDTO
*/
List<OrgStaffDTO> queryOrgStaffIds(String customerId);
}

52
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/StatsCustomerAgencyDao.xml
View File

@ -126,31 +126,6 @@
and ca.CUSTOMER_ID=#{customerId}
</select>
<select id="queryAgencyListByCustomerId" parameterType="java.lang.String" resultType="com.epmet.entity.org.CustomerAgencyEntity">
select *
from customer_agency ca
where ca.del_flag='0'
and ca.CUSTOMER_ID=#{customerId}
</select>
<select id="selectByDeptId" parameterType="java.lang.String" resultType="com.epmet.entity.org.CustomerAgencyEntity">
SELECT
*
FROM
customer_agency ca
WHERE
ca.DEL_FLAG = '0'
AND ca.id =(
SELECT
cd.AGENCY_ID
FROM
customer_department cd
WHERE
cd.id = #{deptId}
AND cd.DEL_FLAG = '0'
)
</select>
<resultMap id="OrgStaffResultDTOMap" type="com.epmet.dto.org.result.OrgStaffDTO">
<result property="orgId" column="orgId"/>
<result property="orgType" column="orgType"/>
@ -191,4 +166,29 @@
AND ca.CUSTOMER_ID = #{customerId}
and ca.pids like CONCAT(#{agencyId},'%')
</select>
</mapper>
<select id="queryAgencyListByCustomerId" parameterType="java.lang.String" resultType="com.epmet.entity.org.CustomerAgencyEntity">
select *
from customer_agency ca
where ca.del_flag='0'
and ca.CUSTOMER_ID=#{customerId}
</select>
<select id="selectByDeptId" parameterType="java.lang.String" resultType="com.epmet.entity.org.CustomerAgencyEntity">
SELECT
*
FROM
customer_agency ca
WHERE
ca.DEL_FLAG = '0'
AND ca.id =(
SELECT
cd.AGENCY_ID
FROM
customer_department cd
WHERE
cd.id = #{deptId}
AND cd.DEL_FLAG = '0'
)
</select>
</mapper>

3
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java
View File

@ -191,7 +191,6 @@ public interface ResiGroupOpenFeignClient {
@PostMapping("resi/group/topic/sendevent")
Result sendEvent(@RequestBody TopicEventFormDTO param);
@GetMapping("resi/group/topic/querytopicinfobyissueid/{issueId}")
Result<ResiTopicDTO> queryTopicInfoByIssueId(@PathVariable("issueId")String issueId);
@ -271,8 +270,6 @@ public interface ResiGroupOpenFeignClient {
@PostMapping("/resi/group/topic/allmessages")
Result<List<AllMessagesResultDTO>> allMessages(@RequestBody AllMessagesFormDTO formDTO);
/**
/**
* @Description 查询话题信息
* @Param issueIds

8
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java
View File

@ -223,12 +223,12 @@ public class ResiGroupOpenFeignClientFallback implements ResiGroupOpenFeignClien
}
@Override
public Result<List<TopicInfoResultDTO>> getTopicInfos(List<String> issueIds) {
return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "getTopicInfos", issueIds);
public Result<List<ResiTopicDetailResultDTO>> listTopicDetailsByIds(TopicDetailBatchFormDTO input) {
return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "listTopicDetailsByIds", input);
}
@Override
public Result<List<ResiTopicDetailResultDTO>> listTopicDetailsByIds(TopicDetailBatchFormDTO input) {
return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "listTopicDetailsByIds", input);
public Result<List<TopicInfoResultDTO>> getTopicInfos(List<String> issueIds) {
return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "getTopicInfos", issueIds);
}
}

1
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java
View File

@ -532,5 +532,4 @@ public class ResiTopicController {
return new Result<List<ResiTopicDetailResultDTO>>().ok(topicDetails);
}
}

52
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
View File

@ -2825,32 +2825,6 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
return result;
}
/**
* @Description 查询话题信息
* @Param issueIds
* @author zxc
* @date 2021/5/17 4:19 下午
*/
@Override
public List<TopicInfoResultDTO> getTopicInfos(List<String> issueIds) {
if (CollectionUtils.isEmpty(issueIds)){
return new ArrayList<>();
}
List<TopicInfoResultDTO> topicInfos = baseDao.getTopicInfos(issueIds);
Result<List<AllGridsByUserIdResultDTO>> gridNames = govOrgOpenFeignClient.getGridListByGridIds(topicInfos.stream().map(m -> m.getGridId()).collect(Collectors.toList()));
if (!gridNames.success()){
throw new RenException("查询网格Name失败");
}
topicInfos.forEach(t -> {
gridNames.getData().forEach(g -> {
if (t.getGridId().equals(g.getGridId())){
t.setGridName(g.getGridName());
}
});
});
return topicInfos;
}
@Override
public List<ResiTopicDetailResultDTO> listTopicDetailsByIds(List<String> topicIdList) {
LambdaQueryWrapper<ResiTopicEntity> qw = new LambdaQueryWrapper<>();
@ -2885,6 +2859,32 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
.eq(ResiTopicAttachmentEntity::getAttachmentType, type);
return resiTopicAttachmentDao.selectList(qw).stream().map(a -> a.getAttachmentUrl()).collect(Collectors.toList());
}
/**
* @Description 查询话题信息
* @Param issueIds
* @author zxc
* @date 2021/5/17 4:19 下午
*/
@Override
public List<TopicInfoResultDTO> getTopicInfos(List<String> issueIds) {
if (CollectionUtils.isEmpty(issueIds)){
return new ArrayList<>();
}
List<TopicInfoResultDTO> topicInfos = baseDao.getTopicInfos(issueIds);
Result<List<AllGridsByUserIdResultDTO>> gridNames = govOrgOpenFeignClient.getGridListByGridIds(topicInfos.stream().map(m -> m.getGridId()).collect(Collectors.toList()));
if (!gridNames.success()){
throw new RenException("查询网格Name失败");
}
topicInfos.forEach(t -> {
gridNames.getData().forEach(g -> {
if (t.getGridId().equals(g.getGridId())){
t.setGridName(g.getGridName());
}
});
});
return topicInfos;
}
}

Write Preview
Loading…
Cancel
Save