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

删除不必要的文件

Browse Source
This commit is contained in:
hongawen
2024-05-09 18:32:14 +08:00
parent 1b85acaa74
commit 928af53cc9
24 changed files with 163 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/UserReportQueryParm.java
View File

@@ -1,53 +0,0 @@
package com.njcn.process.pojo.param;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull;
/**
* Description:
* 接口文档访问地址：http://serverIP:port/swagger-ui.html
* Date: 2022/11/11 15:20【需求编号】
*
* @author clam
* @version V1.0.0
*/
@Data
public class UserReportQueryParm {
@NotNull(message="当前页不能为空！")
@Min(value = 1, message = "当前页不能为0")
@ApiModelProperty(value = "当前页",name = "currentPage",dataType ="Integer",required = true)
private Integer pageNum;
/**显示条数*/
@NotNull(message="显示条数不能为空！")
@ApiModelProperty(value = "显示条数",name = "pageSize",dataType ="Integer",required = true)
private Integer pageSize;
@ApiModelProperty(value="单位ID")
private String orgNo;
@ApiModelProperty(value="开始时间")
private String startTime;
@ApiModelProperty(value="结束时间")
private String endTime;
@ApiModelProperty(value = "申请流程类型")
@NotNull(message="申请流程类型为空！")
private Integer applyType;
@ApiModelProperty(value = "申请单类型")
@NotNull(message="申请单类型为空！")
private Integer type;
@ApiModelProperty(value = "申请页面1，审核页面2")
@NotNull(message="页面类型为空！")
private String pageType;
}

15
pqs-process/process-boot/src/main/java/com/njcn/process/mapper/UserReportPOMapper.java
View File

@@ -1,15 +0,0 @@
package com.njcn.process.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.njcn.process.pojo.po.UserReportPO;
/**
*
* Description:
* Date: 2024/4/25 10:07【需求编号】
*
* @author clam
* @version V1.0.0
*/
public interface UserReportPOMapper extends BaseMapper<UserReportPO> {
}

30
pqs-process/process-boot/src/main/java/com/njcn/process/service/UserReportPOService.java
View File

@@ -1,30 +0,0 @@
package com.njcn.process.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.njcn.process.pojo.param.UserReportParam;
import com.njcn.process.pojo.param.UserReportQueryParm;
import com.njcn.process.pojo.po.UserReportPO;
import com.baomidou.mybatisplus.extension.service.IService;
import com.njcn.process.pojo.vo.UserReportVO;
import java.util.List;
/**
*
* Description:
* Date: 2024/4/25 10:07【需求编号】
*
* @author clam
* @version V1.0.0
*/
public interface UserReportPOService extends IService<UserReportPO>{
boolean addUserReport(UserReportParam userReportParam);
boolean auditUserReport(UserReportParam.UserReportUpdate userReportUpdate);
Page<UserReportVO> getUserReport(UserReportQueryParm userReportQueryParm);
Boolean removeUserReport(List<String> ids);
}

24
pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/UserReportParam.java → pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/user/UserReportParam.java
View File

@@ -1,13 +1,15 @@
package com.njcn.process.pojo.param;
package com.njcn.supervision.pojo.param.user;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.njcn.db.bo.BaseEntity;
import com.njcn.process.pojo.po.UserReportProjectPO;
import com.njcn.process.pojo.po.UserReportSensitivePO;
import com.njcn.process.pojo.po.UserReportSubstationPO;
import com.njcn.supervision.pojo.po.user.UserReportProjectPO;
import com.njcn.supervision.pojo.po.user.UserReportSensitivePO;
import com.njcn.supervision.pojo.po.user.UserReportSubstationPO;
import com.njcn.web.pojo.param.BaseParam;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import java.time.LocalDate;
@@ -121,4 +123,18 @@ public class UserReportParam extends BaseEntity {
}
/**
* 分页查询实体
*/
@Data
@EqualsAndHashCode(callSuper = true)
public static class UserReportQueryParam extends BaseParam {
@ApiModelProperty(value="所属区域")
private String city;
}
}

