调整

cs-system/cs-system-boot/src/main/java/com/njcn/system/CsSystemBootApplication.java

@@ -0,0 +1,27 @@
+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;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+
+
+/**
+ * @author hongawen
+ * @version 1.0.0
+ * @date 2021年12月09日 20:59
+ */
+@Slf4j
+@MapperScan("com.njcn.**.mapper")
+@EnableFeignClients(basePackages = "com.njcn")
+@SpringBootApplication(scanBasePackages = "com.njcn")
+@EnableMPP
+public class CsSystemBootApplication {
+
+    public static void main(String[] args)  {
+        SpringApplication.run(CsSystemBootApplication.class, args);
+    }
+
+}

cs-system/cs-system-boot/src/main/java/com/njcn/system/controller/EleEpdPqdController.java

@@ -0,0 +1,105 @@
+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 java.util.List;
+
+/**
+ * <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)
+    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);
+    }
+
+
+}
+

cs-system/cs-system-boot/src/main/java/com/njcn/system/mapper/EleEpdPqdMapper.java

@@ -0,0 +1,23 @@
+package com.njcn.system.mapper;
+
+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.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);
+
+}

cs-system/cs-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>

cs-system/cs-system-boot/src/main/java/com/njcn/system/service/IEleEpdPqdService.java

@@ -0,0 +1,50 @@
+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.vo.EleEpdPqdVO;
+
+import java.util.List;
+
+/**
+ * <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);
+
+}

cs-system/cs-system-boot/src/main/java/com/njcn/system/service/impl/EleEpdPqdServiceImpl.java

@@ -0,0 +1,113 @@
+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.CsSystemResponseEnum;
+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.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+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);
+            return eleEpdPqd;
+        }).collect(Collectors.toList());
+        this.saveOrUpdateBatchByMultiId(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);
+    }
+
+    /**
+     * 校验参数，
+     * 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(CsSystemResponseEnum.DICT_REPEAT);
+        }
+    }
+}

cs-system/cs-system-boot/src/main/resources/bootstrap.yml

@@ -0,0 +1,51 @@
+#当前服务的基本信息
+microservice:
+  ename: @artifactId@
+  name: '@name@'
+  version: @version@
+  sentinel:
+    url: @sentinel.url@
+  gateway:
+    url: @gateway.url@
+server:
+  port: 10224
+#feign接口开启服务熔断降级处理
+feign:
+  sentinel:
+    enabled: true
+spring:
+  application:
+    name: @artifactId@
+  cloud:
+    nacos:
+      discovery:
+        ip: @service.server.url@
+        server-addr: @nacos.url@
+        namespace: @nacos.namespace@
+      config:
+        server-addr: @nacos.url@
+        namespace: @nacos.namespace@
+        file-extension: yaml
+        shared-configs:
+          - data-id: share-config.yaml
+            refresh: true
+          - data-Id: share-config-datasource-db.yaml
+            refresh: true
+  main:
+    allow-bean-definition-overriding: true
+
+
+#项目日志的配置
+logging:
+  config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml
+  level:
+    root: info
+
+
+#mybatis配置信息
+mybatis-plus:
+  #别名扫描
+  type-aliases-package: com.njcn.system.pojo
+
+mqtt:
+  client-id: @artifactId@${random.value}

cs-system/cs-system-boot/src/test/java/com/njcn/AppTest.java

@@ -0,0 +1,20 @@
+package com.njcn;
+
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest 
+{
+    /**
+     * Rigorous Test :-)
+     */
+    @Test
+    public void shouldAnswerWithTrue()
+    {
+        assertTrue( true );
+    }
+}