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

表单提交

Browse Source
This commit is contained in:
hzj
2024-05-13 14:55:33 +08:00
parent d814600c85
commit 14fe1a7537
28 changed files with 1679 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/dev/DeVReportManageController.java Normal file
View File

@@ -0,0 +1,72 @@
package com.njcn.supervision.controller.dev;
import com.njcn.common.pojo.annotation.OperateInfo;
import com.njcn.common.pojo.constant.OperateType;
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.supervision.pojo.param.user.SupervisionDevMainReportParam;
import com.njcn.supervision.service.dev.SupervisionDevMainReportPOService;
import com.njcn.web.controller.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* 干扰源用户管理
*
* @author qijian
* @version 1.0.0
* @createTime 2022/11/11 - 9:20
*/
@Slf4j
@RestController
@RequestMapping("/deVReport")
@Api(tags = "电能质量监测装置设备管理")
@AllArgsConstructor
public class DeVReportManageController extends BaseController {
private final SupervisionDevMainReportPOService supervisionDevMainReportPOService;
@OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType= OperateType.ADD)
@PostMapping("/add")
@ApiOperation("新增电能质量监测装置设备")
@ApiImplicitParam(name = "supervisionDevMainReportParam", value = "实体参数", required = true)
public HttpResult<String> addDevReport(@RequestBody @Validated SupervisionDevMainReportParam supervisionDevMainReportParam){
String methodDescribe = getMethodDescribe("userReportParam");
String devReportId = supervisionDevMainReportPOService.addDevReport(supervisionDevMainReportParam);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, devReportId, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType= OperateType.ADD)
@PostMapping("/auditDevReport")
@ApiOperation("修改电能质量监测装置设备")
@ApiImplicitParam(name = "supervisionDevMainReportParamUpdate", value = "实体参数", required = true)
public HttpResult<Boolean> auditDevReport(@RequestBody @Validated SupervisionDevMainReportParam.SupervisionDevMainReportParamUpdate supervisionDevMainReportParamUpdate){
String methodDescribe = getMethodDescribe("auditDevReport");
boolean res = supervisionDevMainReportPOService.auditDevReport(supervisionDevMainReportParamUpdate);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, res, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/removeDevReport")
@ApiOperation("移除电能质量监测装置设备")
public HttpResult<Boolean> removeDevReport(@RequestParam("ids") List<String> ids){
String methodDescribe = getMethodDescribe("removeDevReport");
Boolean flag = supervisionDevMainReportPOService.removeDevReport(ids);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
}
}

3
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportManageController.java
View File

