Browse Source

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

dev
jianjun 3 years ago
parent
commit
2fce1fe838
  1. 2
      epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/org/CustomerStaffGridDTO.java
  2. 11
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
  3. 10
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectMainDailyDao.java
  4. 10
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectDataDao.java
  5. 10
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/project/ProjectDao.java
  6. 19
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/HistoryDataService.java
  7. 10
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectMainDailyService.java
  8. 16
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectMainDailyServiceImpl.java
  9. 10
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenProjectDataService.java
  10. 15
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java
  11. 75
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/HistoryDataServiceImpl.java
  12. 10
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectService.java
  13. 16
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java
  14. 14
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml
  15. 15
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectDataDao.xml
  16. 1
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/CustomerGridDao.xml
  17. 12
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectDao.xml
  18. 4
      epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/MemoConcernDTO.java
  19. 2
      epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/MemoDifficultyDTO.java
  20. 7
      epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/AddMemoDifficultyFromDTO.java
  21. 1
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/MemoDifficultyController.java
  22. 4
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/MemoConcernEntity.java
  23. 2
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/MemoDifficultyEntity.java
  24. 86
      epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.21__create_memo_table.sql
  25. 1
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataOrgChangeEventListener.java
  26. 1
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataStaffChangeEventListener.java
  27. 10
      epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/ExDeptDao.xml
  28. 16
      epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/ExUserDao.xml

2
epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/org/CustomerStaffGridDTO.java

