diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/GuardarDatosLouDongTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/GuardarDatosLouDongTask.java deleted file mode 100644 index 03ec5b5ad2..0000000000 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/GuardarDatosLouDongTask.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.epmet.task; - -import com.alibaba.fastjson.JSON; -import com.epmet.commons.tools.utils.Result; -import com.epmet.opendata.dto.form.PreserVationFormDTO; -import com.epmet.opendata.feign.GuardarDatosFeignClient; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -/** - * 获取楼栋的数据存入ca_开头的表 - * - * @param - * @return - * @author LZN - * @date 2022/6/6 14:37 - */ -@Slf4j -@Component("getPreserLouDongVation") -public class GuardarDatosLouDongTask implements ITask { - - @Autowired - private GuardarDatosFeignClient guardarDatosFeignClient; - - @Override - public void run(String params) { - log.info("LouDong定时任务执行，参数为：" + params); - PreserVationFormDTO formDTO = new PreserVationFormDTO(); - if (StringUtils.isNotBlank(params)) { - formDTO = JSON.parseObject(params, PreserVationFormDTO.class); - } - Result result = guardarDatosFeignClient.getPreserLouDongVation(formDTO); - if (result.success()){ - log.debug("LouDong执行成功"); - }else{ - log.debug("LouDong执行失败" + result.getMsg()); - } - } -} diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/GuardarDatosPingFangTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/GuardarDatosPingFangTask.java deleted file mode 100644 index 6f56f8e7ad..0000000000 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/GuardarDatosPingFangTask.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.epmet.task; - -import com.alibaba.fastjson.JSON; -import com.epmet.commons.tools.utils.Result; -import com.epmet.opendata.dto.form.PreserVationFormDTO; -import com.epmet.opendata.feign.GuardarDatosFeignClient; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Component; - -import javax.annotation.Resource; - -/** - * 获取平房的数据存入ca_开头的表 - * - * @param - * @return - * @author LZN - * @date 2022/6/6 14:37 - */ -@Component("getPreserPingFangVation") -@Slf4j -public class GuardarDatosPingFangTask implements ITask { - - @Resource - private GuardarDatosFeignClient feignClient; - - @Override - public void run(String params) { - PreserVationFormDTO formDTO = new PreserVationFormDTO(); - if (StringUtils.isNotBlank(params)) { - formDTO = JSON.parseObject(params, PreserVationFormDTO.class); - } - Result result = feignClient.getPreserPingFangVation(formDTO); - if (result.success()) { - log.debug("pingfang执行成功"); - } else { - log.debug("pingfang执行失败" + result.getMsg()); - } - } -} diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/GuardarDatosRentalTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/GuardarDatosRentalTask.java deleted file mode 100644 index efed6268e3..0000000000 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/GuardarDatosRentalTask.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.epmet.task; - -import com.alibaba.fastjson.JSON; -import com.epmet.commons.tools.utils.Result; -import com.epmet.opendata.dto.form.PreserVationFormDTO; -import com.epmet.opendata.feign.GuardarDatosFeignClient; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -/** - * 获取出租房的数据存入ca_开头的表 - * - * @param - * @return - * @author LZN - * @date 2022/6/6 14:38 - */ -@Component("getPreserRentalVation") -@Slf4j -public class GuardarDatosRentalTask implements ITask { - - @Autowired - private GuardarDatosFeignClient feignClient; - - @Override - public void run(String params) { - PreserVationFormDTO formDTO = new PreserVationFormDTO(); - if (StringUtils.isNotBlank(params)) { - formDTO = JSON.parseObject(params, PreserVationFormDTO.class); - } - Result result = feignClient.getPreserRentalVation(formDTO); - if (result.success()) { - log.debug("Rental执行成功"); - }else{ - log.debug("Rental执行失败" + result.getMsg()); - } - } -} diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/GuardarDatosResidentTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/GuardarDatosResidentTask.java deleted file mode 100644 index b52aff94f6..0000000000 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/GuardarDatosResidentTask.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.epmet.task; - -import com.alibaba.fastjson.JSON; -import com.epmet.commons.tools.utils.Result; -import com.epmet.opendata.dto.form.PreserVationFormDTO; -import com.epmet.opendata.feign.GuardarDatosFeignClient; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Component; - -import javax.annotation.Resource; - -/** - * 获取人口的数据存入ca_开头的表 - * - * @param - * @return - * @author LZN - * @date 2022/6/6 14:39 - */ -@Component("getPreserResidentVation") -@Slf4j -public class GuardarDatosResidentTask implements ITask { - - @Resource - private GuardarDatosFeignClient feignClient; - - @Override - public void run(String params) { - PreserVationFormDTO formDTO = new PreserVationFormDTO(); - if (StringUtils.isNotBlank(params)) { - formDTO = JSON.parseObject(params, PreserVationFormDTO.class); - } - Result result = feignClient.getPreserResidentVation(formDTO); - if (result.success()) { - log.debug("Resident执行成功"); - } else { - log.debug("Resident执行失败" + result.getMsg()); - } - } -} diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/GuardarDatosRotatorsTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/GuardarDatosTask.java similarity index 70% rename from epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/GuardarDatosRotatorsTask.java rename to epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/GuardarDatosTask.java index b8414eaa56..4a1376a5fd 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/GuardarDatosRotatorsTask.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/GuardarDatosTask.java @@ -6,22 +6,23 @@ import com.epmet.opendata.dto.form.PreserVationFormDTO; import com.epmet.opendata.feign.GuardarDatosFeignClient; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import javax.annotation.Resource; + /** * 获取流动人口的数据存入ca_开头的表 * * @param - * @return * @author LZN + * @return * @date 2022/6/6 14:39 */ -@Component("getPreserRotatorsVation") +@Component("guardarDatosTask") @Slf4j -public class GuardarDatosRotatorsTask implements ITask { +public class GuardarDatosTask implements ITask { - @Autowired + @Resource private GuardarDatosFeignClient guardarDatosFeignClient; @Override @@ -30,11 +31,11 @@ public class GuardarDatosRotatorsTask implements ITask { if (StringUtils.isNotBlank(params)) { formDTO = JSON.parseObject(params, PreserVationFormDTO.class); } - Result result = guardarDatosFeignClient.getPreserRotatorsVation(formDTO); + Result result = guardarDatosFeignClient.guardarDatosTask(formDTO); if (result.success()) { - log.debug("Rotators执行成功"); + log.debug("定时任务执行成功"); } else { - log.debug("Rotators执行失败" + result.getMsg()); + log.debug("定时任务执行失败" + result.getMsg()); } } } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaTaskController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaTaskController.java new file mode 100644 index 0000000000..97c77cd539 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaTaskController.java @@ -0,0 +1,33 @@ +package com.epmet.opendata.controller; + +import com.epmet.commons.tools.utils.Result; +import com.epmet.opendata.dto.form.PreserVationFormDTO; +import com.epmet.opendata.service.GuardarDatosTaskService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * 定时任务 + * + * @param + * @author LZN + * @return + * @date 2022/6/7 15:54 + */ +@RestController +@RequestMapping("caTask") +public class CaTaskController { + + @Autowired + private GuardarDatosTaskService taskService; + + @PostMapping("guardarDatosTask") + public Result guardarDatosTask(@RequestBody PreserVationFormDTO dto) { + taskService.guardarDatosTask(dto); + return new Result(); + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/feign/GuardarDatosFeignClient.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/feign/GuardarDatosFeignClient.java index cc884d2a12..faac32189f 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/feign/GuardarDatosFeignClient.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/feign/GuardarDatosFeignClient.java @@ -9,18 +9,6 @@ import org.springframework.web.bind.annotation.PostMapping; @FeignClient(name = "open-data-worker-server",fallback = GuardarDatosFeignClientFallBack.class) public interface GuardarDatosFeignClient { - @PostMapping(value = "/opendata/caLoudong/preserLouDongVation") - Result getPreserLouDongVation(PreserVationFormDTO dto); - - @PostMapping(value = "/opendata/caPingfang/preserPingFangVation") - Result getPreserPingFangVation(PreserVationFormDTO dto); - - @PostMapping("/opendata/caRental/preserRentalVation") - Result getPreserRentalVation(PreserVationFormDTO dto); - - @PostMapping("/opendata/caResident/preserResidentVation") - Result getPreserResidentVation(PreserVationFormDTO dto); - - @PostMapping("/opendata/caRotators/preserRotatorsVation") - Result getPreserRotatorsVation(PreserVationFormDTO dto); + @PostMapping("/opendata/caTask/guardarDatosTask") + Result guardarDatosTask(PreserVationFormDTO dto); } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/feign/impl/GuardarDatosFeignClientFallBack.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/feign/impl/GuardarDatosFeignClientFallBack.java index 9dc6f57393..4a688e5ae5 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/feign/impl/GuardarDatosFeignClientFallBack.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/feign/impl/GuardarDatosFeignClientFallBack.java @@ -1,6 +1,5 @@ package com.epmet.opendata.feign.impl; -import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.ModuleUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.opendata.dto.form.PreserVationFormDTO; @@ -11,27 +10,8 @@ import org.springframework.stereotype.Component; public class GuardarDatosFeignClientFallBack implements GuardarDatosFeignClient { @Override - public Result getPreserLouDongVation(PreserVationFormDTO dto) { - return ModuleUtils.feignConError("open-data-worker", "getPreserLouDongVation", dto); + public Result guardarDatosTask(PreserVationFormDTO dto) { + return ModuleUtils.feignConError("open-data-worker", "guardarDatosTask", dto); } - @Override - public Result getPreserPingFangVation(PreserVationFormDTO dto) { - return ModuleUtils.feignConError("open-data-worker", "getPreserPingFangVation", dto); - } - - @Override - public Result getPreserRentalVation(PreserVationFormDTO dto) { - return ModuleUtils.feignConError("open-data-worker", "getPreserRentalVation", dto); - } - - @Override - public Result getPreserResidentVation(PreserVationFormDTO dto) { - return ModuleUtils.feignConError("open-data-worker", "getPreserResidentVation", dto); - } - - @Override - public Result getPreserRotatorsVation(PreserVationFormDTO dto) { - return ModuleUtils.feignConError("open-data-worker", "getPreserRotatorsVation", dto); - } } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/GuardarDatosTaskService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/GuardarDatosTaskService.java new file mode 100644 index 0000000000..fbd89caa2f --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/GuardarDatosTaskService.java @@ -0,0 +1,16 @@ +package com.epmet.opendata.service; + +import com.epmet.opendata.dto.form.PreserVationFormDTO; + +/** + * 定时任务 + * + * @param + * @author LZN + * @return + * @date 2022/6/7 15:54 + */ +public interface GuardarDatosTaskService { + + void guardarDatosTask(PreserVationFormDTO dto); +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java new file mode 100644 index 0000000000..54c5b0b231 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java @@ -0,0 +1,91 @@ +package com.epmet.opendata.service.impl; + +import com.epmet.opendata.dto.form.PreserVationFormDTO; +import com.epmet.opendata.service.*; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +@Service +public class GuardarDatosTaskServiceImpl implements GuardarDatosTaskService { + + @Autowired + private CaLoudongService caLoudongService; + + @Autowired + private CaPingfangService pingfangService; + + @Autowired + private CaRentalService rentalService; + + @Autowired + private CaResidentService residentService; + + @Autowired + private CaRotatorsService rotatorsService; + + @Override + public void guardarDatosTask(PreserVationFormDTO dto) { + if (StringUtils.isBlank(dto.getTableName())) { + caLoudongService.preserLouDongVation(dto); + pingfangService.preserPingFangVation(dto); + rentalService.preserRentalVation(dto); + residentService.preserResidentVation(dto); + rotatorsService.preserRotatorsVation(dto); + } + TableName name = TableName.getTableByOutSide(dto.getTableName()); + if (null == name) { + throw new Error(); + } + + switch (name) { + case LD: + caLoudongService.preserLouDongVation(dto); + break; + case PF: + pingfangService.preserPingFangVation(dto); + break; + case RK: + residentService.preserResidentVation(dto); + break; + case CZF: + rentalService.preserRentalVation(dto); + break; + case LDRK: + rotatorsService.preserRotatorsVation(dto); + break; + } + } + + enum TableName { + LD("ca_loudong"), + PF("ca_pingfang"), + RK("ca_resident"), + LDRK("ca_rotators"), + CZF("ca_rental"); + + private String tableName; + + TableName(String tableOs) { + + this.tableName = tableOs; + } + + + public String getTableName() { + return tableName; + } + + static TableName getTableByOutSide(String outSideName) { + if (StringUtils.isNotBlank(outSideName)) { + TableName[] values = TableName.values(); + for (TableName value : values) { + if (value.getTableName().equals(outSideName)) { + return value; + } + } + } + return null; + } + } +}