ljf
/
shuili
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

fix: 调整依赖

master_tdsql
hxh 10 months ago
parent
d5ea8a35cc
commit
eddb0c08a5
11 changed files with 530 additions and 560 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 81
      pom.xml
  2. 34
      shuili-admin/pom.xml
  3. 41
      shuili-common/pom.xml
  4. 43
      shuili-framework/pom.xml
  5. 25
      shuili-framework/src/main/java/com/shuili/common/mybaitsplus/BeanToWrapper.java
  6. 50
      shuili-framework/src/main/java/com/shuili/common/mybaitsplus/CamelUnderlineUtil.java
  7. 8
      shuili-generator/pom.xml
  8. 27
      shuili-system/pom.xml
  9. 12
      shuili-system/src/main/java/com/kms/yg/znjg/controller/SyLayerController.java
  10. 2
      shuili-system/src/main/java/com/kms/yg/znjg/service/SyLayerService.java
  11. 31
      shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java

81
pom.xml
View File

@ -32,7 +32,7 @@
<spring-web.version>5.2.14.RELEASE</spring-web.version>
<spring-boot.version>2.3.10.RELEASE</spring-boot.version>
<fastjson.version>1.2.83</fastjson.version>
<hutool.version>5.6.0</hutool.version>
<hutool.version>5.8.25</hutool.version>
<mybatis-plus.version>3.4.2</mybatis-plus.version>
<mapstruct.version>1.4.1.Final</mapstruct.version>
<druid-stater.version>1.1.21</druid-stater.version>
@ -42,32 +42,26 @@
<knife4j.version>2.0.8</knife4j.version>
<druid.version>1.2.6</druid.version>
<p6spy.version>3.9.1</p6spy.version>
<bitwalker.version>1.19</bitwalker.version>
<pagehelper.boot.version>1.3.0</pagehelper.boot.version>
<oshi.version>3.9.1</oshi.version>
<swagger.version>2.9.2</swagger.version>
<io-swagger.version>1.6.2</io-swagger.version>
<commons.io.version>2.11.0</commons.io.version>
<commons.fileupload.version>1.3.3</commons.fileupload.version>
<commons.fileupload.version>1.5</commons.fileupload.version>
<poi.version>3.17</poi.version>
<velocity.version>1.7</velocity.version>
<jwt.version>0.9.1</jwt.version>
<kaptcha.version>2.3.2</kaptcha.version>
<jna.version>5.8.0</jna.version>
<fastdfs.version>1.27.2</fastdfs.version>
<libthrift.version>0.10.0</libthrift.version>
</properties>
<dependencies>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
@ -75,6 +69,46 @@
<dependencies>
<!-- SpringBoot 依赖配置 -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>${spring-boot.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-bom</artifactId>
<version>${hutool.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
<version>${hutool.version}</version>
</dependency>
<dependency>
<groupId>cn.dev33</groupId>
<artifactId>sa-token-spring-boot-starter</artifactId>
<version>${sa-token.version}</version>
</dependency>
<dependency>
<groupId>cn.dev33</groupId>
<artifactId>sa-token-dao-redis-jackson</artifactId>
<version>${sa-token.version}</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.20</version>
</dependency>
<dependency>
<groupId>org.apache.thrift</groupId>
@ -99,19 +133,26 @@
<version>${jna.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>${spring-boot.version}</version>
<scope>import</scope>
<type>pom</type>
<groupId>com.github.ben-manes.caffeine</groupId>
<artifactId>caffeine</artifactId>
<version>2.9.3</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
<version>5.2.5</version>
</dependency>
<dependency>
<artifactId>commons-compress</artifactId>
<groupId>org.apache.commons</groupId>
<version>1.26.0</version>
</dependency>
<!--验证码 -->
<dependency>
<groupId>com.github.penggle</groupId>
<groupId>pro.fessional</groupId>
<artifactId>kaptcha</artifactId>
<version>${kaptcha.version}</version>
<version>2.3.3</version>
</dependency>
<!--Token生成与解析-->
@ -130,7 +171,6 @@
</dependency>
<!--文件上传工具类 -->
<dependency>
<groupId>commons-fileupload</groupId>
@ -222,12 +262,7 @@
<artifactId>mybatis-plus-boot-starter</artifactId>
<version>${mybatis-plus.version}</version>
</dependency>
<!-- Hutool是一个Java工具包 -->
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
<version>${hutool.version}</version>
</dependency>
<!-- 阿里巴巴fastjson，解析json视图 -->
<dependency>
<groupId>com.alibaba</groupId>

34
shuili-admin/pom.xml
View File

@ -15,21 +15,16 @@
<!-- FIXME change it to the project's website -->
<url>http://www.example.com</url>
<properties>
<hutool.version>4.5.16</hutool.version>
</properties>
<dependencies>
<dependency>
<groupId>javax.xml.ws</groupId>
<artifactId>jaxws-api</artifactId>
<version>2.2.6</version>
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
</dependency>
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
</dependency>
<!--<dependency>
@ -42,13 +37,13 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<!-- 代码生成-->
<dependency>
<groupId>com.slsoft</groupId>
<artifactId>shuili-system</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>${project.version}</version>
</dependency>
<!-- https://mvnrepository.com/artifact/io.springfox/springfox-core -->
<dependency>
@ -77,23 +72,6 @@
<artifactId>bcprov-jdk15on</artifactId>
<version>1.65</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-annotations</artifactId>
<version>1.6</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.0.0</version>
<exclusions>
<exclusion>
<artifactId>commons-compress</artifactId>
<groupId>org.apache.commons</groupId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
<build>

41
shuili-common/pom.xml
View File

@ -13,18 +13,6 @@
<packaging>jar</packaging>
<description>boot 工程工具类 </description>
<properties>
<bitwalker.version>1.21</bitwalker.version>
<fastjson.version>1.2.79</fastjson.version>
<commons.io.version>2.11.0</commons.io.version>
<commons.fileupload.version>1.4</commons.fileupload.version>
<commons-lang3.version>3.12.0</commons-lang3.version>
<servlet-api.version>4.0.1</servlet-api.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
</properties>
<dependencies>
<!--csv文件操作-->
@ -37,10 +25,14 @@
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
<version>5.2.3</version>
<exclusions>
<exclusion>
<artifactId>commons-codec</artifactId>
<groupId>commons-codec</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.dom4j</groupId>
<artifactId>dom4j</artifactId>
@ -50,18 +42,11 @@
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
<version>1.5.21</version>
</dependency>
<!--添加lombok的包-->
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.20</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>${servlet-api.version}</version>
</dependency>
<dependency>
@ -81,27 +66,23 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>2.13.2</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>${commons-lang3.version}</version>
</dependency>
<!--文件上传工具类 -->
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>${commons.fileupload.version}</version>
</dependency>
<!--io常用工具类 -->
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>${commons.io.version}</version>
</dependency>
@ -109,22 +90,16 @@
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>${fastjson.version}</version>
</dependency>
<!-- 解析客户端操作系统、浏览器等 -->
<dependency>
<groupId>eu.bitwalker</groupId>
<artifactId>UserAgentUtils</artifactId>
<version>${bitwalker.version}</version>
</dependency>
</dependencies>
<build>
<finalName>${project.artifactId}</finalName>
</build>

43
shuili-framework/pom.xml
View File

@ -19,13 +19,12 @@
<dependencies>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>20.0</version>
<version>33.2.1-android</version>
</dependency>
<!-- mybatis plus 代码生成器 -->
<dependency>
<groupId>com.baomidou</groupId>
@ -39,13 +38,6 @@
<version>1.9.19</version>
</dependency>
<!--<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-mongodb</artifactId>
</dependency>-->
<dependency>
<groupId>com.github.tobato</groupId>
<artifactId>fastdfs-client</artifactId>
@ -55,7 +47,6 @@
<dependency>
<groupId>cn.dev33</groupId>
<artifactId>sa-token-spring-boot-starter</artifactId>
<version>1.34.0</version>
</dependency>
<!-- Sa-Token 整合 Redis （使用jackson序列化方式） -->
@ -63,18 +54,8 @@
<dependency>
<groupId>cn.dev33</groupId>
<artifactId>sa-token-dao-redis-jackson</artifactId>
<version>1.34.0</version>
</dependency>
<!-- https://mvnrepository.com/artifact/cn.dev33/sa-token-core -->
<dependency>
<groupId>cn.dev33</groupId>
<artifactId>sa-token-core</artifactId>
<version>1.34.0</version>
</dependency>
<!-- SpringBoot Web容器 -->
<dependency>
<groupId>org.springframework.boot</groupId>
@ -89,22 +70,12 @@
<!-- excel工具 -->
<!-- https://mvnrepository.com/artifact/org.apache.poi/poi -->
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
<version>5.2.3</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.poi/poi-ooxml -->
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
<version>5.2.3</version>
</dependency>
<!-- 阿里数据库连接池 -->
<dependency>
<groupId>com.alibaba</groupId>
@ -115,20 +86,14 @@
<dependency>
<groupId>com.slsoft</groupId>
<artifactId>shuili-common</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>${project.version}</version>
</dependency>
<!-- 验证码 -->
<dependency>
<groupId>com.github.penggle</groupId>
<groupId>pro.fessional</groupId>
<artifactId>kaptcha</artifactId>
<exclusions>
<exclusion>
<artifactId>javax.servlet-api</artifactId>
<groupId>javax.servlet</groupId>
</exclusion>
</exclusions>
</dependency>
<!-- 获取系统信息 -->

25
shuili-framework/src/main/java/com/shuili/common/mybaitsplus/BeanToWrapper.java
View File

@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.google.common.base.CaseFormat;
import com.shuili.common.constant.YesOrNo;
import com.shuili.common.core.domain.*;
import com.shuili.common.core.domain.*;
import com.shuili.common.utils.StringUtils;
import com.shuili.common.utils.reflect.ReflectUtils;
import org.springframework.context.annotation.Lazy;
@ -257,7 +256,7 @@ public class BeanToWrapper<T extends BaseEntity> {
private static Map<String, Method> methodMap = new HashMap<>();
static{
static {
try {
List<Method> methods = new ArrayList<>();
Class<? extends QueryWrapper> aClass = QueryWrapper.class;
@ -290,23 +289,23 @@ public class BeanToWrapper<T extends BaseEntity> {
}
}
for (Method declaredMethod : methods) {
if("in".equals(declaredMethod.getName()) || "nin".equals(declaredMethod.getName())
|| "all".equals(declaredMethod.getName())){
if ("in".equals(declaredMethod.getName()) || "nin".equals(declaredMethod.getName())
|| "all".equals(declaredMethod.getName())) {
Class<?>[] parameterTypes = declaredMethod.getParameterTypes();
for (Class<?> parameterType : parameterTypes) {
//使用collection参数的方法
if(parameterType.getName().equals(Collection.class.getName())){
methodMap.put(declaredMethod.getName(),declaredMethod);
if (parameterType.getName().equals(Collection.class.getName())) {
methodMap.put(declaredMethod.getName(), declaredMethod);
}
}
}else if("like".equals(declaredMethod.getName())){
} else if ("like".equals(declaredMethod.getName())) {
Class<?>[] parameterTypes = declaredMethod.getParameterTypes();
if(parameterTypes.length == 2){ //
methodMap.put(declaredMethod.getName(),declaredMethod);
if (parameterTypes.length == 2) { //
methodMap.put(declaredMethod.getName(), declaredMethod);
}
}else {
methodMap.put(declaredMethod.getName(),declaredMethod);
} else {
methodMap.put(declaredMethod.getName(), declaredMethod);
}
}
@ -365,9 +364,9 @@ public class BeanToWrapper<T extends BaseEntity> {
recursionCriteria(wrapper, sp.getCv().getCv());
}
}
if(StringUtils.isNotEmpty(sp.getConditionViews())){
if (StringUtils.isNotEmpty(sp.getConditionViews())) {
for (ConditionView conditionView : sp.getConditionViews()) {
if(StringUtils.isNotNull(conditionView.getValue())){
if (StringUtils.isNotNull(conditionView.getValue())) {
getWrapper(wrapper, conditionView);
}
}

50
shuili-framework/src/main/java/com/shuili/common/mybaitsplus/CamelUnderlineUtil.java
View File

@ -3,7 +3,6 @@ package com.shuili.common.mybaitsplus;
import com.google.common.base.CaseFormat;
import lombok.extern.slf4j.Slf4j;
import java.util.ArrayList;
import java.util.List;
/**
@ -14,96 +13,99 @@ public class CamelUnderlineUtil {
/**
*驼峰转下划线及中划线
* 驼峰转下划线及中划线
*
* @param list
* @param resultList
*/
private static void camel2UnderScoreOrHyphen(List<String> list, List<String> resultList) {
for (String key : list) {
//驼峰转小写下划线
log.info("----------驼峰转{}{}------------start","下划线","首字母小写");
log.info("----------驼峰转{}{}------------start", "下划线", "首字母小写");
String to = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, key);
log.info(to);
to = CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, key);
log.info(to);
log.info("----------驼峰转{}{}------------end","下划线","首字母小写");
log.info("----------驼峰转{}{}------------end", "下划线", "首字母小写");
log.info("----------驼峰转{}{}------------start","大写下划线","");
log.info("----------驼峰转{}{}------------start", "大写下划线", "");
to = CaseFormat.LOWER_CAMEL.to(CaseFormat.UPPER_UNDERSCORE, key);
log.info(to);
to = CaseFormat.UPPER_CAMEL.to(CaseFormat.UPPER_UNDERSCORE, key);
log.info(to);
log.info("----------驼峰转大{}{}------------end","大写下划线","");
log.info("----------驼峰转大{}{}------------end", "大写下划线", "");
log.info("----------驼峰转{}{}------------start","小写中划线","");
log.info("----------驼峰转{}{}------------start", "小写中划线", "");
to = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_HYPHEN, key);
log.info(to);
to = CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_HYPHEN, key);
log.info(to);
log.info("----------驼峰转{}{}------------end","小写中划线","");
log.info("----------驼峰转{}{}------------end", "小写中划线", "");
resultList.add(to);
}
}
/**
*下划线转驼峰及中划线
* 下划线转驼峰及中划线
*
* @param list
* @param resultList
*/
private static void underScore2CamelOrHyphen(List<String> list, List<String> resultList) {
for (String key : list) {
log.info("----------下划线转{}{}------------start","驼峰","首字母小写");
log.info("----------下划线转{}{}------------start", "驼峰", "首字母小写");
String to = CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, key);
log.info(to);
to = CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, key);
log.info(to);
log.info("----------下划线转{}{}------------end","驼峰","首字母小写");
log.info("----------下划线转{}{}------------end", "驼峰", "首字母小写");
log.info("----------下划线转{}{}------------start","驼峰","首字母大写");
log.info("----------下划线转{}{}------------start", "驼峰", "首字母大写");
to = CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.UPPER_CAMEL, key);
log.info(to);
to = CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.UPPER_CAMEL, key);
log.info(to);
log.info("----------下划线转{}{}------------end","驼峰","首字母大写");
log.info("----------下划线转{}{}------------end", "驼峰", "首字母大写");
log.info("----------下划线转{}{}------------start","小写中划线","");
log.info("----------下划线转{}{}------------start", "小写中划线", "");
to = CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_HYPHEN, key);
log.info(to);
log.info("----------下划线转{}{}------------end","小写中划线","");
log.info("----------下划线转{}{}------------end", "小写中划线", "");
resultList.add(to);
}
}
/**
*中划线转驼峰及下划线
* 中划线转驼峰及下划线
*
* @param list
* @param resultList
*/
private static void hyphen2CamelOrUnderScore(List<String> list, List<String> resultList) {
for (String key : list) {
log.info("----------中划线转{}{}------------start","驼峰","首字母小写");
log.info("----------中划线转{}{}------------start", "驼峰", "首字母小写");
String to = CaseFormat.LOWER_HYPHEN.to(CaseFormat.LOWER_CAMEL, key);
log.info(to);
log.info("----------中划线转{}{}------------end","驼峰","首字母小写");
log.info("----------中划线转{}{}------------end", "驼峰", "首字母小写");
log.info("----------中划线转{}{}------------start","驼峰","首字母大写");
log.info("----------中划线转{}{}------------start", "驼峰", "首字母大写");
to = CaseFormat.LOWER_HYPHEN.to(CaseFormat.UPPER_CAMEL, key);
log.info(to);
log.info("----------中划线转{}{}------------end","驼峰","首字母大写");
log.info("----------中划线转{}{}------------end", "驼峰", "首字母大写");
log.info("----------中划线转{}{}------------start","小写下划线","");
log.info("----------中划线转{}{}------------start", "小写下划线", "");
to = CaseFormat.LOWER_HYPHEN.to(CaseFormat.LOWER_UNDERSCORE, key);
log.info(to);
log.info("----------中划线转{}{}------------end","小写下划线","");
log.info("----------中划线转{}{}------------end", "小写下划线", "");
log.info("----------中划线转{}{}------------start","大写下划线","");
log.info("----------中划线转{}{}------------start", "大写下划线", "");
to = CaseFormat.LOWER_HYPHEN.to(CaseFormat.UPPER_UNDERSCORE, key);
log.info(to);
log.info("----------中划线转{}{}------------end","大写下划线","");
log.info("----------中划线转{}{}------------end", "大写下划线", "");
resultList.add(to);
}
}

8
shuili-generator/pom.xml
View File

@ -24,13 +24,19 @@
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
<exclusions>
<exclusion>
<artifactId>commons-collections</artifactId>
<groupId>commons-collections</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.slsoft</groupId>
<artifactId>shuili-framework</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>${project.version}</version>
</dependency>
</dependencies>

27
shuili-system/pom.xml
View File

@ -15,23 +15,24 @@
<name>shuili-system</name>
<!-- FIXME change it to the project's website -->
<url>http://www.example.com</url>
<properties>
<hutool.version>4.5.16</hutool.version>
</properties>
<dependencies>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<version>2.6.6</version>
</dependency>
<!-- Mysql驱动包 -->
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>8.0.23</version>
</dependency>
<dependency>
@ -47,17 +48,10 @@
<version>5.4.3</version>
</dependency>
<dependency>
<groupId>com.slsoft</groupId>
<artifactId>shuili-generator</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.slsoft</groupId>
<artifactId>shuili-common</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>${project.version}</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient -->
@ -83,14 +77,19 @@
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-core</artifactId>
<version>5.8.5</version>
</dependency>
<!-- https://mvnrepository.com/artifact/com.github.ben-manes.caffeine/caffeine -->
<dependency>
<groupId>com.github.ben-manes.caffeine</groupId>
<artifactId>caffeine</artifactId>
<version>2.9.3</version>
</dependency>
<dependency>
<groupId>com.slsoft</groupId>
<artifactId>shuili-framework</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>

12
shuili-system/src/main/java/com/kms/yg/znjg/controller/SyLayerController.java
View File

@ -9,9 +9,9 @@ import com.kms.yg.znjg.service.SyLayerService;
import com.kms.yxgh.base.Response;
import com.shuili.common.core.domain.SearchParam;
import com.shuili.common.core.domain.entity.SysUser;
import com.shuili.common.utils.StringUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@ -72,10 +72,7 @@ public class SyLayerController {
}
SysUser user = UserUtils.getUser();
syLayer.setCreateUser(user.getNickName());
Boolean insertDataFlag = false;
if (StringUtils.isBlank(syLayer.getId())) {
insertDataFlag = true;
}
boolean insertDataFlag = StringUtils.isBlank(syLayer.getId());
if (insertDataFlag) {
//同一层下图层名称不同
Boolean serviceIsRepeat = syLayerService.checkNameIsRepeat(syLayer.getServiceName(), syLayer.getId());
@ -133,6 +130,7 @@ public class SyLayerController {
/**
* 分页查询全部资源信息
*
* @param spLayer
* @return
*/
@ -140,8 +138,8 @@ public class SyLayerController {
@ApiOperation("根据查询条件分页查询全部资源信息")
public IPage<SyLayer> getLayers(@RequestBody SearchParam<SyLayer> spLayer) {
SyLayer syLayerInfo = spLayer.getData();
Page<SyLayer> page = new Page<>(spLayer.getPageNum(),spLayer.getPageSize());
Page<SyLayer> page = new Page<>(spLayer.getPageNum(), spLayer.getPageSize());
Map<String, Object> params = spLayer.getParams();
return syLayerService.selectPage(page,syLayerInfo,params);
return syLayerService.selectPage(page, syLayerInfo, params);
}
}

2
shuili-system/src/main/java/com/kms/yg/znjg/service/SyLayerService.java
View File

@ -13,7 +13,7 @@ import com.kms.yg.znjg.domain.SyLayerField;
import com.kms.yg.znjg.mapper.SyDirLayerMapper;
import com.kms.yg.znjg.mapper.SyLayerFieldMapper;
import com.kms.yg.znjg.mapper.SyLayerMapper;
import org.apache.commons.lang.StringUtils;
import com.shuili.common.utils.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

31
shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java
View File

@ -16,6 +16,7 @@ import com.kms.yxgh.df.dto.DfCheckingPlanContentDto;
import com.kms.yxgh.df.dto.DfPlanDetailDto;
import com.kms.yxgh.df.dto.DfPlanSearchDto;
import com.kms.yxgh.df.dto.DfPlanSimpleDto;
import com.kms.yxgh.df.mapper.DfCheckingPlanContentMapper;
import com.kms.yxgh.df.mapper.DfPlanMapper;
import com.kms.yxgh.df.mapper.DfRecordMapper;
import com.kms.yxgh.util.BeanCopyUtils;
@ -32,6 +33,8 @@ import java.time.ZoneId;
import java.util.*;
import java.util.stream.Collectors;
import static com.alibaba.fastjson.JSON.toJSONString;
/**
* 堤防巡视检查计划Service接口
*
@ -44,6 +47,7 @@ public class DfPlanService extends BaseService<DfPlanMapper, DfPlan> {
private final DfRecordMapper dfRecordMapper;
private final DfCheckingPlanContentService dfCheckingPlanContentService;
private final DfCheckingPlanContentMapper dfCheckingPlanContentMapper;
private final SysUserService userService;
private final DfPlanOperatorService dfPlanOperatorService;
@ -83,8 +87,8 @@ public class DfPlanService extends BaseService<DfPlanMapper, DfPlan> {
if (dfPlan != null) {
dfPlan.setId(null);
if (checkNameDistinct(dfPlan.getId(), dfPlan.getName())) {
dfPlan.setOtherConfig(JSON.toJSONString(dto.getOtherConfig()));
dfPlan.setFiles(JSON.toJSONString(dto.getFiles()));
dfPlan.setOtherConfig(toJSONString(dto.getOtherConfig()));
dfPlan.setFiles(toJSONString(dto.getFiles()));
planeTime(dfPlan, dto.getContents());
getBaseMapper().insert(dfPlan);
String id = dfPlan.getId();
@ -104,8 +108,8 @@ public class DfPlanService extends BaseService<DfPlanMapper, DfPlan> {
DfPlan dfPlan = BeanCopyUtils.copy(dto, DfPlan.class);
if (dfPlan != null) {
if (checkNameDistinct(dfPlan.getId(), dfPlan.getName())) {
dfPlan.setOtherConfig(JSON.toJSONString(dto.getOtherConfig()));
dfPlan.setFiles(JSON.toJSONString(dto.getFiles()));
dfPlan.setOtherConfig(toJSONString(dto.getOtherConfig()));
dfPlan.setFiles(toJSONString(dto.getFiles()));
planeTime(dfPlan, dto.getContents());
getBaseMapper().updateById(dfPlan);
String id = dfPlan.getId();
@ -199,17 +203,26 @@ public class DfPlanService extends BaseService<DfPlanMapper, DfPlan> {
dfCheckingPlanContentService.removeByIds(deleteContents);
}
}
dfCheckingPlanContentService.saveOrUpdateBatch(contents.stream().peek(item -> item.setPlanId(planId)).map(this::toEntity).collect(Collectors.toList()));
List<DfPlanOperator> operators = contents.stream().flatMap(item -> item.getOperator().stream().map(operator -> {
contents.forEach(content -> {
content.setPlanId(planId);
DfCheckingPlanContent entity = toEntity(content);
if (entity.getId() == null) {
dfCheckingPlanContentMapper.insert(entity);
} else {
dfCheckingPlanContentMapper.updateById(entity);
}
String contentId = entity.getId();
List<DfPlanOperator> operators = content.getOperator().stream().map(operator -> {
DfPlanOperator po = new DfPlanOperator();
po.setId(operator.getId());
po.setSubPlanId(item.getId());
po.setSubPlanId(contentId);
po.setOperatorUid(operator.getUid());
po.setPlanId(item.getPlanId());
po.setPlanId(planId);
po.setOperatorName(operator.getName());
return po;
})).collect(Collectors.toList());
}).collect(Collectors.toList());
dfPlanOperatorService.saveOrUpdateBatch(operators);
});
} else {
throw new DfException("执行计划内容不能为空");
}

Write Preview
Loading…
Cancel
Save