diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/TempLineRunTestFeignClient.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/TempLineRunTestFeignClient.java index d4847dad9..b227161ac 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/TempLineRunTestFeignClient.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/TempLineRunTestFeignClient.java @@ -20,4 +20,7 @@ public interface TempLineRunTestFeignClient { @GetMapping("/updateStatus") HttpResult updateStatus(@RequestParam("businessKey") String businessKey, @RequestParam("status")Integer status); + @GetMapping("/isTestRunStartOrEnd") + void isTestRunStartOrEnd(); + } diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/fallback/TempLineRunTestFeignClientFallbackFactory.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/fallback/TempLineRunTestFeignClientFallbackFactory.java index 737f190f6..f9f9a3918 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/fallback/TempLineRunTestFeignClientFallbackFactory.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/fallback/TempLineRunTestFeignClientFallbackFactory.java @@ -33,6 +33,12 @@ public class TempLineRunTestFeignClientFallbackFactory implements FallbackFactor log.error("{}异常，降级处理，异常为：{}", "更新流程状态", throwable.toString()); throw new BusinessException(finalExceptionEnum); } + + @Override + public void isTestRunStartOrEnd() { + log.error("{}异常，降级处理，异常为：{}", "定时判断试运行是否结束", throwable.toString()); + throw new BusinessException(finalExceptionEnum); + } }; } } diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/problem/SupervisionUserComplaintParam.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/problem/SupervisionUserComplaintParam.java index 861e232c9..cca626e0c 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/problem/SupervisionUserComplaintParam.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/problem/SupervisionUserComplaintParam.java @@ -3,7 +3,6 @@ package com.njcn.supervision.pojo.param.problem; import com.fasterxml.jackson.annotation.JsonFormat; import com.njcn.web.pojo.param.BaseParam; -import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; @@ -13,7 +12,6 @@ import lombok.NoArgsConstructor; import java.time.LocalDateTime; @Data -@ApiModel(description="用户投诉信息") @AllArgsConstructor @NoArgsConstructor public class SupervisionUserComplaintParam { @@ -34,12 +32,17 @@ public class SupervisionUserComplaintParam { @ApiModelProperty(value = "投诉内容") private String complaintText; + @ApiModelProperty(value = "稳态指标") + private String steadyIndicator; + + @ApiModelProperty(value = "暂态指标") + private String transientIndicators; + @ApiModelProperty(value = "异常指标") private String anomalyMetrics; - @ApiModelProperty(value = "是否实现检测(1：是 2：否)") - private String status; - + @ApiModelProperty(value = "是否实现检测(0-否 1-是)") + private Integer detectionFlag; @ApiModelProperty(value = "监测点编号") private String monitorNumber; @@ -47,8 +50,8 @@ public class SupervisionUserComplaintParam { @ApiModelProperty(value = "监测点名称") private String monitorName; - @ApiModelProperty(value = "是否发起警告单(1：是；2：否)") - private String initiateWarningFlag; + @ApiModelProperty(value = "是否发起警告单(0-否 1-是)") + private Integer initiateWarningFlag; @ApiModelProperty(value = "状态：0-删除 1-正常") private Integer state; @@ -64,6 +67,14 @@ public class SupervisionUserComplaintParam { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime updateTime; + @Data + @EqualsAndHashCode(callSuper = true) + public static class SupervisionUserComplaintUpdate extends SupervisionUserComplaintParam { + + @ApiModelProperty("id") + private String Id; + + } /** * 分页查询实体 @@ -75,5 +86,4 @@ public class SupervisionUserComplaintParam { } - } diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/problem/SupervisionUserComplaintPO.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/problem/SupervisionUserComplaintPO.java new file mode 100644 index 000000000..0dd35bb1f --- /dev/null +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/problem/SupervisionUserComplaintPO.java @@ -0,0 +1,111 @@ +package com.njcn.supervision.pojo.po.problem; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.njcn.db.bo.BaseEntity; +import io.swagger.annotations.ApiModel; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * + * Description: + * Date: 2024/5/22 16:25【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +@ApiModel(description="") +@Data +@AllArgsConstructor +@NoArgsConstructor +@TableName(value = "supervision_user_complaint") +public class SupervisionUserComplaintPO extends BaseEntity { + @TableId(value = "id", type = IdType.ASSIGN_UUID) + private String id; + + /** + * 用户类别 + */ + @TableField(value = "user_category") + private String userCategory; + + /** + * 用户编号 + */ + @TableField(value = "user_number") + private String userNumber; + + /** + * 用户名称 + */ + @TableField(value = "user_name") + private String userName; + + /** + * 投诉名称 + */ + @TableField(value = "complaint_name") + private String complaintName; + + /** + * 投诉内容 + */ + @TableField(value = "complaint_text") + private String complaintText; + + /** + * 稳态指标 + */ + @TableField(value = "steady_Indicator") + private String steadyIndicator; + + /** + * 暂态指标 + */ + @TableField(value = "transient_Indicators") + private String transientIndicators; + + /** + * 异常指标 + */ + @TableField(value = "anomaly_metrics") + private String anomalyMetrics; + + /** + * 是否实现检测(0：否；1：是) + */ + @TableField(value = "`detection_flag`") + private Integer detectionFlag; + + + + /** + * 监测点编号 + */ + @TableField(value = "monitor_number") + private String monitorNumber; + + /** + * 检测点名称 + */ + @TableField(value = "monitor_name") + private String monitorName; + + /** + * 是否发起警告单(0：否；1：是) + */ + @TableField(value = "initiate_warning_flag") + private Integer initiateWarningFlag; + + /** + * 状态：0-删除 1-正常 + */ + @TableField(value = "`state`") + private Integer state; + + +} \ No newline at end of file diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/SupervisionDevMainReportVO.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/SupervisionDevMainReportVO.java index c8fd4618e..6e0c8b966 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/SupervisionDevMainReportVO.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/SupervisionDevMainReportVO.java @@ -160,4 +160,12 @@ public class SupervisionDevMainReportVO { -} \ No newline at end of file + private String substation; + + private String monitoringTerminalCode; + + private String monitoringTerminalName; + + + +} diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/SupervisionTempLineDebugVO.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/SupervisionTempLineDebugVO.java index b5e30a0bb..4941921a1 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/SupervisionTempLineDebugVO.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/SupervisionTempLineDebugVO.java @@ -1,6 +1,7 @@ package com.njcn.supervision.pojo.vo.device; import com.njcn.db.bo.BaseEntity; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -14,12 +15,19 @@ import lombok.Data; public class SupervisionTempLineDebugVO extends BaseEntity { private String id; + @ApiModelProperty(value="监测点编号") private String lineId; + @ApiModelProperty(value="监测点名称") private String lineName; + @ApiModelProperty(value="关联干扰源用户id名称") private String userName; + @ApiModelProperty(value="接入母线") private String connectedBus; + @ApiModelProperty(value="监测终端编码") private String monitoringTerminalCode; + @ApiModelProperty(value="监测终端名称") private String monitoringTerminalName; + @ApiModelProperty(value="电网侧变电站") private String powerSubstationName; private String reason; private String processInstanceId; diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/problem/SupervisionUserComplaint.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/problem/SupervisionUserComplaintVO.java similarity index 56% rename from pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/problem/SupervisionUserComplaint.java rename to pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/problem/SupervisionUserComplaintVO.java index e97420139..36f30ea72 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/problem/SupervisionUserComplaint.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/problem/SupervisionUserComplaintVO.java @@ -1,7 +1,6 @@ package com.njcn.supervision.pojo.vo.problem; -import com.fasterxml.jackson.annotation.JsonFormat; import com.njcn.web.pojo.param.BaseParam; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -10,17 +9,15 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import java.time.LocalDateTime; - @Data +@ApiModel(description="用户投诉信息") @AllArgsConstructor @NoArgsConstructor -public class SupervisionUserComplaint { +public class SupervisionUserComplaintVO { - private String id; + @ApiModelProperty("id") + private String Id; - @ApiModelProperty(value = "用户类别") - private String userCategory; @ApiModelProperty(value = "用户编号") private String userNumber; @@ -40,11 +37,9 @@ public class SupervisionUserComplaint { @ApiModelProperty(value = "暂态指标") private String transientIndicators; - @ApiModelProperty(value = "异常指标") - private String anomalyMetrics; + @ApiModelProperty(value = "是否实现检测(0：否；1：是)") + private Integer detectionFlag; - @ApiModelProperty(value = "是否实现检测(1：是 2：否)") - private String status; @ApiModelProperty(value = "监测点编号") private String monitorNumber; @@ -52,23 +47,9 @@ public class SupervisionUserComplaint { @ApiModelProperty(value = "监测点名称") private String monitorName; - @ApiModelProperty(value = "是否发起警告单(1：是；2：否)") - private String initiateWarningFlag; + @ApiModelProperty(value = "是否发起警告单(0：否；1：是)") + private Integer initiateWarningFlag; - @ApiModelProperty(value = "状态：0-删除 1-正常") - private Integer state; - - @ApiModelProperty(value = "创建人") - private String createBy; - - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime createTime; - - @ApiModelProperty(value = "更新人") - private String updateBy; - - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime updateTime; /** * 分页查询实体 @@ -80,4 +61,5 @@ public class SupervisionUserComplaint { } + } diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/SupervisionTempLineRunTestController.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/SupervisionTempLineRunTestController.java index 162eae637..46f6b134b 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/SupervisionTempLineRunTestController.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/SupervisionTempLineRunTestController.java @@ -54,11 +54,8 @@ public class SupervisionTempLineRunTestController extends BaseController { @OperateInfo(info = LogEnum.BUSINESS_COMMON) @GetMapping("/isTestRunStartOrEnd") @ApiOperation("每日判断试运行是否结束") - public HttpResult isTestRunStartOrEnd(){ - String methodDescribe = getMethodDescribe("isTestRunStartOrEnd"); + public void isTestRunStartOrEnd(){ iSupervisionTempLineRunTestService.isTestRunStartOrEnd(); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe); - } diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/problem/SupervisionUserComplaintController.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/problem/SupervisionUserComplaintController.java index 18fd4fa80..b8cd78e56 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/problem/SupervisionUserComplaintController.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/problem/SupervisionUserComplaintController.java @@ -7,8 +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.supervision.pojo.vo.problem.SupervisionUserComplaint; -import com.njcn.supervision.service.problem.impl.SupervisionUserComplaintServiceImpl; +import com.njcn.supervision.pojo.param.problem.SupervisionUserComplaintParam; +import com.njcn.supervision.pojo.vo.problem.SupervisionUserComplaintVO; +import com.njcn.supervision.service.problem.SupervisionUserComplaintPOService; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -27,15 +28,15 @@ import org.springframework.web.bind.annotation.RestController; @AllArgsConstructor public class SupervisionUserComplaintController extends BaseController { - private final SupervisionUserComplaintServiceImpl supervisionUserComplaintService; + private final SupervisionUserComplaintPOService supervisionUserComplaintService; @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/list") @ApiOperation("分页用户投诉数据") @ApiImplicitParam(name = "supervisionUserComplaintQueryParam", value = "参数", required = true) - public HttpResult> getSupervisionUserComplaint(@RequestBody SupervisionUserComplaint.SupervisionUserComplaintQueryParam supervisionUserComplaintQueryParam) { + public HttpResult> getSupervisionUserComplaint(@RequestBody SupervisionUserComplaintParam.SupervisionUserComplaintQueryParam supervisionUserComplaintQueryParam) { String methodDescribe = getMethodDescribe("getSupervisionUserComplaint"); - Page out = supervisionUserComplaintService.getSupervisionUserComplaint(supervisionUserComplaintQueryParam); + Page out = supervisionUserComplaintService.getSupervisionUserComplaint(supervisionUserComplaintQueryParam); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, out, methodDescribe); } @@ -43,9 +44,9 @@ public class SupervisionUserComplaintController extends BaseController { @PostMapping("/add") @ApiOperation("投诉问题填报") @ApiImplicitParam(name = "supervisionUserComplaint", value = "实体参数", required = true) - public HttpResult addSupervisionUserComplaint(@RequestBody SupervisionUserComplaint supervisionUserComplaint) { + public HttpResult addSupervisionUserComplaint(@RequestBody SupervisionUserComplaintParam supervisionUserComplaintParam) { String methodDescribe = getMethodDescribe("addSupervisionUserComplaint"); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, supervisionUserComplaintService.addSupervisionUserComplaint(supervisionUserComplaint), methodDescribe); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, supervisionUserComplaintService.addSupervisionUserComplaint(supervisionUserComplaintParam), methodDescribe); } diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionDevMainReportPOMapper.xml b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionDevMainReportPOMapper.xml index c20d009ea..f173f9e0d 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionDevMainReportPOMapper.xml +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionDevMainReportPOMapper.xml @@ -29,18 +29,20 @@ - 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, + 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` - \ No newline at end of file + diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionTempLineDebugPOMapper.xml b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionTempLineDebugPOMapper.xml index b30102eaa..3980e4803 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionTempLineDebugPOMapper.xml +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionTempLineDebugPOMapper.xml @@ -23,8 +23,17 @@ + + select + * + + from supervision_user_complaint supervision_user_complaint WHERE ${ew.sqlSegment} + + \ No newline at end of file diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineDebugPOServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineDebugPOServiceImpl.java index f84f61724..9d4268d13 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineDebugPOServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineDebugPOServiceImpl.java @@ -135,6 +135,14 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl lineDTOList = commLineClient.getLineDetailBatch(lineIds).getData(); if(lineIds.size()!=lineDTOList.size()){ - throw new BusinessException("请联系管理员检查监测点唯一编号是否匹配"); + throw new BusinessException(CommonResponseEnum.FAIL,"请联系管理员检查监测点唯一编号是否匹配"); } //校验 @@ -103,7 +104,6 @@ public class SupervisionTempLineRunTestServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(SupervisionTempLineRunTestPO::getTestRunState,1).eq(SupervisionTempLineRunTestPO::getState,DataStateEnum.ENABLE.getCode()); List supervisionTempLineRunTestPOList = this.list(lambdaQueryWrapper); diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/problem/SupervisionUserComplaintPOService.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/problem/SupervisionUserComplaintPOService.java new file mode 100644 index 000000000..5dce21232 --- /dev/null +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/problem/SupervisionUserComplaintPOService.java @@ -0,0 +1,22 @@ +package com.njcn.supervision.service.problem; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.njcn.supervision.pojo.po.problem.SupervisionUserComplaintPO; +import com.baomidou.mybatisplus.extension.service.IService; +import com.njcn.supervision.pojo.param.problem.SupervisionUserComplaintParam; +import com.njcn.supervision.pojo.vo.problem.SupervisionUserComplaintVO; + +/** + * + * Description: + * Date: 2024/5/22 16:25【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +public interface SupervisionUserComplaintPOService extends IService{ + String addSupervisionUserComplaint(SupervisionUserComplaintParam supervisionUserComplaintParam); + + Page getSupervisionUserComplaint(SupervisionUserComplaintParam.SupervisionUserComplaintQueryParam supervisionUserComplaintQueryParam); + +} diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/problem/SupervisionUserComplaintService.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/problem/SupervisionUserComplaintService.java deleted file mode 100644 index 0cd8f650c..000000000 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/problem/SupervisionUserComplaintService.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.njcn.supervision.service.problem; - -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.IService; -import com.njcn.supervision.pojo.param.problem.SupervisionUserComplaintParam; -import com.njcn.supervision.pojo.vo.problem.SupervisionUserComplaint; - -public interface SupervisionUserComplaintService extends IService { - String addSupervisionUserComplaint(SupervisionUserComplaint supervisionUserComplaint); - - Page getSupervisionUserComplaint(SupervisionUserComplaint.SupervisionUserComplaintQueryParam supervisionUserComplaintQueryParam); -} diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/problem/impl/SupervisionUserComplaintPOServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/problem/impl/SupervisionUserComplaintPOServiceImpl.java new file mode 100644 index 000000000..e91ef9caa --- /dev/null +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/problem/impl/SupervisionUserComplaintPOServiceImpl.java @@ -0,0 +1,69 @@ +package com.njcn.supervision.service.problem.impl; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.njcn.common.pojo.enums.common.DataStateEnum; +import com.njcn.supervision.mapper.problem.SupervisionUserComplaintPOMapper; +import com.njcn.supervision.pojo.param.problem.SupervisionUserComplaintParam; +import com.njcn.supervision.pojo.po.problem.SupervisionUserComplaintPO; +import com.njcn.supervision.pojo.vo.problem.SupervisionUserComplaintVO; +import com.njcn.supervision.service.problem.SupervisionUserComplaintPOService; +import com.njcn.user.api.UserFeignClient; +import com.njcn.web.factory.PageFactory; +import com.njcn.web.utils.RequestUtil; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; +import java.util.Objects; + +/** + * + * Description: + * Date: 2024/5/22 16:25【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +@Service +@RequiredArgsConstructor +public class SupervisionUserComplaintPOServiceImpl extends ServiceImpl implements SupervisionUserComplaintPOService{ + + private final UserFeignClient userFeignClient; + + @Override + @Transactional(rollbackFor = Exception.class) + public String addSupervisionUserComplaint(SupervisionUserComplaintParam supervisionUserComplaintParam) { + SupervisionUserComplaintPO supervisionUserComplaintPO = new SupervisionUserComplaintPO(); + BeanUtil.copyProperties(supervisionUserComplaintParam,supervisionUserComplaintPO); + supervisionUserComplaintPO.setInitiateWarningFlag(1); + supervisionUserComplaintPO.setState(DataStateEnum.ENABLE.getCode()); + this.save(supervisionUserComplaintPO); + return supervisionUserComplaintPO.getId(); + } + + @Override + public Page getSupervisionUserComplaint(SupervisionUserComplaintParam.SupervisionUserComplaintQueryParam supervisionUserComplaintQueryParam) { + QueryWrapper supervisionUserComplaintQueryWrapper = new QueryWrapper<>(); + + if (Objects.nonNull(supervisionUserComplaintQueryParam)) { + //添加上时间范围 + supervisionUserComplaintQueryWrapper.between("supervision_user_complaint.Create_Time", + DateUtil.beginOfDay(DateUtil.parse(supervisionUserComplaintQueryParam.getSearchBeginTime())), + DateUtil.endOfDay(DateUtil.parse(supervisionUserComplaintQueryParam.getSearchEndTime()))); + } + //获取当前用户部门所有同事的id，查看该部门下所有的数据 + List colleaguesIds = userFeignClient.getColleaguesIdByUserId(RequestUtil.getUserIndex()).getData(); + supervisionUserComplaintQueryWrapper.in("supervision_user_complaint.Create_By", colleaguesIds) + .eq("supervision_user_complaint.state",DataStateEnum.ENABLE.getCode()) + .orderByDesc("supervision_user_complaint.Update_Time"); + Page page = this.baseMapper.getPage(new Page<>(PageFactory.getPageNum(supervisionUserComplaintQueryParam), PageFactory.getPageSize(supervisionUserComplaintQueryParam)), supervisionUserComplaintQueryWrapper); + + return page; + } + +} diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/problem/impl/SupervisionUserComplaintServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/problem/impl/SupervisionUserComplaintServiceImpl.java deleted file mode 100644 index 5db7bee8a..000000000 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/problem/impl/SupervisionUserComplaintServiceImpl.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.njcn.supervision.service.problem.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.njcn.supervision.mapper.problem.SupervisionUserComplaintMapper; -import com.njcn.supervision.pojo.vo.problem.SupervisionUserComplaint; -import com.njcn.supervision.pojo.param.problem.SupervisionUserComplaintParam; -import com.njcn.supervision.service.problem.SupervisionUserComplaintService; -import com.njcn.web.factory.PageFactory; -import org.springframework.stereotype.Service; - -@Service -public class SupervisionUserComplaintServiceImpl extends ServiceImpl implements SupervisionUserComplaintService { - - @Override - public String addSupervisionUserComplaint(SupervisionUserComplaint supervisionUserComplaint) { - this.save(supervisionUserComplaint); - return supervisionUserComplaint.getMonitorNumber(); - } - - @Override - public Page getSupervisionUserComplaint(SupervisionUserComplaint.SupervisionUserComplaintQueryParam supervisionUserComplaintQueryParam) { - QueryWrapper supervisionUserComplaintQueryWrapper = new QueryWrapper<>(); - return this.page(new Page<>(PageFactory.getPageNum(supervisionUserComplaintQueryParam), PageFactory.getPageSize(supervisionUserComplaintQueryParam)), supervisionUserComplaintQueryWrapper); - } - - -} diff --git a/pqs-system/system-boot/pom.xml b/pqs-system/system-boot/pom.xml index b1ed591d9..fa0467979 100644 --- a/pqs-system/system-boot/pom.xml +++ b/pqs-system/system-boot/pom.xml @@ -31,6 +31,12 @@ user-api ${project.version} + + + com.njcn + supervision-api + ${project.version} + com.njcn common-web @@ -128,4 +134,4 @@ - \ No newline at end of file + diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/SupervisionLineRunTestTaskRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/SupervisionLineRunTestTaskRunner.java new file mode 100644 index 000000000..a4aa1124b --- /dev/null +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/SupervisionLineRunTestTaskRunner.java @@ -0,0 +1,25 @@ +package com.njcn.system.timer.tasks; + +import com.njcn.supervision.api.TempLineRunTestFeignClient; +import com.njcn.system.timer.TimerTaskRunner; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; + +/** + * pqs + * 冀北技术监督监测点试运行，每日扫描 + * @author cdf + * @date 2024/5/22 + */ +@Component +@RequiredArgsConstructor +public class SupervisionLineRunTestTaskRunner implements TimerTaskRunner { + + + private final TempLineRunTestFeignClient tempLineRunTestFeignClient; + + @Override + public void action(String date) { + tempLineRunTestFeignClient.isTestRunStartOrEnd(); + } +}