@ -20,7 +20,6 @@ package com.epmet.dto.org;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
@ -46,6 +45,7 @@ public class CustomerStaffGridDTO implements Serializable {
* 网格ID
*/
private String gridId;
private String gridName;
/**
* 上级组织ID
*/

11
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java

@ -41,6 +41,7 @@ import com.epmet.entity.stats.DimAgencyEntity;
import com.epmet.entity.stats.DimCustomerEntity;
import com.epmet.entity.stats.DimDateEntity;
import com.epmet.entity.stats.DimMonthEntity;
import com.epmet.service.HistoryDataService;
import com.epmet.service.StatsDemoService;
import com.epmet.service.StatsPartyMemberVanguardService;
import com.epmet.service.evaluationindex.extract.dataToIndex.*;
@ -60,6 +61,7 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
@ -139,6 +141,8 @@ public class DemoController {
private DimCustomerService dimCustomerService;
@Autowired
private ScreenProjectDataService screenProjectDataService;
@Resource
private HistoryDataService historyDataService;
@GetMapping("testAlarm")
public void testAlarm() {
@ -1139,4 +1143,11 @@ public class DemoController {
long l = (end - start) / 1000;
return new Result<String>().ok("gridAndOrgDaily耗时" + l+ "s");
}
@PostMapping("projectHistoryData")
public Result projectHistoryData(@RequestBody ExtractOriginFormDTO formDTO) {
historyDataService.projectAddGridId(formDTO.getCustomerId());
return new Result();
}
}

10
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectMainDailyDao.java

@ -23,6 +23,7 @@ import com.epmet.dto.extract.result.GridProjectClosedTotalResultDTO;
import com.epmet.dto.extract.result.OrgStatisticsResultDTO;
import com.epmet.dto.extract.result.TransferRightRatioResultDTO;
import com.epmet.dto.indexcollect.result.CpcIndexCommonDTO;
import com.epmet.dto.org.CustomerStaffGridDTO;
import com.epmet.dto.pingyin.result.*;
import com.epmet.dto.screen.ScreenProjectDataDTO;
import com.epmet.dto.screen.form.ProjectSourceMapFormDTO;
@ -550,4 +551,13 @@ public interface FactOriginProjectMainDailyDao extends BaseDao<FactOriginProject
*/
List<OrgStatisticsResultDTO> getMemberProjectCount(@Param("customerId") String customerId, @Param("dateId") String dateId);
/**
* 更新历史数据
* @Param dto
* @Return
* @Author zhaoqifeng
* @Date 2022/3/16 9:48
*/
void updateHistoryData(CustomerStaffGridDTO dto);
}

10
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectDataDao.java

@ -19,6 +19,7 @@ package com.epmet.dao.evaluationindex.screen;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.extract.form.ExtractOriginFormDTO;
import com.epmet.dto.org.CustomerStaffGridDTO;
import com.epmet.dto.screen.ScreenProjectDataDTO;
import com.epmet.dto.screen.result.DataCheckDTO;
import com.epmet.dto.screen.result.GridAndOrgCategoryCountResultDTO;
@ -122,4 +123,13 @@ public interface ScreenProjectDataDao extends BaseDao<ScreenProjectDataEntity> {
* @Date 2022/3/7 16:00
*/
List<DataCheckDTO> getCheckResult(ExtractOriginFormDTO formDTO);
/**
* 更新历史数据
* @Param list
* @Return
* @Author zhaoqifeng
* @Date 2022/3/16 9:48
*/
void updateHistoryData(CustomerStaffGridDTO dto);
}

10
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/project/ProjectDao.java

@ -19,6 +19,7 @@ package com.epmet.dao.project;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.ProjectDTO;
import com.epmet.dto.org.CustomerStaffGridDTO;
import com.epmet.dto.project.*;
import com.epmet.dto.project.result.ProjectExceedParamsResultDTO;
import com.epmet.entity.project.ProjectEntity;
@ -204,4 +205,13 @@ public interface ProjectDao extends BaseDao<ProjectEntity> {
* @return
*/
List<ResiEventDTO> getEventList(@Param("customerId") String customerId, @Param("projectId") String projectId);
/**
* 更新历史数据
* @Param dto
* @Return
* @Author zhaoqifeng
* @Date 2022/3/16 9:48
*/
void updateHistoryData(CustomerStaffGridDTO dto);
}

19
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/HistoryDataService.java

@ -0,0 +1,19 @@
package com.epmet.service;
/**
* @Description
* @Author zhaoqifeng
* @Date 2022/3/15 10:09
*/
public interface HistoryDataService {
/**
* 网格员立项来源改为work_event
*
* @Param customerId
* @Return
* @Author zhaoqifeng
* @Date 2022/3/15 10:13
*/
void projectAddGridId(String customerId);
}

10
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectMainDailyService.java

@ -23,6 +23,7 @@ import com.epmet.dto.extract.result.GridProjectClosedTotalResultDTO;
import com.epmet.dto.extract.result.OrgStatisticsResultDTO;
import com.epmet.dto.extract.result.TransferRightRatioResultDTO;
import com.epmet.dto.indexcollect.result.CpcIndexCommonDTO;
import com.epmet.dto.org.CustomerStaffGridDTO;
import com.epmet.dto.pingyin.result.*;
import com.epmet.dto.screen.ScreenProjectDataDTO;
import com.epmet.dto.screen.form.ProjectSourceMapFormDTO;
@ -490,4 +491,13 @@ public interface FactOriginProjectMainDailyService extends BaseService<FactOrigi
* @return java.util.Map<java.lang.String,java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>>
*/
Map<String, List<OrgStatisticsResultDTO>> getMemberProjectCount(String customerId, String dateId, Integer type);
/**
* 更新项目表历史数据
* @Param dto
* @Return
* @Author zhaoqifeng
* @Date 2022/3/16 9:46
*/
void updateHistoryData(CustomerStaffGridDTO dto);
}

16
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectMainDailyServiceImpl.java

@ -31,6 +31,7 @@ import com.epmet.dto.extract.result.GridProjectClosedTotalResultDTO;
import com.epmet.dto.extract.result.OrgStatisticsResultDTO;
import com.epmet.dto.extract.result.TransferRightRatioResultDTO;
import com.epmet.dto.indexcollect.result.CpcIndexCommonDTO;
import com.epmet.dto.org.CustomerStaffGridDTO;
import com.epmet.dto.pingyin.result.*;
import com.epmet.dto.result.CostDayResultDTO;
import com.epmet.dto.screen.ScreenProjectDataDTO;
@ -44,6 +45,7 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import java.math.BigDecimal;
@ -734,5 +736,19 @@ public class FactOriginProjectMainDailyServiceImpl extends BaseServiceImpl<FactO
return list.stream().collect(Collectors.groupingBy(OrgStatisticsResultDTO::getStaffId));
}
/**
* 更新项目表历史数据
*
* @param dto
* @Return
* @Author zhaoqifeng
* @Date 2022/3/16 9:46
*/
@Override
@Transactional(rollbackFor = Exception.class)
public void updateHistoryData(CustomerStaffGridDTO dto) {
baseDao.updateHistoryData(dto);
}
}

10
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenProjectDataService.java

