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

Merge remote-tracking branch 'origin/develop' into release_temp

master
zxc 4 years ago
parent
6acfc33dd3 1bc4a1e2f3
commit
ce438d13d5
9 changed files with 106 additions and 71 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. 60
      epmet-gateway/src/main/java/com/epmet/filter/CpAuthGatewayFilterFactory.java
  2. 9
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenPartyUserRankDataDao.java
  3. 4
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenPartyUserRankDataServiceImpl.java
  4. 37
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectCategoryOrgDailyServiceImpl.java
  5. 6
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenPartyUserRankDataDao.xml
  6. 3
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/GridManagerUserListResultDTO.java
  7. 10
      epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffPatrolRecordDao.java
  8. 19
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java
  9. 29
      epmet-user/epmet-user-server/src/main/resources/mapper/StaffPatrolRecordDao.xml

60
epmet-gateway/src/main/java/com/epmet/filter/CpAuthGatewayFilterFactory.java
View File

@ -68,18 +68,25 @@ public class CpAuthGatewayFilterFactory extends AbstractGatewayFilterFactory<CpA
return chain.filter(exchange);
}
//1.添加流水号
ServerHttpRequest request = exchange.getRequest();
List<String> tranSerials = request.getHeaders().get(AppClientConstant.TRANSACTION_SERIAL_KEY);
if (CollectionUtils.isEmpty(tranSerials) || StringUtils.isBlank(tranSerials.get(0))) {
request.mutate().header(AppClientConstant.TRANSACTION_SERIAL_KEY, new String[]{getTransactionSerial()});
//0.添加流水号
String tranSerial = getTranserialFromRequestHeader(request);
if (StringUtils.isBlank(tranSerial)) {
tranSerial = generateTransactionSerial();
// 设置当前线程名
request.mutate().header(AppClientConstant.TRANSACTION_SERIAL_KEY, new String[]{tranSerial});
}
Thread.currentThread().setName(tranSerial);
//1.打印请求信息
logRequest(request);
//2.获取请求路径，参数
String requestUri = request.getPath().pathWithinApplication().value();
MultiValueMap<String, String> queryParams = request.getQueryParams();
String queryParamsStr = convertQueryParams2String(queryParams);
logger.info("CpAuthGatewayFilterFactory当前requestUri=[" + requestUri.concat(queryParamsStr) + "],CpAuthGatewayFilterFactory拦截成功,客户端Id:{}", IpUtils.getClientIp(request));
logger.info("当前requestUri=[" + requestUri.concat(queryParamsStr) + "],客户端Id:{}", IpUtils.getClientIp(request));
//3.认证
String authType = getAuthType(request);
@ -109,6 +116,36 @@ public class CpAuthGatewayFilterFactory extends AbstractGatewayFilterFactory<CpA
};
}
/**
* @Description 打印请求头
* @param request 请求
* @return void
* @author wxz
* @date 2021.08.18 11:18:00
*/
private void logRequest(ServerHttpRequest request) {
HttpHeaders headers = request.getHeaders();
StringBuilder sb = new StringBuilder("请求头：");
for (Map.Entry<String, List<String>> entry : headers.entrySet()) {
String headerKey = entry.getKey();
List<String> headerValue = entry.getValue();
sb.append(headerKey).append(":").append(headerValue).append(",");
}
logger.info(sb.toString());
}
/**
* @Description 从request请求头中获取传递过来的流水号
* @param request
* @return java.lang.String
* @author wxz
* @date 2021.08.18 15:55:30
*/
private String getTranserialFromRequestHeader(ServerHttpRequest request) {
List<String> tranSerials = request.getHeaders().get(AppClientConstant.TRANSACTION_SERIAL_KEY);
return CollectionUtils.isEmpty(tranSerials) ? null : tranSerials.get(0);
}
/**
* @return
* @Description 将url参数转化为String
@ -181,23 +218,12 @@ public class CpAuthGatewayFilterFactory extends AbstractGatewayFilterFactory<CpA
return AuthTypeConstant.AUTH_TYPE_INTERNAL;
}
/**
* 获取请求头
*
* @param request
* @return
*/
private String getHeader(ServerHttpRequest request, String headerName) {
HttpHeaders headers = request.getHeaders();
return headers.getFirst(headerName);
}
/**
* 获取事务流水号
*
* @return
*/
public static String getTransactionSerial() {
public static String generateTransactionSerial() {
String[] letterPool = {"a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n"
, "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z"};

9
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenPartyUserRankDataDao.java
View File

@ -45,15 +45,6 @@ public interface ScreenPartyUserRankDataDao extends BaseDao<ScreenPartyUserRankD
**/
Integer deletePartyUserRankData(@Param("customerId") String customerId);
/**
* @Description 按照客户、月份删除
* @param
* @return java.lang.Integer
* @author wangc
* @date 2020.09.27 11:19
*/
Integer deleteBatchByCustomerIdAndDateId(@Param("customerId") String customerId);
/**
* 9、党建引领|基层治理-居民（党员）积分排行榜
* 2) 在批量新增

4
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenPartyUserRankDataServiceImpl.java
View File

@ -59,9 +59,9 @@ public class ScreenPartyUserRankDataServiceImpl extends BaseServiceImpl<ScreenPa
if(!CollectionUtils.isEmpty(dataList)) {
int affectedRows;
do {
affectedRows = baseDao.deleteBatchByCustomerIdAndDateId(customerId);
affectedRows = baseDao.deletePartyUserRankData(customerId);
} while (affectedRows > NumConstant.ZERO);
baseDao.insertBatch(dataList);
}
}
}
}

37
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectCategoryOrgDailyServiceImpl.java
View File

@ -413,7 +413,7 @@ public class ScreenProjectCategoryOrgDailyServiceImpl extends BaseServiceImpl<Sc
Map<String, List<CategoryProjectResultDTO>> groupByCategoryCode = categoryProjectResultDTOS.stream().collect(Collectors.groupingBy(CategoryProjectResultDTO::getCategoryCode));
// 这时的result集合要清空,因为被上边使用 【result = ConvertUtils.sourceToTarget(categoryProjectResultDTOS,ScreenProjectCategoryOrgDailyEntity.class);】
result.clear();
List<ScreenProjectCategoryOrgDailyEntity> finalResult = new ArrayList<>();
List<ScreenProjectCategoryOrgDailyEntity> finalResult = result;
groupByCategoryCode.forEach((code, list) -> {
ScreenProjectCategoryOrgDailyEntity e = new ScreenProjectCategoryOrgDailyEntity();
e.setCustomerId(customerId);
@ -428,37 +428,7 @@ public class ScreenProjectCategoryOrgDailyServiceImpl extends BaseServiceImpl<Sc
});
if (!CollectionUtils.isEmpty(sonResult)){
List<ScreenProjectCategoryOrgDailyEntity> entities = ConvertUtils.sourceToTarget(sonResult, ScreenProjectCategoryOrgDailyEntity.class);
finalResult.addAll(entities);
}
Map<String, List<CustomerAgencyInfoResultDTO>> groupByLevel = agencyIdList.stream().collect(Collectors.groupingBy(CustomerAgencyInfoResultDTO::getLevel));
List<CustomerAgencyInfoResultDTO> levelAgencyInfo = groupByLevel.get(level);
// 计算内部客户的分类
if (!CollectionUtils.isEmpty(levelAgencyInfo)){
List<String> orgIdss = levelAgencyInfo.stream().map(m -> m.getAgencyId()).collect(Collectors.toList());
orgIds.addAll(orgIdss);
List<CategoryProjectResultDTO> selfOrgCategory = baseDao.selectSelfAgencyCategory(dateId, orgIdss);
if (!CollectionUtils.isEmpty(selfOrgCategory)){
List<ScreenProjectCategoryOrgDailyEntity> selfResult = ConvertUtils.sourceToTarget(selfOrgCategory, ScreenProjectCategoryOrgDailyEntity.class);
selfResult.forEach(s -> {
finalResult.forEach(f -> {
if (s.getCategoryCode().equals(f.getCategoryCode())){
s.setProjectTotal(s.getProjectTotal() + f.getProjectTotal());
f.setUseStatus(true);
}
});
});
result.addAll(selfResult);
}
}
Map<Boolean, List<ScreenProjectCategoryOrgDailyEntity>> groupByStatus = finalResult.stream().collect(Collectors.groupingBy(ScreenProjectCategoryOrgDailyEntity::getUseStatus));
List<ScreenProjectCategoryOrgDailyEntity> falseList = groupByStatus.get(false);
if (!CollectionUtils.isEmpty(falseList)){
result.addAll(falseList);
result.forEach(r -> {
r.setCustomerId(customerId);
r.setOrgId(entity.getAgencyId());
r.setPid(entity.getPid());
});
result.addAll(entities);
}
// 添加此 锦水、孔村、榆山 orgId，删除时使用
orgIds.add(PingYinConstant.JIN_SHUI_AGENCY_ID);
@ -471,8 +441,9 @@ public class ScreenProjectCategoryOrgDailyServiceImpl extends BaseServiceImpl<Sc
List<CustomerAgencyInfoResultDTO> levelAgencyInfo = groupByLevel.get(level);
if (!CollectionUtils.isEmpty(levelAgencyInfo)) {
List<String> orgIdss = levelAgencyInfo.stream().map(m -> m.getAgencyId()).collect(Collectors.toList());
orgIds.addAll(orgIdss);
// 查询客户下，组织直接立项的，各项目分类下的项目数量【筛选组织创建的项目，fact_origin_project_main_daily表gridId为空】
List<ScreenProjectCategoryGridDailyDTO> screenProjectCategory = factOriginProjectCategoryDailyService.selectListProjectCategoryByOrg(orgIdss, customerId);
List<ScreenProjectCategoryGridDailyDTO> screenProjectCategory = factOriginProjectCategoryDailyService.selectListProjectCategoryByOrg(orgIds, customerId);
if (!CollectionUtils.isEmpty(result)) {
if (!CollectionUtils.isEmpty(screenProjectCategory)) {
result.forEach(r -> {

6
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenPartyUserRankDataDao.xml
View File

@ -9,12 +9,6 @@
limit 1000;
</delete>
<delete id="deleteBatchByCustomerIdAndDateId">
delete from screen_party_user_rank_data
where CUSTOMER_ID = #{customerId}
limit 1000;
</delete>
<insert id="batchInsertPartyUserRankData" parameterType="map">
insert into screen_party_user_rank_data
(

3
epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/GridManagerUserListResultDTO.java
View File

@ -62,4 +62,7 @@ public class GridManagerUserListResultDTO implements Serializable {
@JsonIgnore
private Boolean llStatus;
@JsonIgnore
private String recordId;
}

10
epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffPatrolRecordDao.java
View File

@ -44,6 +44,16 @@ public interface StaffPatrolRecordDao extends BaseDao<StaffPatrolRecordEntity> {
*/
List<GridManagerUserListResultDTO> selectLL(@Param("userIds")List<String> userIds);
List<GridManagerUserListResultDTO> selectPatrolRecord(@Param("userIds")List<String> userIds);
/**
* @Description 按照巡查记录查询经纬度
* @Param recordIds
* @author zxc
* @date 2021/8/18 5:16 下午
*/
List<GridManagerUserListResultDTO> selectPatrolLL(@Param("recordIds")List<String> recordIds);
/**
* @Description 巡查记录查询
* @Param formDTO

19
epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java
View File

@ -411,10 +411,21 @@ public class StaffPatrolRecordServiceImpl extends BaseServiceImpl<StaffPatrolRec
if (CollectionUtils.isEmpty(userIds)){
return result;
}
// 经纬度查询
List<GridManagerUserListResultDTO> llResult = baseDao.selectLL(userIds);
if (!CollectionUtils.isEmpty(llResult)){
result.setLl(llResult);
// 查询记录
// List<GridManagerUserListResultDTO> llResult = baseDao.selectLL(userIds);
List<GridManagerUserListResultDTO> recordList = baseDao.selectPatrolRecord(userIds);
if (!CollectionUtils.isEmpty(recordList)){
// 查询经纬度
List<GridManagerUserListResultDTO> llList = baseDao.selectPatrolLL(recordList.stream().map(m -> m.getRecordId()).collect(Collectors.toList()));
recordList.forEach(r -> {
llList.forEach(l -> {
if (r.getRecordId().equals(l.getRecordId())){
r.setLatitude(l.getLatitude());
r.setLongitude(l.getLongitude());
}
});
});
result.setLl(recordList);
}
// 姓名查询
List<UserNameResultDTO> nameResult = customerStaffDao.selectUserName(userIds);

29
epmet-user/epmet-user-server/src/main/resources/mapper/StaffPatrolRecordDao.xml
View File

@ -46,4 +46,33 @@
ORDER BY CREATED_TIME DESC
</select>
<select id="selectPatrolRecord" resultType="com.epmet.dto.result.GridManagerUserListResultDTO">
SELECT t.* FROM (SELECT
pr.ID AS recordId,
pr.GRID AS gridId,
pr.STAFF_ID,
pr.`STATUS`
FROM staff_patrol_record pr
WHERE pr.DEL_FLAG = 0
AND pr.staff_id IN (
<foreach collection="userIds" item="userId" separator=",">
#{userId}
</foreach>
)
ORDER BY pr.CREATED_TIME DESC)t GROUP BY STAFF_ID
</select>
<!-- 按照巡查记录查询经纬度 -->
<select id="selectPatrolLL" resultType="com.epmet.dto.result.GridManagerUserListResultDTO">
SELECT
t.*
FROM
( SELECT DISTINCT ID, SERIAL_NUM, LATITUDE, LONGITUDE, STAFF_PATROL_REC_ID AS recordId FROM staff_patrol_detail WHERE DEL_FLAG = 0 AND STAFF_PATROL_REC_ID IN (
<foreach collection="recordIds" item="recordId" separator=",">
#{recordId}
</foreach>
) ORDER BY SERIAL_NUM DESC ) t
GROUP BY recordId
</select>
</mapper>
Write Preview
Loading…
Cancel
Save