Browse Source

append

feature/dangjian
YUJT 4 years ago
parent
commit
7ea55d3227
  1. 2
      esua-epdc/epdc-cloud-commons-shibei
  2. 6
      esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml
  3. 125
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiCustomController.java
  4. 4
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiCustomEnterpriseController.java
  5. 121
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/CustomFeignClient.java
  6. 62
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/CustomFeignClientFallback.java
  7. 4
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/CustomEnterpriseService.java
  8. 165
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/CustomService.java
  9. 10
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CustomEnterpriseServiceImpl.java
  10. 118
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CustomServiceImpl.java
  11. 58
      esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/custom/dto/suggestion/TypeNode.java
  12. 2
      esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/enterprise/result/EnterpriseInfoResultDTO.java
  13. 111
      esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/enterprise/result/EnterpriseInfoUpdateResultDTO.java
  14. 8
      esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprise/controller/EnterpriseInfoController.java
  15. 4
      esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprise/dao/EnterpriseInfoDao.java
  16. 4
      esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprise/service/EnterpriseInfoService.java
  17. 6
      esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprise/service/impl/EnterpriseInfoServiceImpl.java
  18. 4
      esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/vaccine/epidemic/controller/EpidemicUserInfoController.java
  19. 18
      esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/vaccine/epidemic/controller/v2/EpidemicUserInfoV2Controller.java
  20. 4
      esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/vaccine/epidemic/dao/EpidemicUserInfoDao.java
  21. 6
      esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/vaccine/epidemic/service/EpidemicUserInfoService.java
  22. 61
      esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java
  23. 14
      esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/vaccine/vim/redis/VaccinationAuthRedis.java
  24. 4
      esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/vaccine/vim/service/VaccinationUserRoleService.java
  25. 4
      esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/vaccine/vim/service/impl/VaccinationInfoServiceImpl.java
  26. 18
      esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/vaccine/vim/service/impl/VaccinationUserRoleServiceImpl.java
  27. 2
      esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/enterprise/EnterpriseInfoDao.xml
  28. 8
      esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/vaccine/epidemic/EpidemicUserInfoDao.xml

2
esua-epdc/epdc-cloud-commons-shibei

@ -1 +1 @@
Subproject commit c0f1c78ecd8b361e58ce19acd2c37b71af0d6d3c
Subproject commit 0827892c5f98b395d5f332eec0d4bbd9ba02e9bf

6
esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml

@ -32,7 +32,11 @@
<artifactId>epdc-commons-tools</artifactId>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>com.esua.epdc.shibei</groupId>
<artifactId>epdc-custom-client</artifactId>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>com.esua.epdc.shibei</groupId>
<artifactId>epdc-commons-mybatis</artifactId>

125
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiCustomController.java

@ -4,6 +4,12 @@ import com.elink.esua.epdc.common.token.dto.TokenDto;
import com.elink.esua.epdc.commons.tools.annotation.LoginUser;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
import com.elink.esua.epdc.custom.dto.epidemic.GetTripInfoFormDTO;
import com.elink.esua.epdc.custom.dto.epidemic.SaveTripInfoFormDTO;
import com.elink.esua.epdc.custom.dto.suggestion.TypeNode;
import com.elink.esua.epdc.custom.dto.suggestion.form.MySuggestionFormDTO;
import com.elink.esua.epdc.custom.dto.suggestion.form.SuggestionMakeFormDTO;
import com.elink.esua.epdc.custom.dto.suggestion.result.MySuggestionResultDTO;
import com.elink.esua.epdc.dto.DeptOption;
import com.elink.esua.epdc.dto.epdc.form.EpdcAppPidemicCompleteInfoFromDTO;
import com.elink.esua.epdc.dto.form.EpiDemicReportFormDTO;
@ -13,6 +19,8 @@ import com.elink.esua.epdc.service.MessageService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* @author yinzuomei
* @Description 疫情管理
@ -91,4 +99,121 @@ public class ApiCustomController {
ValidatorUtils.validateEntity(completeInfoFromDto);
return customService.createPidemicInfo(completeInfoFromDto, userDetail);
}
/**
* 获取 建议类别 树结构
*
* @param
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.TypeOption>
* @Author zhangyong
* @Date 14:15 2021-09-14
**/
@GetMapping("getSuggestionTypeTree")
public Result<List<TypeNode>> getSuggestionTypeTree() {
return customService.getSuggestionTypeTree();
}
/**
* 新增建议
*
* @param formDTO
* @param userDetail
* @return com.elink.esua.epdc.commons.tools.utils.Result
* @Author zhangyong
* @Date 15:21 2021-09-14
**/
@PostMapping("insertSuggestion")
public Result insertSuggestion(@RequestBody SuggestionMakeFormDTO formDTO, @LoginUser TokenDto userDetail) {
ValidatorUtils.validateEntity(formDTO);
return customService.insertSuggestion(formDTO, userDetail);
}
/**
* 修改建议
*
* @param formDTO
* @param userDetail
* @return com.elink.esua.epdc.commons.tools.utils.Result
* @Author zhangyong
* @Date 15:21 2021-09-14
**/
@PostMapping("updateSuggestion")
public Result updateSuggestion(@RequestBody SuggestionMakeFormDTO formDTO, @LoginUser TokenDto userDetail) {
ValidatorUtils.validateEntity(formDTO);
return customService.updateSuggestion(formDTO, userDetail);
}
/**
* 我提出的建议
*
* @param formDTO
* @param userDetail
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.suggestion.result.MySuggestionResultDTO>>
* @Author zhangyong
* @Date 15:58 2021-09-14
**/
@GetMapping("mySuggestion")
public Result<List<MySuggestionResultDTO>> mySuggestion(MySuggestionFormDTO formDTO, @LoginUser TokenDto userDetail) {
return customService.getMySuggestion(formDTO, userDetail);
}
/**
* 建议详情
* @param id
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.suggestion.result.MySuggestionResultDTO>
* @Author zhangyong
* @Date 09:37 2021-09-15
**/
@GetMapping("detailSuggestion/{id}")
public Result<MySuggestionResultDTO> detailSuggestion(@PathVariable String id) {
return customService.getDetailSuggestion(id);
}
/**
* @describe: 行程上报
* @author wangtong
* @date 2021/10/13 10:50
* @params [userDetail, formDto]
* @return com.elink.esua.epdc.commons.tools.utils.Result
*/
@PostMapping("saveTripInfo")
public Result saveTripInfo(@LoginUser TokenDto userDetail, @RequestBody SaveTripInfoFormDTO formDto) {
return customService.saveTripInfo(userDetail,formDto);
}
/**
* @describe: 我的上报列表
* @author wangtong
* @date 2021/10/13 13:37
* @params [userDetail, formDto]
* @return com.elink.esua.epdc.commons.tools.utils.Result
*/
@GetMapping("getTripInfoList")
public Result getTripInfoList(@LoginUser TokenDto userDetail, GetTripInfoFormDTO formDto) {
return customService.getTripInfoList(userDetail,formDto);
}
/**
* @describe: 上报详情
* @author wangtong
* @date 2021/10/13 13:37
* @params [userDetail, formDto]
* @return com.elink.esua.epdc.commons.tools.utils.Result
*/
@GetMapping("getTripInfoDetail")
public Result getTripInfoDetail(GetTripInfoFormDTO formDto) {
return customService.getTripInfoDetail(formDto);
}
/**
* @describe: 删除上报信息
* @author wangtong
* @date 2021/10/13 14:17
* @params [formDto]
* @return com.elink.esua.epdc.commons.tools.utils.Result
*/
@DeleteMapping("deleteTripById")
public Result deleteTripById(@RequestBody GetTripInfoFormDTO formDto) {
return customService.deleteTripById(formDto);
}
}