@ -20,6 +20,7 @@ package com.epmet.service.evaluationindex.screen;
import com.epmet.commons.mybatis.service.BaseService;
import com.epmet.commons.rocketmq.messages.DisputeProcessMQMsg;
import com.epmet.commons.tools.page.PageData;
import com.epmet.dto.org.CustomerStaffGridDTO;
import com.epmet.dto.screen.ScreenProjectDataDTO;
import com.epmet.dto.screen.form.ScreenProjectDataInfoFormDTO;
import com.epmet.dto.screencoll.ScreenCollFormDTO;
@ -157,4 +158,13 @@ public interface ScreenProjectDataService extends BaseService<ScreenProjectDataE
*/
void extractCategory(String customerId);
/**
* 更新项目表历史数据
* @Param dto
* @Return
* @Author zhaoqifeng
* @Date 2022/3/16 9:46
*/
void updateHistoryData(CustomerStaffGridDTO dto);
}

15
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java

@ -32,6 +32,7 @@ import com.epmet.commons.tools.utils.Result;
import com.epmet.constant.DataSourceConstant;
import com.epmet.dao.evaluationindex.screen.ScreenProjectDataDao;
import com.epmet.dao.evaluationindex.screen.ScreenProjectImgDataDao;
import com.epmet.dto.org.CustomerStaffGridDTO;
import com.epmet.dto.screen.ScreenProjectDataDTO;
import com.epmet.dto.screen.ScreenProjectImgDataDTO;
import com.epmet.dto.screen.form.ScreenProjectDataInfoFormDTO;
@ -390,4 +391,18 @@ public class ScreenProjectDataServiceImpl extends BaseServiceImpl<ScreenProjectD
}
}
/**
* 更新项目表历史数据
*
* @Param dto
* @Return
* @Author zhaoqifeng
* @Date 2022/3/16 9:46
*/
@Override
@Transactional(rollbackFor = Exception.class)
public void updateHistoryData(CustomerStaffGridDTO dto) {
baseDao.updateHistoryData(dto);
}
}

75
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/HistoryDataServiceImpl.java

@ -0,0 +1,75 @@
package com.epmet.service.impl;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.constant.RoleKeyConstants;
import com.epmet.dto.org.CustomerStaffGridDTO;
import com.epmet.dto.user.result.StaffRoleInfoDTO;
import com.epmet.service.HistoryDataService;
import com.epmet.service.evaluationindex.extract.todata.FactOriginProjectMainDailyService;
import com.epmet.service.evaluationindex.screen.ScreenProjectDataService;
import com.epmet.service.org.CustomerGridService;
import com.epmet.service.project.ProjectService;
import com.epmet.service.user.UserService;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
import java.util.Map;
import java.util.function.Function;
import java.util.stream.Collectors;
/**
* @Description
* @Author zhaoqifeng
* @Date 2022/3/15 10:12
*/
@Service
public class HistoryDataServiceImpl implements HistoryDataService {
@Resource
CustomerGridService customerGridService;
@Resource
private UserService userService;
@Resource
private ProjectService projectService;
@Resource
private FactOriginProjectMainDailyService factOriginProjectMainDailyService;
@Resource
private ScreenProjectDataService screenProjectDataService;
/**
* 网格员立项来源改为work_event
*
* @param customerId
* @Param customerId
* @Return
* @Author zhaoqifeng
* @Date 2022/3/15 10:13
*/
@Override
public void projectAddGridId(String customerId) {
List<CustomerStaffGridDTO> staffGridList = customerGridService.getCustomerStaffGridList(customerId);
List<StaffRoleInfoDTO> staffInfoList = userService.getStaffByRoleKey(customerId, RoleKeyConstants.ROLE_KEY_GRID_MEMBER);
if (CollectionUtils.isEmpty(staffGridList) || CollectionUtils.isEmpty(staffInfoList)) {
return;
}
Map<String, StaffRoleInfoDTO> staffMap = staffInfoList.stream().collect(Collectors.toMap(StaffRoleInfoDTO :: getStaffId,
Function.identity()));
List<CustomerStaffGridDTO> list = staffGridList.stream().filter(p -> null != staffMap.get(p.getStaffId())).map(item -> {
StaffRoleInfoDTO staffInfo = staffMap.get(item.getStaffId());
CustomerStaffGridDTO dto = ConvertUtils.sourceToTarget(item, CustomerStaffGridDTO.class);
dto.setStaffId(staffInfo.getStaffId());
return dto;
}).collect(Collectors.toList());
list.forEach(part -> {
//更新project表
projectService.updateHistoryData(part);
//更新fact_origin_project_main_daily
factOriginProjectMainDailyService.updateHistoryData(part);
//更新screen_project_data
screenProjectDataService.updateHistoryData(part);
});
}
}

