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 new file mode 100644 index 000000000..79b1b2298 --- /dev/null +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/problem/SupervisionUserComplaintParam.java @@ -0,0 +1,76 @@ +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; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import java.time.LocalDateTime; + +@Data +@ApiModel(description="用户投诉信息") +@AllArgsConstructor +@NoArgsConstructor +public class SupervisionUserComplaintParam { + + + @ApiModelProperty(value = "用户类别") + private String userCategory; + + @ApiModelProperty(value = "用户编号") + private String userNumber; + + @ApiModelProperty(value = "用户名称") + private String userName; + + @ApiModelProperty(value = "投诉名称") + private String complaintName; + + @ApiModelProperty(value = "投诉内容") + private String complaintText; + + @ApiModelProperty(value = "异常指标") + private String anomalyMetrics; + + @ApiModelProperty(value = "是否实现检测(1：是 2：否)") + private String status; + + + @ApiModelProperty(value = "监测点ID") + private String monitorId; + + @ApiModelProperty(value = "是否发起警告单(1：是；2：否)") + private String 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; + + /** + * 分页查询实体 + */ + @Data + @EqualsAndHashCode(callSuper = true) + public static class SupervisionUserComplaintQueryParam extends BaseParam { + + + } + + +} 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/SupervisionUserComplaint.java new file mode 100644 index 000000000..c407b9143 --- /dev/null +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/problem/SupervisionUserComplaint.java @@ -0,0 +1,80 @@ +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; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import java.time.LocalDateTime; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class SupervisionUserComplaint { + + private String id; + + @ApiModelProperty(value = "用户类别") + private String userCategory; + + @ApiModelProperty(value = "用户编号") + private String userNumber; + + @ApiModelProperty(value = "用户名称") + private String userName; + + @ApiModelProperty(value = "投诉名称") + private String complaintName; + + @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 = "监测点ID") + private String monitorId; + + @ApiModelProperty(value = "是否发起警告单(1：是；2：否)") + private String 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; + + /** + * 分页查询实体 + */ + @Data + @EqualsAndHashCode(callSuper = true) + public static class SupervisionUserComplaintQueryParam extends BaseParam { + + + } + +} 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 new file mode 100644 index 000000000..65a22221d --- /dev/null +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/problem/SupervisionUserComplaintController.java @@ -0,0 +1,60 @@ +package com.njcn.supervision.controller.problem; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +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.device.QuitRunningDeviceParam; +import com.njcn.supervision.pojo.param.problem.SupervisionUserComplaintParam; +import com.njcn.supervision.pojo.vo.device.QuitRunningDeviceVO; +import com.njcn.supervision.pojo.vo.problem.SupervisionUserComplaint; +import com.njcn.supervision.service.problem.impl.SupervisionUserComplaintServiceImpl; +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.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@Slf4j +@RestController +@RequestMapping("/SupervisionUserComplaint") +@Api(tags = "用户投诉") +@AllArgsConstructor +public class SupervisionUserComplaintController extends BaseController { + + private final SupervisionUserComplaintServiceImpl supervisionUserComplaintService; + + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/list") + @ApiOperation("分页用户投诉数据") + @ApiImplicitParam(name = "supervisionUserComplaintQueryParam", value = "参数", required = true) + public HttpResult> getSupervisionUserComplaint(@RequestBody SupervisionUserComplaint.SupervisionUserComplaintQueryParam supervisionUserComplaintQueryParam) { + String methodDescribe = getMethodDescribe("getSupervisionUserComplaint"); + Page out = supervisionUserComplaintService.getSupervisionUserComplaint(supervisionUserComplaintQueryParam); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, out, methodDescribe); + } + + @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD) + @PostMapping("/add") + @ApiOperation("投诉问题填报") + @ApiImplicitParam(name = "supervisionUserComplaint", value = "实体参数", required = true) + public HttpResult addSupervisionUserComplaint(@RequestBody SupervisionUserComplaint supervisionUserComplaint) { + String methodDescribe = getMethodDescribe("addSupervisionUserComplaint"); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, supervisionUserComplaintService.addSupervisionUserComplaint(supervisionUserComplaint), methodDescribe); + } + + + + + + +} diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/problem/SupervisionUserComplaintMapper.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/problem/SupervisionUserComplaintMapper.java new file mode 100644 index 000000000..c2d47a478 --- /dev/null +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/problem/SupervisionUserComplaintMapper.java @@ -0,0 +1,12 @@ +package com.njcn.supervision.mapper.problem; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.njcn.supervision.pojo.vo.problem.SupervisionUserComplaint; +import org.apache.ibatis.annotations.Param; + +public interface SupervisionUserComplaintMapper extends BaseMapper { + + Page page(@Param("page")Page objectPage, @Param("ew")QueryWrapper supervisionUserComplaintQueryWrapper); +} diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/problem/mapper/SupervisionUserComplaintMapper.xml b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/problem/mapper/SupervisionUserComplaintMapper.xml new file mode 100644 index 000000000..df8559443 --- /dev/null +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/problem/mapper/SupervisionUserComplaintMapper.xml @@ -0,0 +1,26 @@ + + + + + + + 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 new file mode 100644 index 000000000..0cd8f650c --- /dev/null +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/problem/SupervisionUserComplaintService.java @@ -0,0 +1,12 @@ +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/SupervisionUserComplaintServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/problem/impl/SupervisionUserComplaintServiceImpl.java new file mode 100644 index 000000000..04310548b --- /dev/null +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/problem/impl/SupervisionUserComplaintServiceImpl.java @@ -0,0 +1,43 @@ +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) { + +// SupervisionUserComplaint supervisionUserComplaint = new SupervisionUserComplaint(); +// +// supervisionUserComplaint.setUserCategory(supervisionUserComplaintParam.getUserCategory()); +// supervisionUserComplaint.setUserNumber(supervisionUserComplaintParam.getUserNumber()); +// supervisionUserComplaint.setUserName(supervisionUserComplaintParam.getUserName()); +// supervisionUserComplaint.setComplaintText(supervisionUserComplaintParam.getComplaintText()); +// supervisionUserComplaint.setAnomalyMetrics(supervisionUserComplaintParam.getAnomalyMetrics()); +// supervisionUserComplaint.setStatus(supervisionUserComplaintParam.getStatus()); +// supervisionUserComplaint.setMonitorId(supervisionUserComplaintParam.getMonitorId()); +// supervisionUserComplaint.setInitiateWarningFlag(supervisionUserComplaintParam.getInitiateWarningFlag()); +// supervisionUserComplaint.setCreateTime(supervisionUserComplaintParam.getCreateTime()); +// supervisionUserComplaint.setUpdateTime(supervisionUserComplaintParam.getUpdateTime()); + this.save(supervisionUserComplaint); + return supervisionUserComplaint.getMonitorId(); + } + + @Override + public Page getSupervisionUserComplaint(SupervisionUserComplaint.SupervisionUserComplaintQueryParam supervisionUserComplaintQueryParam) { + QueryWrapper supervisionUserComplaintQueryWrapper = new QueryWrapper<>(); + Page page = this.page(new Page<>(PageFactory.getPageNum(supervisionUserComplaintQueryParam), PageFactory.getPageSize(supervisionUserComplaintQueryParam)), supervisionUserComplaintQueryWrapper); + return page; + } + + +}