4
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiCustomEnterpriseController.java

@ -5,7 +5,7 @@ import com.elink.esua.epdc.commons.tools.annotation.LoginUser;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
import com.elink.esua.epdc.dto.enterprise.form.EnterpriseInfoFormDTO;
import com.elink.esua.epdc.dto.enterprise.result.EnterpriseInfoUpdateResultDTO;
import com.elink.esua.epdc.dto.enterprise.result.EnterpriseInfoResultDTO;
import com.elink.esua.epdc.dto.form.CompleteRequisiteInfoDTO;
import com.elink.esua.epdc.service.CustomEnterpriseService;
import org.springframework.beans.factory.annotation.Autowired;
@ -52,7 +52,7 @@ public class ApiCustomEnterpriseController {
* @Param [userId]
**/
@GetMapping("getByUserId")
public Result<EnterpriseInfoUpdateResultDTO> getByUserId(@LoginUser TokenDto tokenDto) {
public Result<EnterpriseInfoResultDTO> getByUserId(@LoginUser TokenDto tokenDto) {
return customEnterpriseService.selectOneEnterpriseInfo(tokenDto);
}

121
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/CustomFeignClient.java

@ -2,21 +2,24 @@ package com.elink.esua.epdc.feign;
import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.custom.dto.epidemic.GetTripInfoFormDTO;
import com.elink.esua.epdc.custom.dto.epidemic.SaveTripInfoFormDTO;
import com.elink.esua.epdc.custom.dto.suggestion.TypeNode;
import com.elink.esua.epdc.custom.dto.suggestion.form.MySuggestionFormDTO;
import com.elink.esua.epdc.custom.dto.suggestion.form.SuggestionMakeFormDTO;
import com.elink.esua.epdc.custom.dto.suggestion.result.MySuggestionResultDTO;
import com.elink.esua.epdc.dto.EpidemicSentryPostDTO;
import com.elink.esua.epdc.dto.consult.form.GridOperatorListFormDTO;
import com.elink.esua.epdc.dto.consult.result.CheckStateResultDTO;
import com.elink.esua.epdc.dto.consult.result.GridOperatorListResultDTO;
import com.elink.esua.epdc.dto.enterprise.form.EnterpriseInfoFormDTO;
import com.elink.esua.epdc.dto.enterprise.result.EnterpriseInfoUpdateResultDTO;
import com.elink.esua.epdc.dto.enterprise.result.EnterpriseInfoResultDTO;
import com.elink.esua.epdc.dto.form.CompleteRequisiteInfoDTO;
import com.elink.esua.epdc.dto.form.EpiDemicReportFormDTO;
import com.elink.esua.epdc.feign.fallback.CustomFeignClientFallback;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@ -77,7 +80,7 @@ public interface CustomFeignClient {
* @Param [userId]
**/
@GetMapping(value = "custom/enterpriseinfo/getByUserId/{userId}", consumes = MediaType.APPLICATION_JSON_VALUE)
Result<EnterpriseInfoUpdateResultDTO> getEnterpriseInfoByUserId(@PathVariable("userId") String userId);
Result<EnterpriseInfoResultDTO> getEnterpriseInfoByUserId(@PathVariable("userId") String userId);
/***
* 完善企业信息必填表单
@ -119,4 +122,110 @@ public interface CustomFeignClient {
*/
@GetMapping(value = "custom/majorfunctionconf/checkState", consumes = MediaType.APPLICATION_JSON_VALUE)
Result<List<CheckStateResultDTO>> getCheckState();
/**
* 查询用户疫苗接种信息
*
* @param userName 人员姓名
* @param idCard 身份证号
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.lang.Object>
* @author work@yujt.net.cn
* @date 2021/5/8 15:29
*/
@GetMapping("custom/vaccinationinfo/epdc-app/query")
Result<Object> getUserVimInfo(@RequestParam("userName") String userName, @RequestParam("idCard") String idCard);
/**
* 获取 建议类别 树结构
*
* @param
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.TypeOption>
* @Author zhangyong
* @Date 14:15 2021-09-14
**/
@GetMapping("custom/suggestiontype/getSuggestionTypeTree")
Result<List<TypeNode>> getSuggestionTypeTree();
/**
* 新增建议
*
* @param formDTO
* @return com.elink.esua.epdc.commons.tools.utils.Result
* @Author zhangyong
* @Date 15:21 2021-09-14
**/
@PostMapping(value = "custom/suggestionmake/insertSuggestion", consumes = MediaType.APPLICATION_JSON_VALUE)
Result insertSuggestion(SuggestionMakeFormDTO formDTO);
/**
* 修改建议
*
* @param formDTO
* @return com.elink.esua.epdc.commons.tools.utils.Result
* @Author zhangyong
* @Date 15:21 2021-09-14
**/
@PostMapping(value = "custom/suggestionmake/updateSuggestion", consumes = MediaType.APPLICATION_JSON_VALUE)
Result updateSuggestion(SuggestionMakeFormDTO formDTO);
/**
* 我提出的建议
*
* @param formDTO
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.suggestion.result.MySuggestionResultDTO>>
* @Author zhangyong
* @Date 15:59 2021-09-14
**/
@GetMapping(value = "custom/suggestionmake/mySuggestion", consumes = MediaType.APPLICATION_JSON_VALUE)
Result<List<MySuggestionResultDTO>> getMySuggestion(MySuggestionFormDTO formDTO);
/**
* 建议详情
* @param id
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.suggestion.result.MySuggestionResultDTO>
* @Author zhangyong
* @Date 09:37 2021-09-15
**/
@GetMapping("custom/suggestionmake/detailSuggestion/{id}")
Result<MySuggestionResultDTO> getDetailSuggestion(@PathVariable("id") String id);
/**
* @describe: 行程上报
* @author wangtong
* @date 2021/10/13 10:50
* @params [userDetail, formDto]
* @return com.elink.esua.epdc.commons.tools.utils.Result
*/
@PostMapping(value = "custom/tripreport/saveTripInfo", consumes = MediaType.APPLICATION_JSON_VALUE)
Result saveTripInfo(SaveTripInfoFormDTO formDto);
/**
* @describe: 我的上报列表
* @author wangtong
* @date 2021/10/13 13:37
* @params [userDetail, formDto]
* @return com.elink.esua.epdc.commons.tools.utils.Result
*/
@GetMapping(value = "custom/tripreport/getTripInfoList", consumes = MediaType.APPLICATION_JSON_VALUE)
Result getTripInfoList(GetTripInfoFormDTO formDto);
/**
* @describe: 上报详情
* @author wangtong
* @date 2021/10/13 13:37
* @params [userDetail, formDto]
* @return com.elink.esua.epdc.commons.tools.utils.Result
*/
@GetMapping(value = "custom/tripreport/getTripInfoDetail", consumes = MediaType.APPLICATION_JSON_VALUE)
Result getTripInfoDetail(GetTripInfoFormDTO formDto);
/**
* @describe: 删除上报信息
* @author wangtong
* @date 2021/10/13 14:17
* @params [formDto]
* @return com.elink.esua.epdc.commons.tools.utils.Result
*/
@DeleteMapping(value = "custom/tripreport/deleteTripById", consumes = MediaType.APPLICATION_JSON_VALUE)
Result deleteTripById(GetTripInfoFormDTO formDto);
}

62
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/CustomFeignClientFallback.java

@ -3,12 +3,18 @@ package com.elink.esua.epdc.feign.fallback;
import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.custom.dto.epidemic.GetTripInfoFormDTO;
import com.elink.esua.epdc.custom.dto.epidemic.SaveTripInfoFormDTO;
import com.elink.esua.epdc.custom.dto.suggestion.TypeNode;
import com.elink.esua.epdc.custom.dto.suggestion.form.MySuggestionFormDTO;
import com.elink.esua.epdc.custom.dto.suggestion.form.SuggestionMakeFormDTO;
import com.elink.esua.epdc.custom.dto.suggestion.result.MySuggestionResultDTO;
import com.elink.esua.epdc.dto.EpidemicSentryPostDTO;
import com.elink.esua.epdc.dto.consult.form.GridOperatorListFormDTO;
import com.elink.esua.epdc.dto.consult.result.CheckStateResultDTO;
import com.elink.esua.epdc.dto.consult.form.GridOperatorListFormDTO;
import com.elink.esua.epdc.dto.consult.result.GridOperatorListResultDTO;
import com.elink.esua.epdc.dto.enterprise.form.EnterpriseInfoFormDTO;
import com.elink.esua.epdc.dto.enterprise.result.EnterpriseInfoUpdateResultDTO;
import com.elink.esua.epdc.dto.enterprise.result.EnterpriseInfoResultDTO;
import com.elink.esua.epdc.dto.form.CompleteRequisiteInfoDTO;
import com.elink.esua.epdc.dto.form.EpiDemicReportFormDTO;
import com.elink.esua.epdc.feign.CustomFeignClient;
@ -45,7 +51,7 @@ public class CustomFeignClientFallback implements CustomFeignClient {
}
@Override
public Result<EnterpriseInfoUpdateResultDTO> getEnterpriseInfoByUserId(String userId) {
public Result<EnterpriseInfoResultDTO> getEnterpriseInfoByUserId(String userId) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "getEnterpriseInfoByUserId", userId);
}
@ -68,4 +74,54 @@ public class CustomFeignClientFallback implements CustomFeignClient {
public Result<List<CheckStateResultDTO>> getCheckState() {
return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "checkState");
}
@Override
public Result<Object> getUserVimInfo(String userName, String idCard) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getUserVimInfo", userName, idCard);
}
@Override
public Result<List<TypeNode>> getSuggestionTypeTree() {
return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "getSuggestionTypeTree");
}
@Override
public Result insertSuggestion(SuggestionMakeFormDTO formDTO) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "insertSuggestion", formDTO);
}
@Override
public Result updateSuggestion(SuggestionMakeFormDTO formDTO) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "updateSuggestion", formDTO);
}
@Override
public Result<List<MySuggestionResultDTO>> getMySuggestion(MySuggestionFormDTO formDTO) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "getMySuggestion", formDTO);
}
@Override
public Result<MySuggestionResultDTO> getDetailSuggestion(String id) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "getDetailSuggestion", id);
}
@Override
public Result saveTripInfo(SaveTripInfoFormDTO formDto) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "saveTripInfo", formDto);
}
@Override
public Result getTripInfoList(GetTripInfoFormDTO formDto) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "getTripInfoList", formDto);
}
@Override
public Result getTripInfoDetail(GetTripInfoFormDTO formDto) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "getTripInfoDetail", formDto);
}
@Override
public Result deleteTripById(GetTripInfoFormDTO formDto) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "deleteTripById", formDto);
}
}