10
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectService.java

@ -20,6 +20,7 @@ package com.epmet.service.project;
import com.epmet.commons.mybatis.service.BaseService;
import com.epmet.dto.ProjectCategoryDTO;
import com.epmet.dto.ProjectDTO;
import com.epmet.dto.org.CustomerStaffGridDTO;
import com.epmet.dto.project.ProjectAgencyDTO;
import com.epmet.dto.project.ProjectGridDTO;
import com.epmet.dto.project.ResiEventDTO;
@ -204,4 +205,13 @@ public interface ProjectService extends BaseService<ProjectEntity> {
* @return
*/
Map<String, ResiEventDTO> getEventList(String customerId, String projectId);
/**
* 更新项目表历史数据
* @Param dto
* @Return
* @Author zhaoqifeng
* @Date 2022/3/16 9:46
*/
void updateHistoryData(CustomerStaffGridDTO dto);
}

16
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java

@ -23,6 +23,7 @@ import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.constant.DataSourceConstant;
import com.epmet.dao.project.ProjectDao;
import com.epmet.dto.ProjectDTO;
import com.epmet.dto.org.CustomerStaffGridDTO;
import com.epmet.dto.project.*;
import com.epmet.dto.project.result.ProjectExceedParamsResultDTO;
import com.epmet.entity.evaluationindex.extract.FactOriginProjectMainDailyEntity;
@ -31,6 +32,7 @@ import com.epmet.service.project.ProjectService;
import com.github.pagehelper.PageHelper;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import java.math.BigDecimal;
@ -263,5 +265,19 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
return list.stream().collect(Collectors.toMap(ResiEventDTO::getProjectId, Function.identity()));
}
/**
* 更新项目表历史数据
*
* @param dto
* @Return
* @Author zhaoqifeng
* @Date 2022/3/16 9:46
*/
@Override
@Transactional(rollbackFor = Exception.class)
public void updateHistoryData(CustomerStaffGridDTO dto) {
baseDao.updateHistoryData(dto);
}
}

14
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml

@ -1211,4 +1211,18 @@
AGENCY_ID,
PROJECT_CREATOR
</select>
<update id="updateHistoryData">
UPDATE
fact_origin_project_main_daily
SET
ORIGIN = 'work_event',
ORIGIN_ID = #{gridId},
GRID_ID = #{gridId}
WHERE
PROJECT_CREATOR = #{staffId}
AND CUSTOMER_ID = #{customerId}
AND AGENCY_ID = #{agencyId}
AND ORIGIN = 'agency'
</update>
</mapper>

15
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectDataDao.xml

@ -458,4 +458,19 @@
AGENCY_ID,
DATE_ID DESC
</select>
<update id="updateHistoryData">
UPDATE
screen_project_data
SET
ORIGIN = 'work_event',
ORG_TYPE = 'grid',
ORG_ID = #{gridId},
ORG_NAME = #{gridName}
WHERE
PROJECT_CREATOR = #{staffId}
AND CUSTOMER_ID = #{customerId}
AND ORG_ID = #{agencyId}
AND ORIGIN = 'agency'
</update>
</mapper>

1
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/CustomerGridDao.xml

@ -121,6 +121,7 @@
ca.PID,
cg.PIDS,
csg.GRID_ID,
cg.GRID_NAME,
csg.USER_ID AS staffId
FROM
customer_staff_grid csg

12
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectDao.xml

@ -268,4 +268,16 @@
and rero.CUSTOMER_ID = #{customerId}
</select>
<update id="updateHistoryData">
UPDATE
project
SET
ORIGIN = 'work_event',
ORIGIN_ID = #{gridId}
WHERE
CREATED_BY = #{staffId}
AND CUSTOMER_ID = #{customerId}
AND AGENCY_ID = #{agencyId}
AND ORIGIN = 'agency'
</update>
</mapper>

4
epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/MemoConcernDTO.java

