新增指标字典功能和组件功能调整

2023-05-30 13:43:06 +08:00
parent a549c461f9
commit 8d4228d0eb
19 changed files with 874 additions and 22 deletions
--- a/pqs-system/system-boot/src/main/java/com/njcn/system/SystemBootMain.java
+++ b/pqs-system/system-boot/src/main/java/com/njcn/system/SystemBootMain.java
@@ -1,5 +1,6 @@
 package com.njcn.system;

+import com.github.jeffreyning.mybatisplus.conf.EnableMPP;
 import lombok.extern.slf4j.Slf4j;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
@@ -15,6 +16,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
@MapperScan("com.njcn.**.mapper")
@EnableFeignClients(basePackages = "com.njcn")
@SpringBootApplication(scanBasePackages = "com.njcn")
+@EnableMPP
 public class SystemBootMain {
    public static void main(String[] args) {
        SpringApplication.run(SystemBootMain.class, args);
--- a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EleEpdPqdController.java
+++ b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EleEpdPqdController.java
@@ -0,0 +1,131 @@
+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.EleEpdPqdParam;
+import com.njcn.system.pojo.po.EleEpdPqd;
+import com.njcn.system.pojo.vo.EleEpdPqdVO;
+import com.njcn.system.service.IEleEpdPqdService;
+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 springfox.documentation.annotations.ApiIgnore;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author xuyang
+ * @since 2023-05-24
+ */
+@Slf4j
+@RestController
+@RequestMapping("/csDictData")
+@RequiredArgsConstructor
+@Api(tags = "数据字典")
+@Validated
+public class EleEpdPqdController extends BaseController {
+
+    private final IEleEpdPqdService eleEpdPqdService;
+
+    @PostMapping("/addByModel")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("根据模板录入字典数据")
+    @ApiImplicitParam(name = "eleEpdPqdParam", value = "模板的字典数据", required = true)
+    @ApiIgnore
+    public HttpResult<String> addByModel(@RequestBody @Validated List<EleEpdPqdParam> eleEpdPqdParam){
+        log.info("根据模板录入字典数据");
+        String methodDescribe = getMethodDescribe("addByModel");
+        LogUtil.njcnDebug(log, "{}，模板当前解析字典数据为:", methodDescribe);
+        eleEpdPqdService.saveData(eleEpdPqdParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
+    @PostMapping("/add")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("新增字典数据")
+    @ApiImplicitParam(name = "eleEpdPqdParam", value = "字典数据", required = true)
+    public HttpResult<String> add(@RequestBody @Validated EleEpdPqdParam eleEpdPqdParam){
+        log.info("录入字典数据");
+        String methodDescribe = getMethodDescribe("add");
+        LogUtil.njcnDebug(log, "{}，模板当前解析字典数据为:", methodDescribe);
+        eleEpdPqdService.add(eleEpdPqdParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
+    @PostMapping("/delete")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("删除字典数据")
+    @ApiImplicitParam(name = "id", value = "字典数据id", required = true)
+    public HttpResult<String> delete(@RequestParam String id){
+        log.info("删除字典数据");
+        String methodDescribe = getMethodDescribe("delete");
+        LogUtil.njcnDebug(log, "{}，字典id为:", methodDescribe);
+        eleEpdPqdService.delete(id);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
+    @PostMapping("/update")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("更新字典数据")
+    @ApiImplicitParam(name = "updateParam", value = "字典数据", required = true)
+    public HttpResult<String> update(@RequestBody @Validated EleEpdPqdParam.EleEpdPqdUpdateParam updateParam){
+        log.info("更新字典数据");
+        String methodDescribe = getMethodDescribe("update");
+        LogUtil.njcnDebug(log, "{}，字典数据为:", updateParam);
+        eleEpdPqdService.update(updateParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @PostMapping("/list")
+    @ApiOperation("列表分页")
+    @ApiImplicitParam(name = "queryParam", value = "查询参数", required = true)
+    public HttpResult<Page<EleEpdPqdVO>> getList(@RequestBody @Validated EleEpdPqdParam.EleEpdPqdQueryParam queryParam) {
+        String methodDescribe = getMethodDescribe("getList");
+        LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, queryParam);
+        Page<EleEpdPqdVO> list = eleEpdPqdService.eleEpdPqdList(queryParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @PostMapping("/dictMarkByDataType")
+    @ApiOperation("字典数据组装唯一标识")
+    @ApiImplicitParam(name = "dataType", value = "数据模型", required = true)
+    @ApiIgnore
+    public HttpResult<List<EleEpdPqd>> dictMarkByDataType(@RequestParam("dataType") @Validated String dataType) {
+        String methodDescribe = getMethodDescribe("dictMark");
+        List<EleEpdPqd> list = eleEpdPqdService.dictMarkByDataType(dataType);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+    @PostMapping("/addEvt")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("事件录入字典数据")
+    @ApiImplicitParam(name = "eleEpdPqdParam", value = "模板的字典数据", required = true)
+    @ApiIgnore
+    public HttpResult<Map<String,String>> addEvt(@RequestBody @Validated List<EleEpdPqdParam> eleEpdPqdParam){
+        log.info("根据模板录入字典数据");
+        String methodDescribe = getMethodDescribe("addEvt");
+        LogUtil.njcnDebug(log, "{}，模板当前解析字典数据为:", methodDescribe);
+        Map<String,String> map = eleEpdPqdService.saveEvt(eleEpdPqdParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, map, methodDescribe);
+    }
+
+}
+
--- a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/EleEpdPqdMapper.java
+++ b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/EleEpdPqdMapper.java
@@ -0,0 +1,22 @@
+package com.njcn.system.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
+import com.njcn.system.pojo.po.EleEpdPqd;
+import com.njcn.system.pojo.vo.EleEpdPqdVO;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author xuyang
+ * @since 2023-05-24
+ */
+public interface EleEpdPqdMapper extends MppBaseMapper<EleEpdPqd> {
+
+    Page<EleEpdPqdVO> page(@Param("page")Page<EleEpdPqdVO> page, @Param("ew") QueryWrapper<EleEpdPqdVO> queryWrapper);
+
+}
--- a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/EleEpdPqdMapper.xml
+++ b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/EleEpdPqdMapper.xml
@@ -0,0 +1,11 @@
+<?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.system.mapper.EleEpdPqdMapper">
+
+    <select id="page" resultType="EleEpdPqdVO">
+        SELECT t0.*
+        FROM ele_epd_pqd t0
+        ${ew.sqlSegment}
+    </select>
+
+</mapper>
--- a/pqs-system/system-boot/src/main/java/com/njcn/system/service/IEleEpdPqdService.java
+++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/IEleEpdPqdService.java
@@ -0,0 +1,63 @@
+package com.njcn.system.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.njcn.system.pojo.param.EleEpdPqdParam;
+import com.njcn.system.pojo.po.EleEpdPqd;
+import com.njcn.system.pojo.vo.EleEpdPqdVO;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author xuyang
+ * @since 2023-05-24
+ */
+public interface IEleEpdPqdService {
+
+    /**
+     * 存储模板的字典数据
+     * @param eleEpdPqdParam
+     */
+    void saveData(List<EleEpdPqdParam> eleEpdPqdParam);
+
+    /**
+     * 存储字典数据
+     * @param eleEpdPqdParam
+     */
+    void add(EleEpdPqdParam eleEpdPqdParam);
+
+    /**
+     * 删除字典数据
+     * @param id
+     */
+    void delete(String id);
+
+    /**
+     * 更新字典数据
+     * @param updateParam
+     */
+    void update(EleEpdPqdParam.EleEpdPqdUpdateParam updateParam);
+
+    /**
+     * 查询字典分页
+     * @param queryParam
+     * @return
+     */
+    Page<EleEpdPqdVO> eleEpdPqdList(EleEpdPqdParam.EleEpdPqdQueryParam queryParam);
+
+    /**
+     * 查询所有字典数据组成唯一标识，用于验证字典是否重复
+     * @return
+     */
+    List<EleEpdPqd> dictMarkByDataType(String dataType);
+
+    /**
+     * 存储事件的字典数据
+     * @param eleEpdPqdParam
+     */
+    Map<String,String> saveEvt(List<EleEpdPqdParam> eleEpdPqdParam);
+}
--- a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EleEpdPqdServiceImpl.java
+++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EleEpdPqdServiceImpl.java
@@ -0,0 +1,146 @@
+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.extension.plugins.pagination.Page;
+import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
+import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.db.constant.DbConstant;
+import com.njcn.system.enums.SystemResponseEnum;
+import com.njcn.system.mapper.EleEpdPqdMapper;
+import com.njcn.system.pojo.param.EleEpdPqdParam;
+import com.njcn.system.pojo.po.EleEpdPqd;
+import com.njcn.system.pojo.vo.EleEpdPqdVO;
+import com.njcn.system.service.IEleEpdPqdService;
+import com.njcn.web.factory.PageFactory;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author xuyang
+ * @since 2023-05-24
+ */
+@Service
+public class EleEpdPqdServiceImpl extends MppServiceImpl<EleEpdPqdMapper, EleEpdPqd> implements IEleEpdPqdService {
+
+    @Override
+    public void saveData(List<EleEpdPqdParam> eleEpdPqdParam) {
+        List<EleEpdPqd> list = eleEpdPqdParam.stream().map(item->{
+            EleEpdPqd eleEpdPqd = new EleEpdPqd();
+            BeanUtils.copyProperties(item,eleEpdPqd);
+            if (StringUtils.isBlank(item.getType())){
+                eleEpdPqd.setType("");
+            }
+            return eleEpdPqd;
+        }).collect(Collectors.toList());
+        this.saveBatch(list,1000);
+    }
+
+    @Override
+    public void add(EleEpdPqdParam eleEpdPqdParam) {
+        checkEleEpdPqdParam(eleEpdPqdParam,false);
+        EleEpdPqd eleEpdPqd = new EleEpdPqd();
+        BeanUtils.copyProperties(eleEpdPqdParam,eleEpdPqd);
+        this.save(eleEpdPqd);
+    }
+
+    @Override
+    public void delete(String id) {
+        this.baseMapper.deleteById(id);
+    }
+
+    @Override
+    public void update(EleEpdPqdParam.EleEpdPqdUpdateParam updateParam) {
+        checkEleEpdPqdParam(updateParam,true);
+        EleEpdPqd eleEpdPqd = new EleEpdPqd();
+        BeanUtils.copyProperties(updateParam,eleEpdPqd);
+        this.updateById(eleEpdPqd);
+    }
+
+    @Override
+    public Page<EleEpdPqdVO> eleEpdPqdList(EleEpdPqdParam.EleEpdPqdQueryParam queryParam) {
+        QueryWrapper<EleEpdPqdVO> queryWrapper = new QueryWrapper<EleEpdPqdVO>();
+        if (ObjectUtil.isNotNull(queryParam)) {
+            //查询参数不为空，进行条件填充
+            if (StrUtil.isNotBlank(queryParam.getSearchValue())) {
+                //部门根据名称模糊查询
+                queryWrapper
+                        .and(param -> param.like("ele_epd_pqd.Name", queryParam.getSearchValue())
+                                      .or().like("ele_epd_pqd.Other_Name", queryParam.getSearchValue())
+                                      .or().like("ele_epd_pqd.Show_Name", queryParam.getSearchValue()));
+            }
+            //排序
+            if (ObjectUtil.isAllNotEmpty(queryParam.getSortBy(), queryParam.getOrderBy())) {
+                queryWrapper.orderBy(true, queryParam.getOrderBy().equalsIgnoreCase(DbConstant.ASC), StrUtil.toUnderlineCase(queryParam.getSortBy()));
+            } else {
+                //默认根据sort排序
+                queryWrapper.orderBy(true, true, "Sort");
+            }
+        }
+        return this.baseMapper.page(new Page<>(PageFactory.getPageNum(queryParam), PageFactory.getPageSize(queryParam)), queryWrapper);
+    }
+
+    @Override
+    public List<EleEpdPqd> dictMarkByDataType(String dataType) {
+        LambdaQueryWrapper<EleEpdPqd> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(EleEpdPqd::getDataType,dataType);
+        return this.baseMapper.selectList(lambdaQueryWrapper);
+    }
+
+    @Override
+    public Map<String, String> saveEvt(List<EleEpdPqdParam> eleEpdPqdParam) {
+        List<EleEpdPqd> list = eleEpdPqdParam.stream().map(item->{
+            EleEpdPqd eleEpdPqd = new EleEpdPqd();
+            BeanUtils.copyProperties(item,eleEpdPqd);
+            if (StringUtils.isBlank(item.getType())){
+                eleEpdPqd.setType("");
+            }
+            return eleEpdPqd;
+        }).collect(Collectors.toList());
+        this.saveBatch(list,1000);
+        List<String> nameList = eleEpdPqdParam.stream().map(EleEpdPqdParam::getName).collect(Collectors.toList());
+        List<EleEpdPqd> list1 = this.lambdaQuery().in(EleEpdPqd::getName,nameList).list();
+        Map<String,String> map = new HashMap<>();
+        list1.forEach(item->{
+            map.put(item.getName(),item.getId());
+        });
+        return map;
+    }
+
+    /**
+     * 校验参数，
+     * 1.检查是否存在相同名称的菜单
+     * 名称 && 路径做唯一判断
+     */
+    private void checkEleEpdPqdParam(EleEpdPqdParam eleEpdPqdParam, boolean isExcludeSelf) {
+        LambdaQueryWrapper<EleEpdPqd> eleEpdPqdLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        eleEpdPqdLambdaQueryWrapper
+                .eq(EleEpdPqd::getName, eleEpdPqdParam.getName())
+                .eq(EleEpdPqd::getPhase, eleEpdPqdParam.getPhase())
+                .eq(EleEpdPqd::getClassId,eleEpdPqdParam.getClassId())
+                .eq(EleEpdPqd::getDataType, eleEpdPqdParam.getDataType());
+        //更新的时候，需排除当前记录
+        if (isExcludeSelf) {
+            if (eleEpdPqdParam instanceof EleEpdPqdParam.EleEpdPqdUpdateParam) {
+                eleEpdPqdLambdaQueryWrapper.ne(EleEpdPqd::getId, ((EleEpdPqdParam.EleEpdPqdUpdateParam) eleEpdPqdParam).getId());
+            }
+        }
+        int countByAccount = this.count(eleEpdPqdLambdaQueryWrapper);
+        //大于等于1个则表示重复
+        if (countByAccount >= 1) {
+            throw new BusinessException(SystemResponseEnum.DICT_DATA_NAME_REPEAT);
+        }
+    }
+}