4
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/CustomEnterpriseService.java

@ -3,7 +3,7 @@ package com.elink.esua.epdc.service;
import com.elink.esua.epdc.common.token.dto.TokenDto;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.enterprise.form.EnterpriseInfoFormDTO;
import com.elink.esua.epdc.dto.enterprise.result.EnterpriseInfoUpdateResultDTO;
import com.elink.esua.epdc.dto.enterprise.result.EnterpriseInfoResultDTO;
import com.elink.esua.epdc.dto.form.CompleteRequisiteInfoDTO;
/**
@ -30,7 +30,7 @@ public interface CustomEnterpriseService {
* @Date 2020/2/28
* @Param [userId]
**/
Result<EnterpriseInfoUpdateResultDTO> selectOneEnterpriseInfo(TokenDto tokenDto);
Result<EnterpriseInfoResultDTO> selectOneEnterpriseInfo(TokenDto tokenDto);
/***
* 完善企业信息必填表单

165
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/CustomService.java

@ -2,52 +2,147 @@ package com.elink.esua.epdc.service;
import com.elink.esua.epdc.common.token.dto.TokenDto;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.custom.dto.epidemic.GetTripInfoFormDTO;
import com.elink.esua.epdc.custom.dto.epidemic.SaveTripInfoFormDTO;
import com.elink.esua.epdc.custom.dto.suggestion.TypeNode;
import com.elink.esua.epdc.custom.dto.suggestion.form.MySuggestionFormDTO;
import com.elink.esua.epdc.custom.dto.suggestion.form.SuggestionMakeFormDTO;
import com.elink.esua.epdc.custom.dto.suggestion.result.MySuggestionResultDTO;
import com.elink.esua.epdc.dto.DeptOption;
import com.elink.esua.epdc.dto.epdc.form.EpdcAppPidemicCompleteInfoFromDTO;
import com.elink.esua.epdc.dto.form.EpiDemicReportFormDTO;
import com.elink.esua.epdc.dto.result.EpdcSentryPostInfoResultDTO;
import java.util.List;
/**
* @Description 疫情管理
* @Author yinzuomei
* @Date 2020/1/28 13:39
*/
public interface CustomService {
/**
* @param
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.DeptOption>
* @Author yinzuomei
* @Description 获取所有组织机构信息
* @Date 2020/1/28 12:14
**/
Result<DeptOption> getDeptTree();
/**
* @param formDTO
* @return com.elink.esua.epdc.commons.tools.utils.Result
* @Author yinzuomei
* @Description 疫情上报
* @Date 2020/1/28 13:23
**/
Result report(EpiDemicReportFormDTO formDTO);
/** 根据小程序码内的字符串解析机构名称和第三方哨卡id
* @Description
* @Author songyunpeng
* @Date 2020/2/14
* @Param [maCode]
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.EpdcSentryPostInfoResultDTO>
**/
Result<EpdcSentryPostInfoResultDTO> getDeptInfoByMaCode(String maCode);
/***
* 居民在防疫哨卡进行登记时上送数据并完善党群系统个人信息
* @param completeInfoFromDto
* @return com.elink.esua.epdc.commons.tools.utils.Result
* @author qushutong
* @date 2020/2/15 10:58
*/
Result createPidemicInfo(EpdcAppPidemicCompleteInfoFromDTO completeInfoFromDto, TokenDto userDetail);
/**
* @param
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.DeptOption>
* @Author yinzuomei
* @Description 获取所有组织机构信息
* @Date 2020/1/28 12:14
**/
Result<DeptOption> getDeptTree();
/**
* @param formDTO
* @return com.elink.esua.epdc.commons.tools.utils.Result
* @Author yinzuomei
* @Description 疫情上报
* @Date 2020/1/28 13:23
**/
Result report(EpiDemicReportFormDTO formDTO);
/** 根据小程序码内的字符串解析机构名称和第三方哨卡id
* @Description
* @Author songyunpeng
* @Date 2020/2/14
* @Param [maCode]
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.EpdcSentryPostInfoResultDTO>
**/
Result<EpdcSentryPostInfoResultDTO> getDeptInfoByMaCode(String maCode);
/***
* 居民在防疫哨卡进行登记时上送数据并完善党群系统个人信息
* @param completeInfoFromDto
* @return com.elink.esua.epdc.commons.tools.utils.Result
* @author qushutong
* @date 2020/2/15 10:58
*/
Result createPidemicInfo(EpdcAppPidemicCompleteInfoFromDTO completeInfoFromDto, TokenDto userDetail);
void completeSentryPostUserInfo(EpdcAppPidemicCompleteInfoFromDTO completeInfoDto);
/**
* 获取 建议类别 树结构
*
* @param
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.TypeOption>
* @Author zhangyong
* @Date 14:15 2021-09-14
**/
Result<List<TypeNode>> getSuggestionTypeTree();
/**
* 新增建议
*
* @param formDTO
* @param userDetail
* @return com.elink.esua.epdc.commons.tools.utils.Result
* @Author zhangyong
* @Date 15:21 2021-09-14
**/
Result insertSuggestion(SuggestionMakeFormDTO formDTO, TokenDto userDetail);
/**
* 修改建议
*
* @param formDTO
* @param userDetail
* @return com.elink.esua.epdc.commons.tools.utils.Result
* @Author zhangyong
* @Date 15:21 2021-09-14
**/
Result updateSuggestion(SuggestionMakeFormDTO formDTO, TokenDto userDetail);
/**
* 我提出的建议
* @param formDTO
* @param userDetail
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.suggestion.result.MySuggestionResultDTO>>
* @Author zhangyong
* @Date 15:58 2021-09-14
**/
Result<List<MySuggestionResultDTO>> getMySuggestion(MySuggestionFormDTO formDTO, TokenDto userDetail);
/**
* 建议详情
* @param id
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.suggestion.result.MySuggestionResultDTO>
* @Author zhangyong
* @Date 09:37 2021-09-15
**/
Result<MySuggestionResultDTO> getDetailSuggestion(String id);
/**
* @describe: 行程上报
* @author wangtong
* @date 2021/10/13 10:50
* @params [userDetail, formDto]
* @return com.elink.esua.epdc.commons.tools.utils.Result
*/
Result saveTripInfo(TokenDto userDetail, SaveTripInfoFormDTO formDto);
/**
* @describe: 我的上报列表
* @author wangtong
* @date 2021/10/13 13:37
* @params [userDetail, formDto]
* @return com.elink.esua.epdc.commons.tools.utils.Result
*/
Result getTripInfoList(TokenDto userDetail, GetTripInfoFormDTO formDto);
/**
* @describe: 上报详情
* @author wangtong
* @date 2021/10/13 13:37
* @params [userDetail, formDto]
* @return com.elink.esua.epdc.commons.tools.utils.Result
*/
Result getTripInfoDetail(GetTripInfoFormDTO formDto);
/**
* @describe: 删除上报信息
* @author wangtong
* @date 2021/10/13 14:17
* @params [formDto]
* @return com.elink.esua.epdc.commons.tools.utils.Result
*/
Result deleteTripById(GetTripInfoFormDTO formDto);
}

