Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

干扰源功能：用户管理

Browse Source
This commit is contained in:
qijian
2022-11-18 10:56:52 +08:00
parent 6155e3d0e8
commit 0f428ccc87
12 changed files with 273 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
process-api/src/main/java/com/njcn/process/constant/Param.java
View File

@@ -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;
}

49
process-api/src/main/java/com/njcn/process/pojo/param/LoadTypeUserAUploadParam.java Normal file
View File

@@ -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;
}

34
process-api/src/main/java/com/njcn/process/pojo/param/LoadTypeUserAssociateParam.java Normal file
View File

@@ -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;
}

6
process-api/src/main/java/com/njcn/process/pojo/param/LoadTypeUserUploadParam.java → process-api/src/main/java/com/njcn/process/pojo/param/LoadTypeUserIUploadParam.java
View File

@@ -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;

3
process-api/src/main/java/com/njcn/process/pojo/param/LoadTypeUserSearchParam.java
View File

@@ -27,6 +27,9 @@ public class LoadTypeUserSearchParam {
@ApiModelProperty("干扰源用户名称")
private String userName;
@ApiModelProperty("关联干扰源用户名称")
private String relationUserName;
@ApiModelProperty("是否上传报告(0:否 1:是)")
private Integer aIsFileUpload;

4
process-api/src/main/java/com/njcn/process/pojo/po/RLoadTypeUserManage.java
View File

@@ -36,6 +36,10 @@ public class RLoadTypeUserManage implements Serializable {
* 关联干扰源用户编号ID
*/
private String relationUserId;
/**
* 关联干扰源用户名称
*/
private String relationUserName;
/**
* 建档时间
*/

5
process-api/src/main/java/com/njcn/process/pojo/vo/RLoadTypeUserManageVO.java
View File

@@ -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;
}

64
process-boot/src/main/java/com/njcn/process/controller/LoadTypeUserManageController.java
View File

@@ -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<Page<RLoadTypeUserManageVO>> 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<Boolean> uploadLoadTypeUser(@RequestBody @Validated LoadTypeUserUploadParam loadTypeUserUploadParam){
String methodDescribe = getMethodDescribe("uploadLoadTypeUser");
boolean res = loadTypeUserManageService.uploadLoadTypeUser(loadTypeUserUploadParam);
// @ApiImplicitParam(name = "loadTypeUserIUploadParam", value = "实体参数", required = true)
public HttpResult<Boolean> 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<Boolean> linkUser(){
@ApiImplicitParam(name = "loadTypeUserAssociateParam", value = "实体参数", required = true)
public HttpResult<Boolean> 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<Page<RLoadTypeUserManageVO>> getLoadTypeRelationList(@RequestBody @Validated LoadTypeUserSearchParam loadTypeUserSearchParam){
String methodDescribe = getMethodDescribe("getLoadTypeRelationList");
Page<RLoadTypeUserManageVO> 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<Boolean> uploadLoadTypeUserA(@Validated LoadTypeUserAUploadParam loadTypeUserAUploadParam){
String methodDescribe = getMethodDescribe("uploadLoadTypeUserA");
boolean res = loadTypeUserManageService.uploadLoadTypeUserA(loadTypeUserAUploadParam);
if(res){
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
}else {

10
process-boot/src/main/java/com/njcn/process/mapper/LoadTypeUserManageMapper.java
View File

@@ -24,5 +24,13 @@ public interface LoadTypeUserManageMapper extends BaseMapper<RLoadTypeUserManage
* @param loadTypeUserSearchParam 入参
* @return 结果
*/
Page<RLoadTypeUserManageVO> getLoadTypeUserPage(IPage<RLoadTypeUserManageVO> page, @Param("loadTypeUserParam") LoadTypeUserSearchParam loadTypeUserSearchParam);
Page<RLoadTypeUserManageVO> getLoadTypeUserPage(IPage<RLoadTypeUserManageVO> page, @Param("loadTypeUserSearchParam") LoadTypeUserSearchParam loadTypeUserSearchParam);
/**
* 干扰源用户分页查询
* @param page 分页参数
* @param loadTypeUserSearchParam 入参
* @return 结果
*/
Page<RLoadTypeUserManageVO> getLoadTypeRelationPage(IPage<RLoadTypeUserManageVO> page, @Param("loadTypeUserSearchParam") LoadTypeUserSearchParam loadTypeUserSearchParam);
}

28
process-boot/src/main/java/com/njcn/process/mapper/mapping/LoadTypeUserManageMapper.xml
View File

@@ -15,7 +15,33 @@
and r.load_type = #{loadTypeUserSearchParam.loadType}
</if>
<if test="loadTypeUserSearchParam.userName != null and loadTypeUserSearchParam.userName != ''">
and r.user_name like CONCAT(CONCAT('%', #{loadTypeUserSearchParam.userName}), '%')
and r.user_name like CONCAT('%', #{loadTypeUserSearchParam.userName}, '%')
</if>
<if test="loadTypeUserSearchParam.aIsFileUpload != null and loadTypeUserSearchParam.aIsFileUpload != ''">
and r.a_is_file_upload = #{loadTypeUserSearchParam.aIsFileUpload}
</if>
</select>
<select id="getLoadTypeRelationPage" resultType="RLoadTypeUserManageVO">
SELECT
*
FROM
r_load_type_user_manage r
where 1=1
AND ISNULL( relation_user_id )= 0
AND LENGTH(
trim( relation_user_id ))> 0
<if test="loadTypeUserSearchParam.orgNo != null and loadTypeUserSearchParam.orgNo != ''">
and r.org_no = #{loadTypeUserSearchParam.orgNo}
</if>
<if test="loadTypeUserSearchParam.loadType != null and loadTypeUserSearchParam.loadType != ''">
and r.load_type = #{loadTypeUserSearchParam.loadType}
</if>
<if test="loadTypeUserSearchParam.userName != null and loadTypeUserSearchParam.userName != ''">
and r.user_name like CONCAT('%', #{loadTypeUserSearchParam.relationUserName}, '%')
</if>
<if test="loadTypeUserSearchParam.relationUserName != null and loadTypeUserSearchParam.relationUserName != ''">
and r.relation_user_name like CONCAT('%', #{loadTypeUserSearchParam.relationUserName}, '%')
</if>
<if test="loadTypeUserSearchParam.aIsFileUpload != null and loadTypeUserSearchParam.aIsFileUpload != ''">
and r.a_is_file_upload = #{loadTypeUserSearchParam.aIsFileUpload}

26
process-boot/src/main/java/com/njcn/process/service/LoadTypeUserManageService.java
View File

@@ -1,9 +1,7 @@
package com.njcn.process.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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;
@@ -39,15 +37,29 @@ public interface LoadTypeUserManageService {
/**
* 上传干扰源用户入网报告
* @param loadTypeUserUploadParam
* @param loadTypeUserIUploadParam
* @return
*/
boolean uploadLoadTypeUser(LoadTypeUserUploadParam loadTypeUserUploadParam);
boolean uploadLoadTypeUserI(LoadTypeUserIUploadParam loadTypeUserIUploadParam);
/**
* 关联营销用户
* @param
* @param loadTypeUserAssociateParam
* @return
*/
boolean linkUser();
boolean linkUser(LoadTypeUserAssociateParam loadTypeUserAssociateParam);
/**
* 查询所有干扰源用户（与营销系统关联）
* @param loadTypeUserSearchParam
* @return
*/
Page<RLoadTypeUserManageVO> getLoadTypeRelationList(LoadTypeUserSearchParam loadTypeUserSearchParam);
/**
* 上传干扰源用户实测报告
* @param loadTypeUserAUploadParam
* @return
*/
boolean uploadLoadTypeUserA(LoadTypeUserAUploadParam loadTypeUserAUploadParam);
}

76
process-boot/src/main/java/com/njcn/process/service/impl/LoadTypeUserManageServiceImpl.java
View File

@@ -3,14 +3,14 @@ package com.njcn.process.service.impl;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.device.pms.api.DistributionMonitorClient;
import com.njcn.minio.bo.MinIoUploadResDTO;
import com.njcn.minio.config.MinIoProperties;
import com.njcn.minio.utils.MinIoUtils;
import com.njcn.process.constant.Param;
import com.njcn.process.enums.ProcessResponseEnum;
import com.njcn.process.mapper.LoadTypeUserManageMapper;
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;
@@ -24,6 +24,7 @@ import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import java.util.Date;
import java.util.Objects;
/**
* 干扰源用户管理
@@ -41,6 +42,8 @@ public class LoadTypeUserManageServiceImpl implements LoadTypeUserManageService
private final DicDataFeignClient dicDataFeignClient;
private final DistributionMonitorClient distributionMonitorClient;
@Resource
private MinIoUtils minIoUtils;
@@ -90,22 +93,28 @@ public class LoadTypeUserManageServiceImpl implements LoadTypeUserManageService
/**
* 上传干扰源用户入网报告
* @param loadTypeUserUploadParam
* @param loadTypeUserIUploadParam
* @return
*/
@Override
public boolean uploadLoadTypeUser(LoadTypeUserUploadParam loadTypeUserUploadParam) {
public boolean uploadLoadTypeUserI(LoadTypeUserIUploadParam loadTypeUserIUploadParam) {
RLoadTypeUserManage rLoadTypeUserManage = new RLoadTypeUserManage();
//文件上传到Minio服务器，存入文件名
MinIoUploadResDTO minIoUploadResDTO = fileToMinio(loadTypeUserUploadParam.getFile());
MinIoUploadResDTO minIoUploadResDTO = fileToMinio(loadTypeUserIUploadParam.getFile());
rLoadTypeUserManage.setIFilePath(minIoUploadResDTO.getMinFileName());
rLoadTypeUserManage.setIUploadTime(new Date());
//填入数据修改
BeanUtils.copyProperties(loadTypeUserUploadParam, rLoadTypeUserManage);
rLoadTypeUserManage.setIStatus(DicDataEnum.NEWLY.getCode());
//填入数据
BeanUtils.copyProperties(loadTypeUserIUploadParam, rLoadTypeUserManage);
//提交：待审核/保存：新建
if(Objects.equals(Param.LOAD_TYPE_USER_SUBMIT,loadTypeUserIUploadParam.getStatus())){
rLoadTypeUserManage.setIStatus(DicDataEnum.AUDIT.getCode());
}else{
rLoadTypeUserManage.setIStatus(DicDataEnum.NEWLY.getCode());
}
loadTypeUserManageMapper.updateById(rLoadTypeUserManage);
return true;
@@ -117,8 +126,23 @@ public class LoadTypeUserManageServiceImpl implements LoadTypeUserManageService
* @return
*/
@Override
public boolean linkUser() {
return false;
public boolean linkUser(LoadTypeUserAssociateParam loadTypeUserAssociateParam) {
RLoadTypeUserManage rLoadTypeUserManage = new RLoadTypeUserManage();
//填入数据修改
BeanUtils.copyProperties(loadTypeUserAssociateParam, rLoadTypeUserManage);
loadTypeUserManageMapper.updateById(rLoadTypeUserManage);
return true;
}
/**
* 查询所有干扰源用户（与营销系统关联）
* @param loadTypeUserSearchParam
* @return
*/
@Override
public Page<RLoadTypeUserManageVO> getLoadTypeRelationList(LoadTypeUserSearchParam loadTypeUserSearchParam) {
Page<RLoadTypeUserManageVO> page = new Page<>(loadTypeUserSearchParam.getPageNum(), loadTypeUserSearchParam.getPageSize());
return loadTypeUserManageMapper.getLoadTypeRelationPage(page,loadTypeUserSearchParam);
}
/**
@@ -136,4 +160,34 @@ public class LoadTypeUserManageServiceImpl implements LoadTypeUserManageService
throw new BusinessException(ProcessResponseEnum.UPLOAD_FILE_ERROR);
}
}
/**
* 上传干扰源用户入网报告
* @param loadTypeUserAUploadParam
* @return
*/
@Override
public boolean uploadLoadTypeUserA(LoadTypeUserAUploadParam loadTypeUserAUploadParam) {
RLoadTypeUserManage rLoadTypeUserManage = new RLoadTypeUserManage();
//文件上传到Minio服务器，存入文件名
MinIoUploadResDTO minIoUploadResDTO = fileToMinio(loadTypeUserAUploadParam.getFile());
rLoadTypeUserManage.setAFilePath(minIoUploadResDTO.getMinFileName());
rLoadTypeUserManage.setAUploadTime(new Date());
//填入数据
BeanUtils.copyProperties(loadTypeUserAUploadParam, rLoadTypeUserManage);
//提交：待审核/保存：新建
if(Objects.equals(Param.LOAD_TYPE_USER_SUBMIT,loadTypeUserAUploadParam.getStatus())){
rLoadTypeUserManage.setAStatus(DicDataEnum.AUDIT.getCode());
}else{
rLoadTypeUserManage.setAStatus(DicDataEnum.NEWLY.getCode());
}
loadTypeUserManageMapper.updateById(rLoadTypeUserManage);
return true;
}
}