@@ -1,7 +1,6 @@
package com.njcn.supervision.controller.user;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.njcn.bpm.pojo.po.BpmForm;
import com.njcn.common.pojo.annotation.OperateInfo;
import com.njcn.common.pojo.constant.OperateType;
import com.njcn.common.pojo.enums.common.LogEnum;
@@ -16,7 +15,6 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
@@ -76,7 +74,6 @@ public class UserReportManageController extends BaseController {
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/removeUserReport")
@ApiOperation("查询干扰源用户")
@ApiImplicitParam(name = "userReportQueryParm", value = "参数", required = true)
public HttpResult<Boolean> removeUserReport(@RequestParam("ids") List<String> ids){
String methodDescribe = getMethodDescribe("removeUserReport");
Boolean flag = userReportPOService.removeUserReport(ids);

14
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/dev/SupervisionDevMainReportPOMapper.java Normal file
View File

@@ -0,0 +1,14 @@
package com.njcn.supervision.mapper.dev;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.njcn.supervision.pojo.po.dev.SupervisionDevMainReportPO;
/**
* Description:
* Date: 2024/5/10 18:16【需求编号】
*
* @author clam
* @version V1.0.0
*/
public interface SupervisionDevMainReportPOMapper extends BaseMapper<SupervisionDevMainReportPO> {
}

15
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/dev/SupervisionTempDeviceReportMapper.java Normal file
View File

@@ -0,0 +1,15 @@
package com.njcn.supervision.mapper.dev;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.njcn.supervision.pojo.po.dev.SupervisionTempDeviceReport;
/**
*
* Description:
* Date: 2024/5/11 14:07【需求编号】
*
* @author clam
* @version V1.0.0
*/
public interface SupervisionTempDeviceReportMapper extends BaseMapper<SupervisionTempDeviceReport> {
}

15
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/dev/SupervisionTempLineReportMapper.java Normal file
View File

@@ -0,0 +1,15 @@
package com.njcn.supervision.mapper.dev;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.njcn.supervision.pojo.po.dev.SupervisionTempLineReport;
/**
*
* Description:
* Date: 2024/5/11 14:07【需求编号】
*
* @author clam
* @version V1.0.0
*/
public interface SupervisionTempLineReportMapper extends BaseMapper<SupervisionTempLineReport> {
}

38
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/dev/mapping/SupervisionDevMainReportPOMapper.xml Normal file
View File

@@ -0,0 +1,38 @@
<?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.supervision.mapper.dev.SupervisionDevMainReportPOMapper">
<resultMap id="BaseResultMap" type="com.njcn.supervision.pojo.po.dev.SupervisionDevMainReportPO">
<!--@mbg.generated-->
<!--@Table supervision_dev_main_report-->
<id column="id" jdbcType="VARCHAR" property="id" />
<result column="reporter" jdbcType="VARCHAR" property="reporter" />
<result column="report_date" jdbcType="DATE" property="reportDate" />
<result column="org_id" jdbcType="VARCHAR" property="orgId" />
<result column="expected_production_date" jdbcType="DATE" property="expectedProductionDate" />
<result column="city" jdbcType="VARCHAR" property="city" />
<result column="user_status" jdbcType="VARCHAR" property="userStatus" />
<result column="user_name" jdbcType="VARCHAR" property="userName" />
<result column="acceptance_inspection_report" jdbcType="VARCHAR" property="acceptanceInspectionReport" />
<result column="acceptance_inspection_report_single" jdbcType="VARCHAR" property="acceptanceInspectionReportSingle" />
<result column="type_experiment_report" jdbcType="VARCHAR" property="typeExperimentReport" />
<result column="factory_inspection_report" jdbcType="VARCHAR" property="factoryInspectionReport" />
<result column="performance_test_report" jdbcType="VARCHAR" property="performanceTestReport" />
<result column="information_security_test_report" jdbcType="VARCHAR" property="informationSecurityTestReport" />
<result column="other_attachments" jdbcType="VARCHAR" property="otherAttachments" />
<result column="process_instance_id" jdbcType="VARCHAR" property="processInstanceId" />
<result column="status" jdbcType="BIT" property="status" />
<result column="Create_By" jdbcType="CHAR" property="createBy" />
<result column="Create_Time" jdbcType="TIMESTAMP" property="createTime" />
<result column="Update_By" jdbcType="CHAR" property="updateBy" />
<result column="Update_Time" jdbcType="TIMESTAMP" property="updateTime" />
<result column="State" jdbcType="BIT" property="state" />
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
id, reporter, report_date, org_id, expected_production_date, city, user_status, user_name,
acceptance_inspection_report, acceptance_inspection_report_single, type_experiment_report,
factory_inspection_report, performance_test_report, information_security_test_report,
other_attachments, process_instance_id, `status`, Create_By, Create_Time, Update_By,
Update_Time, `State`
</sql>
</mapper>

58
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/dev/mapping/SupervisionTempDeviceReportMapper.xml Normal file
View File

@@ -0,0 +1,58 @@
<?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.supervision.mapper.dev.SupervisionTempDeviceReportMapper">
<resultMap id="BaseResultMap" type="com.njcn.supervision.pojo.po.dev.SupervisionTempDeviceReport">
<!--@mbg.generated-->
<!--@Table supervision_temp_device_report-->
<id column="id" jdbcType="INTEGER" property="id" />
<result column="power_company" jdbcType="VARCHAR" property="powerCompany" />
<result column="substation" jdbcType="VARCHAR" property="substation" />
<result column="substation_voltage_level" jdbcType="VARCHAR" property="substationVoltageLevel" />
<result column="monitoring_terminal_code" jdbcType="VARCHAR" property="monitoringTerminalCode" />
<result column="monitoring_terminal_name" jdbcType="VARCHAR" property="monitoringTerminalName" />
<result column="voltage_transformer_type" jdbcType="VARCHAR" property="voltageTransformerType" />
<result column="terminal_wiring_method_type" jdbcType="VARCHAR" property="terminalWiringMethodType" />
<result column="neutral_point_wiring_method" jdbcType="VARCHAR" property="neutralPointWiringMethod" />
<result column="manufacturer" jdbcType="VARCHAR" property="manufacturer" />
<result column="manufacturer_device_number" jdbcType="VARCHAR" property="manufacturerDeviceNumber" />
<result column="terminal_ip" jdbcType="VARCHAR" property="terminalIp" />
<result column="terminal_type" jdbcType="VARCHAR" property="terminalType" />
<result column="terminal_port" jdbcType="VARCHAR" property="terminalPort" />
<result column="front_end_machine" jdbcType="VARCHAR" property="frontEndMachine" />
<result column="current_terminal_detection_time" jdbcType="TIMESTAMP" property="currentTerminalDetectionTime" />
<result column="next_terminal_inspection_time" jdbcType="TIMESTAMP" property="nextTerminalInspectionTime" />
<result column="identification_code" jdbcType="VARCHAR" property="identificationCode" />
<result column="terminal_secret_key" jdbcType="VARCHAR" property="terminalSecretKey" />
<result column="longitude" jdbcType="DECIMAL" property="longitude" />
<result column="latitude" jdbcType="DECIMAL" property="latitude" />
<result column="terminal_model" jdbcType="VARCHAR" property="terminalModel" />
<result column="data_type" jdbcType="VARCHAR" property="dataType" />
<result column="communication_status" jdbcType="VARCHAR" property="communicationStatus" />
<result column="sim_card_number" jdbcType="VARCHAR" property="simCardNumber" />
<result column="commissioning_time" jdbcType="TIMESTAMP" property="commissioningTime" />
<result column="data_update_time" jdbcType="TIMESTAMP" property="dataUpdateTime" />
<result column="time_sync_function" jdbcType="VARCHAR" property="timeSyncFunction" />
<result column="electroplating_function" jdbcType="VARCHAR" property="electroplatingFunction" />
<result column="monitoring_device_installation_position" jdbcType="VARCHAR" property="monitoringDeviceInstallationPosition" />
<result column="summon_flag" jdbcType="VARCHAR" property="summonFlag" />
<result column="alarm_function" jdbcType="VARCHAR" property="alarmFunction" />
<result column="contract_number" jdbcType="VARCHAR" property="contractNumber" />
<result column="Create_By" jdbcType="CHAR" property="createBy" />
<result column="Create_Time" jdbcType="TIMESTAMP" property="createTime" />
<result column="Update_By" jdbcType="CHAR" property="updateBy" />
<result column="Update_Time" jdbcType="TIMESTAMP" property="updateTime" />
<result column="State" jdbcType="BIT" property="state" />
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
id, power_company, substation, substation_voltage_level, monitoring_terminal_code,
monitoring_terminal_name, voltage_transformer_type, terminal_wiring_method_type,
neutral_point_wiring_method, manufacturer, manufacturer_device_number, terminal_ip,
terminal_type, terminal_port, front_end_machine, current_terminal_detection_time,
next_terminal_inspection_time, identification_code, terminal_secret_key, longitude,
latitude, terminal_model, data_type, communication_status, sim_card_number, commissioning_time,
data_update_time, time_sync_function, electroplating_function, monitoring_device_installation_position,
summon_flag, alarm_function, contract_number, Create_By, Create_Time, Update_By,
Update_Time, `State`
</sql>
</mapper>

38
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/dev/mapping/SupervisionTempLineReportMapper.xml Normal file
View File

@@ -0,0 +1,38 @@
<?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.supervision.mapper.dev.SupervisionTempLineReportMapper">
<resultMap id="BaseResultMap" type="com.njcn.supervision.pojo.po.dev.SupervisionTempLineReport">
<!--@mbg.generated-->
<!--@Table supervision_temp_line_report-->
<result column="id" jdbcType="VARCHAR" property="id" />
<result column="line_name" jdbcType="VARCHAR" property="lineName" />
<result column="voltage_level" jdbcType="VARCHAR" property="voltageLevel" />
<result column="connected_bus" jdbcType="VARCHAR" property="connectedBus" />
<result column="short_capacity" jdbcType="REAL" property="shortCapacity" />
<result column="deal_capacity" jdbcType="REAL" property="dealCapacity" />
<result column="dev_capacity" jdbcType="REAL" property="devCapacity" />
<result column="standard_capacity" jdbcType="REAL" property="standardCapacity" />
<result column="ct_ratio" jdbcType="REAL" property="ctRatio" />
<result column="pt_ratio" jdbcType="REAL" property="ptRatio" />
<result column="line_id" jdbcType="VARCHAR" property="lineId" />
<result column="time_interval" jdbcType="INTEGER" property="timeInterval" />
<result column="Load_Type" jdbcType="VARCHAR" property="loadType" />
<result column="Business_Type" jdbcType="VARCHAR" property="businessType" />
<result column="point_nature" jdbcType="VARCHAR" property="pointNature" />
<result column="is_statistical" jdbcType="BIT" property="isStatistical" />
<result column="Obj_Name" jdbcType="VARCHAR" property="objName" />
<result column="Power_Substation_Name" jdbcType="VARCHAR" property="powerSubstationName" />
<result column="is_grid_connection_point" jdbcType="BIT" property="isGridConnectionPoint" />
<result column="operation_status" jdbcType="VARCHAR" property="operationStatus" />
<result column="main_wiring_diagram" jdbcType="VARCHAR" property="mainWiringDiagram" />
<result column="voltage_deviation_upper_limit" jdbcType="REAL" property="voltageDeviationUpperLimit" />
<result column="voltage_deviation_lower_limit" jdbcType="REAL" property="voltageDeviationLowerLimit" />
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
id, line_name, voltage_level, connected_bus, short_capacity, deal_capacity, dev_capacity,
standard_capacity, ct_ratio, pt_ratio, line_id, time_interval, Load_Type, Business_Type,
point_nature, is_statistical, Obj_Name, Power_Substation_Name, is_grid_connection_point,
operation_status, main_wiring_diagram, voltage_deviation_upper_limit, voltage_deviation_lower_limit
</sql>
</mapper>

25
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/dev/SupervisionDevMainReportPOService.java Normal file
View File

@@ -0,0 +1,25 @@
package com.njcn.supervision.service.dev;
import com.baomidou.mybatisplus.extension.service.IService;
import com.njcn.supervision.pojo.param.user.SupervisionDevMainReportParam;
import com.njcn.supervision.pojo.po.dev.SupervisionDevMainReportPO;
import java.util.List;
/**
*
* Description:
* Date: 2024/5/10 18:10【需求编号】
*
* @author clam
* @version V1.0.0
*/
public interface SupervisionDevMainReportPOService extends IService<SupervisionDevMainReportPO>{
String addDevReport(SupervisionDevMainReportParam supervisionDevMainReportParam);
boolean auditDevReport(SupervisionDevMainReportParam.SupervisionDevMainReportParamUpdate supervisionDevMainReportParamUpdate);
Boolean removeDevReport(List<String> ids);
}

16
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/dev/SupervisionTempDeviceReportService.java Normal file
View File

@@ -0,0 +1,16 @@
package com.njcn.supervision.service.dev;
import com.njcn.supervision.pojo.po.dev.SupervisionTempDeviceReport;
import com.baomidou.mybatisplus.extension.service.IService;
/**
*
* Description:
* Date: 2024/5/11 14:07【需求编号】
*
* @author clam
* @version V1.0.0
*/
public interface SupervisionTempDeviceReportService extends IService<SupervisionTempDeviceReport>{
}

16
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/dev/SupervisionTempLineReportService.java Normal file
View File

@@ -0,0 +1,16 @@
package com.njcn.supervision.service.dev;
import com.njcn.supervision.pojo.po.dev.SupervisionTempLineReport;
import com.baomidou.mybatisplus.extension.service.IService;
/**
*
* Description:
* Date: 2024/5/11 14:07【需求编号】
*
* @author clam
* @version V1.0.0
*/
public interface SupervisionTempLineReportService extends IService<SupervisionTempLineReport>{
}

132
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/dev/impl/SupervisionDevMainReportPOServiceImpl.java Normal file
View File

@@ -0,0 +1,132 @@
package com.njcn.supervision.service.dev.impl;
import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njcn.bpm.api.BpmProcessFeignClient;
import com.njcn.bpm.pojo.dto.BpmProcessInstanceCreateReqDTO;
import com.njcn.common.pojo.enums.common.DataStateEnum;
import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.supervision.enums.FlowStatusEnum;
import com.njcn.supervision.mapper.dev.SupervisionDevMainReportPOMapper;
import com.njcn.supervision.pojo.param.user.SupervisionDevMainReportParam;
import com.njcn.supervision.pojo.param.user.SupervisionTempDeviceReportParam;
import com.njcn.supervision.pojo.param.user.SupervisionTempLineReportParam;
import com.njcn.supervision.pojo.po.dev.SupervisionDevMainReportPO;
import com.njcn.supervision.pojo.po.dev.SupervisionTempDeviceReport;
import com.njcn.supervision.pojo.po.dev.SupervisionTempLineReport;
import com.njcn.supervision.service.dev.SupervisionDevMainReportPOService;
import com.njcn.supervision.service.dev.SupervisionTempDeviceReportService;
import com.njcn.supervision.service.dev.SupervisionTempLineReportService;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
*
* Description:
* Date: 2024/5/10 18:10【需求编号】
*
* @author clam
* @version V1.0.0
*/
@Service
@RequiredArgsConstructor
public class SupervisionDevMainReportPOServiceImpl extends ServiceImpl<SupervisionDevMainReportPOMapper, SupervisionDevMainReportPO> implements SupervisionDevMainReportPOService {
/**
* 用户信息建档对应的流程定义 KEY
*/
//todo 修改成建设阶段流程图key
public static final String PROCESS_KEY = "build_user_info";
private final BpmProcessFeignClient bpmProcessFeignClient;
private final SupervisionTempDeviceReportService supervisionTempDeviceReportService;
private final SupervisionTempLineReportService supervisionTempLineReportService;
@Override
@Transactional(rollbackFor = Exception.class)
public String addDevReport(SupervisionDevMainReportParam supervisionDevMainReportParam) {
//判断干扰源用户是否绑定
checkUserId(supervisionDevMainReportParam, false);
SupervisionDevMainReportPO supervisionDevMainReportPO = new SupervisionDevMainReportPO();
BeanUtils.copyProperties(supervisionDevMainReportParam, supervisionDevMainReportPO);
supervisionDevMainReportPO.setState(DataStateEnum.ENABLE.getCode());
this.save(supervisionDevMainReportPO);
String id = supervisionDevMainReportPO.getId();
//存储临时终端信息
SupervisionTempDeviceReportParam supervisionTempDeviceReportParam = supervisionDevMainReportParam.getSupervisionTempDeviceReportParam();
SupervisionTempDeviceReport supervisionTempDeviceReportPO = new SupervisionTempDeviceReport();
BeanUtils.copyProperties(supervisionTempDeviceReportParam, supervisionTempDeviceReportPO);
supervisionTempDeviceReportPO.setId(id);
supervisionTempDeviceReportService.save(supervisionTempDeviceReportPO);
//存储临时监测点信息
SupervisionTempLineReportParam supervisionTempLineReportParam = supervisionDevMainReportParam.getSupervisionTempLineReportParam();
SupervisionTempLineReport supervisionTempLineReport = new SupervisionTempLineReport();
BeanUtils.copyProperties(supervisionTempLineReportParam, supervisionTempLineReport);
supervisionTempDeviceReportPO.setId(id);
supervisionTempLineReportService.save(supervisionTempLineReport);
// 发起 BPM 流程
Map<String, Object> processInstanceVariables = new HashMap<>();
BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO();
bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(PROCESS_KEY);
bpmProcessInstanceCreateReqDTO.setBusinessKey(id);
bpmProcessInstanceCreateReqDTO.setStartUserSelectAssignees(supervisionDevMainReportParam.getStartUserSelectAssignees());
bpmProcessInstanceCreateReqDTO.setVariables(processInstanceVariables);
String processInstanceId = bpmProcessFeignClient.createProcessInstance(supervisionDevMainReportPO.getCreateBy(),bpmProcessInstanceCreateReqDTO).getData();
// 将工作流的编号，更新到流程单中
supervisionDevMainReportPO.setProcessInstanceId(processInstanceId);
this.baseMapper.updateById(supervisionDevMainReportPO);
return id;
}
@Override
public boolean auditDevReport(SupervisionDevMainReportParam.SupervisionDevMainReportParamUpdate supervisionDevMainReportParamUpdate) {
return true;
}
@Override
public Boolean removeDevReport(List<String> ids) {
// this.lambdaUpdate().set(SupervisionDevMainReportPO::getState,)
return true;
}
/**
* @Description: 判断干扰源用户是否绑定设备，如果重复则提示干扰源用户已经设备
* @Param: supervisionDevMainReportParam终端详情 isExcludeSelf是否排除自己，一般新增不排除，更新时需要排除自己
* @return: void
* @Author: clam
* @Date: 2024/5/11
*/
private void checkUserId(SupervisionDevMainReportParam supervisionDevMainReportParam, boolean isExcludeSelf) {
LambdaQueryWrapper<SupervisionDevMainReportPO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper
.eq(SupervisionDevMainReportPO::getUserId, supervisionDevMainReportParam.getUserId())
.eq(SupervisionDevMainReportPO::getState, DataStateEnum.ENABLE.getCode());
//更新的时候，需排除当前记录
if (isExcludeSelf) {
lambdaQueryWrapper.ne(SupervisionDevMainReportPO::getId, supervisionDevMainReportParam.getId());
}
List<SupervisionDevMainReportPO> list = this.baseMapper.selectList(lambdaQueryWrapper);
if (CollectionUtil.isNotEmpty(list)) {
//过滤已取消的申请
list = list.stream()
.filter(userReportPO -> !userReportPO.getStatus().equals(FlowStatusEnum.CANCEL.getCode()))
.collect(Collectors.toList());
//如果还存在，则说明有人申请过了
if (CollectionUtil.isNotEmpty(list)) {
throw new BusinessException(supervisionDevMainReportParam.getUserName().concat(",扰源用户").concat(list.get(0).getReporter()).concat("绑定"));
}
}
}
}

21
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/dev/impl/SupervisionTempDeviceReportServiceImpl.java Normal file
View File

@@ -0,0 +1,21 @@
package com.njcn.supervision.service.dev.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.supervision.mapper.dev.SupervisionTempDeviceReportMapper;
import com.njcn.supervision.pojo.po.dev.SupervisionTempDeviceReport;
import com.njcn.supervision.service.dev.SupervisionTempDeviceReportService;
/**
*
* Description:
* Date: 2024/5/11 14:07【需求编号】
*
* @author clam
* @version V1.0.0
*/
@Service
public class SupervisionTempDeviceReportServiceImpl extends ServiceImpl<SupervisionTempDeviceReportMapper, SupervisionTempDeviceReport> implements SupervisionTempDeviceReportService{
}

21
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/dev/impl/SupervisionTempLineReportServiceImpl.java Normal file
View File

@@ -0,0 +1,21 @@
package com.njcn.supervision.service.dev.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.supervision.mapper.dev.SupervisionTempLineReportMapper;
import com.njcn.supervision.pojo.po.dev.SupervisionTempLineReport;
import com.njcn.supervision.service.dev.SupervisionTempLineReportService;
/**
*
* Description:
* Date: 2024/5/11 14:07【需求编号】
*
* @author clam
* @version V1.0.0
*/
@Service
public class SupervisionTempLineReportServiceImpl extends ServiceImpl<SupervisionTempLineReportMapper, SupervisionTempLineReport> implements SupervisionTempLineReportService{
}

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

@@ -121,27 +121,37 @@ public class UserReportPOServiceImpl extends ServiceImpl<UserReportPOMapper, Use
@Override
public boolean auditUserReport(UserReportParam.UserReportUpdate userReportUpdate) {
//判断工程名称是否有重复的
checkProjectName(userReportUpdate, true);
String id = userReportUpdate.getId();
UserReportPO byId = this.getById(id);
BeanUtils.copyProperties(userReportUpdate, byId);
this.updateById(byId);
if (Objects.equals(userReportUpdate.getUserType(), "1") ||
Objects.equals(userReportUpdate.getUserType(), "2")) {
if (CollectionUtil.newArrayList(
UserNatureEnum.BUILD_POWER_GRID.getCode(),
UserNatureEnum.EXTEND_POWER_GRID.getCode()
).contains(byId.getUserType())) {
//电网工程类用户额外数据
UserReportProjectPO userReportProjectPO = userReportProjectPOService.getById(id);
BeanUtils.copyProperties(userReportUpdate.getUserReportProjectPO(), userReportProjectPO, getNullPropertyNames(userReportUpdate.getUserReportProjectPO()));
userReportProjectPOService.updateById(userReportProjectPO);
} else if (Objects.equals(userReportUpdate.getUserType(), "3") ||
Objects.equals(userReportUpdate.getUserType(), "4")) {
} else if ( CollectionUtil.newArrayList(
UserNatureEnum.BUILD_NON_LINEAR_LOAD.getCode(),
UserNatureEnum.EXTEND_NON_LINEAR_LOAD.getCode(),
UserNatureEnum.BUILD_NEW_ENERGY_POWER_STATION.getCode(),
UserNatureEnum.EXTEND_NEW_ENERGY_POWER_STATION.getCode()
).contains(byId.getUserType())) {
UserReportSubstationPO userReportSubstationPO = userReportSubstationPOService.getById(id);
BeanUtils.copyProperties(userReportUpdate.getUserReportSubstationPO(), userReportSubstationPO, getNullPropertyNames(userReportUpdate.getUserReportSubstationPO()));
userReportSubstationPOService.updateById(userReportSubstationPO);
} else if (Objects.equals(userReportUpdate.getUserType(), "5")) {
} else if (UserNatureEnum.SENSITIVE_USER.getCode().equals(byId.getUserType())) {
UserReportSensitivePO userReportSensitivePO = userReportSensitivePOService.getById(id);
BeanUtils.copyProperties(userReportUpdate.getUserReportSensitivePO(), userReportSensitivePO, getNullPropertyNames(userReportUpdate.getUserReportSensitivePO()));
userReportSensitivePOService.updateById(userReportSensitivePO);
}
return false;
return true;
}
/**