@ -61,13 +61,13 @@ public class MemoConcernDTO implements Serializable {
private String content;
/**
* 计划执行时间
* 预计关怀时间
*/
@JsonFormat(pattern="yyyy-MM-dd HH:mm")
private Date scheduledTime;
/**
* 实际执行时间
* 实际执行时间(预留字段)
*/
@JsonFormat(pattern="yyyy-MM-dd HH:mm")
private Date actualTime;

2
epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/MemoDifficultyDTO.java

@ -45,7 +45,7 @@ public class MemoDifficultyDTO implements Serializable {
private String remark;
/**
* 计划执行时间
* 预计处理时间
*/
@JsonFormat(pattern="yyyy-MM-dd HH:mm")
private Date scheduledTime;

7
epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/AddMemoDifficultyFromDTO.java

@ -5,7 +5,6 @@ import com.epmet.dto.MemoAttachmentDTO;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.hibernate.validator.constraints.Length;
import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
@ -34,21 +33,23 @@ public class AddMemoDifficultyFromDTO implements Serializable {
* 内容
*/
@NotBlank(message = "难点堵点内容不能为空", groups = { AddMemoDifficulty.class })
@Length(max = 500, message = "难点堵点内容最为50个字", groups = { AddMemoDifficulty.class })
@Length(max = 500, message = "难点堵点内容最为50个字", groups = { AddMemoDifficulty.class })
private String content;
/**
* 解决方式
*/
@Length(max = 500, message = "解决方式最多为500个字", groups = { AddMemoDifficulty.class })
private String resolveWay;
/**
* 备注
*/
@Length(max = 200, message = "备注最多为200个字", groups = { AddMemoDifficulty.class })
private String remark;
/**
* 计划执行时间
* 预计处理时间
*/
@JsonFormat(pattern="yyyy-MM-dd HH:mm")
private Date scheduledTime;

1
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/MemoDifficultyController.java

@ -92,6 +92,7 @@ public class MemoDifficultyController {
@PostMapping("detail")
public Result<AddMemoDifficultyFromDTO> detail(@RequestBody MemoDifficultyDetailFromDTO fromDTO){
ValidatorUtils.validateEntity(fromDTO, MemoDifficultyDetailFromDTO.Detail.class);
return new Result<AddMemoDifficultyFromDTO>().ok(memoDifficultyService.detail(fromDTO));
}

4
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/MemoConcernEntity.java

@ -51,12 +51,12 @@ public class MemoConcernEntity extends BaseEpmetEntity {
private String content;
/**
* 计划执行时间
* 预计关怀时间
*/
private Date scheduledTime;
/**
* 实际执行时间
* 实际执行时间(预留字段)
*/
private Date actualTime;

2
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/MemoDifficultyEntity.java

@ -41,7 +41,7 @@ public class MemoDifficultyEntity extends BaseEpmetEntity {
private String remark;
/**
* 计划执行时间
* 预计处理时间
*/
private Date scheduledTime;

86
epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.21__create_memo_table.sql

@ -0,0 +1,86 @@
CREATE TABLE `memo_attachment` (
`ID` varchar(64) NOT NULL COMMENT '主键',
`CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID',
`REMIND_MSG_ID` varchar(64) NOT NULL COMMENT 'REMIND_MSG.ID 业务(工作日志、难点堵点、人员关怀)表Id',
`FILE_NAME` varchar(255) DEFAULT NULL COMMENT '文件名',
`ATTACHMENT_NAME` varchar(64) DEFAULT NULL COMMENT '附件名(uuid随机生成)',
`ATTACHMENT_SIZE` int(11) DEFAULT NULL COMMENT '文件大小,单位b',
`ATTACHMENT_FORMAT` varchar(64) NOT NULL COMMENT '文件格式(JPG、PNG、PDF、JPEG、BMP、MP4、WMA、M4A、MP3、DOC、DOCX、XLS)',
`ATTACHMENT_TYPE` varchar(64) NOT NULL COMMENT '附件类型((图片 - image、 视频 - video、 语音 - voice、 文档 - doc))',
`ATTACHMENT_URL` varchar(255) NOT NULL COMMENT '附件地址',
`DURATION` int(11) DEFAULT '0' COMMENT '语音或视频时长,秒',
`SORT` int(1) NOT NULL COMMENT '排序字段',
`DEL_FLAG` varchar(1) NOT NULL COMMENT '删除标记 0:未删除,1:已删除',
`REVISION` int(11) NOT NULL COMMENT '乐观锁',
`CREATED_BY` varchar(32) NOT NULL COMMENT '创建人',
`CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
`UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人',
`UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
PRIMARY KEY (`ID`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT COMMENT='备忘录-附件表';
CREATE TABLE `memo_attr` (
`ID` varchar(32) NOT NULL COMMENT '唯一标识',
`CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID',
`REMIND_TIME` datetime DEFAULT NULL COMMENT '提醒时间',
`TYPE` varchar(32) NOT NULL COMMENT '业务类型 人员关怀:concern;难点堵点:difficulty;工作日志:work_diary',
`READ_FLAG` tinyint(1) NOT NULL DEFAULT '0' COMMENT '阅读标记1 已读;0未读',
`RECEIVER` varchar(32) NOT NULL COMMENT '接收人ID',
`DEL_FLAG` char(1) NOT NULL COMMENT '删除标识:0.未删除 1.已删除',
`REVISION` int(11) NOT NULL COMMENT '乐观锁',
`CREATED_BY` varchar(32) NOT NULL COMMENT '创建人',
`CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
`UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人',
`UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
PRIMARY KEY (`ID`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='备忘录-属性(通知)表';
CREATE TABLE `memo_concern` (
`ID` varchar(32) NOT NULL COMMENT '唯一标识(同memo_attr表Id)',
`CUSTOMER_ID` varchar(32) NOT NULL COMMENT '客户ID',
`CONCERN_TYPE` varchar(64) DEFAULT NULL COMMENT '关怀类型',
`RESI_NAME` varchar(64) NOT NULL COMMENT '关怀人员',
`PHONE` varchar(64) DEFAULT NULL COMMENT '关怀对象电话',
`ADDRESS` varchar(64) DEFAULT NULL COMMENT '关怀对象地址',
`CONTENT` varchar(1024) NOT NULL COMMENT '关怀事项',
`SCHEDULED_TIME` datetime DEFAULT NULL COMMENT '预计关怀时间',
`ACTUAL_TIME` datetime DEFAULT NULL COMMENT '实际执行时间(预留字段)',
`STATUS` tinyint(1) NOT NULL DEFAULT '0' COMMENT '状态 0未完成 1已完成',
`DEL_FLAG` char(1) NOT NULL COMMENT '删除标识:0.未删除 1.已删除',
`REVISION` int(11) NOT NULL COMMENT '乐观锁',
`CREATED_BY` varchar(32) NOT NULL COMMENT '操作人',
`CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
`UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人',
`UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
PRIMARY KEY (`ID`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='备忘录-人文关怀';
CREATE TABLE `memo_difficulty` (
`ID` varchar(32) NOT NULL COMMENT '唯一标识(同memo_attr表Id)',
`CUSTOMER_ID` varchar(32) NOT NULL COMMENT '客户ID',
`CONTENT` varchar(1024) NOT NULL COMMENT '内容',
`RESOLVE_WAY` varchar(512) DEFAULT NULL COMMENT '解决方式',
`REMARK` varchar(255) DEFAULT NULL COMMENT '备注',
`SCHEDULED_TIME` datetime DEFAULT NULL COMMENT '预计处理时间',
`DEL_FLAG` char(1) NOT NULL COMMENT '删除标识:0.未删除 1.已删除',
`REVISION` int(11) NOT NULL COMMENT '乐观锁',
`CREATED_BY` varchar(32) NOT NULL COMMENT '创建人',
`CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
`UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人',
`UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
PRIMARY KEY (`ID`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='备忘录-难点读点';
CREATE TABLE `memo_work_diary` (
`ID` varchar(32) NOT NULL COMMENT '唯一标识(同memo_attr表Id)',
`CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID',
`CONTENT` varchar(1024) NOT NULL COMMENT '内容',
`WORK_TYPE` varchar(64) DEFAULT NULL COMMENT '工作事项',
`DEL_FLAG` char(1) NOT NULL COMMENT '删除标识:0.未删除 1.已删除',
`REVISION` int(11) NOT NULL COMMENT '乐观锁',
`CREATED_BY` varchar(32) NOT NULL COMMENT '创建人',
`CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
`UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人',
`UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
PRIMARY KEY (`ID`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='备忘录-工作日志';

1
epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataOrgChangeEventListener.java

@ -83,6 +83,7 @@ public class OpenDataOrgChangeEventListener implements MessageListenerConcurrent
dto.setType(obj.getType());
List<String> orgIdList = new ArrayList<>();
orgIdList.add(obj.getOrgId());
dto.setOrgIdList(orgIdList);
if ("agency".equals(obj.getOrgType())) {
SpringContextUtils.getBean(ExDeptService.class).getAgencyBaseInfo(dto);
} else {

1
epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataStaffChangeEventListener.java

@ -85,6 +85,7 @@ public class OpenDataStaffChangeEventListener implements MessageListenerConcurre
dto.setType(obj.getType());
List<String> staffIdList = new ArrayList<>();
staffIdList.add(obj.getOrgId());
dto.setStaffIdList(staffIdList);
SpringContextUtils.getBean(ExUserService.class).getStaffBaseInfo(dto);
} catch (RenException e) {
// 如果是我们手动抛出的异常,说明在业务可控范围内。目前不需要MQ重试

10
epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/ExDeptDao.xml

@ -10,7 +10,7 @@
<trim prefix="qx_dept_id =(case" suffix="end),">
<foreach collection="list" item="item">
<if test='null != item.qxDeptId'>
when qx_dept_name = #{item.qxDeptName} then #{item.qxDeptId}
when dept_name = #{item.qxDeptName} then #{item.qxDeptId}
</if>
</foreach>
</trim>
@ -18,7 +18,7 @@
<trim prefix="qx_dept_name =(case" suffix="end),">
<foreach collection="list" item="item">
<if test='null != item.qxDeptName'>
when qx_dept_name = #{item.qxDeptName} then #{item.qxDeptId}
when dept_name = #{item.qxDeptName} then #{item.qxDeptName}
</if>
</foreach>
</trim>
@ -26,7 +26,7 @@
<trim prefix="qx_dept_code =(case" suffix="end),">
<foreach collection="list" item="item">
<if test='null != item.qxDeptCode'>
when qx_dept_name = #{item.qxDeptName} then #{item.qxDeptCode}
when dept_name = #{item.qxDeptName} then #{item.qxDeptCode}
</if>
</foreach>
</trim>
@ -34,7 +34,7 @@
<trim prefix="qx_customer_id =(case" suffix="end),">
<foreach collection="list" item="item">
<if test='null != item.qxCustomerId'>
when qx_dept_name = #{item.qxDeptName} then #{item.qxCustomerId}
when dept_name = #{item.qxDeptName} then #{item.qxCustomerId}
</if>
</foreach>
</trim>
@ -43,7 +43,7 @@
WHERE
1=1
<foreach collection="list" item="item" open="AND( " separator=" OR " index="index" close=")">
qx_dept_name = #{item.qxDeptName}
dept_name = #{item.qxDeptName}
</foreach>
</update>

16
epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/ExUserDao.xml

@ -7,10 +7,18 @@
UPDATE ex_user
<trim prefix="set" suffixOverrides=",">
<trim prefix="qx_user_id =(case" suffix="end),">
<foreach collection="list" item="item">
<if test='null != item.qxUserId'>
when (login_name = #{item.qxMobile} ) then #{item.qxUserId}
</if>
</foreach>
</trim>
<trim prefix="qx_user_name =(case" suffix="end),">
<foreach collection="list" item="item">
<if test='null != item.qxUserName'>
when (qx_user_id = #{item.qxUserId} ) then #{item.qxUserName}
when (login_name = #{item.qxMobile} ) then #{item.qxUserName}
</if>
</foreach>
</trim>
@ -18,7 +26,7 @@
<trim prefix="qx_mobile =(case" suffix="end),">
<foreach collection="list" item="item">
<if test='null != item.qxMobile'>
when (qx_user_id = #{item.qxUserId} ) then #{item.qxMobile}
when (login_name = #{item.qxMobile} ) then #{item.qxMobile}
</if>
</foreach>
</trim>
@ -26,7 +34,7 @@
<trim prefix="qx_customer_id =(case" suffix="end),">
<foreach collection="list" item="item">
<if test='null != item.qxCustomerId'>
when (qx_user_id = #{item.qxUserId} ) then #{item.qxCustomerId}
when (login_name = #{item.qxMobile} ) then #{item.qxCustomerId}
</if>
</foreach>
</trim>
@ -34,7 +42,7 @@
</trim>
WHERE 1=1
<foreach collection="list" item="item" open="AND ( " separator=" OR " index="index" close=")">
(qx_user_id = #{item.qxUserId} )
(login_name = #{item.qxMobile} )
</foreach>
</update>

Loading…
Cancel
Save