10
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CustomEnterpriseServiceImpl.java

@ -13,7 +13,7 @@ import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
import com.elink.esua.epdc.dto.enterprise.form.EnterpriseInfoFormDTO;
import com.elink.esua.epdc.dto.enterprise.result.EnterpriseInfoUpdateResultDTO;
import com.elink.esua.epdc.dto.enterprise.result.EnterpriseInfoResultDTO;
import com.elink.esua.epdc.dto.form.CompleteRequisiteInfoDTO;
import com.elink.esua.epdc.feign.AdminFeignClient;
import com.elink.esua.epdc.feign.CustomFeignClient;
@ -60,13 +60,13 @@ public class CustomEnterpriseServiceImpl implements CustomEnterpriseService {
}
@Override
public Result<EnterpriseInfoUpdateResultDTO> selectOneEnterpriseInfo(TokenDto tokenDto) {
public Result<EnterpriseInfoResultDTO> selectOneEnterpriseInfo(TokenDto tokenDto) {
Result<EnterpriseInfoUpdateResultDTO> enterpriseResult = customFeignClient.getEnterpriseInfoByUserId(tokenDto.getUserId());
Result<EnterpriseInfoResultDTO> enterpriseResult = customFeignClient.getEnterpriseInfoByUserId(tokenDto.getUserId());
if (enterpriseResult.success()) {
EnterpriseInfoUpdateResultDTO enterpriseInfo = enterpriseResult.getData();
EnterpriseInfoResultDTO enterpriseInfo = enterpriseResult.getData();
if (null == enterpriseInfo) {
enterpriseInfo = new EnterpriseInfoUpdateResultDTO();
enterpriseInfo = new EnterpriseInfoResultDTO();
enterpriseInfo.setDeptId(tokenDto.getGridId());
//未完善信息获取用户当前所在的网格的后两级机构(社区-网格),返回给前端
Result<ParentAndAllDeptDTO> resultParentAndAllDeptDTO = adminFeignClient.getParentAndAllDept(tokenDto.getGridId());

118
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CustomServiceImpl.java

@ -1,17 +1,18 @@
package com.elink.esua.epdc.service.impl;
import com.alibaba.fastjson.JSON;
import com.elink.esua.epdc.commons.tools.constant.NumConstant;
import com.elink.esua.epdc.common.token.dto.TokenDto;
import com.elink.esua.epdc.commons.tools.constant.NumConstant;
import com.elink.esua.epdc.commons.tools.exception.RenException;
import com.elink.esua.epdc.commons.tools.redis.RedisChannels;
import com.elink.esua.epdc.commons.tools.redis.RedisKeys;
import com.elink.esua.epdc.commons.tools.redis.RedisUtils;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.CompleteDeptDTO;
import com.elink.esua.epdc.dto.DeptOption;
import com.elink.esua.epdc.dto.EpidemicSentryPostDTO;
import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
import com.elink.esua.epdc.custom.dto.epidemic.GetTripInfoFormDTO;
import com.elink.esua.epdc.custom.dto.epidemic.SaveTripInfoFormDTO;
import com.elink.esua.epdc.custom.dto.suggestion.TypeNode;
import com.elink.esua.epdc.custom.dto.suggestion.form.MySuggestionFormDTO;
import com.elink.esua.epdc.custom.dto.suggestion.form.SuggestionMakeFormDTO;
import com.elink.esua.epdc.custom.dto.suggestion.result.MySuggestionResultDTO;
import com.elink.esua.epdc.dto.*;
import com.elink.esua.epdc.dto.epdc.form.EpdcAppPidemicCompleteInfoFromDTO;
import com.elink.esua.epdc.dto.form.EpiDemicReportFormDTO;
import com.elink.esua.epdc.dto.result.EpdcSentryPostInfoResultDTO;
@ -25,6 +26,8 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* @Description 疫情管理实现
* @Author yinzuomei
@ -187,4 +190,105 @@ public class CustomServiceImpl implements CustomService {
}
return epidemicSentryResult.getData();
}
@Override
public Result<List<TypeNode>> getSuggestionTypeTree() {
return customFeignClient.getSuggestionTypeTree();
}
@Override
public Result insertSuggestion(SuggestionMakeFormDTO formDTO, TokenDto userDetail) {
this.collectUserInfo(formDTO, userDetail);
return customFeignClient.insertSuggestion(formDTO);
}
@Override
public Result updateSuggestion(SuggestionMakeFormDTO formDTO, TokenDto userDetail) {
this.collectUserInfo(formDTO, userDetail);
return customFeignClient.updateSuggestion(formDTO);
}
private void collectUserInfo(SuggestionMakeFormDTO formDTO, TokenDto userDetail) {
formDTO.setUserId(userDetail.getUserId());
formDTO.setNickname(userDetail.getNickname());
formDTO.setFaceImg(userDetail.getFaceImg());
formDTO.setMobile(userDetail.getMobile());
formDTO.setDeptId(userDetail.getGridId());
// 获取党员标识
formDTO.setPartyFlag(NumConstant.ZERO_STR);
Result<UserDTO> userInfo = userFeignClient.getUserInfoById(userDetail.getUserId());
if (userInfo.success() && null != userInfo.getData()) {
formDTO.setPartyFlag(userInfo.getData().getPartyFlag());
}
if (null != formDTO.getDeptId()) {
Result<ParentAndAllDeptDTO> pidInfoResult = adminFeignClient.getParentAndAllDept(formDTO.getDeptId());
if (pidInfoResult.success() && null != pidInfoResult.getData()) {
formDTO.setParentDeptIds(pidInfoResult.getData().getParentDeptIds());
formDTO.setParentDeptNames(pidInfoResult.getData().getParentDeptNames());
formDTO.setAllDeptIds(pidInfoResult.getData().getAllDeptIds());
formDTO.setAllDeptNames(pidInfoResult.getData().getAllDeptNames());
formDTO.setDeptName(pidInfoResult.getData().getGrid());
}
}
}
@Override
public Result<List<MySuggestionResultDTO>> getMySuggestion(MySuggestionFormDTO formDTO, TokenDto userDetail) {
formDTO.setUserId(userDetail.getUserId());
return customFeignClient.getMySuggestion(formDTO);
}
@Override
public Result<MySuggestionResultDTO> getDetailSuggestion(String id) {
return customFeignClient.getDetailSuggestion(id);
}
@Override
public Result saveTripInfo(TokenDto userDetail, SaveTripInfoFormDTO formDto) {
log.info("formDto:"+formDto);
if (null == userDetail) {
return new Result().error("获取用户信息失败");
}
//获取所有上级机构名称和ID拼接
Result<ParentAndAllDeptDTO> dtoResult = adminFeignClient.getParentAndAllDept(userDetail.getGridId());
ParentAndAllDeptDTO deptDTO = dtoResult.getData();
// 父所有部门
formDto.setParentDeptIds(deptDTO.getParentDeptIds());
formDto.setParentDeptNames(deptDTO.getParentDeptNames());
// 所有部门
formDto.setAllDeptIds(deptDTO.getAllDeptIds());
formDto.setAllDeptNames(deptDTO.getAllDeptNames());
// 网格
formDto.setDeptName(deptDTO.getGrid());
formDto.setDeptId(deptDTO.getGridId().toString());
formDto.setUserId(userDetail.getUserId());
formDto.setFaceImg(userDetail.getFaceImg());
formDto.setRealName(userDetail.getRealName());
formDto.setUserMobile(userDetail.getMobile());
return customFeignClient.saveTripInfo(formDto);
}
@Override
public Result getTripInfoList(TokenDto userDetail, GetTripInfoFormDTO formDto) {
log.info("formDto:"+formDto);
if (null == userDetail) {
return new Result().error("获取用户信息失败");
}
formDto.setUserId(userDetail.getUserId());
return customFeignClient.getTripInfoList(formDto);
}
@Override
public Result getTripInfoDetail( GetTripInfoFormDTO formDto) {
log.info("formDto:"+formDto);
return customFeignClient.getTripInfoDetail(formDto);
}
@Override
public Result deleteTripById(GetTripInfoFormDTO formDto) {
log.info("formDto:"+formDto);
return customFeignClient.deleteTripById(formDto);
}
}

58
esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/custom/dto/suggestion/TypeNode.java

@ -0,0 +1,58 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.elink.esua.epdc.custom.dto.suggestion;
import lombok.Data;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
/**
* 建议类别表
*
* @author qu qu@elink-cn.com
* @since v1.0.0 2021-09-14
*/
@Data
public class TypeNode implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键
*/
private Long value;
/**
* 名称
*/
private String label;
/**
* 上级ID
*/
private Long pid;
/**
* 子级集合
*/
private List<TypeNode> children = new ArrayList<>();
}

2
esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/enterprise/result/EnterpriseInfoResultDTO.java

@ -19,9 +19,7 @@ package com.elink.esua.epdc.dto.enterprise.result;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
import java.util.Date;
/**

111
esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/enterprise/result/EnterpriseInfoUpdateResultDTO.java

@ -1,111 +0,0 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.elink.esua.epdc.dto.enterprise.result;
import lombok.Data;
import java.io.Serializable;
/**
* 查询企业信息结果
*
* @author elink elink@elink-cn.com
* @since v1.0.0 2020-02-28
*/
@Data
public class EnterpriseInfoUpdateResultDTO implements Serializable {
private static final long serialVersionUID = 6426517740744532420L;
/**
* 主键
*/
private String id;
/**
* 用户id
*/
private String userId;
/**
* 用户姓名
*/
private String realName;
/**
* 性别 0女 1男
*/
private String sex;
/**
* 联系电话
*/
private String mobile;
/**
* 企业名称
*/
private String enterpriseName;
/**
* 统一社会信用代码
*/
private String uniformSocialCreditCode;
/**
* 企业地址
*/
private String enterpriseAddress;
/**
* 法定代表人
*/
private String legalPerson;
/**
* 注册资金(万元)
*/
private String registeredCapital;
/**
* 从业人数
*/
private String employedPopulation;
/**
* 所属行业
*/
private String industry;
/**
* 经营范围
*/
private String businessScope;
/**
* 居住网格id
*/
private Long deptId;
/**
* 所有部门名称
*/
private String deptName;
}

8
esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprise/controller/EnterpriseInfoController.java

@ -28,7 +28,7 @@ import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
import com.elink.esua.epdc.dto.enterprise.EnterpriseInfoDTO;
import com.elink.esua.epdc.dto.enterprise.form.EnterpriseInfoFormDTO;
import com.elink.esua.epdc.dto.enterprise.result.EnterpriseInfoUpdateResultDTO;
import com.elink.esua.epdc.dto.enterprise.result.EnterpriseInfoResultDTO;
import com.elink.esua.epdc.dto.form.CompleteRequisiteInfoDTO;
import com.elink.esua.epdc.modules.enterprise.excel.EnterpriseInfoExcel;
import com.elink.esua.epdc.modules.enterprise.service.EnterpriseInfoService;
@ -131,8 +131,8 @@ public class EnterpriseInfoController {
* @Param [userId]
**/
@GetMapping("getByUserId/{userId}")
public Result<EnterpriseInfoUpdateResultDTO> getEnterpriseInfoByUserId(@PathVariable("userId") String userId) {
EnterpriseInfoUpdateResultDTO enterpriseInfoDTO = enterpriseInfoService.selectOneEnterpriseInfo(userId);
return new Result<EnterpriseInfoUpdateResultDTO>().ok(enterpriseInfoDTO);
public Result<EnterpriseInfoResultDTO> getEnterpriseInfoByUserId(@PathVariable("userId") String userId) {
EnterpriseInfoResultDTO enterpriseInfoDTO = enterpriseInfoService.selectOneEnterpriseInfo(userId);
return new Result<EnterpriseInfoResultDTO>().ok(enterpriseInfoDTO);
}
}

4
esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprise/dao/EnterpriseInfoDao.java

@ -20,7 +20,7 @@ package com.elink.esua.epdc.modules.enterprise.dao;
import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
import com.elink.esua.epdc.dto.enterprise.EnterpriseInfoDTO;
import com.elink.esua.epdc.dto.enterprise.form.EnterpriseInfoFormDTO;
import com.elink.esua.epdc.dto.enterprise.result.EnterpriseInfoUpdateResultDTO;
import com.elink.esua.epdc.dto.enterprise.result.EnterpriseInfoResultDTO;
import com.elink.esua.epdc.dto.form.CompleteRequisiteInfoDTO;
import com.elink.esua.epdc.modules.enterprise.entity.EnterpriseInfoEntity;
import org.apache.ibatis.annotations.Mapper;
@ -53,7 +53,7 @@ public interface EnterpriseInfoDao extends BaseDao<EnterpriseInfoEntity> {
* @Date 2020/2/28
* @Param [userId]
**/
EnterpriseInfoUpdateResultDTO selectOneEnterpriseInfo(@Param("userId") String userId);
EnterpriseInfoResultDTO selectOneEnterpriseInfo(@Param("userId") String userId);
/**
* @return java.util.List<com.elink.esua.epdc.dto.enterprise.EnterpriseInfoDTO>

4
esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprise/service/EnterpriseInfoService.java

@ -22,7 +22,7 @@ import com.elink.esua.epdc.commons.tools.page.PageData;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.enterprise.EnterpriseInfoDTO;
import com.elink.esua.epdc.dto.enterprise.form.EnterpriseInfoFormDTO;
import com.elink.esua.epdc.dto.enterprise.result.EnterpriseInfoUpdateResultDTO;
import com.elink.esua.epdc.dto.enterprise.result.EnterpriseInfoResultDTO;
import com.elink.esua.epdc.dto.form.CompleteRequisiteInfoDTO;
import com.elink.esua.epdc.modules.enterprise.entity.EnterpriseInfoEntity;
import com.elink.esua.epdc.rocketmq.dto.OrganizationModifyDTO;
@ -114,7 +114,7 @@ public interface EnterpriseInfoService extends BaseService<EnterpriseInfoEntity>
* @Date 2020/2/28
* @Param [userId]
**/
EnterpriseInfoUpdateResultDTO selectOneEnterpriseInfo(String userId);
EnterpriseInfoResultDTO selectOneEnterpriseInfo(String userId);
/***

6
esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprise/service/impl/EnterpriseInfoServiceImpl.java

@ -30,7 +30,7 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
import com.elink.esua.epdc.dto.enterprise.EnterpriseInfoDTO;
import com.elink.esua.epdc.dto.enterprise.form.EnterpriseInfoFormDTO;
import com.elink.esua.epdc.dto.enterprise.result.EnterpriseInfoUpdateResultDTO;
import com.elink.esua.epdc.dto.enterprise.result.EnterpriseInfoResultDTO;
import com.elink.esua.epdc.dto.epdc.form.CompleteRequisiteUserInfoDTO;
import com.elink.esua.epdc.dto.form.CompleteRequisiteInfoDTO;
import com.elink.esua.epdc.modules.enterprise.dao.EnterpriseInfoDao;
@ -122,8 +122,8 @@ public class EnterpriseInfoServiceImpl extends BaseServiceImpl<EnterpriseInfoDao
}
@Override
public EnterpriseInfoUpdateResultDTO selectOneEnterpriseInfo(String userId) {
EnterpriseInfoUpdateResultDTO result = baseDao.selectOneEnterpriseInfo(userId);
public EnterpriseInfoResultDTO selectOneEnterpriseInfo(String userId) {
EnterpriseInfoResultDTO result = baseDao.selectOneEnterpriseInfo(userId);
if (null != result) {
String deptName = result.getDeptName();
if (StringUtils.isNotBlank(deptName)) {

4
esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/vaccine/epidemic/controller/EpidemicUserInfoController.java

@ -47,11 +47,11 @@ public class EpidemicUserInfoController {
@Autowired
private EpidemicUserInfoDao epidemicUserInfoDao;
@GetMapping("page")
/*@GetMapping("page")
public Result<PageData<EpidemicRecordListDTO>> page(@RequestParam Map<String, Object> params) {
PageData<EpidemicRecordListDTO> page = epidemicUserInfoService.getPageList(params);
return new Result<PageData<EpidemicRecordListDTO>>().ok(page);
}
}*/
@GetMapping("{id}")
public Result<EpidemicRecordDetailDTO> get(@PathVariable("id") Long id) {

18
esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/vaccine/epidemic/controller/v2/EpidemicUserInfoV2Controller.java

@ -20,13 +20,13 @@ import java.util.Map;
* @author Mark sunlightcs@gmail.com
* @since 1.0.0 2021-01-26
*/
@ApiVersion(2)
@RestController
@RequestMapping("epidemicuserinfo" + Constant.VERSION_CONTROL)
//@ApiVersion(2)
//@RestController
//@RequestMapping("epidemicuserinfo" + Constant.VERSION_CONTROL)
public class EpidemicUserInfoV2Controller {
@Autowired
private EpidemicUserInfoService epidemicUserInfoService;
// @Autowired
// private EpidemicUserInfoService epidemicUserInfoService;
/**
* @return io.pingyin.common.utils.Result<io.pingyin.common.page.PageData < io.pingyin.modules.epidemic.dto.result.EpidemicPageResultDTO>>
@ -35,16 +35,16 @@ public class EpidemicUserInfoV2Controller {
* @date 2021/4/15 16:40
* @params [params]
*/
@GetMapping("getEpidemicPage")
/*@GetMapping("getEpidemicPage")
public Result<PageData<EpidemicPageResultV2DTO>> getEpidemicPage(@RequestParam Map<String, Object> params) {
// 按人员录入时间倒序排列
PageData<EpidemicPageResultV2DTO> page = epidemicUserInfoService.getEpidemicPageV2(params);
return new Result<PageData<EpidemicPageResultV2DTO>>().ok(page);
}
}*/
@GetMapping("getinfo/{id}")
/*@GetMapping("getinfo/{id}")
public Result<VaccinationInfoResultV2DTO> getinfo(@PathVariable("id") String id) {
VaccinationInfoResultV2DTO data = epidemicUserInfoService.getInfoV2(id);
return new Result<VaccinationInfoResultV2DTO>().ok(data);
}
}*/
}

4
esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/vaccine/epidemic/dao/EpidemicUserInfoDao.java

@ -127,7 +127,7 @@ public interface EpidemicUserInfoDao extends BaseDao<EpidemicUserInfoEntity> {
* @date 2021/8/30
* @params params
*/
List<EpidemicPageResultV2DTO> getEpidemicPageV2(Map<String, Object> params);
// List<EpidemicPageResultV2DTO> getEpidemicPageV2(Map<String, Object> params);
/**
* 查询接种信息
@ -146,7 +146,7 @@ public interface EpidemicUserInfoDao extends BaseDao<EpidemicUserInfoEntity> {
* @date 2021/8/31
* @params id
*/
VaccinationInfoResultV2DTO selectInfoV2(String id);
// VaccinationInfoResultV2DTO selectInfoV2(String id);
/**
* 查询异类接种信息

6
esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/vaccine/epidemic/service/EpidemicUserInfoService.java

@ -61,7 +61,7 @@ public interface EpidemicUserInfoService extends CrudService<EpidemicUserInfoEnt
* @date 2021/1/19 17:45
* @params [params]
*/
PageData<EpidemicRecordListDTO> getPageList(Map<String, Object> params);
// PageData<EpidemicRecordListDTO> getPageList(Map<String, Object> params);
/**
* @return io.pingyin.modules.epidemic.dto.EpidemicRecordDetailDTO
@ -107,7 +107,7 @@ public interface EpidemicUserInfoService extends CrudService<EpidemicUserInfoEnt
* @date 2021/8/30
* @params params
*/
PageData<EpidemicPageResultV2DTO> getEpidemicPageV2(Map<String, Object> params);
// PageData<EpidemicPageResultV2DTO> getEpidemicPageV2(Map<String, Object> params);
/**
* 查询接种信息
@ -126,7 +126,7 @@ public interface EpidemicUserInfoService extends CrudService<EpidemicUserInfoEnt
* @date 2021/8/31
* @params id
*/
VaccinationInfoResultV2DTO getInfoV2(String id);
// VaccinationInfoResultV2DTO getInfoV2(String id);
/**
* 更新年龄

61
esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java

@ -25,13 +25,10 @@ import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
import com.elink.esua.epdc.dto.SysSimpleDictDTO;
import com.elink.esua.epdc.modules.vaccine.constant.ImageConstant;
import com.elink.esua.epdc.modules.vaccine.epidemic.dao.EpidemicUserInfoDao;
import com.elink.esua.epdc.modules.vaccine.epidemic.dao.EpidemicUserInoutRecordDao;
import com.elink.esua.epdc.modules.vaccine.epidemic.dao.SelectAreaDao;
import com.elink.esua.epdc.modules.vaccine.epidemic.dto.*;
import com.elink.esua.epdc.modules.vaccine.epidemic.dto.result.EpidemicPageResultDTO;
import com.elink.esua.epdc.modules.vaccine.epidemic.dto.result.EpidemicPageResultV2DTO;
import com.elink.esua.epdc.modules.vaccine.epidemic.dto.result.VaccinationInfoResultDTO;
import com.elink.esua.epdc.modules.vaccine.epidemic.dto.result.VaccinationInfoResultV2DTO;
import com.elink.esua.epdc.modules.vaccine.epidemic.entity.EpidemicUserInfoEntity;
import com.elink.esua.epdc.modules.vaccine.epidemic.service.EpidemicReportUserInfoService;
import com.elink.esua.epdc.modules.vaccine.epidemic.service.EpidemicUserInfoService;
@ -69,8 +66,8 @@ import java.util.stream.Collectors;
@Service
public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInfoDao, EpidemicUserInfoEntity, EpidemicUserInfoDTO> implements EpidemicUserInfoService {
@Autowired
private EpidemicUserInoutRecordService inoutRecordService;
// @Autowired
// private EpidemicUserInoutRecordService inoutRecordService;
@Autowired
private VaccinationInfoService vaccinationInfoService;
@Autowired
@ -81,10 +78,10 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
public EpidemicReportUserInfoService epidemicReportUserInfoService;
@Autowired
public VaccinationUserRoleService vaccinationUserRoleService;
@Resource
public SelectAreaDao selectAreaDao;
@Resource
private EpidemicUserInoutRecordDao inoutRecordDao;
// @Resource
// public SelectAreaDao selectAreaDao;
// @Resource
// private EpidemicUserInoutRecordDao inoutRecordDao;
@Resource
public EpidemicUserInfoDao epidemicUserInfoDao;
@Resource
@ -107,6 +104,24 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
}
@Override
public PageData<EpidemicPageResultDTO> getEpidemicPage(Map<String, Object> params) {
IPage<EpidemicPageResultDTO> page = getEpiPage(params);
UserDetail user = SecurityUser.getUser();
if (user == null) {
throw new RenException("用户未登录");
}
/*Map<String, Object> authParams = vaccinationUserRoleService.getVaccinationAuthParams(user.getId());
params.putAll(authParams);*/
// 街道和超管有权查看所有数据
if (NumConstant.ZERO == user.getSuperAdmin() && !user.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_STREET_PARTY)) {
params.put("deptIdList", user.getDeptIdList());
}
List<EpidemicPageResultDTO> list = baseDao.getEpidemicPage(params);
return new PageData<>(list, page.getTotal());
}
/*@Override
public PageData<EpidemicRecordListDTO> getPageList(Map<String, Object> params) {
IPage<EpidemicRecordListDTO> page = getPage(params);
@ -125,7 +140,7 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
eru.setUserName(nameDesensitization(eru.getUserName()));
}
return new PageData<>(list, page.getTotal());
}
}*/
@Override
public EpidemicRecordDetailDTO getDetailById(Long id) {
@ -541,25 +556,7 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
return page;
}
@Override
public PageData<EpidemicPageResultDTO> getEpidemicPage(Map<String, Object> params) {
IPage<EpidemicPageResultDTO> page = getEpiPage(params);
UserDetail user = SecurityUser.getUser();
if (user == null) {
throw new RenException("用户未登录");
}
Map<String, Object> authParams = vaccinationUserRoleService.getVaccinationAuthParams(user.getId());
params.putAll(authParams);
// 街道和超管有权查看所有数据
if (NumConstant.ZERO == user.getSuperAdmin() && !user.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_STREET_PARTY)) {
params.put("deptIdList", user.getDeptIdList());
}
List<EpidemicPageResultDTO> list = baseDao.getEpidemicPage(params);
return new PageData<>(list, page.getTotal());
}
@Override
/*@Override
public PageData<EpidemicPageResultV2DTO> getEpidemicPageV2(Map<String, Object> params) {
IPage<EpidemicPageResultV2DTO> page = getEpiPageV2(params);
@ -572,7 +569,7 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
List<EpidemicPageResultV2DTO> list = baseDao.getEpidemicPageV2(params);
return new PageData<>(list, page.getTotal());
}
}*/
@Override
public VaccinationInfoResultDTO getInfo(Long id) {
@ -592,11 +589,11 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
return dto;
}
@Override
/*@Override
public VaccinationInfoResultV2DTO getInfoV2(String id) {
VaccinationInfoResultV2DTO dto = baseDao.selectInfoV2(id);
return dto;
}
}*/
@Override
public Result updateAge() {

14
esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/vaccine/vim/redis/VaccinationAuthRedis.java

@ -29,11 +29,11 @@ import org.springframework.stereotype.Component;
* @author yujintao yujintao@elink-cn.com
* @since v1.0.0 2019-05-08
*/
@Component
//@Component
public class VaccinationAuthRedis {
@Autowired
private RedisUtils redisUtils;
// @Autowired
// private RedisUtils redisUtils;
/**
* 疫苗接种权限
@ -44,10 +44,10 @@ public class VaccinationAuthRedis {
* @author zhy
* @date 2021/6/3 17:19
*/
public void setVaccinationAuth(String userId, Object auth) {
/*public void setVaccinationAuth(String userId, Object auth) {
String key = RedisKeys.getVaccinationAuthKey(userId);
redisUtils.set(key, auth, RedisUtils.MINUTE_THIRTY_EXPIRE);
}
}*/
/**
* 疫苗接种权限
@ -58,8 +58,8 @@ public class VaccinationAuthRedis {
* @author zhy
* @date 2021/6/3 17:19
*/
public void setVaccinationAuthParam(String userId, Object param) {
/*public void setVaccinationAuthParam(String userId, Object param) {
String key = RedisKeys.getVaccinationAuthParamKey(userId);
redisUtils.set(key, param, RedisUtils.MINUTE_THIRTY_EXPIRE);
}
}*/
}

4
esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/vaccine/vim/service/VaccinationUserRoleService.java

@ -40,7 +40,7 @@ public interface VaccinationUserRoleService extends CrudService<VaccinationUserR
* @author zhy
* @date 2021/5/31 17:27
*/
VaccinationAuthDTO getVaccinationAuth(Long userId);
// VaccinationAuthDTO getVaccinationAuth(Long userId);
/**
* 获取用户的所有接种数据权限
@ -50,5 +50,5 @@ public interface VaccinationUserRoleService extends CrudService<VaccinationUserR
* @author zhy
* @date 2021/5/31 17:27
*/
Map<String, Object> getVaccinationAuthParams(Long userId);
// Map<String, Object> getVaccinationAuthParams(Long userId);
}

4
esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/vaccine/vim/service/impl/VaccinationInfoServiceImpl.java

@ -71,8 +71,8 @@ public class VaccinationInfoServiceImpl extends BaseVimCurdServiceImpl<Vaccinati
private VaccinationSiteService vaccinationSiteService;
@Autowired
private VaccinationErrorService vaccinationErrorService;
@Autowired
private VaccinationUserRoleService vaccinationUserRoleService;
// @Autowired
// private VaccinationUserRoleService vaccinationUserRoleService;
@Autowired
private VaccinationErrorDao vaccinationErrorDao;
@Autowired

18
esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/vaccine/vim/service/impl/VaccinationUserRoleServiceImpl.java

@ -55,11 +55,11 @@ import java.util.stream.Collectors;
@Service
public class VaccinationUserRoleServiceImpl extends BaseVimCurdServiceImpl<VaccinationUserRoleDao, VaccinationUserRoleEntity, VaccinationUserRoleDTO> implements VaccinationUserRoleService {
@Autowired
private VaccinationAuthRedis vaccinationAuthRedis;
@Autowired
private RedisUtils redisUtils;
// @Autowired
// private VaccinationAuthRedis vaccinationAuthRedis;
//
// @Autowired
// private RedisUtils redisUtils;
@Override
public QueryWrapper<VaccinationUserRoleEntity> getWrapper(Map<String, Object> params) {
@ -118,7 +118,7 @@ public class VaccinationUserRoleServiceImpl extends BaseVimCurdServiceImpl<Vacci
baseDao.deleteByUserId(entity.getUserId());
}
@Override
/*@Override
public VaccinationAuthDTO getVaccinationAuth(Long userId) {
VaccinationAuthDTO vaccinationAuthDTO = new VaccinationAuthDTO();
UserDetail user = SecurityUser.getUser();
@ -155,9 +155,9 @@ public class VaccinationUserRoleServiceImpl extends BaseVimCurdServiceImpl<Vacci
vaccinationAuthRedis.setVaccinationAuth(userId.toString(), vaccinationAuthDTO);
return vaccinationAuthDTO;
}
}*/
@Override
/*@Override
public Map<String, Object> getVaccinationAuthParams(Long userId) {
Map<String, Object> map = new HashMap<>(4);
UserDetail user = SecurityUser.getUser();
@ -197,6 +197,6 @@ public class VaccinationUserRoleServiceImpl extends BaseVimCurdServiceImpl<Vacci
vaccinationAuthRedis.setVaccinationAuthParam(userId.toString(), map);
return map;
}
}*/
}

2
esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/enterprise/EnterpriseInfoDao.xml

@ -3,7 +3,7 @@
<mapper namespace="com.elink.esua.epdc.modules.enterprise.dao.EnterpriseInfoDao">
<resultMap id="enterpriseInfoMap" type="com.elink.esua.epdc.dto.enterprise.result.EnterpriseInfoUpdateResultDTO">
<resultMap id="enterpriseInfoMap" type="com.elink.esua.epdc.dto.enterprise.result.EnterpriseInfoResultDTO">
<result property="id" column="ID"/>
<result property="userId" column="USER_ID"/>
<result property="realName" column="REAL_NAME"/>

8
esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/vaccine/epidemic/EpidemicUserInfoDao.xml

@ -446,7 +446,7 @@
and del_flag = '0' limit 1
</select>
<select id="getEpidemicPageV2"
<!--<select id="getEpidemicPageV2"
resultType="com.elink.esua.epdc.modules.vaccine.epidemic.dto.result.EpidemicPageResultV2DTO">
select
t.ID,
@ -531,9 +531,9 @@
</if>
group by t.ID
order by t.CREATED_TIME desc
</select>
</select>-->
<select id="selectInfoV2"
<!--<select id="selectInfoV2"
resultType="com.elink.esua.epdc.modules.vaccine.epidemic.dto.result.VaccinationInfoResultV2DTO">
select
i.id,
@ -569,7 +569,7 @@
where
i.DEL_FLAG = '0'
and i.id = #{id}
</select>
</select>-->
<update id="setJionTimeToNull">
update epidemic_user_info
set JOIN_TIME = null

Loading…
Cancel
Save