From bedc8fd208c165d41354b93586610710cce38ab7 Mon Sep 17 00:00:00 2001 From: hanyong Date: Tue, 13 Sep 2022 16:34:09 +0800 Subject: [PATCH] =?UTF-8?q?EventTemplate=E6=8E=A7=E5=88=B6=E5=99=A8?= =?UTF-8?q?=E7=BC=96=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../njcn/device/pojo/param/TerminalParam.java | 12 + .../TerminalMaintainController.java | 17 +- .../service/TerminalMaintainService.java | 6 + .../impl/TerminalMaintainServiceImpl.java | 13 +- .../njcn/system/enums/EventResponseEnum.java | 83 + .../system/pojo/param/EventTemplateParam.java | 65 + .../com/njcn/system/pojo/po/EventDict.java | 52 + .../system/pojo/vo/EventTemplateTree.java | 54 + .../njcn/system/pojo/vo/EventTemplateVO.java | 47 + .../controller/EventTemplateController.java | 127 + .../system/mapper/EventTemplateMapper.java | 24 + .../mapper/mapping/EventTemplateMapper.xml | 14 + .../system/service/IEventTemplateService.java | 45 + .../impl/EventTemplateServiceImpl.java | 137 + pqs.ipr | 3993 ++++++++++++++++- pqs.iws | 2049 +++++++-- 16 files changed, 6177 insertions(+), 561 deletions(-) create mode 100644 pqs-system/system-api/src/main/java/com/njcn/system/enums/EventResponseEnum.java create mode 100644 pqs-system/system-api/src/main/java/com/njcn/system/pojo/param/EventTemplateParam.java create mode 100644 pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/EventDict.java create mode 100644 pqs-system/system-api/src/main/java/com/njcn/system/pojo/vo/EventTemplateTree.java create mode 100644 pqs-system/system-api/src/main/java/com/njcn/system/pojo/vo/EventTemplateVO.java create mode 100644 pqs-system/system-boot/src/main/java/com/njcn/system/controller/EventTemplateController.java create mode 100644 pqs-system/system-boot/src/main/java/com/njcn/system/mapper/EventTemplateMapper.java create mode 100644 pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/EventTemplateMapper.xml create mode 100644 pqs-system/system-boot/src/main/java/com/njcn/system/service/IEventTemplateService.java create mode 100644 pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EventTemplateServiceImpl.java diff --git a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/TerminalParam.java b/pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/TerminalParam.java index 5233ebc47..087348179 100644 --- a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/TerminalParam.java +++ b/pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/TerminalParam.java @@ -3,9 +3,11 @@ package com.njcn.device.pojo.param; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.hibernate.validator.constraints.Range; import javax.validation.Valid; import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; import java.util.List; /** @@ -30,4 +32,14 @@ public class TerminalParam { private String extendMealId; @ApiModelProperty(name = "flowStrategyId",value = "流量策略") private String flowStrategyId; + + @ApiModelProperty("页码") + @NotNull(message = "页码不可为空") + @Range(min = 1,message = "页码必须大于0") + private Integer pageNum; + + @ApiModelProperty("条数") + @NotNull(message = "条数不可为空") + @Range(min = 1,message = "条数必须大于0") + private Integer pageSize; } diff --git a/pqs-device/device-boot/src/main/java/com/njcn/device/controller/TerminalMaintainController.java b/pqs-device/device-boot/src/main/java/com/njcn/device/controller/TerminalMaintainController.java index 4c3de1d58..789642111 100644 --- a/pqs-device/device-boot/src/main/java/com/njcn/device/controller/TerminalMaintainController.java +++ b/pqs-device/device-boot/src/main/java/com/njcn/device/controller/TerminalMaintainController.java @@ -1,6 +1,7 @@ package com.njcn.device.controller; import cn.hutool.core.util.StrUtil; +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; @@ -8,9 +9,9 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; -import com.njcn.device.enums.DeviceResponseEnum; import com.njcn.device.pojo.param.TerminalMainQueryParam; import com.njcn.device.pojo.param.TerminalParam; +import com.njcn.device.pojo.po.MonthFlow; import com.njcn.device.pojo.vo.TerminalMaintainVO; import com.njcn.device.service.TerminalMaintainService; import com.njcn.web.controller.BaseController; @@ -22,9 +23,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; import java.util.List; import java.util.Objects; @@ -106,6 +105,18 @@ public class TerminalMaintainController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, resList, methodDescribe); } + /** + * 流量统计主界面 + * + */ + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/getFlowStatisticsList") + @ApiOperation("查看流量统计列表") + public HttpResult> getFlowStatisticsList(@RequestBody TerminalParam terminalParam) { + String methodDescribe = getMethodDescribe("getFlowStatisticsList"); + Page resList = terminalMaintainService.getFlowStatic(terminalParam); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, resList, methodDescribe); + } /** * 批量修改终端状态 * diff --git a/pqs-device/device-boot/src/main/java/com/njcn/device/service/TerminalMaintainService.java b/pqs-device/device-boot/src/main/java/com/njcn/device/service/TerminalMaintainService.java index 7011bd796..eb83da0af 100644 --- a/pqs-device/device-boot/src/main/java/com/njcn/device/service/TerminalMaintainService.java +++ b/pqs-device/device-boot/src/main/java/com/njcn/device/service/TerminalMaintainService.java @@ -1,7 +1,9 @@ package com.njcn.device.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njcn.device.pojo.param.TerminalMainQueryParam; import com.njcn.device.pojo.param.TerminalParam; +import com.njcn.device.pojo.po.MonthFlow; import com.njcn.device.pojo.vo.TerminalMaintainVO; import java.util.List; @@ -29,6 +31,10 @@ public interface TerminalMaintainService { */ List getManageList(List ids,Integer type); + /** + * 流量统计主界面 + */ + Page getFlowStatic(TerminalParam terminalParam); /** * 修改终端参数 * @author cdf diff --git a/pqs-device/device-boot/src/main/java/com/njcn/device/service/impl/TerminalMaintainServiceImpl.java b/pqs-device/device-boot/src/main/java/com/njcn/device/service/impl/TerminalMaintainServiceImpl.java index 177812a1f..5ff371ffd 100644 --- a/pqs-device/device-boot/src/main/java/com/njcn/device/service/impl/TerminalMaintainServiceImpl.java +++ b/pqs-device/device-boot/src/main/java/com/njcn/device/service/impl/TerminalMaintainServiceImpl.java @@ -1,6 +1,7 @@ package com.njcn.device.service.impl; import cn.hutool.core.collection.CollectionUtil; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.device.enums.DeviceResponseEnum; @@ -11,6 +12,7 @@ import com.njcn.device.pojo.param.TerminalParam; import com.njcn.device.pojo.po.DevMeal; import com.njcn.device.pojo.po.DevStrategy; import com.njcn.device.pojo.po.Device; +import com.njcn.device.pojo.po.MonthFlow; import com.njcn.device.pojo.vo.TerminalMaintainVO; import com.njcn.device.pojo.vo.TerminalVersionVO; import com.njcn.device.service.IDevMealService; @@ -92,6 +94,14 @@ public class TerminalMaintainServiceImpl implements TerminalMaintainService { throw new BusinessException(CommonResponseEnum.FAIL); } + @Override + public Page getFlowStatic(TerminalParam terminalParam) { + Page page = new Page<>(); + page.setSize(terminalParam.getPageSize()); + page.setCurrent(terminalParam.getPageNum()); + return page; + } + @Override public boolean updateRunFlagManage(TerminalParam terminalParam){ //终端状态管理 @@ -150,7 +160,4 @@ public class TerminalMaintainServiceImpl implements TerminalMaintainService { } - - - } diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/enums/EventResponseEnum.java b/pqs-system/system-api/src/main/java/com/njcn/system/enums/EventResponseEnum.java new file mode 100644 index 000000000..29ee97da0 --- /dev/null +++ b/pqs-system/system-api/src/main/java/com/njcn/system/enums/EventResponseEnum.java @@ -0,0 +1,83 @@ +package com.njcn.system.enums; + +import lombok.Getter; + +/** + * @author hany + * @version 1.0.0 + * @date 2022年09月08日 + */ +@Getter +public enum EventResponseEnum { + + /** + * 用能模块异常响应码的范围： + * A00450 ~ A00549 + */ + ENERGY_COMMON_ERROR("A00450","用能模块异常"), + NET_DEV_NAME_REPEAT("A00451", "网关设备名称重复"), + DEV_VERSION_REPEAT("A00451", "设备版本信息重复"), + STRATEGY_REPEAT("A00453","空调策略名称重复"), + + /** + * 用能模板交互应答code + */ + SUCCESS("200","success"), + PROCESSING("202","请求处理中"), + + AUTO_OFFLINE("300","设备有异常，主动下线"), + FAIL("400","请求失败"), + PARAM_FAIL_TIMESTAMP("400","请求失败,时间戳不能为空,请检查timestamp字段"), + PARAM_ERROR_TIMESTAMP("400","请求失败,时间戳格式错误,请检查timestamp字段"), + PARAM_FAIL_TYPE("400","请求失败,消息类型不能为空,请检查type字段"), + TYPE_ERROR("400","请求失败,接口名称不匹配,请检查type字段"), + REGISTER_ERROR("400","注册失败,注册的联网设备不存在,请先平台录入"), + REPEAT_ERROR("400","注册失败,有重复装置注册"), + EXIST_ERROR("400","注册失败,存在已注册的装置"), + CANCEL_ERROR("400","取消注册失败,存在未注册或者接入的装置，无法取消注册"), + NO_MODEL_FIND("402","接入失败,模板未找到"), + MISSING_MODEL("402","接入失败,模板数据缺失"), + MISSING_TOPIC("402","接入失败,缺少网关主题相关信息"), + NO_DID_FIND("400","接入失败,需要接入的装置未找到"), + MODULE_MATCH_ERROR("400","接入失败,接入的装置和模板数量不匹配"), + SAME_DEV_ERROR("400","模板数据错误,存在重复的装置信息"), + MODEL_ERROR("400","模板数据错误,模板未找到"), + NET_DEV_MODEL_ERROR("400","网关模板解析错误，平台未找到此网关"), + LINE_REPEAT_ERROR("400","网关模板解析错误，库中存在相同的监测点id"), + + + CERTIFICATION_ERROR("401","请求未认证/认证错误"), + REQUEST_REFUSE("403","请求被拒绝"), + FUNCTION_MISSING("404","请求的资源不存在"), + OVER_WAITING_TIME("408","请求超时"), + OTHER_ERROR("500","其他错误"), + + NO_DICT("501","字典表无此数据"), + NO_TABLE("501","字典表无influxDB表名数据"), + DEV_LINE_EMPTY("501","设备监测点不可为空"), + DIC_NAME_REPEAT("502","字典名称不可重复"), + CHILDREN_EXIT("503","存在子节点，不可删除"), + + + CAI_BIND("504","用能负荷未绑定监测点"), + LOAD_VAL_CONFLICT("505","负荷类型与值类型冲突"), + ENERGY_EMPTY("506","用能查询数据为空"), + TASK_CREATE_ERROR("507","定时任务创建失败"), + + TASK_HAS_START("508","任务已经执行完毕"), + TASK_DEL_ERROR("509","定时任务删除失败,请联系管理员"), + TASK_RUNING("510","任务正在执行无法操作,请先停止任务"), + TASK_TIME_ERROR("511","两条策略时间差应在5分钟以上"), + TASK_NO_RUN("512","策略不在执行中"), + TASK_STOP_ERROR("513","策略停止失败,请联系管理员"), + ; + + private final String code; + + private final String message; + + EventResponseEnum(String code, String message) { + this.code = code; + this.message = message; + } +} diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/param/EventTemplateParam.java b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/param/EventTemplateParam.java new file mode 100644 index 000000000..4e044cca5 --- /dev/null +++ b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/param/EventTemplateParam.java @@ -0,0 +1,65 @@ +package com.njcn.system.pojo.param; + +import com.njcn.common.pojo.constant.PatternRegex; +import com.njcn.web.constant.ValidMessage; +import com.njcn.web.pojo.param.BaseParam; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import javax.validation.constraints.*; + +/** + * @author hany + * @version 1.0.0 + * @date 2022/09/13 + */ +@Data +public class EventTemplateParam { + + @ApiModelProperty("名称") + @NotBlank(message = ValidMessage.NAME_NOT_BLANK) + @Pattern(regexp = PatternRegex.DIC_REGEX, message = ValidMessage.NAME_FORMAT_ERROR) + private String name; + + + @ApiModelProperty("父节点") + @NotBlank(message = ValidMessage.PID_NOT_BLANK) + @Pattern(regexp = PatternRegex.DIC_REGEX, message = ValidMessage.PID_FORMAT_ERROR) + private String pid; + + + @ApiModelProperty("排序") + @NotNull(message = ValidMessage.SORT_NOT_NULL) + @Min(value = 0, message = ValidMessage.SORT_FORMAT_ERROR) + @Max(value = 999, message = ValidMessage.SORT_FORMAT_ERROR) + private Integer sort; + + + + /** + * 更新操作实体 + */ + @Data + @EqualsAndHashCode(callSuper = true) + public static class EventTemplateUpdateParam extends EventTemplateParam { + + /** + * 表Id + */ + @ApiModelProperty("id") + @NotBlank(message = ValidMessage.ID_NOT_BLANK) + @Pattern(regexp = PatternRegex.SYSTEM_ID, message = ValidMessage.ID_FORMAT_ERROR) + private String id; + } + + /** + * 分页查询实体 + */ + @Data + @EqualsAndHashCode(callSuper = true) + public static class EventTemplateQueryParam extends BaseParam { + + } + +} diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/EventDict.java b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/EventDict.java new file mode 100644 index 000000000..2a3d90e44 --- /dev/null +++ b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/EventDict.java @@ -0,0 +1,52 @@ +package com.njcn.system.pojo.po; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.njcn.db.bo.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 类的介绍： + * + * @author hany + * @version 1.0.0 + * @createTime 2022/09/10 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName(value = "eventreport_dict") +public class EventDict extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 字典数据表Id + */ + private String id; + + /** + * 名称 + */ + private String name; + + /** + * 父节点 + */ + private String pid; + + /** + * 上层所有父节点 + */ + private String pids; + + /** + * 状态：0-删除 1-正常 + */ + private Integer state; + + /** + * 排序 + */ + private Integer sort; + +} diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/vo/EventTemplateTree.java b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/vo/EventTemplateTree.java new file mode 100644 index 000000000..d844b6620 --- /dev/null +++ b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/vo/EventTemplateTree.java @@ -0,0 +1,54 @@ +package com.njcn.system.pojo.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; + +/** + * 字典树 + * @author hany + * @date 2022/09/09 + */ +@ApiModel +@Data +public class EventTemplateTree implements Serializable { + private String id; + @ApiModelProperty(name = "parentId",value = "父id") + private String pid; + @ApiModelProperty(name = "level",value = "等级") + private Integer level; + @ApiModelProperty(name = "name",value = "名称") + private String name; + @ApiModelProperty(name = "sort",value = "排序") + private Integer sort; + @ApiModelProperty(name = "comFlag",value = "设备状态") + private Integer comFlag; + @ApiModelProperty(name = "children",value = "子节点") + private List children = new ArrayList<>(); + + private String pids; + + /** + * 终端厂家 + */ + private String manufacturer; + + /** + * 电压等级Id，字典表 + */ + private String scale; + + /** + * 干扰源类型,字典表 + */ + private String loadType; + + /** + * 接线方式 + */ + private Integer ptType; +} diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/vo/EventTemplateVO.java b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/vo/EventTemplateVO.java new file mode 100644 index 000000000..40d8e113a --- /dev/null +++ b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/vo/EventTemplateVO.java @@ -0,0 +1,47 @@ +package com.njcn.system.pojo.vo; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @author hany + * @version 1.0.0 + * @date 2022/09/13 + */ +@Data +public class EventTemplateVO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 字典数据表Id + */ + private String id; + + /** + * 名称 + */ + private String name; + + /** + * 父节点 + */ + private String pid; + + /** + * 所有父节点 + */ + private String pids; + + /** + * 状态：0-删除 1-正常 + */ + private Integer state; + + /** + * 排序 + */ + private Integer sort; + +} diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EventTemplateController.java b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EventTemplateController.java new file mode 100644 index 000000000..1cf8e4fbb --- /dev/null +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EventTemplateController.java @@ -0,0 +1,127 @@ +package com.njcn.system.controller; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.njcn.common.pojo.annotation.OperateInfo; +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.common.utils.LogUtil; +import com.njcn.system.pojo.param.DictDataParam; +import com.njcn.system.pojo.param.EventTemplateParam; +import com.njcn.system.pojo.vo.DictDataVO; +import com.njcn.system.pojo.vo.EventTemplateTree; +import com.njcn.system.pojo.vo.EventTemplateVO; +import com.njcn.system.service.IEventTemplateService; +import com.njcn.web.controller.BaseController; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * pqs + * + * @author hany + * @date 2022/9/7 + */ +@Slf4j +@Api(tags = "事件模板") +@RestController +@RequestMapping("/EventTemplate") +@RequiredArgsConstructor +@Validated +public class EventTemplateController extends BaseController{ + + private final IEventTemplateService iEventTemplateService; + + /** + * 获取字典树 + * @author hany + * @date 2022/09/09 + */ + @ApiOperation("获取字典树") + @OperateInfo(info = LogEnum.BUSINESS_MEDIUM) + @GetMapping("/getEventTemplateTree") + public HttpResult> getEventTemplateTree(){ + String methodDescribe = getMethodDescribe("getEventTemplateTree"); + List tree = iEventTemplateService.getEventTemplateTree(); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, tree, methodDescribe); + } + + /** + * 分页查询字典类型数据 + * @author hany + * @date 2022/09/09 + */ + @OperateInfo(info = LogEnum.SYSTEM_COMMON) + @PostMapping("/list") + @ApiOperation("查询字典数据") + @ApiImplicitParam(name = "queryParam", value = "查询参数", required = true) + public HttpResult> list(@RequestBody @Validated EventTemplateParam.EventTemplateQueryParam queryParam) { + String methodDescribe = getMethodDescribe("list"); + LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, queryParam); + Page result = iEventTemplateService.listEventTemplateData(queryParam); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); + } + + /** + * 新增模板 + * @author hany + * @date 2022/09/09 + */ + @PostMapping("/add") + @OperateInfo(info = LogEnum.SYSTEM_COMMON) + @ApiOperation("新增模板") + @ApiImplicitParam(name = "dictDataParam", value = "模板数据", required = true) + public HttpResult add(@RequestBody EventTemplateParam eventTemplateParam){ + String methodDescribe = getMethodDescribe("add"); + LogUtil.njcnDebug(log, "{}，模板数据为：{}", methodDescribe, eventTemplateParam); + boolean result = iEventTemplateService.add(eventTemplateParam); + if (result) { + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); + } else { + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe); + } + } + + /** + * 修改 + * @author hany + * @date 2022/09/08 + */ + @PostMapping("/update") + @OperateInfo(info = LogEnum.SYSTEM_COMMON) + @ApiOperation("修改字典") + @ApiImplicitParam(name = "dictDataUpdateParam", value = "字典表数据", required = true) + public HttpResult update(@RequestBody EventTemplateParam.EventTemplateUpdateParam eventTemplateUpdateParam){ + String methodDescribe = getMethodDescribe("update"); + LogUtil.njcnDebug(log, "{}，字典表数据数据为：{}", methodDescribe, eventTemplateUpdateParam); + boolean result = iEventTemplateService.update(eventTemplateUpdateParam); + if (result) { + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); + } else { + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe); + } + } + + /** + * 删除 + * @author hany + * @date 2022/09/08 + */ + @DeleteMapping("/delete") + @OperateInfo(info = LogEnum.SYSTEM_COMMON) + @ApiOperation("删除字典") + @ApiImplicitParam(name = "id", value = "字典表索引", required = true) + public HttpResult delete(@RequestParam("id") String id){ + String methodDescribe = getMethodDescribe("delete"); + iEventTemplateService.delete(id); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); + } +} diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/EventTemplateMapper.java b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/EventTemplateMapper.java new file mode 100644 index 000000000..c27fb379c --- /dev/null +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/EventTemplateMapper.java @@ -0,0 +1,24 @@ +package com.njcn.system.mapper; + +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.system.pojo.po.EventDict; +import com.njcn.system.pojo.vo.DictDataVO; +import com.njcn.system.pojo.vo.EventTemplateVO; +import org.apache.ibatis.annotations.Param; + +/** + * @author hany + * @createTime 2022/09/08 + */ +public interface EventTemplateMapper extends BaseMapper { + + /** + * 分页查询字典数据 + * @param page 分页数据 + * @param queryWrapper 查询条件 + * @return 字典数据 + */ + Page page(@Param("page")Page page, @Param("ew")QueryWrapper queryWrapper); +} diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/EventTemplateMapper.xml b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/EventTemplateMapper.xml new file mode 100644 index 000000000..d34040425 --- /dev/null +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/EventTemplateMapper.xml @@ -0,0 +1,14 @@ + + + + + + + + \ No newline at end of file diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/service/IEventTemplateService.java b/pqs-system/system-boot/src/main/java/com/njcn/system/service/IEventTemplateService.java new file mode 100644 index 000000000..6c0b13df0 --- /dev/null +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/IEventTemplateService.java @@ -0,0 +1,45 @@ +package com.njcn.system.service; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.njcn.system.pojo.param.DictDataParam; +import com.njcn.system.pojo.param.EventTemplateParam; +import com.njcn.system.pojo.vo.EventTemplateTree; +import com.njcn.system.pojo.vo.EventTemplateVO; + +import java.util.List; + +/** + * @author: hany + * @date: 2022/09/08 + * @Description: <描述> + */ +public interface IEventTemplateService { + + /** + * 获取字典树 + */ + List getEventTemplateTree(); + + /** + * 根据前台传递参数，分页查询字典数据 + * @param queryParam 查询参数 + * @return 字典列表 + */ + Page listEventTemplateData(EventTemplateParam.EventTemplateQueryParam queryParam); + + /** + * 新增 + */ + boolean add(EventTemplateParam eventDataParam); + + /** + * 修改 + * @param eventDataUpdateParam + */ + boolean update(EventTemplateParam.EventTemplateUpdateParam eventDataUpdateParam); + + /** + * 删除 + */ + boolean delete(String id); +} diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EventTemplateServiceImpl.java b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EventTemplateServiceImpl.java new file mode 100644 index 000000000..0d0d98974 --- /dev/null +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EventTemplateServiceImpl.java @@ -0,0 +1,137 @@ +package com.njcn.system.service.impl; + +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +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.common.pojo.exception.BusinessException; +import com.njcn.db.constant.DbConstant; +import com.njcn.system.enums.EventResponseEnum; +import com.njcn.system.mapper.EventTemplateMapper; +import com.njcn.system.pojo.param.EventTemplateParam; +import com.njcn.system.pojo.po.EventDict; +import com.njcn.system.pojo.vo.EventTemplateTree; +import com.njcn.system.pojo.vo.EventTemplateVO; +import com.njcn.system.service.IEventTemplateService; +import com.njcn.web.factory.PageFactory; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @author: hany + * @date: 2022/09/07 + * @Description: <描述> + */ +@Service +@AllArgsConstructor +public class EventTemplateServiceImpl extends ServiceImpl implements IEventTemplateService { + + /** + * 获取字典树 + * @author hany + * @date 2022/09/09 + */ + @Override + public List getEventTemplateTree() { + return null; + } + + /** + * 分页查询字典类型数据 + * @author hany + * @date 2022/09/13 + */ + @Override + public Page listEventTemplateData(EventTemplateParam.EventTemplateQueryParam queryParam) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + if (ObjectUtil.isNotNull(queryParam)) { + //查询参数不为空，进行条件填充 + if (StrUtil.isNotBlank(queryParam.getSearchValue())) { + //字典类型表，仅提供名称、编码模糊查询 + queryWrapper + .and(param -> param.like("eventreport_dict.name", queryParam.getSearchValue()) + .or().like("eventreport_dict.pid", queryParam.getSearchValue())); + } + //排序 + if (ObjectUtil.isAllNotEmpty(queryParam.getSortBy(), queryParam.getOrderBy())) { + queryWrapper.orderBy(true, queryParam.getOrderBy().equals(DbConstant.ASC), StrUtil.toUnderlineCase(queryParam.getSortBy())); + } else { + //没有排序参数，默认根据sort字段排序，没有排序字段的，根据updateTime更新时间排序 + queryWrapper.orderBy(true, true, "eventreport_dict.sort"); + } + } + queryWrapper.ne("eventreport_dict.state", DataStateEnum.DELETED.getCode()); + //初始化分页数据 + return this.baseMapper.page(new Page<>(PageFactory.getPageNum(queryParam), PageFactory.getPageSize(queryParam)), queryWrapper); + } + + /** + * 新增 + * @author hany + * @date 2022/09/08 + */ + @Override + public boolean add(EventTemplateParam eventTemplateParam) { + checkName(eventTemplateParam,true); + EventDict eventDict = new EventDict(); + BeanUtils.copyProperties(eventTemplateParam,eventDict); + eventDict.setState(DataStateEnum.ENABLE.getCode()); + return this.save(eventDict); + } + /** + * 修改 + */ + @Override + public boolean update(EventTemplateParam.EventTemplateUpdateParam eventTemplateUpdateParam) { + checkName(eventTemplateUpdateParam,false); + EventDict eventDict = new EventDict(); + BeanUtils.copyProperties(eventTemplateUpdateParam,eventDict); + return this.updateById(eventDict); + + } + + /** + * 删除 + */ + @Override + public boolean delete(String id) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(EventDict::getPid,id).eq(EventDict::getState,DataStateEnum.ENABLE.getCode()); + int resCount = this.count(lambdaQueryWrapper); + if(resCount>0){ + throw new BusinessException(EventResponseEnum.CHILDREN_EXIT); + } + + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.lambda().eq(EventDict::getState,DataStateEnum.ENABLE.getCode()).set(EventDict::getState,DataStateEnum.DELETED.getCode()).eq(EventDict::getId,id); + return this.update(updateWrapper); + } + + /** + * 名称重复校验 + */ + private void checkName(EventTemplateParam eventTemplateParam,boolean flag){ + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(EventDict::getName,eventTemplateParam.getName()) + .eq(EventDict::getState, DataStateEnum.ENABLE.getCode()); + //修改 + if(!flag){ + if(eventTemplateParam instanceof EventTemplateParam.EventTemplateUpdateParam ){ + lambdaQueryWrapper.ne(EventDict::getId,((EventTemplateParam.EventTemplateUpdateParam)eventTemplateParam).getId()); + } + } + int res = this.count(lambdaQueryWrapper); + //大于等于1个则表示重复 + if (res >= 1) { + throw new BusinessException(EventResponseEnum.DIC_NAME_REPEAT); + } + + } +} diff --git a/pqs.ipr b/pqs.ipr index 0d8690cf2..814ca2211 100644 --- a/pqs.ipr +++ b/pqs.ipr @@ -1,141 +1,3858 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + eventreport + pids + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pqs.iws b/pqs.iws index 03c854e98..ed59ccc0c 100644 --- a/pqs.iws +++ b/pqs.iws @@ -1,418 +1,1633 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1654239603000 + + + + + + + + + + + + + + + + true + DEFINITION_ORDER + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1660184597130 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Spring + + + + + + + + + + + + + + + 1.8 + + + + + + + + common-autocode + + + + + + + + Maven: ch.qos.logback:logback-classic:1.2.3 + + + + + + + + \ No newline at end of file