Browse Source

还原代码

feature/visit_zhy
zhangyuan 3 years ago
parent
commit
bc59fa6de2
  1. 3
      epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/feign/PliPowerFeignClient.java
  2. 5
      epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/feign/impl/PliPowerFeignClientFallBack.java
  3. 21
      epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/visit/controller/VisitVisitorController.java

3
epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/feign/PliPowerFeignClient.java

@ -21,7 +21,4 @@ public interface PliPowerFeignClient {
@PostMapping("/pli/power/visitVisitor/visitorlogout") @PostMapping("/pli/power/visitVisitor/visitorlogout")
Result visitorLogout(@RequestBody VisitorLogoutFormDTO formDTO); Result visitorLogout(@RequestBody VisitorLogoutFormDTO formDTO);
@PostMapping("/pli/power/visitVisitor/logout")
Result logout(@RequestBody VisitorLogoutFormDTO formDTO);
} }

5
epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/feign/impl/PliPowerFeignClientFallBack.java

@ -21,9 +21,4 @@ public class PliPowerFeignClientFallBack implements PliPowerFeignClient {
return ModuleUtils.feignConError(ServiceConstant.PLI_POWER_SERVER, "visitorLogout",formDTO); return ModuleUtils.feignConError(ServiceConstant.PLI_POWER_SERVER, "visitorLogout",formDTO);
} }
@Override
public Result logout(VisitorLogoutFormDTO formDTO) {
return ModuleUtils.feignConError(ServiceConstant.PLI_POWER_SERVER, "logout",formDTO);
}
} }

21
epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/visit/controller/VisitVisitorController.java

@ -7,14 +7,13 @@ import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.AssertUtils; import com.epmet.commons.tools.validator.AssertUtils;
import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.commons.tools.validator.ValidatorUtils;
import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.AddGroup;
import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.DefaultGroup;
import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.epmet.plugin.power.dto.visit.VisitVisitorDTO; import com.epmet.plugin.power.dto.visit.VisitVisitorDTO;
import com.epmet.plugin.power.dto.visit.form.VisitVisitorChartFormDTO; import com.epmet.plugin.power.dto.visit.form.VisitVisitorChartFormDTO;
import com.epmet.plugin.power.dto.visit.form.VisitVisitorFormDTO; import com.epmet.plugin.power.dto.visit.form.VisitVisitorFormDTO;
import com.epmet.plugin.power.dto.visit.form.VisitorLogoutFormDTO; import com.epmet.plugin.power.dto.visit.form.VisitorLogoutFormDTO;
import com.epmet.plugin.power.dto.visit.result.VisitVisitorChartResultDTO; import com.epmet.plugin.power.dto.visit.result.VisitVisitorChartResultDTO;
import com.epmet.plugin.power.feign.PliPowerFeignClient;
import com.epmet.plugin.power.modules.visit.excel.VisitVisitorExcel; import com.epmet.plugin.power.modules.visit.excel.VisitVisitorExcel;
import com.epmet.plugin.power.modules.visit.service.VisitVisitorService; import com.epmet.plugin.power.modules.visit.service.VisitVisitorService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -38,9 +37,6 @@ public class VisitVisitorController {
@Autowired @Autowired
private VisitVisitorService visitVisitorService; private VisitVisitorService visitVisitorService;
@Autowired
private PliPowerFeignClient pliPowerFeignClient;
@RequestMapping("page") @RequestMapping("page")
public Result<PageData<VisitVisitorDTO>> page(@RequestParam Map<String, Object> params) { public Result<PageData<VisitVisitorDTO>> page(@RequestParam Map<String, Object> params) {
PageData<VisitVisitorDTO> page = visitVisitorService.page(params); PageData<VisitVisitorDTO> page = visitVisitorService.page(params);
@ -103,14 +99,6 @@ public class VisitVisitorController {
return new Result(); return new Result();
} }
@PostMapping("logout")
public Result logout(@RequestBody VisitorLogoutFormDTO dto) {
//效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
visitVisitorService.logout(dto);
return new Result();
}
@NoRepeatSubmit @NoRepeatSubmit
@PostMapping("chart/traffic") @PostMapping("chart/traffic")
public Result<List<VisitVisitorChartResultDTO>> getTraffic(@RequestBody VisitVisitorChartFormDTO dto) { public Result<List<VisitVisitorChartResultDTO>> getTraffic(@RequestBody VisitVisitorChartFormDTO dto) {
@ -119,11 +107,4 @@ public class VisitVisitorController {
return new Result<List<VisitVisitorChartResultDTO>>().ok(visitVisitorService.getTraffic(dto)); return new Result<List<VisitVisitorChartResultDTO>>().ok(visitVisitorService.getTraffic(dto));
} }
@PostMapping("test")
public Result test() {
VisitorLogoutFormDTO formDTO = new VisitorLogoutFormDTO();
pliPowerFeignClient.visitorLogout(formDTO);
return new Result();
}
} }

Loading…
Cancel
Save