elink-star
/
ShibeiWorkPlatform
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'remotes/origin/dev' into develop

dev
jianjun 3 years ago
parent
5a3c1bc25e 019284cd10
commit
e007eea552
10 changed files with 62 additions and 39 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. 1
      epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/form/AreaCodeDictFormDTO.java
  2. 2
      epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/dao/AreaCodeChildDao.java
  3. 22
      epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/AreaCodeServiceImpl.java
  4. 43
      epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/ShowApiServiceImpl.java
  5. 8
      epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/utils/ShowApiUtil.java
  6. 4
      epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/AreaCodeChildDao.xml
  7. 4
      epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/WorkDayInitTask.java
  8. 2
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/HouseErrorInfoModel.java
  9. 7
      epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml
  10. 8
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataPatrolChangeEventListener.java

1
epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/form/AreaCodeDictFormDTO.java
View File

@ -13,6 +13,7 @@ public class AreaCodeDictFormDTO implements Serializable {
private static final long serialVersionUID = 5780301376757138238L;
//平阴传参：rootAreaCode=370124, rootAreaLevel=district
/**
* 根结点code 不传，则返回全部
*/

2
epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/dao/AreaCodeChildDao.java
View File

@ -34,7 +34,7 @@ import java.util.List;
@Mapper
public interface AreaCodeChildDao extends BaseDao<AreaCodeChildEntity> {
List<AreaCodeChildDTO> selectAllChild();
List<AreaCodeChildDTO> selectAllChild(String areaCode);
AreaCodeChildDTO selectByCode(@Param("code") String code);

22
epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/AreaCodeServiceImpl.java
View File

@ -137,7 +137,7 @@ public class AreaCodeServiceImpl extends BaseServiceImpl<AreaCodeDao, AreaCodeEn
if (StringUtils.isNotBlank(s)){
tree = JSON.parseArray(s,AreaCodeDictResultDTO.class);
}else {
List<AreaCodeDictResultDTO> areaCodeDictResultDTOS = disposeTree();
List<AreaCodeDictResultDTO> areaCodeDictResultDTOS = disposeTree(formDTO);
areaCodeRedis.set(AreaCodeConstant.SCREEN_TREE,areaCodeDictResultDTOS);
tree = areaCodeDictResultDTOS;
}
@ -154,11 +154,11 @@ public class AreaCodeServiceImpl extends BaseServiceImpl<AreaCodeDao, AreaCodeEn
* @author zxc
* @date 2021/1/8 上午8:57
*/
public List<AreaCodeDictResultDTO> disposeTree(){
public List<AreaCodeDictResultDTO> disposeTree(AreaCodeDictFormDTO formDTO){
// 查询所有省市区
List<AreaCodeDTO> areaCodeDTOS = baseDao.selectAllArea();
// 查询所有街道、社区
List<AreaCodeChildDTO> areaCodeChildDTOS = childDao.selectAllChild();
List<AreaCodeChildDTO> areaCodeChildDTOS = childDao.selectAllChild(formDTO.getRootAreaCode());
List<AreaCodeDictResultDTO> result = new ArrayList<>();
List<AreaCodeDictResultDTO> fourResult = new ArrayList<>();
List<AreaCodeDictResultDTO> cityResult = new ArrayList<>();
@ -388,21 +388,21 @@ public class AreaCodeServiceImpl extends BaseServiceImpl<AreaCodeDao, AreaCodeEn
* @author zxc
* @date 2021/1/11 上午9:48
*/
public List<AreaCodeDictResultDTO> afterTwoTree(){
public List<AreaCodeDictResultDTO> afterTwoTree(AreaCodeDictFormDTO form){
// 查询所有街道、社区
List<AreaCodeChildDTO> areaCodeChildDTOS = childDao.selectAllChild();
List<AreaCodeChildDTO> areaCodeChildDTOS = childDao.selectAllChild(form.getRootAreaCode());
List<AreaCodeDictResultDTO> fourResult = new ArrayList<>();
List<AreaCodeDictResultDTO> fiveResult = new ArrayList<>();
// 街道-社区
Map<Integer, List<AreaCodeChildDTO>> groupByLevel = areaCodeChildDTOS.stream().collect(Collectors.groupingBy(AreaCodeChildDTO::getLevel));
//社区
List<AreaCodeChildDTO> levelFive = groupByLevel.get(NumConstant.FIVE);
Map<String, List<AreaCodeChildDTO>> groupByPCode = levelFive.stream().collect(Collectors.groupingBy(AreaCodeChildDTO::getPCode));
List<AreaCodeChildDTO> levelFive = org.apache.commons.collections4.CollectionUtils.isNotEmpty(groupByLevel.get(NumConstant.FIVE)) ? groupByLevel.get(NumConstant.FIVE) : new ArrayList<>();
Map<String, List<AreaCodeChildDTO>> groupByPCode = CollectionUtils.isEmpty(levelFive) ? new HashMap<>() : levelFive.stream().collect(Collectors.groupingBy(AreaCodeChildDTO::getPCode));
//街道
List<AreaCodeChildDTO> levelFour = groupByLevel.get(NumConstant.FOUR);
List<AreaCodeChildDTO> levelFour = org.apache.commons.collections4.CollectionUtils.isNotEmpty(groupByLevel.get(NumConstant.FOUR)) ?groupByLevel.get(NumConstant.FOUR):new ArrayList<>();
// 6级
List<AreaCodeChildDTO> levelSix = groupByLevel.get(NumConstant.SIX);
Map<String, List<AreaCodeChildDTO>> groupBySixPCode = levelSix.stream().collect(Collectors.groupingBy(AreaCodeChildDTO::getPCode));
Map<String, List<AreaCodeChildDTO>> groupBySixPCode = CollectionUtils.isEmpty(levelSix) ? new HashMap<>() : levelSix.stream().collect(Collectors.groupingBy(AreaCodeChildDTO::getPCode));
levelFive.forEach(f -> {
AreaCodeDictResultDTO dto = new AreaCodeDictResultDTO();
@ -450,7 +450,7 @@ public class AreaCodeServiceImpl extends BaseServiceImpl<AreaCodeDao, AreaCodeEn
*/
public List<AreaCodeDictResultDTO> disposeAfterTwoLevel(AreaCodeDictFormDTO form){
List<AreaCodeDictResultDTO> result = new ArrayList<>();
List<AreaCodeDictResultDTO> areaCodeDictResultDTOS = afterTwoTree();
List<AreaCodeDictResultDTO> areaCodeDictResultDTOS = afterTwoTree(form);
if (CollectionUtils.isEmpty(areaCodeDictResultDTOS)){
return new ArrayList<>();
}
@ -532,7 +532,7 @@ public class AreaCodeServiceImpl extends BaseServiceImpl<AreaCodeDao, AreaCodeEn
*/
public List<AreaCodeDictResultDTO> disposeBeforeThreeLevelFinal(AreaCodeDictFormDTO form,List<AreaCodeDictResultDTO> tree){
List<AreaCodeDictResultDTO> threeDto = disposeBeforeThreeLevel(form, tree);
List<AreaCodeDictResultDTO> twoDto = afterTwoTree();
List<AreaCodeDictResultDTO> twoDto = afterTwoTree(form);
if (CollectionUtils.isEmpty(threeDto)){
return new ArrayList<>();
}

43
epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/ShowApiServiceImpl.java
View File

@ -128,34 +128,37 @@ public class ShowApiServiceImpl implements ShowApiService {
DayDetailResultDTO dayDetailResultDTO = null;
try {
dayDetailResultDTO = ShowApiUtil.queryHolidayV2020(currentDate);
if (dayDetailResultDTO == null){
logger.warn("initWorkDay howApiUtil.queryHolidayV2020 return null");
return;
}
} catch (Exception e) {
logger.error("queryHolidayV2020 exception", e);
return;
}
List<CalenderEntity> list = calenderDao.selectByDay(currentDate);
if(null!=list&&list.size()>0){
if (0 == dayDetailResultDTO.getRet_code()) {
for (CalenderEntity calenderEntity : list) {
calenderEntity.setRetCode(dayDetailResultDTO.getRet_code());
calenderEntity.setWeekday(dayDetailResultDTO.getWeekDay());
calenderEntity.setBegin(dayDetailResultDTO.getBegin());
calenderEntity.setEnd(dayDetailResultDTO.getEnd());
calenderEntity.setHoliday(dayDetailResultDTO.getHoliday());
calenderEntity.setHolidayRemark(dayDetailResultDTO.getHoliday_remark());
calenderEntity.setEn(dayDetailResultDTO.getEn());
calenderEntity.setCn(dayDetailResultDTO.getCn());
calenderEntity.setType(dayDetailResultDTO.getType());
//1为工作日，2为周末，3为节假日
if ("1".equals(dayDetailResultDTO.getType())) {
calenderEntity.setTypeName("工作日");
} else if ("2".equals(dayDetailResultDTO.getType())) {
calenderEntity.setTypeName("周末");
} else if ("3".equals(dayDetailResultDTO.getType())) {
calenderEntity.setTypeName("节假日");
}
calenderDao.updateById(calenderEntity);
for (CalenderEntity calenderEntity : list) {
calenderEntity.setRetCode(dayDetailResultDTO.getRet_code());
calenderEntity.setWeekday(dayDetailResultDTO.getWeekDay());
calenderEntity.setBegin(dayDetailResultDTO.getBegin());
calenderEntity.setEnd(dayDetailResultDTO.getEnd());
calenderEntity.setHoliday(dayDetailResultDTO.getHoliday());
calenderEntity.setHolidayRemark(dayDetailResultDTO.getHoliday_remark());
calenderEntity.setEn(dayDetailResultDTO.getEn());
calenderEntity.setCn(dayDetailResultDTO.getCn());
calenderEntity.setType(dayDetailResultDTO.getType());
//1为工作日，2为周末，3为节假日
if ("1".equals(dayDetailResultDTO.getType())) {
calenderEntity.setTypeName("工作日");
} else if ("2".equals(dayDetailResultDTO.getType())) {
calenderEntity.setTypeName("周末");
} else if ("3".equals(dayDetailResultDTO.getType())) {
calenderEntity.setTypeName("节假日");
}
calenderDao.updateById(calenderEntity);
}
}else {
calenderDao.insert(getCalenderEntity(dayDetailResultDTO));
}

8
epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/utils/ShowApiUtil.java
View File

@ -1,10 +1,13 @@
package com.epmet.utils;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.constant.ShowApiConstant;
import com.epmet.result.DayDetailResultDTO;
import com.epmet.result.HolidayResultDTO;
import com.epmet.result.ShowApiResult;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -51,7 +54,10 @@ public class ShowApiUtil {
JSONObject jsonobject = JSONObject.parseObject(resultStr);
ShowApiResult showApiResult= JSONObject.toJavaObject(jsonobject, ShowApiResult.class);
logger.info(showApiResult.toString());
if (showApiResult.getShowapi_res_code() != NumConstant.ZERO || StringUtils.isBlank(showApiResult.getShowapi_res_body())) {
logger.error("获取工作日失败,result:{}", JSON.toJSONString(showApiResult));
return null;
}
JSONObject holidayJsonObject = JSONObject.parseObject(showApiResult.getShowapi_res_body());
DayDetailResultDTO dayDetailResultDTO= JSONObject.toJavaObject(holidayJsonObject, DayDetailResultDTO.class);
logger.info(String.format("(3)QUERY_HOLIDAY_V2020返参:%s",dayDetailResultDTO.toString()));

4
epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/AreaCodeChildDao.xml
View File

@ -5,7 +5,9 @@
<select id="selectAllChild" resultType="com.epmet.dto.AreaCodeChildDTO">
select * from area_code_child m where m.DEL_FLAG = '0'
select * from area_code_child m
where m.DEL_FLAG = '0'
and m.code like concat(#{areaCode},'%')
</select>
<select id="selectByCode" resultType="com.epmet.dto.AreaCodeChildDTO">

4
epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/WorkDayInitTask.java
View File

@ -1,5 +1,6 @@
package com.epmet.task;
import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.commons.tools.utils.DateUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.service.WorkDayInitService;
@ -27,7 +28,8 @@ public class WorkDayInitTask implements ITask {
public void run(String params) {
log.info("WorkDayInitTask定时任务正在执行，参数为：{}", params);
if (StringUtils.isBlank(params)){
params = DateUtils.format(new Date(),DateUtils.DATE_PATTERN_YYYYMMDD);
//没有参数默认 初始化明天的
params = DateUtils.format(DateUtils.addDateDays(new Date(), NumConstant.ONE),DateUtils.DATE_PATTERN_YYYYMMDD);
}
Result result = workDayInitService.workDayInit(params);
if (result.success()) {

2
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/HouseErrorInfoModel.java
View File

@ -23,7 +23,7 @@ public class HouseErrorInfoModel {
private String buildingName;
@Excel(name = "单元号", width = 20)
private Integer buildingUnit;
private String buildingUnit;
@Excel(name = "门牌号", width = 20)
private String doorName;

7
epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml
View File

@ -79,6 +79,13 @@ spring:
namespace: @nacos.config.namespace@
group: @nacos.config.group@
file-extension: yaml
servlet:
# 上传文件限制
multipart:
max-file-size: 100MB
max-request-size: 100MB
management:
endpoints:
web:

8
epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataPatrolChangeEventListener.java
View File

@ -16,7 +16,6 @@ import com.epmet.commons.tools.utils.SpringContextUtils;
import com.epmet.constant.SystemMessageType;
import com.epmet.opendata.dto.form.UpsertPatrolRecordForm;
import com.epmet.opendata.service.BaseGridDailyworkService;
import com.epmet.opendata.service.UserPatrolRecordService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyContext;
@ -90,10 +89,13 @@ public class OpenDataPatrolChangeEventListener implements MessageListenerConcurr
Boolean aBoolean = false;
switch (tags) {
case SystemMessageType.USER_PATROL_START:
aBoolean = SpringContextUtils.getBean(UserPatrolRecordService.class).insertPatrolRecord(patrolRecordForm);
//巡查的未对接暂时不用同步了
//aBoolean = SpringContextUtils.getBean(UserPatrolRecordService.class).insertPatrolRecord(patrolRecordForm);
aBoolean = true;
break;
case SystemMessageType.USER_PATROL_STOP:
aBoolean = SpringContextUtils.getBean(UserPatrolRecordService.class).updatePatrolRecord(patrolRecordForm);
//aBoolean = SpringContextUtils.getBean(UserPatrolRecordService.class).updatePatrolRecord(patrolRecordForm);
aBoolean = true;
break;
case SystemMessageType.PATROL_ROUTINE_WORK_ADD:
aBoolean = SpringContextUtils.getBean(BaseGridDailyworkService.class).insertBaseGridWorkRecord(patrolRecordForm);

Write Preview
Loading…
Cancel
Save