diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml index 1302aab78..b1dc71cc7 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml @@ -199,6 +199,7 @@ sd.`name` FROM sys_dept sd + where sd.del_flag='0' diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/ServiceConstant.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/ServiceConstant.java index 7103332f8..1c33d197b 100644 --- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/ServiceConstant.java +++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/ServiceConstant.java @@ -79,4 +79,9 @@ public interface ServiceConstant { * 绩效考核模块 */ String EPDC_KPI_SERVER = "epdc-kpi-server"; + + /** + * 定制功能模块 + */ + String EPDC_CUSTOM_SERVER = "epdc-custom-server"; } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml b/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml index c51c44a61..31a3c42d9 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml @@ -80,6 +80,12 @@ feign-httpclient 10.3.0 + + com.esua.epdc + epdc-custom-client + 1.0.0 + compile + diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiCustomController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiCustomController.java new file mode 100644 index 000000000..57ff781d0 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiCustomController.java @@ -0,0 +1,64 @@ +package com.elink.esua.epdc.controller; + +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; +import com.elink.esua.epdc.dto.DeptOption; +import com.elink.esua.epdc.dto.form.EpiDemicReportFormDTO; +import com.elink.esua.epdc.service.CustomService; +import com.elink.esua.epdc.service.MessageService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * @author yinzuomei + * @Description 疫情管理 + * @Date 2020/1/28 11:26 + */ +@RestController +@RequestMapping("custom/epidemic") +public class ApiCustomController { + + @Autowired + private CustomService customService; + + @Autowired + private MessageService messageService; + + + /** + * @param + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Author yinzuomei + * @Description 获取所有组织机构信息 + * @Date 2020/1/28 11:50 + **/ + @GetMapping("getDeptTree") + public Result getDeptTree() { + return customService.getDeptTree(); + } + + /** + * @param mobile 手机号码 + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Author yinzuomei + * @Description 发送短信验证码 + * @Date 2020/1/28 11:55 + **/ + @GetMapping("sendCode") + public Result sendCode(String mobile) { + return messageService.sendSmsCode(mobile); + } + + /** + * @param formDTO + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Author yinzuomei + * @Description 疫情上报 + * @Date 2020/1/28 13:23 + **/ + @PostMapping("report") + public Result report(@RequestBody EpiDemicReportFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO); + return customService.report(formDTO); + } +} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java index b826a8212..3c6319346 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java @@ -3,6 +3,7 @@ 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.dto.CompleteDeptDTO; +import com.elink.esua.epdc.dto.DeptOption; import com.elink.esua.epdc.dto.ParentAndAllDeptDTO; import com.elink.esua.epdc.dto.SysUserDTO; import com.elink.esua.epdc.dto.epdc.GridLeaderRegisterDTO; @@ -79,4 +80,14 @@ public interface AdminFeignClient { **/ @GetMapping("sys/appmenu/indexPanel/{mobile}") Result> indexPanel(@PathVariable("mobile") String mobile); + + /** + * @param + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Author yinzuomei + * @Description 获取所有组织机构信息 + * @Date 2020/1/28 12:15 + **/ + @GetMapping("sys/dept/party/getDeptTree") + Result getDeptTree(); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/CustomFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/CustomFeignClient.java new file mode 100644 index 000000000..6e978b543 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/CustomFeignClient.java @@ -0,0 +1,27 @@ +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.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.PostMapping; + +/** + * @author yzm + * @Date: 2020/1/28 13:24 + * @Description: 定制化功能模块fegin + */ +@FeignClient(name = ServiceConstant.EPDC_CUSTOM_SERVER, fallback = CustomFeignClientFallback.class) +public interface CustomFeignClient { + /** + * @param formDTO + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Author yinzuomei + * @Description 疫情上报 + * @Date 2020/1/28 13:27 + **/ + @PostMapping(value = "custom/epidemic/report", consumes = MediaType.APPLICATION_JSON_VALUE) + Result report(EpiDemicReportFormDTO formDTO); +} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java index 1d6763bde..b0d4ab13e 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java @@ -4,6 +4,7 @@ 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.dto.CompleteDeptDTO; +import com.elink.esua.epdc.dto.DeptOption; import com.elink.esua.epdc.dto.ParentAndAllDeptDTO; import com.elink.esua.epdc.dto.SysUserDTO; import com.elink.esua.epdc.dto.epdc.GridLeaderRegisterDTO; @@ -45,4 +46,9 @@ public class AdminFeignClientFallback implements AdminFeignClient { public Result> indexPanel(String mobile) { return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "indexPanel", mobile); } + + @Override + public Result getDeptTree() { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getDeptTree"); + } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/CustomFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/CustomFeignClientFallback.java new file mode 100644 index 000000000..ea4baba25 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/CustomFeignClientFallback.java @@ -0,0 +1,22 @@ +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.dto.form.EpiDemicReportFormDTO; +import com.elink.esua.epdc.feign.CustomFeignClient; +import org.springframework.stereotype.Component; + +/** + * @Description 定制化功能模块fegin + * @Author yinzuomei + * @Date 2020/1/28 13:26 + */ +@Component +public class CustomFeignClientFallback implements CustomFeignClient { + + @Override + public Result report(EpiDemicReportFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "report", formDTO); + } +} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/CustomService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/CustomService.java new file mode 100644 index 000000000..dac29a359 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/CustomService.java @@ -0,0 +1,30 @@ +package com.elink.esua.epdc.service; + +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.DeptOption; +import com.elink.esua.epdc.dto.form.EpiDemicReportFormDTO; + +/** + * @Description 疫情管理 + * @Author yinzuomei + * @Date 2020/1/28 13:39 + */ +public interface CustomService { + /** + * @param + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Author yinzuomei + * @Description 获取所有组织机构信息 + * @Date 2020/1/28 12:14 + **/ + Result 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); +} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CustomServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CustomServiceImpl.java new file mode 100644 index 000000000..42bb3fd22 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CustomServiceImpl.java @@ -0,0 +1,48 @@ +package com.elink.esua.epdc.service.impl; + +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.DeptOption; +import com.elink.esua.epdc.dto.form.EpiDemicReportFormDTO; +import com.elink.esua.epdc.feign.AdminFeignClient; +import com.elink.esua.epdc.feign.CustomFeignClient; +import com.elink.esua.epdc.service.CustomService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** + * @Description 疫情管理实现 + * @Author yinzuomei + * @Date 2020/1/28 11:42 + */ +@Service +public class CustomServiceImpl implements CustomService { + + @Autowired + private AdminFeignClient adminFeignClient; + @Autowired + private CustomFeignClient customFeignClient; + + /** + * @param + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Author yinzuomei + * @Description 获取所有组织机构信息 + * @Date 2020/1/28 13:31 + **/ + @Override + public Result getDeptTree() { + return adminFeignClient.getDeptTree(); + } + + /** + * @param formDTO + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Author yinzuomei + * @Description 疫情上报 + * @Date 2020/1/28 13:31 + **/ + @Override + public Result report(EpiDemicReportFormDTO formDTO) { + return customFeignClient.report(formDTO); + } +} diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/EpiDemicReportFormDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/EpiDemicReportFormDTO.java new file mode 100644 index 000000000..01476353b --- /dev/null +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/EpiDemicReportFormDTO.java @@ -0,0 +1,56 @@ +package com.elink.esua.epdc.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Description 上报接口入参DTO + * @Author yinzuomei + * @Date 2020/1/28 13:15 + */ +@Data +public class EpiDemicReportFormDTO implements Serializable { + private static final long serialVersionUID = 2379520294973498819L; + /** + * 是否是网格党建指导员（0：否，1：是） + */ + @NotBlank(message = "网格党建指导员标识不能为空") + private String instructorFlag; + + /** + * 部门ID + */ + private Long deptId; + + /** + * 地点 + */ + @NotBlank(message = "地点不能为空") + private String address; + + /** + * 上报人姓名 + */ + @NotBlank(message = "上报人姓名不能为空") + private String reporter; + + /** + * 上报人电话 + */ + @NotBlank(message = "上报人电话不能为空") + private String mobile; + + /** + * 验证码 + */ + @NotBlank(message = "验证码不能为空") + private String smsCode; + + /** + * 上报内容 + */ + @NotBlank(message = "上报内容不能为空") + private String content; +} diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/epdc.gitkeep b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/epdc.gitkeep new file mode 100644 index 000000000..e69de29bb