diff --git a/pom.xml b/pom.xml index 8c6dc618..daf2d940 100644 --- a/pom.xml +++ b/pom.xml @@ -1,312 +1,347 @@ - 4.0.0 - - com.slsoft - slSoft - 0.0.1-SNAPSHOT - - shuili-admin - shuili-system - shuili-framework - shuili-generator - shuili-common - - - slSoft - - http://www.example.com - pom - - - 1.8 - 1.8 - 1.8 - UTF-8 - - 5.4.6 - 6.1.7.Final - 4.0.1 - 5.2.14.RELEASE - 2.3.10.RELEASE - 1.2.83 - 5.6.0 - 3.4.2 - 1.4.1.Final - 1.1.21 - 1.2.17 - 3.12.5 - 1.34.0 - 2.0.8 - 1.2.6 - 3.9.1 - - - 1.19 - 1.3.0 - 3.9.1 - 2.9.2 - 1.6.2 - 2.11.0 - 1.3.3 - 3.17 - 1.7 - 0.9.1 - 2.3.2 - 5.8.0 - 1.27.2 - 0.10.0 - - - - - - - - org.projectlombok - lombok - provided - - - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + com.slsoft + slSoft + 0.0.1-SNAPSHOT + + shuili-admin + shuili-system + shuili-framework + shuili-generator + shuili-common + + + slSoft + + http://www.example.com + pom + + + 1.8 + 1.8 + 1.8 + UTF-8 + + 5.4.6 + 6.1.7.Final + 4.0.1 + 5.2.14.RELEASE + 2.3.10.RELEASE + 1.2.83 + 5.8.25 + 3.4.2 + 1.4.1.Final + 1.1.21 + 1.2.17 + 3.12.5 + 1.34.0 + 2.0.8 + 1.2.6 + 3.9.1 + 1.19 + 1.3.0 + 3.9.1 + 2.9.2 + 1.6.2 + 2.11.0 + 1.5 + 3.17 + 1.7 + 0.9.1 + 5.8.0 + 1.27.2 + 0.10.0 + + - - - - org.apache.thrift - libthrift - ${libthrift.version} - - - com.github.tobato - fastdfs-client - ${fastdfs.version} - - - net.java.dev.jna - jna-platform - ${jna.version} - - - - - net.java.dev.jna - jna - ${jna.version} - - - - - org.springframework.boot - spring-boot-dependencies - ${spring-boot.version} - import - pom - - - - com.github.penggle - kaptcha - ${kaptcha.version} - - - - - io.jsonwebtoken - jjwt - ${jwt.version} - - - - - - org.apache.velocity - velocity - ${velocity.version} - - - - - - - commons-fileupload - commons-fileupload - ${commons.fileupload.version} - - - - - commons-io - commons-io - ${commons.io.version} - - - - - io.springfox - springfox-swagger2 - ${swagger.version} - - - io.swagger - swagger-annotations - - - io.swagger - swagger-models - - - - - - - io.springfox - springfox-swagger-ui - ${swagger.version} - - - - - com.github.oshi - oshi-core - ${oshi.version} - - - - - com.github.pagehelper - pagehelper-spring-boot-starter - ${pagehelper.boot.version} - - - - com.github.xiaoymin - knife4j-spring-boot-starter - ${knife4j.version} - - - p6spy - p6spy - ${p6spy.version} - - - com.alibaba - druid-spring-boot-starter - ${druid.version} - - - - - eu.bitwalker - UserAgentUtils - ${bitwalker.version} - - - - - org.springframework.security - spring-security-core - ${spring-security.version} - - - org.springframework - spring-context-support - ${spring-web.version} - - - com.baomidou - mybatis-plus-boot-starter - ${mybatis-plus.version} - - - - cn.hutool - hutool-all - ${hutool.version} - - - - com.alibaba - fastjson - ${fastjson.version} - - - - org.springframework - spring-web - ${spring-web.version} - - - - javax.servlet - javax.servlet-api - ${servlet-api.version} - - - - org.hibernate.validator - hibernate-validator - ${hibernate-validator.version} - - - - - org.springframework.boot - spring-boot-starter-aop - ${spring-boot.version} - - - - io.swagger - swagger-annotations - ${io-swagger.version} - - - - org.redisson - redisson-spring-boot-starter - ${redisson.version} - + + org.projectlombok + lombok + - - - - ${project.artifactId} - - - org.springframework.boot - spring-boot-maven-plugin - ${spring-boot.version} - - true - - - - - repackage - - - - - - - - - - nexus-aliyun - nexus-aliyun - http://maven.aliyun.com/nexus/content/groups/public/ - - true - - - false - - - - + + + + + + + + org.springframework.boot + spring-boot-dependencies + ${spring-boot.version} + pom + import + + + + cn.hutool + hutool-bom + ${hutool.version} + pom + import + + + cn.hutool + hutool-all + ${hutool.version} + + + + + + cn.dev33 + sa-token-spring-boot-starter + ${sa-token.version} + + + cn.dev33 + sa-token-dao-redis-jackson + ${sa-token.version} + + + + org.projectlombok + lombok + 1.18.20 + + + + org.apache.thrift + libthrift + ${libthrift.version} + + + com.github.tobato + fastdfs-client + ${fastdfs.version} + + + net.java.dev.jna + jna-platform + ${jna.version} + + + + + net.java.dev.jna + jna + ${jna.version} + + + + com.github.ben-manes.caffeine + caffeine + 2.9.3 + + + org.apache.poi + poi-ooxml + 5.2.5 + + + commons-compress + org.apache.commons + 1.26.0 + + + + pro.fessional + kaptcha + 2.3.3 + + + + + io.jsonwebtoken + jjwt + ${jwt.version} + + + + + + org.apache.velocity + velocity + ${velocity.version} + + + + + + commons-fileupload + commons-fileupload + ${commons.fileupload.version} + + + + + commons-io + commons-io + ${commons.io.version} + + + + + io.springfox + springfox-swagger2 + ${swagger.version} + + + io.swagger + swagger-annotations + + + io.swagger + swagger-models + + + + + + + io.springfox + springfox-swagger-ui + ${swagger.version} + + + + + com.github.oshi + oshi-core + ${oshi.version} + + + + + com.github.pagehelper + pagehelper-spring-boot-starter + ${pagehelper.boot.version} + + + + com.github.xiaoymin + knife4j-spring-boot-starter + ${knife4j.version} + + + p6spy + p6spy + ${p6spy.version} + + + com.alibaba + druid-spring-boot-starter + ${druid.version} + + + + + eu.bitwalker + UserAgentUtils + ${bitwalker.version} + + + + + org.springframework.security + spring-security-core + ${spring-security.version} + + + org.springframework + spring-context-support + ${spring-web.version} + + + com.baomidou + mybatis-plus-boot-starter + ${mybatis-plus.version} + + + + + com.alibaba + fastjson + ${fastjson.version} + + + + org.springframework + spring-web + ${spring-web.version} + + + + javax.servlet + javax.servlet-api + ${servlet-api.version} + + + + org.hibernate.validator + hibernate-validator + ${hibernate-validator.version} + + + + + org.springframework.boot + spring-boot-starter-aop + ${spring-boot.version} + + + + io.swagger + swagger-annotations + ${io-swagger.version} + + + + org.redisson + redisson-spring-boot-starter + ${redisson.version} + + + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + ${spring-boot.version} + + true + + + + + repackage + + + + + + + + + + nexus-aliyun + nexus-aliyun + http://maven.aliyun.com/nexus/content/groups/public/ + + true + + + false + + + + diff --git a/shuili-admin/pom.xml b/shuili-admin/pom.xml index fbfd5297..fbe9c889 100644 --- a/shuili-admin/pom.xml +++ b/shuili-admin/pom.xml @@ -15,21 +15,16 @@ http://www.example.com - - 4.5.16 - - - javax.xml.ws - jaxws-api - 2.2.6 + cn.hutool + hutool-all - cn.hutool - hutool-all + com.baomidou + mybatis-plus-boot-starter com.slsoft shuili-system - 0.0.1-SNAPSHOT + ${project.version} @@ -77,23 +72,6 @@ bcprov-jdk15on 1.65 - - org.codehaus.plexus - plexus-component-annotations - 1.6 - - - org.apache.maven.plugins - maven-assembly-plugin - 3.0.0 - - - commons-compress - org.apache.commons - - - - diff --git a/shuili-common/pom.xml b/shuili-common/pom.xml index 2f693563..77b1cf4a 100644 --- a/shuili-common/pom.xml +++ b/shuili-common/pom.xml @@ -13,18 +13,6 @@ jar boot 工程工具类 - - 1.21 - 1.2.79 - 2.11.0 - 1.4 - 3.12.0 - 4.0.1 - UTF-8 - 1.8 - 1.8 - - @@ -37,10 +25,14 @@ org.apache.poi poi-ooxml - 5.2.3 + + + commons-codec + commons-codec + + - org.dom4j dom4j @@ -50,18 +42,11 @@ io.swagger swagger-annotations - 1.5.21 - - - - org.projectlombok - lombok - 1.18.20 + javax.servlet javax.servlet-api - ${servlet-api.version} @@ -81,27 +66,23 @@ com.fasterxml.jackson.core jackson-annotations - 2.13.2 org.apache.commons commons-lang3 - ${commons-lang3.version} commons-fileupload commons-fileupload - ${commons.fileupload.version} commons-io commons-io - ${commons.io.version} @@ -109,22 +90,16 @@ com.alibaba fastjson - ${fastjson.version} - - eu.bitwalker UserAgentUtils - ${bitwalker.version} - - - + ${project.artifactId} diff --git a/shuili-framework/pom.xml b/shuili-framework/pom.xml index 97566e64..c547e183 100644 --- a/shuili-framework/pom.xml +++ b/shuili-framework/pom.xml @@ -19,13 +19,12 @@ - - com.google.guava guava - 20.0 + 33.2.1-android + com.baomidou @@ -39,13 +38,6 @@ 1.9.19 - - - - com.github.tobato fastdfs-client @@ -55,7 +47,6 @@ cn.dev33 sa-token-spring-boot-starter - 1.34.0 @@ -63,18 +54,8 @@ cn.dev33 sa-token-dao-redis-jackson - 1.34.0 - - - - - - cn.dev33 - sa-token-core - 1.34.0 - org.springframework.boot @@ -89,22 +70,12 @@ - - org.apache.poi - poi - 5.2.3 - org.apache.poi poi-ooxml - 5.2.3 - - - - com.alibaba @@ -115,20 +86,14 @@ com.slsoft shuili-common - 0.0.1-SNAPSHOT + ${project.version} - com.github.penggle + pro.fessional kaptcha - - - javax.servlet-api - javax.servlet - - diff --git a/shuili-framework/src/main/java/com/shuili/common/mybaitsplus/BeanToWrapper.java b/shuili-framework/src/main/java/com/shuili/common/mybaitsplus/BeanToWrapper.java index 07bec8fd..fb09d9f1 100644 --- a/shuili-framework/src/main/java/com/shuili/common/mybaitsplus/BeanToWrapper.java +++ b/shuili-framework/src/main/java/com/shuili/common/mybaitsplus/BeanToWrapper.java @@ -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 { private static Map methodMap = new HashMap<>(); - static{ + static { try { List methods = new ArrayList<>(); Class aClass = QueryWrapper.class; @@ -290,23 +289,23 @@ public class BeanToWrapper { } } 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 { 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); } } diff --git a/shuili-framework/src/main/java/com/shuili/common/mybaitsplus/CamelUnderlineUtil.java b/shuili-framework/src/main/java/com/shuili/common/mybaitsplus/CamelUnderlineUtil.java index e75c05ed..09e507db 100644 --- a/shuili-framework/src/main/java/com/shuili/common/mybaitsplus/CamelUnderlineUtil.java +++ b/shuili-framework/src/main/java/com/shuili/common/mybaitsplus/CamelUnderlineUtil.java @@ -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 list, List 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 list, List 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 list, List 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); } } diff --git a/shuili-generator/pom.xml b/shuili-generator/pom.xml index 39452e1e..e49162e6 100644 --- a/shuili-generator/pom.xml +++ b/shuili-generator/pom.xml @@ -24,13 +24,19 @@ org.apache.velocity velocity + + + commons-collections + commons-collections + + com.slsoft shuili-framework - 0.0.1-SNAPSHOT + ${project.version} diff --git a/shuili-system/pom.xml b/shuili-system/pom.xml index 87d83d2d..5d4579c3 100644 --- a/shuili-system/pom.xml +++ b/shuili-system/pom.xml @@ -1,99 +1,98 @@ - - slSoft - com.slsoft - 0.0.1-SNAPSHOT - - 4.0.0 - - shuili-system - - shuili-system - - http://www.example.com - - 4.5.16 - - - - - - - org.springframework.boot - spring-boot-starter-web - 2.6.6 - - - - - mysql - mysql-connector-java - - - - org.apache.ant - ant - 1.10.10 - - - - - com.itextpdf - itextpdf - 5.4.3 - - - - - com.slsoft - shuili-generator - 0.0.1-SNAPSHOT - - - - com.slsoft - shuili-common - 0.0.1-SNAPSHOT - - - - - org.apache.httpcomponents - httpclient - 4.5.13 - - - - - net.sourceforge.htmlcleaner - htmlcleaner - 2.25 - - - - org.jsoup - jsoup - 1.15.3 - - - - cn.hutool - hutool-core - 5.8.5 - - - - - com.github.ben-manes.caffeine - caffeine - 2.9.3 - - - - + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + slSoft + com.slsoft + 0.0.1-SNAPSHOT + + 4.0.0 + + shuili-system + + shuili-system + + http://www.example.com + + + + + com.baomidou + mybatis-plus-boot-starter + + + + org.springframework.boot + spring-boot-starter-web + + + + + mysql + mysql-connector-java + 8.0.23 + + + + org.apache.ant + ant + 1.10.10 + + + + + com.itextpdf + itextpdf + 5.4.3 + + + + com.slsoft + shuili-common + ${project.version} + + + + + org.apache.httpcomponents + httpclient + 4.5.13 + + + + + net.sourceforge.htmlcleaner + htmlcleaner + 2.25 + + + + org.jsoup + jsoup + 1.15.3 + + + + cn.hutool + hutool-core + + + + + com.github.ben-manes.caffeine + caffeine + + + + com.slsoft + shuili-framework + ${project.version} + compile + + + + diff --git a/shuili-system/src/main/java/com/kms/yg/znjg/controller/SyLayerController.java b/shuili-system/src/main/java/com/kms/yg/znjg/controller/SyLayerController.java index 25c40a5f..bf31f419 100644 --- a/shuili-system/src/main/java/com/kms/yg/znjg/controller/SyLayerController.java +++ b/shuili-system/src/main/java/com/kms/yg/znjg/controller/SyLayerController.java @@ -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 getLayers(@RequestBody SearchParam spLayer) { SyLayer syLayerInfo = spLayer.getData(); - Page page = new Page<>(spLayer.getPageNum(),spLayer.getPageSize()); + Page page = new Page<>(spLayer.getPageNum(), spLayer.getPageSize()); Map params = spLayer.getParams(); - return syLayerService.selectPage(page,syLayerInfo,params); + return syLayerService.selectPage(page, syLayerInfo, params); } } diff --git a/shuili-system/src/main/java/com/kms/yg/znjg/service/SyLayerService.java b/shuili-system/src/main/java/com/kms/yg/znjg/service/SyLayerService.java index 41017342..9bbca92e 100644 --- a/shuili-system/src/main/java/com/kms/yg/znjg/service/SyLayerService.java +++ b/shuili-system/src/main/java/com/kms/yg/znjg/service/SyLayerService.java @@ -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; diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java index 449988b2..5bb273ed 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java @@ -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 { 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 { 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 { 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 { dfCheckingPlanContentService.removeByIds(deleteContents); } } - dfCheckingPlanContentService.saveOrUpdateBatch(contents.stream().peek(item -> item.setPlanId(planId)).map(this::toEntity).collect(Collectors.toList())); - List operators = contents.stream().flatMap(item -> item.getOperator().stream().map(operator -> { - DfPlanOperator po = new DfPlanOperator(); - po.setId(operator.getId()); - po.setSubPlanId(item.getId()); - po.setOperatorUid(operator.getUid()); - po.setPlanId(item.getPlanId()); - po.setOperatorName(operator.getName()); - return po; - })).collect(Collectors.toList()); - dfPlanOperatorService.saveOrUpdateBatch(operators); + 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 operators = content.getOperator().stream().map(operator -> { + DfPlanOperator po = new DfPlanOperator(); + po.setId(operator.getId()); + po.setSubPlanId(contentId); + po.setOperatorUid(operator.getUid()); + po.setPlanId(planId); + po.setOperatorName(operator.getName()); + return po; + }).collect(Collectors.toList()); + dfPlanOperatorService.saveOrUpdateBatch(operators); + }); } else { throw new DfException("执行计划内容不能为空"); }