18
pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/UserReportPO.java → pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/user/UserReportPO.java
View File

@@ -1,4 +1,4 @@
package com.njcn.process.pojo.po;
package com.njcn.supervision.pojo.po.user;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
@@ -22,7 +22,7 @@ import java.time.LocalDate;
@Data
@AllArgsConstructor
@NoArgsConstructor
@TableName(value = "user_report")
@TableName(value = "supervision_user_report")
public class UserReportPO extends BaseEntity {
/**
* id
@@ -108,6 +108,18 @@ public class UserReportPO extends BaseEntity {
@TableField(value = "evaluation_conclusion")
private String evaluationConclusion;
/**
* 流程实例的编号
*/
@TableField(value = "process_instance_id")
private String processInstanceId;
/**
* 审批状态：1:审批中；2：审批通过；3：审批不通过；4：已取消
*/
@TableField(value = "`status`")
private Integer status;
/**
@@ -115,4 +127,6 @@ public class UserReportPO extends BaseEntity {
*/
@TableField(value = "`State`")
private Integer state;
}

4
pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/UserReportProjectPO.java → pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/user/UserReportProjectPO.java
View File

@@ -1,4 +1,4 @@
package com.njcn.process.pojo.po;
package com.njcn.supervision.pojo.po.user;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
@@ -20,7 +20,7 @@ import lombok.NoArgsConstructor;
@Data
@AllArgsConstructor
@NoArgsConstructor
@TableName(value = "user_report_project")
@TableName(value = "supervision_user_report_project")
public class UserReportProjectPO extends BaseEntity {
/**
* 关联id

4
pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/UserReportSensitivePO.java → pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/user/UserReportSensitivePO.java
View File

@@ -1,4 +1,4 @@
package com.njcn.process.pojo.po;
package com.njcn.supervision.pojo.po.user;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
@@ -20,7 +20,7 @@ import lombok.NoArgsConstructor;
@Data
@AllArgsConstructor
@NoArgsConstructor
@TableName(value = "user_report_sensitive")
@TableName(value = "supervision_user_report_sensitive")
public class UserReportSensitivePO extends BaseEntity {
/**
* 关联id

4
pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/UserReportSubstationPO.java → pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/user/UserReportSubstationPO.java
View File

@@ -1,4 +1,4 @@
package com.njcn.process.pojo.po;
package com.njcn.supervision.pojo.po.user;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
@@ -22,7 +22,7 @@ import java.math.BigDecimal;
@Data
@AllArgsConstructor
@NoArgsConstructor
@TableName(value = "user_report_substation")
@TableName(value = "supervision_user_report_substation")
public class UserReportSubstationPO extends BaseEntity {
@TableId(value = "id", type = IdType.INPUT)
private String id;

15
pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/UserReportVO.java → pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/user/UserReportVO.java
View File

@@ -1,9 +1,10 @@
package com.njcn.process.pojo.vo;
package com.njcn.supervision.pojo.vo.user;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.njcn.process.pojo.po.UserReportProjectPO;
import com.njcn.process.pojo.po.UserReportSensitivePO;
import com.njcn.process.pojo.po.UserReportSubstationPO;
import com.njcn.supervision.pojo.po.user.UserReportProjectPO;
import com.njcn.supervision.pojo.po.user.UserReportSensitivePO;
import com.njcn.supervision.pojo.po.user.UserReportSubstationPO;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -100,6 +101,12 @@ public class UserReportVO {
@ApiModelProperty(value = "预测评估结论")
private String evaluationConclusion;
/**
* 审批状态：1:审批中；2：审批通过；3：审批不通过；4：已取消
*/
@TableField(value = "`status`")
private Integer status;
private UserReportProjectPO userReportProjectPO;

22
pqs-process/process-boot/src/main/java/com/njcn/process/controller/userreport/UserReportManageController.java → pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportManageController.java
View File

@@ -1,6 +1,5 @@
package com.njcn.process.controller.userreport;
package com.njcn.supervision.controller.user;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.njcn.common.pojo.annotation.OperateInfo;
import com.njcn.common.pojo.constant.OperateType;
@@ -8,10 +7,9 @@ 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.UserReportParam;
import com.njcn.process.pojo.param.UserReportQueryParm;
import com.njcn.process.pojo.vo.UserReportVO;
import com.njcn.process.service.UserReportPOService;
import com.njcn.supervision.pojo.param.user.UserReportParam;
import com.njcn.supervision.pojo.vo.user.UserReportVO;
import com.njcn.supervision.service.user.UserReportPOService;
import com.njcn.web.controller.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -33,13 +31,15 @@ import java.util.List;
@Slf4j
@RestController
@RequestMapping("/userReport")
@Api(tags = "干扰源用户管理(新)")
@Api(tags = "干扰源用户管理")
@AllArgsConstructor
public class UserReportManageController extends BaseController {
private final UserReportPOService userReportPOService;
@OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType= OperateType.ADD)
@PostMapping("/addUserReport")
@ApiOperation("新增干扰源用户（未建档干扰源用户管理）")
@@ -66,11 +66,11 @@ public class UserReportManageController extends BaseController {
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/getUserReport")
@ApiOperation("查询干扰源用户")
@ApiImplicitParam(name = "userReportQueryParm", value = "参数", required = true)
public HttpResult<IPage<UserReportVO>> getUserReport(@RequestBody @Validated UserReportQueryParm userReportQueryParm){
@ApiOperation("分页查询当前用户能看到的用户建档数据")
@ApiImplicitParam(name = "userReportQueryParam", value = "参数", required = true)
public HttpResult<Page<UserReportVO>> getUserReport(@RequestBody @Validated UserReportParam.UserReportQueryParam userReportQueryParam){
String methodDescribe = getMethodDescribe("getUserReport");
Page<UserReportVO> out = userReportPOService.getUserReport(userReportQueryParm);
Page<UserReportVO> out = userReportPOService.getUserReport(userReportQueryParam);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, out, methodDescribe);
}

4
pqs-process/process-boot/src/main/java/com/njcn/process/mapper/UserReportProjectPOMapper.java → pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/user/UserReportProjectPOMapper.java
View File

@@ -1,7 +1,7 @@
package com.njcn.process.mapper;
package com.njcn.supervision.mapper.user;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.njcn.process.pojo.po.UserReportProjectPO;
import com.njcn.supervision.pojo.po.user.UserReportProjectPO;
/**
*

4
pqs-process/process-boot/src/main/java/com/njcn/process/mapper/UserReportSensitivePOMapper.java → pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/user/UserReportSensitivePOMapper.java
View File

@@ -1,7 +1,7 @@
package com.njcn.process.mapper;
package com.njcn.supervision.mapper.user;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.njcn.process.pojo.po.UserReportSensitivePO;
import com.njcn.supervision.pojo.po.user.UserReportSensitivePO;
/**
*

4
pqs-process/process-boot/src/main/java/com/njcn/process/mapper/UserReportSubstationPOMapper.java → pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/user/UserReportSubstationPOMapper.java
View File

@@ -1,7 +1,7 @@
package com.njcn.process.mapper;
package com.njcn.supervision.mapper.user;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.njcn.process.pojo.po.UserReportSubstationPO;
import com.njcn.supervision.pojo.po.user.UserReportSubstationPO;
/**
*

24
pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/UserReportPOMapper.xml → pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/user/mapping/UserReportPOMapper.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.njcn.process.mapper.UserReportPOMapper">
<mapper namespace="com.njcn.supervision.mapper.user.UserReportPOMapper">
<resultMap id="BaseResultMap" type="com.njcn.process.pojo.po.UserReportPO">
<!--@mbg.generated-->
<!--@Table user_report-->
@@ -30,4 +30,26 @@
user_status, substation, voltage_level, project_name, evaluation_dept, evaluation_conclusion,
Create_By, Create_Time, Update_By, Update_Time, `State`
</sql>
<!--获取流程表单分页列表-->
<select id="page" resultType="UserReportVO">
SELECT
supervision_user_report.id,
supervision_user_report.report_date,
supervision_user_report.org_id,
supervision_user_report.expected_production_date,
supervision_user_report.user_type,
supervision_user_report.city,
supervision_user_report.responsible_department,
supervision_user_report.user_status,
supervision_user_report.substation,
supervision_user_report.voltage_level,
supervision_user_report.project_name,
supervision_user_report.evaluation_dept,
supervision_user_report.evaluation_conclusion,
supervision_user_report.process_instance_id,
supervision_user_report.status
FROM supervision_user_report supervision_user_report
WHERE ${ew.sqlSegment}
</select>
</mapper>

2
pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/UserReportProjectPOMapper.xml → pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/user/mapping/UserReportProjectPOMapper.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.njcn.process.mapper.UserReportProjectPOMapper">
<mapper namespace="com.njcn.supervision.mapper.user.UserReportProjectPOMapper">
<resultMap id="BaseResultMap" type="com.njcn.process.pojo.po.UserReportProjectPO">
<!--@mbg.generated-->
<!--@Table user_report_project-->

2
pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/UserReportSensitivePOMapper.xml → pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/user/mapping/UserReportSensitivePOMapper.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.njcn.process.mapper.UserReportSensitivePOMapper">
<mapper namespace="com.njcn.supervision.mapper.user.UserReportSensitivePOMapper">
<resultMap id="BaseResultMap" type="com.njcn.process.pojo.po.UserReportSensitivePO">
<!--@mbg.generated-->
<!--@Table user_report_sensitive-->

2
pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/UserReportSubstationPOMapper.xml → pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/user/mapping/UserReportSubstationPOMapper.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.njcn.process.mapper.UserReportSubstationPOMapper">
<mapper namespace="com.njcn.supervision.mapper.user.UserReportSubstationPOMapper">
<resultMap id="BaseResultMap" type="com.njcn.process.pojo.po.UserReportSubstationPO">
<!--@mbg.generated-->
<!--@Table user_report_substation-->

7
pqs-process/process-boot/src/main/java/com/njcn/process/service/UserReportProjectPOService.java → pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/UserReportProjectPOService.java
View File

@@ -1,8 +1,9 @@
package com.njcn.process.service;
package com.njcn.supervision.service.user;
import com.njcn.process.pojo.po.UserReportProjectPO;
import com.baomidou.mybatisplus.extension.service.IService;
/**
import com.njcn.supervision.pojo.po.user.UserReportProjectPO;
/**
*
* Description:
* Date: 2024/4/25 10:08【需求编号】

7
pqs-process/process-boot/src/main/java/com/njcn/process/service/UserReportSensitivePOService.java → pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/UserReportSensitivePOService.java
View File

@@ -1,8 +1,9 @@
package com.njcn.process.service;
package com.njcn.supervision.service.user;
import com.njcn.process.pojo.po.UserReportSensitivePO;
import com.baomidou.mybatisplus.extension.service.IService;
/**
import com.njcn.supervision.pojo.po.user.UserReportSensitivePO;
/**
*
* Description:
* Date: 2024/4/25 10:09【需求编号】

7
pqs-process/process-boot/src/main/java/com/njcn/process/service/UserReportSubstationPOService.java → pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/UserReportSubstationPOService.java
View File

@@ -1,8 +1,9 @@
package com.njcn.process.service;
package com.njcn.supervision.service.user;
import com.njcn.process.pojo.po.UserReportSubstationPO;
import com.baomidou.mybatisplus.extension.service.IService;
/**
import com.njcn.supervision.pojo.po.user.UserReportSubstationPO;
/**
*
* Description:
* Date: 2024/4/25 10:09【需求编号】

104
pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/UserReportPOServiceImpl.java → pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java
View File

@@ -1,33 +1,34 @@
package com.njcn.process.service.impl;
package com.njcn.supervision.service.user.impl;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njcn.process.mapper.UserReportPOMapper;
import com.njcn.process.pojo.param.UserReportParam;
import com.njcn.process.pojo.param.UserReportQueryParm;
import com.njcn.process.pojo.po.UserReportPO;
import com.njcn.process.pojo.po.UserReportProjectPO;
import com.njcn.process.pojo.po.UserReportSensitivePO;
import com.njcn.process.pojo.po.UserReportSubstationPO;
import com.njcn.process.pojo.vo.UserReportVO;
import com.njcn.process.service.UserReportPOService;
import com.njcn.process.service.UserReportProjectPOService;
import com.njcn.process.service.UserReportSensitivePOService;
import com.njcn.process.service.UserReportSubstationPOService;
import com.njcn.user.api.DeptFeignClient;
import com.njcn.user.pojo.vo.PvTerminalTreeVO;
import com.njcn.common.pojo.enums.common.DataStateEnum;
import com.njcn.supervision.mapper.user.UserReportPOMapper;
import com.njcn.supervision.pojo.param.user.UserReportParam;
import com.njcn.supervision.pojo.po.user.UserReportPO;
import com.njcn.supervision.pojo.po.user.UserReportProjectPO;
import com.njcn.supervision.pojo.po.user.UserReportSensitivePO;
import com.njcn.supervision.pojo.po.user.UserReportSubstationPO;
import com.njcn.supervision.pojo.vo.user.UserReportVO;
import com.njcn.supervision.service.user.UserReportPOService;
import com.njcn.supervision.service.user.UserReportProjectPOService;
import com.njcn.supervision.service.user.UserReportSensitivePOService;
import com.njcn.supervision.service.user.UserReportSubstationPOService;
import com.njcn.web.factory.PageFactory;
import com.njcn.web.utils.RequestUtil;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.BeanWrapper;
import org.springframework.beans.BeanWrapperImpl;
import org.springframework.stereotype.Service;
import java.util.*;
import java.util.stream.Collectors;
import java.util.HashSet;
import java.util.List;
import java.util.Objects;
import java.util.Set;
/**
*
@@ -39,12 +40,11 @@ import java.util.stream.Collectors;
*/
@Service
@RequiredArgsConstructor
public class UserReportPOServiceImpl extends ServiceImpl<UserReportPOMapper, UserReportPO> implements UserReportPOService{
public class UserReportPOServiceImpl extends ServiceImpl<UserReportPOMapper, UserReportPO> implements UserReportPOService {
private final UserReportProjectPOService userReportProjectPOService;
private final UserReportSubstationPOService userReportSubstationPOService;
private final UserReportSensitivePOService userReportSensitivePOService;
private final DeptFeignClient deptFeignClient;
@Override
@@ -101,54 +101,24 @@ public class UserReportPOServiceImpl extends ServiceImpl<UserReportPOMapper, Use
return false;
}
/**
* 正常用户只能看到自己的申请+需要自己审批的
* 部门管理员可以看到部门下所有的+自己的+需要自己审批的 todo。。。
*/
@Override
public Page<UserReportVO> getUserReport(UserReportQueryParm userReportQueryParm) {
Page<UserReportVO> page = new Page<> (userReportQueryParm.getPageNum(), userReportQueryParm.getPageSize());
IPage<UserReportPO> tempPage = new Page<> (userReportQueryParm.getPageNum(), userReportQueryParm.getPageSize());
String loginUsrId = RequestUtil.getUserIndex();
//部门处理：根据部门code取名称
List<PvTerminalTreeVO> dept = deptFeignClient.allDeptList().getData();
Map<String, String> pvTerminalTreeVOMap = dept.stream().collect(Collectors.toMap(PvTerminalTreeVO::getId, PvTerminalTreeVO::getName));
QueryWrapper<UserReportPO> queryWrapper = new QueryWrapper<> ();
/*type=1：新建页面：查看自己负责的计划；type=2：审核页面：审核者==当前用户；结果页面：查看自己负责的计划*/
// if (Objects.equals(userReportQueryParm.getPageType(),"1") ) {
// queryWrapper.lambda().eq(UserReportPO::getCreateBy, loginUsrId);
// queryWrapper.lambda().in(UserReportPO::getProcessStatus, Stream.of(1,3,4,5).collect(Collectors.toList()));
// }
// if (Objects.equals(userReportQueryParm.getPageType(),"2")) {
// queryWrapper.lambda().eq(RFlowProcessPO::getChecker, loginUsrId);
// queryWrapper.lambda().in(RFlowProcessPO::getProcessStatus, Stream.of(2).collect(Collectors.toList()));
// }
queryWrapper.lambda().eq(UserReportPO::getUserType,userReportQueryParm.getType())
.eq(UserReportPO::getState,1)
.between(StringUtils.isNotBlank(userReportQueryParm.getStartTime()) &&
StringUtils.isNotBlank(userReportQueryParm.getEndTime()) ,
UserReportPO::getCreateTime,userReportQueryParm.getStartTime()+" 00:00:00",userReportQueryParm.getEndTime()+" 23:59:59");
IPage<UserReportPO> tempPageList = this.getBaseMapper().selectPage (tempPage, queryWrapper);
List<UserReportVO> collect = tempPageList.getRecords().stream().map(temp->{
UserReportVO userReportVO = new UserReportVO();
BeanUtils.copyProperties(temp,userReportVO);
if(Objects.equals(userReportVO.getUserType(),"1")||
Objects.equals(userReportVO.getUserType(),"2")){
UserReportProjectPO userReportProjectPO = userReportProjectPOService.getById(temp.getId());
userReportVO.setUserReportProjectPO(userReportProjectPO);
}else if(Objects.equals(userReportVO.getUserType(),"3")||
Objects.equals(userReportVO.getUserType(),"4")){
UserReportSubstationPO userReportSubstationPO = userReportSubstationPOService.getById(temp.getId());
userReportVO.setUserReportSubstationPO(userReportSubstationPO);
}else if(Objects.equals(userReportVO.getUserType(),"5")){
UserReportSensitivePO userReportSensitivePO = userReportSensitivePOService.getById(temp.getId());
userReportVO.setUserReportSensitivePO(userReportSensitivePO);
public Page<UserReportVO> getUserReport(UserReportParam.UserReportQueryParam userReportQueryParam) {
String userIndex = RequestUtil.getUserIndex();
QueryWrapper<UserReportVO> userReportVOQueryWrapper = new QueryWrapper<>();
userReportVOQueryWrapper.in("supervision_user_report.create_by", CollectionUtil.newArrayList(userIndex))
.eq("supervision_user_report.state", DataStateEnum.ENABLE.getCode());
if(Objects.nonNull(userReportQueryParam)){
if(StrUtil.isNotBlank(userReportQueryParam.getCity())){
//查询所有区域下的数据
userReportVOQueryWrapper.in("supervision_user_report.city",userReportQueryParam.getCity());
}
return userReportVO;
}).collect(Collectors.toList());
page.setRecords(collect);
page.setTotal(page.getTotal());
return page;
}
userReportVOQueryWrapper.orderByDesc("supervision_user_report.create_time");
return this.baseMapper.page(new Page<>(PageFactory.getPageNum(userReportQueryParam), PageFactory.getPageSize(userReportQueryParam)), userReportVOQueryWrapper);
}
@Override

14
pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/UserReportProjectPOServiceImpl.java → pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportProjectPOServiceImpl.java
View File

@@ -1,12 +1,10 @@
package com.njcn.process.service.impl;
package com.njcn.supervision.service.user.impl;
import org.springframework.stereotype.Service;
import org.springframework.beans.factory.annotation.Autowired;
import java.util.List;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njcn.process.mapper.UserReportProjectPOMapper;
import com.njcn.process.pojo.po.UserReportProjectPO;
import com.njcn.process.service.UserReportProjectPOService;
import com.njcn.supervision.mapper.user.UserReportProjectPOMapper;
import com.njcn.supervision.pojo.po.user.UserReportProjectPO;
import com.njcn.supervision.service.user.UserReportProjectPOService;
import org.springframework.stereotype.Service;
/**
*
* Description:
@@ -16,6 +14,6 @@ import com.njcn.process.service.UserReportProjectPOService;
* @version V1.0.0
*/
@Service
public class UserReportProjectPOServiceImpl extends ServiceImpl<UserReportProjectPOMapper, UserReportProjectPO> implements UserReportProjectPOService{
public class UserReportProjectPOServiceImpl extends ServiceImpl<UserReportProjectPOMapper, UserReportProjectPO> implements UserReportProjectPOService {
}

14
pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/UserReportSensitivePOServiceImpl.java → pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportSensitivePOServiceImpl.java
View File

@@ -1,12 +1,10 @@
package com.njcn.process.service.impl;
package com.njcn.supervision.service.user.impl;
import org.springframework.stereotype.Service;
import org.springframework.beans.factory.annotation.Autowired;
import java.util.List;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njcn.process.pojo.po.UserReportSensitivePO;
import com.njcn.process.mapper.UserReportSensitivePOMapper;
import com.njcn.process.service.UserReportSensitivePOService;
import com.njcn.supervision.mapper.user.UserReportSensitivePOMapper;
import com.njcn.supervision.pojo.po.user.UserReportSensitivePO;
import com.njcn.supervision.service.user.UserReportSensitivePOService;
import org.springframework.stereotype.Service;
/**
*
* Description:
@@ -16,6 +14,6 @@ import com.njcn.process.service.UserReportSensitivePOService;
* @version V1.0.0
*/
@Service
public class UserReportSensitivePOServiceImpl extends ServiceImpl<UserReportSensitivePOMapper, UserReportSensitivePO> implements UserReportSensitivePOService{
public class UserReportSensitivePOServiceImpl extends ServiceImpl<UserReportSensitivePOMapper, UserReportSensitivePO> implements UserReportSensitivePOService {
}

14
pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/UserReportSubstationPOServiceImpl.java → pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportSubstationPOServiceImpl.java
View File

@@ -1,12 +1,10 @@
package com.njcn.process.service.impl;
package com.njcn.supervision.service.user.impl;
import org.springframework.stereotype.Service;
import org.springframework.beans.factory.annotation.Autowired;
import java.util.List;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njcn.process.mapper.UserReportSubstationPOMapper;
import com.njcn.process.pojo.po.UserReportSubstationPO;
import com.njcn.process.service.UserReportSubstationPOService;
import com.njcn.supervision.mapper.user.UserReportSubstationPOMapper;
import com.njcn.supervision.pojo.po.user.UserReportSubstationPO;
import com.njcn.supervision.service.user.UserReportSubstationPOService;
import org.springframework.stereotype.Service;
/**
*
* Description:
@@ -16,6 +14,6 @@ import com.njcn.process.service.UserReportSubstationPOService;
* @version V1.0.0
*/
@Service
public class UserReportSubstationPOServiceImpl extends ServiceImpl<UserReportSubstationPOMapper, UserReportSubstationPO> implements UserReportSubstationPOService{
public class UserReportSubstationPOServiceImpl extends ServiceImpl<UserReportSubstationPOMapper, UserReportSubstationPO> implements UserReportSubstationPOService {
}