diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueCustomerParameterController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueCustomerParameterController.java index 7371c32666..f6ef0513a6 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueCustomerParameterController.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueCustomerParameterController.java @@ -43,7 +43,7 @@ import java.util.Map; * @since v1.0.0 2020-05-11 */ @RestController -@RequestMapping("issuecustomerparameter") +@RequestMapping("parameter") public class IssueCustomerParameterController { @Autowired diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ParameterFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ParameterFormDTO.java new file mode 100644 index 0000000000..d05c1c520c --- /dev/null +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ParameterFormDTO.java @@ -0,0 +1,56 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.validator.group.AddGroup; +import com.epmet.commons.tools.validator.group.DefaultGroup; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @author zhaoqifeng + * @dscription + * @date 2020/11/18 15:00 + */ +@NoArgsConstructor +@Data +public class ParameterFormDTO implements Serializable { + + private static final long serialVersionUID = 6943367994919967821L; + /** + * 客户ID + */ + @NotBlank(message = "客户ID不能为空", groups = DefaultGroup.class) + private String customerId; + /** + * 可滞留天数 + */ + @NotBlank(message = "可滞留天数不能为空", groups = AddGroup.class) + private String detentionDays; + /** + * 计算方式 工作日work 日历天calendar + */ + @NotBlank(message = "计算方式 不能为空", groups = AddGroup.class) + private String calculation; + /** + * 即将超期提醒时间 + */ + @NotBlank(message = "即将超期提醒时间不能为空", groups = AddGroup.class) + private String remindTime; + /** + * 推送时间 默认 上午8点 + */ + @NotBlank(message = "推送时间不能为空", groups = AddGroup.class) + private String pushTime; + /** + * 设定核算单位天开始时间 + */ + @NotBlank(message = "设定核算单位天开始时间不能为空", groups = AddGroup.class) + private String startTime; + /** + * 设定核算单位天结束时间 + */ + @NotBlank(message = "设定核算单位天结束时间不能为空", groups = AddGroup.class) + private String endTime; +} diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ParameterResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ParameterResultDTO.java new file mode 100644 index 0000000000..00d2cee217 --- /dev/null +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ParameterResultDTO.java @@ -0,0 +1,39 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @author zhaoqifeng + * @dscription + * @date 2020/11/18 15:19 + */ +@Data +public class ParameterResultDTO implements Serializable { + private static final long serialVersionUID = -2066374948905858262L; + /** + * 可滞留天数 + */ + private String detentionDays; + /** + * 计算方式 工作日work 日历天calendar + */ + private String calculation; + /** + * 即将超期提醒时间 + */ + private String remindTime; + /** + * 推送时间 默认 上午8点 + */ + private String pushTime; + /** + * 设定核算单位天开始时间 + */ + private String startTime; + /** + * 设定核算单位天结束时间 + */ + private String endTime; +} diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/CustomerProjectParameterController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/CustomerProjectParameterController.java index 93139cfa21..e9b60a9a4c 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/CustomerProjectParameterController.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/CustomerProjectParameterController.java @@ -26,6 +26,8 @@ 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.dto.CustomerProjectParameterDTO; +import com.epmet.dto.form.ParameterFormDTO; +import com.epmet.dto.result.ParameterResultDTO; import com.epmet.excel.CustomerProjectParameterExcel; import com.epmet.service.CustomerProjectParameterService; import org.springframework.beans.factory.annotation.Autowired; @@ -43,7 +45,7 @@ import java.util.Map; * @since v1.0.0 2020-05-11 */ @RestController -@RequestMapping("customerprojectparameter") +@RequestMapping("parameter") public class CustomerProjectParameterController { @Autowired @@ -91,4 +93,46 @@ public class CustomerProjectParameterController { ExcelUtils.exportExcelToTarget(response, null, list, CustomerProjectParameterExcel.class); } + /** + * 滞留提醒-初始化 + * @author zhaoqifeng + * @date 2020/11/18 15:26 + * @param formDTO + * @return com.epmet.commons.tools.utils.Result + */ + @PostMapping("remindinit") + public Result remindInit(@RequestBody ParameterFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO, DefaultGroup.class); + ParameterResultDTO result = customerProjectParameterService.remindInit(formDTO); + return new Result().ok(result); + } + + /** + * 滞留提醒-保存 + * @author zhaoqifeng + * @date 2020/11/18 15:26 + * @param formDTO + * @return com.epmet.commons.tools.utils.Result + */ + @PostMapping("remindsave") + public Result remindSave(@RequestBody ParameterFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO, UpdateGroup.class, DefaultGroup.class); + customerProjectParameterService.remindSave(formDTO); + return new Result(); + } + + /** + * 滞留提醒-恢复默认 + * @author zhaoqifeng + * @date 2020/11/18 15:26 + * @param formDTO + * @return com.epmet.commons.tools.utils.Result + */ + @PostMapping("reminddefault") + public Result remindDefault(@RequestBody ParameterFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO, DefaultGroup.class); + customerProjectParameterService.remindDefault(formDTO); + return new Result(); + } + } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/CustomerProjectParameterService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/CustomerProjectParameterService.java index c9b487e7d0..8dc8a120ca 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/CustomerProjectParameterService.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/CustomerProjectParameterService.java @@ -20,6 +20,8 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.dto.CustomerProjectParameterDTO; +import com.epmet.dto.form.ParameterFormDTO; +import com.epmet.dto.result.ParameterResultDTO; import com.epmet.entity.CustomerProjectParameterEntity; import java.util.List; @@ -137,4 +139,31 @@ public interface CustomerProjectParameterService extends BaseService