From 0f428ccc87ca41f851d8241d82289a767245d185 Mon Sep 17 00:00:00 2001 From: qijian <491437605@qq.com> Date: Fri, 18 Nov 2022 10:56:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B9=B2=E6=89=B0=E6=BA=90=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=EF=BC=9A=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/njcn/process/constant/Param.java | 7 +- .../pojo/param/LoadTypeUserAUploadParam.java | 49 ++++++++++++ .../param/LoadTypeUserAssociateParam.java | 34 +++++++++ ...ram.java => LoadTypeUserIUploadParam.java} | 6 +- .../pojo/param/LoadTypeUserSearchParam.java | 3 + .../process/pojo/po/RLoadTypeUserManage.java | 4 + .../pojo/vo/RLoadTypeUserManageVO.java | 5 ++ .../LoadTypeUserManageController.java | 64 ++++++++++++---- .../mapper/LoadTypeUserManageMapper.java | 10 ++- .../mapping/LoadTypeUserManageMapper.xml | 28 ++++++- .../service/LoadTypeUserManageService.java | 26 +++++-- .../impl/LoadTypeUserManageServiceImpl.java | 76 ++++++++++++++++--- 12 files changed, 273 insertions(+), 39 deletions(-) create mode 100644 process-api/src/main/java/com/njcn/process/pojo/param/LoadTypeUserAUploadParam.java create mode 100644 process-api/src/main/java/com/njcn/process/pojo/param/LoadTypeUserAssociateParam.java rename process-api/src/main/java/com/njcn/process/pojo/param/{LoadTypeUserUploadParam.java => LoadTypeUserIUploadParam.java} (86%) diff --git a/process-api/src/main/java/com/njcn/process/constant/Param.java b/process-api/src/main/java/com/njcn/process/constant/Param.java index dbc097c99..42d3ad290 100644 --- a/process-api/src/main/java/com/njcn/process/constant/Param.java +++ b/process-api/src/main/java/com/njcn/process/constant/Param.java @@ -8,6 +8,9 @@ package com.njcn.process.constant; * @date 2022年11月11日 09:56 */ public interface Param { - - + /** + * 干扰源用户管理 数据状态 + */ + Integer LOAD_TYPE_USER_SUBMIT = 1; + Integer LOAD_TYPE_USER_SAVE = 2; } diff --git a/process-api/src/main/java/com/njcn/process/pojo/param/LoadTypeUserAUploadParam.java b/process-api/src/main/java/com/njcn/process/pojo/param/LoadTypeUserAUploadParam.java new file mode 100644 index 000000000..cfecd31ee --- /dev/null +++ b/process-api/src/main/java/com/njcn/process/pojo/param/LoadTypeUserAUploadParam.java @@ -0,0 +1,49 @@ +package com.njcn.process.pojo.param; + +import com.njcn.web.constant.ValidMessage; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.web.multipart.MultipartFile; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + +/** + * 未建档干扰源用户实测上传Param + * + * @author qijian + * @version 1.0.0 + * @createTime 2022/11/18 10:00 + */ +@Data +public class LoadTypeUserAUploadParam { + + @ApiModelProperty(name = "id",required = true) + @NotBlank(message = ValidMessage.ID_NOT_BLANK) + private String id; + + @ApiModelProperty(name = "file",value = "实测报告文件",required = true) + @NotNull(message = "实测报告文件不可为空") + private MultipartFile file; + + @ApiModelProperty(name = "status",value = "数据状态（1：提交 2：保存）",required = true) + @NotNull(message = "数据状态不可为空") + private Integer status; + + @ApiModelProperty(name = "aIsOverLimit",value = "实测是否超标(0:否 1:是)",required = true) + @NotNull(message = "实测是否超标不可为空") + private Integer aIsOverLimit; + + @ApiModelProperty(name = "aOverLimitTarget",value = "实测超标指标",required = true) + @NotBlank(message = "实测超标指标不可为空") + private String aOverLimitTarget; + + @ApiModelProperty(name = "aPlanStep",value = "实测计划采取措施",required = true) + @NotBlank(message = "实测计划采取措施不可为空") + private String aPlanStep; + + @ApiModelProperty(name = "aDescription",value = "实测详情") + private String aDescription; + + +} diff --git a/process-api/src/main/java/com/njcn/process/pojo/param/LoadTypeUserAssociateParam.java b/process-api/src/main/java/com/njcn/process/pojo/param/LoadTypeUserAssociateParam.java new file mode 100644 index 000000000..3a7c91a19 --- /dev/null +++ b/process-api/src/main/java/com/njcn/process/pojo/param/LoadTypeUserAssociateParam.java @@ -0,0 +1,34 @@ +package com.njcn.process.pojo.param; + +import com.njcn.web.constant.ValidMessage; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + +/** + * 未建档干扰源用户关联营销Param + * + * @author qijian + * @version 1.0.0 + * @createTime 2022/11/16 10:34 + */ +@Data +@ApiModel +public class LoadTypeUserAssociateParam { + + @ApiModelProperty("id") + @NotBlank(message = ValidMessage.ID_NOT_BLANK) + private String id; + + @ApiModelProperty("用户类型") + @NotBlank(message = "用户类型不可为空") + private String userLoadType; + + @ApiModelProperty("关联干扰源用户编号") + @NotNull(message = "关联干扰源用户编号不可为空") + private String relationUserId; + +} diff --git a/process-api/src/main/java/com/njcn/process/pojo/param/LoadTypeUserUploadParam.java b/process-api/src/main/java/com/njcn/process/pojo/param/LoadTypeUserIUploadParam.java similarity index 86% rename from process-api/src/main/java/com/njcn/process/pojo/param/LoadTypeUserUploadParam.java rename to process-api/src/main/java/com/njcn/process/pojo/param/LoadTypeUserIUploadParam.java index 2061f5231..d0b9a5c53 100644 --- a/process-api/src/main/java/com/njcn/process/pojo/param/LoadTypeUserUploadParam.java +++ b/process-api/src/main/java/com/njcn/process/pojo/param/LoadTypeUserIUploadParam.java @@ -16,7 +16,7 @@ import javax.validation.constraints.NotNull; * @createTime 2022/11/11 10:34 */ @Data -public class LoadTypeUserUploadParam { +public class LoadTypeUserIUploadParam { @ApiModelProperty(name = "id",required = true) @NotBlank(message = ValidMessage.ID_NOT_BLANK) @@ -26,6 +26,10 @@ public class LoadTypeUserUploadParam { @NotNull(message = "入网报告文件不可为空") private MultipartFile file; + @ApiModelProperty(name = "status",value = "数据状态（1：提交 2：保存）",required = true) + @NotNull(message = "数据状态不可为空") + private Integer status; + @ApiModelProperty(name = "iIsOverLimit",value = "入网是否超标(0:否 1:是)",required = true) @NotNull(message = "入网是否超标不可为空") private Integer iIsOverLimit; diff --git a/process-api/src/main/java/com/njcn/process/pojo/param/LoadTypeUserSearchParam.java b/process-api/src/main/java/com/njcn/process/pojo/param/LoadTypeUserSearchParam.java index 0861bd16a..1bb18fbc8 100644 --- a/process-api/src/main/java/com/njcn/process/pojo/param/LoadTypeUserSearchParam.java +++ b/process-api/src/main/java/com/njcn/process/pojo/param/LoadTypeUserSearchParam.java @@ -27,6 +27,9 @@ public class LoadTypeUserSearchParam { @ApiModelProperty("干扰源用户名称") private String userName; + @ApiModelProperty("关联干扰源用户名称") + private String relationUserName; + @ApiModelProperty("是否上传报告(0:否 1:是)") private Integer aIsFileUpload; diff --git a/process-api/src/main/java/com/njcn/process/pojo/po/RLoadTypeUserManage.java b/process-api/src/main/java/com/njcn/process/pojo/po/RLoadTypeUserManage.java index 835772a35..1ca54efae 100644 --- a/process-api/src/main/java/com/njcn/process/pojo/po/RLoadTypeUserManage.java +++ b/process-api/src/main/java/com/njcn/process/pojo/po/RLoadTypeUserManage.java @@ -36,6 +36,10 @@ public class RLoadTypeUserManage implements Serializable { * 关联干扰源用户编号ID */ private String relationUserId; + /** + * 关联干扰源用户名称 + */ + private String relationUserName; /** * 建档时间 */ diff --git a/process-api/src/main/java/com/njcn/process/pojo/vo/RLoadTypeUserManageVO.java b/process-api/src/main/java/com/njcn/process/pojo/vo/RLoadTypeUserManageVO.java index 3aad32812..5fcf88a62 100644 --- a/process-api/src/main/java/com/njcn/process/pojo/vo/RLoadTypeUserManageVO.java +++ b/process-api/src/main/java/com/njcn/process/pojo/vo/RLoadTypeUserManageVO.java @@ -34,6 +34,10 @@ public class RLoadTypeUserManageVO implements Serializable { * 关联干扰源用户编号ID */ private String relationUserId; + /** + * 关联干扰源用户名称 + */ + private String relationUserName; /** * 建档时间 */ @@ -110,5 +114,6 @@ public class RLoadTypeUserManageVO implements Serializable { * 实测详情 */ private String aDescription; + } diff --git a/process-boot/src/main/java/com/njcn/process/controller/LoadTypeUserManageController.java b/process-boot/src/main/java/com/njcn/process/controller/LoadTypeUserManageController.java index 091933bfb..594292178 100644 --- a/process-boot/src/main/java/com/njcn/process/controller/LoadTypeUserManageController.java +++ b/process-boot/src/main/java/com/njcn/process/controller/LoadTypeUserManageController.java @@ -7,9 +7,7 @@ import com.njcn.common.pojo.enums.common.LogEnum; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; -import com.njcn.process.pojo.param.LoadTypeUserParam; -import com.njcn.process.pojo.param.LoadTypeUserSearchParam; -import com.njcn.process.pojo.param.LoadTypeUserUploadParam; +import com.njcn.process.pojo.param.*; import com.njcn.process.pojo.po.RLoadTypeUserManage; import com.njcn.process.pojo.vo.RLoadTypeUserManageVO; import com.njcn.process.service.LoadTypeUserManageService; @@ -45,7 +43,7 @@ public class LoadTypeUserManageController extends BaseController { */ @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/getLoadTypeUserList") - @ApiOperation("查询所有数据") + @ApiOperation("查询所有干扰源用户") @ApiImplicitParam(name = "loadTypeUserSearchParam", value = "干扰源用户入参", required = true) public HttpResult> getLoadTypeUserList(@RequestBody @Validated LoadTypeUserSearchParam loadTypeUserSearchParam){ String methodDescribe = getMethodDescribe("getLoadTypeUserList"); @@ -92,13 +90,13 @@ public class LoadTypeUserManageController extends BaseController { * @author qijian * @date 2022/11/14 */ - @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType= OperateType.ADD) - @PostMapping("/uploadLoadTypeUser") + @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType= OperateType.UPDATE) + @PostMapping("/uploadLoadTypeUserI") @ApiOperation("上传干扰源用户入网报告") - @ApiImplicitParam(name = "loadTypeUserUploadParam", value = "实体参数", required = true) - public HttpResult uploadLoadTypeUser(@RequestBody @Validated LoadTypeUserUploadParam loadTypeUserUploadParam){ - String methodDescribe = getMethodDescribe("uploadLoadTypeUser"); - boolean res = loadTypeUserManageService.uploadLoadTypeUser(loadTypeUserUploadParam); +// @ApiImplicitParam(name = "loadTypeUserIUploadParam", value = "实体参数", required = true) + public HttpResult uploadLoadTypeUserI(@Validated LoadTypeUserIUploadParam loadTypeUserIUploadParam){ + String methodDescribe = getMethodDescribe("uploadLoadTypeUserI"); + boolean res = loadTypeUserManageService.uploadLoadTypeUserI(loadTypeUserIUploadParam); if(res){ return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); }else { @@ -107,18 +105,52 @@ public class LoadTypeUserManageController extends BaseController { } /** - * 关联营销用户（待修改） + * 关联营销用户 * @author qijian - * @date 2022/11/15 + * @date 2022/11/16 * */ - @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType= OperateType.ADD) + @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType= OperateType.UPDATE) @PostMapping("/linkUser") @ApiOperation("关联营销用户") -// @ApiImplicitParam(name = "loadTypeUserUploadParam", value = "实体参数", required = true) - public HttpResult linkUser(){ + @ApiImplicitParam(name = "loadTypeUserAssociateParam", value = "实体参数", required = true) + public HttpResult linkUser(@RequestBody @Validated LoadTypeUserAssociateParam loadTypeUserAssociateParam){ String methodDescribe = getMethodDescribe("linkUser"); - boolean res = loadTypeUserManageService.linkUser(); + boolean res = loadTypeUserManageService.linkUser(loadTypeUserAssociateParam); + if(res){ + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); + }else { + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe); + } + } + + /** + * 查询所有干扰源用户（与营销系统关联） + * @author qijian + * @date 2022/11/17 + */ + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/getLoadTypeRelationList") + @ApiOperation("查询所有干扰源用户（与营销系统关联）") + @ApiImplicitParam(name = "loadTypeUserSearchParam", value = "干扰源用户入参", required = true) + public HttpResult> getLoadTypeRelationList(@RequestBody @Validated LoadTypeUserSearchParam loadTypeUserSearchParam){ + String methodDescribe = getMethodDescribe("getLoadTypeRelationList"); + Page list = loadTypeUserManageService.getLoadTypeRelationList(loadTypeUserSearchParam); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); + } + + /** + * 上传干扰源用户实测报告 + * @author qijian + * @date 2022/11/14 + */ + @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType= OperateType.UPDATE) + @PostMapping("/uploadLoadTypeUserA") + @ApiOperation("上传干扰源用户实测报告") +// @ApiImplicitParam(name = "loadTypeUserAUploadParam", value = "实体参数", required = true) + public HttpResult uploadLoadTypeUserA(@Validated LoadTypeUserAUploadParam loadTypeUserAUploadParam){ + String methodDescribe = getMethodDescribe("uploadLoadTypeUserA"); + boolean res = loadTypeUserManageService.uploadLoadTypeUserA(loadTypeUserAUploadParam); if(res){ return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); }else { diff --git a/process-boot/src/main/java/com/njcn/process/mapper/LoadTypeUserManageMapper.java b/process-boot/src/main/java/com/njcn/process/mapper/LoadTypeUserManageMapper.java index 882c1e22c..dc1f53c25 100644 --- a/process-boot/src/main/java/com/njcn/process/mapper/LoadTypeUserManageMapper.java +++ b/process-boot/src/main/java/com/njcn/process/mapper/LoadTypeUserManageMapper.java @@ -24,5 +24,13 @@ public interface LoadTypeUserManageMapper extends BaseMapper getLoadTypeUserPage(IPage page, @Param("loadTypeUserParam") LoadTypeUserSearchParam loadTypeUserSearchParam); + Page getLoadTypeUserPage(IPage page, @Param("loadTypeUserSearchParam") LoadTypeUserSearchParam loadTypeUserSearchParam); + + /** + * 干扰源用户分页查询 + * @param page 分页参数 + * @param loadTypeUserSearchParam 入参 + * @return 结果 + */ + Page getLoadTypeRelationPage(IPage page, @Param("loadTypeUserSearchParam") LoadTypeUserSearchParam loadTypeUserSearchParam); } diff --git a/process-boot/src/main/java/com/njcn/process/mapper/mapping/LoadTypeUserManageMapper.xml b/process-boot/src/main/java/com/njcn/process/mapper/mapping/LoadTypeUserManageMapper.xml index 7f09934c5..39aae0b45 100644 --- a/process-boot/src/main/java/com/njcn/process/mapper/mapping/LoadTypeUserManageMapper.xml +++ b/process-boot/src/main/java/com/njcn/process/mapper/mapping/LoadTypeUserManageMapper.xml @@ -15,7 +15,33 @@ and r.load_type = #{loadTypeUserSearchParam.loadType} - and r.user_name like CONCAT(CONCAT('%', #{loadTypeUserSearchParam.userName}), '%') + and r.user_name like CONCAT('%', #{loadTypeUserSearchParam.userName}, '%') + + + and r.a_is_file_upload = #{loadTypeUserSearchParam.aIsFileUpload} + + + +