疫情管理接口开发v2

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

@@ -1,11 +1,15 @@
 package com.elink.esua.epdc.service.impl;
 
+import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.DeptOption;
+import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
 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.redis.AppUserRedis;
 import com.elink.esua.epdc.service.CustomService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -21,6 +25,8 @@ public class CustomServiceImpl implements CustomService {
 	private AdminFeignClient adminFeignClient;
 	@Autowired
 	private CustomFeignClient customFeignClient;
+	@Autowired
+	private AppUserRedis appUserRedis;
 
 	/**
 	 * @param
@@ -43,6 +49,31 @@ public class CustomServiceImpl implements CustomService {
 	 **/
 	@Override
 	public Result report(EpiDemicReportFormDTO formDTO) {
+		// 验证手机号
+		this.checkSmsCode(formDTO.getMobile(), formDTO.getSmsCode());
+		// 获取部门冗余信息
+		Result<ParentAndAllDeptDTO> pidInfoResult = adminFeignClient.getParentAndAllDept(formDTO.getDeptId());
+		if (!pidInfoResult.success()) {
+			return new Result().error("获取部门信息失败" + pidInfoResult.getMsg());
+		}
+		formDTO.setParentDeptIds(pidInfoResult.getData().getParentDeptIds());
+		formDTO.setParentDeptNames(pidInfoResult.getData().getParentDeptNames());
+		formDTO.setAllDeptIds(pidInfoResult.getData().getAllDeptIds());
+		formDTO.setAllDeptNames(pidInfoResult.getData().getAllDeptNames());
 		return customFeignClient.report(formDTO);
 	}
+
+	/**
+	 * @param mobile  手机号
+	 * @param smsCode 用户输入的验证码
+	 * @Author yinzuomei
+	 * @Description 校验手机验证码
+	 * @Date 2020/1/28 13:50
+	 **/
+	private void checkSmsCode(String mobile, String smsCode) {
+		String redisSmsCode = appUserRedis.getSmsCode(mobile);
+		if (StringUtils.isBlank(redisSmsCode) || !redisSmsCode.equals(smsCode)) {
+			throw new RenException("手机验证码错误");
+		}
+	}
 }

esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/EpiDemicReportFormDTO.java

@@ -53,4 +53,24 @@ public class EpiDemicReportFormDTO implements Serializable {
 	 */
 	@NotBlank(message = "上报内容不能为空")
 	private String content;
+
+	/**
+	 * 父所有部门ID
+	 */
+	private String parentDeptIds;
+
+	/**
+	 * 父所有部门名称
+	 */
+	private String parentDeptNames;
+
+	/**
+	 * 所有部门ID
+	 */
+	private String allDeptIds;
+
+	/**
+	 * 所有部门名称
+	 */
+	private String allDeptNames;
 }

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

@@ -23,10 +23,10 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
 import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
-import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
 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.EpidemicDTO;
-
+import com.elink.esua.epdc.dto.form.EpiDemicReportFormDTO;
 import com.elink.esua.epdc.modules.epidemic.excel.EpidemicExcel;
 import com.elink.esua.epdc.modules.epidemic.service.EpidemicService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -92,4 +92,18 @@ public class EpidemicController {
         ExcelUtils.exportExcelToTarget(response, null, list, EpidemicExcel.class);
     }
 
+    /**
+     * @param formDTO
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @Author yinzuomei
+     * @Description 疫情上报
+     * @Date 2020/1/28 14:37
+     **/
+    @PostMapping("report")
+    public Result report(@RequestBody EpiDemicReportFormDTO formDTO) {
+        //效验数据
+        ValidatorUtils.validateEntity(formDTO);
+        return epidemicService.report(formDTO);
+    }
+
 }

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

@@ -19,7 +19,9 @@ package com.elink.esua.epdc.modules.epidemic.service;
 
 import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.EpidemicDTO;
+import com.elink.esua.epdc.dto.form.EpiDemicReportFormDTO;
 import com.elink.esua.epdc.modules.epidemic.entity.EpidemicEntity;
 
 import java.util.List;
@@ -92,4 +94,13 @@ public interface EpidemicService extends BaseService<EpidemicEntity> {
      * @date 2020-01-28
      */
     void delete(String[] ids);
+
+    /**
+     * @param formDTO
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @Author yinzuomei
+     * @Description 疫情上报
+     * @Date 2020/1/28 14:38
+     **/
+    Result report(EpiDemicReportFormDTO formDTO);
 }

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

@@ -20,10 +20,12 @@ package com.elink.esua.epdc.modules.epidemic.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
+import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
-import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
+import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.EpidemicDTO;
+import com.elink.esua.epdc.dto.form.EpiDemicReportFormDTO;
 import com.elink.esua.epdc.modules.epidemic.dao.EpidemicDao;
 import com.elink.esua.epdc.modules.epidemic.entity.EpidemicEntity;
 import com.elink.esua.epdc.modules.epidemic.redis.EpidemicRedis;
@@ -101,4 +103,11 @@ public class EpidemicServiceImpl extends BaseServiceImpl<EpidemicDao, EpidemicEn
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    @Override
+    public Result report(EpiDemicReportFormDTO formDTO) {
+        EpidemicDTO dto = ConvertUtils.sourceToTarget(formDTO, EpidemicDTO.class);
+        this.save(dto);
+        return new Result();
+    }
+
 }