diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformHeadServiceImpl.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformHeadServiceImpl.java index f83e3974..de8036bb 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformHeadServiceImpl.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformHeadServiceImpl.java @@ -4,57 +4,8 @@ package com.jero.generater.modules.online.cgform.service.impl; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.generater.modules.online.auth.service.IOnlAuthPageService; -import freemarker.template.TemplateException; -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.net.URLDecoder; -import java.sql.SQLException; -import java.util.*; -import java.util.stream.Collectors; - -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.CollectionUtils; -import org.hibernate.HibernateException; -import com.jero.common.api.vo.Result; -import com.jero.common.constant.CommonConstant; -import com.jero.common.constant.enums.CgformEnum; -import com.jero.common.util.MyClassLoader; -import com.jero.common.util.RestUtil; -import com.jero.common.util.SpringContextUtils; -import com.jero.common.util.UUIDGenerator; -import com.jero.common.util.oConvertUtils; -import com.jero.generater.modules.online.cgform.enhance.CgformEnhanceJavaInter; -import com.jero.generater.modules.online.cgform.enhance.CgformEnhanceJavaListInter; -import com.jero.generater.modules.online.cgform.entity.OnlCgformButton; -import com.jero.generater.modules.online.cgform.entity.OnlCgformEnhanceJava; -import com.jero.generater.modules.online.cgform.entity.OnlCgformEnhanceJs; -import com.jero.generater.modules.online.cgform.entity.OnlCgformEnhanceSql; -import com.jero.generater.modules.online.cgform.entity.OnlCgformField; -import com.jero.generater.modules.online.cgform.entity.OnlCgformHead; -import com.jero.generater.modules.online.cgform.entity.OnlCgformIndex; -import com.jero.generater.modules.online.cgform.mapper.OnlCgformButtonMapper; -import com.jero.generater.modules.online.cgform.mapper.OnlCgformEnhanceJavaMapper; -import com.jero.generater.modules.online.cgform.mapper.OnlCgformEnhanceJsMapper; -import com.jero.generater.modules.online.cgform.mapper.OnlCgformEnhanceSqlMapper; -import com.jero.generater.modules.online.cgform.mapper.OnlCgformHeadMapper; -import com.jero.generater.modules.online.cgform.model.OnlCgformModel; -import com.jero.generater.modules.online.cgform.model.OnlGenerateModel; -import com.jero.generater.modules.online.cgform.model.TreeSelectColumn; -import com.jero.generater.modules.online.cgform.service.IOnlCgformFieldService; -import com.jero.generater.modules.online.cgform.service.IOnlCgformHeadService; -import com.jero.generater.modules.online.cgform.service.IOnlCgformIndexService; -import com.jero.generater.modules.online.cgform.util.CgformUtil; -import com.jero.generater.modules.online.config.config.CgformConfigModel; -import com.jero.generater.modules.online.config.config.DataBaseConfig; -import com.jero.generater.modules.online.config.util.DbTableProcess; -import com.jero.generater.modules.online.config.util.DbTableUtil; -import com.jero.generater.modules.online.config.exception.BusinessException; -import com.jero.generater.modules.online.config.exception.DBException; -import com.jero.generater.modules.online.config.service.DbTableHandleI; import com.jero.codegenerate.database.DbReadTableUtil; import com.jero.codegenerate.generate.impl.CodeGenerateOne; import com.jero.codegenerate.generate.impl.CodeGenerateOneToMany; @@ -62,6 +13,33 @@ import com.jero.codegenerate.generate.pojo.ColumnVo; import com.jero.codegenerate.generate.pojo.TableVo; import com.jero.codegenerate.generate.pojo.onetomany.MainTableVo; import com.jero.codegenerate.generate.pojo.onetomany.SubTableVo; +import com.jero.common.api.vo.Result; +import com.jero.common.constant.CommonConstant; +import com.jero.common.constant.enums.CgformEnum; +import com.jero.common.util.*; +import com.jero.generater.modules.online.auth.service.IOnlAuthPageService; +import com.jero.generater.modules.online.cgform.enhance.CgformEnhanceJavaInter; +import com.jero.generater.modules.online.cgform.enhance.CgformEnhanceJavaListInter; +import com.jero.generater.modules.online.cgform.entity.*; +import com.jero.generater.modules.online.cgform.mapper.*; +import com.jero.generater.modules.online.cgform.model.OnlCgformModel; +import com.jero.generater.modules.online.cgform.model.OnlGenerateModel; +import com.jero.generater.modules.online.cgform.service.IOnlCgformFieldService; +import com.jero.generater.modules.online.cgform.service.IOnlCgformHeadService; +import com.jero.generater.modules.online.cgform.service.IOnlCgformIndexService; +import com.jero.generater.modules.online.cgform.util.CgformUtil; +import com.jero.generater.modules.online.config.config.CgformConfigModel; +import com.jero.generater.modules.online.config.config.DataBaseConfig; +import com.jero.generater.modules.online.config.exception.BusinessException; +import com.jero.generater.modules.online.config.exception.DBException; +import com.jero.generater.modules.online.config.service.DbTableHandleI; +import com.jero.generater.modules.online.config.util.DbTableProcess; +import com.jero.generater.modules.online.config.util.DbTableUtil; +import freemarker.template.TemplateException; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.poi.ss.formula.functions.T; +import org.hibernate.HibernateException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; @@ -69,6 +47,12 @@ import org.springframework.http.MediaType; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import java.sql.SQLException; +import java.util.*; + @Slf4j @Service("onlCgformHeadServiceImpl") public class OnlCgformHeadServiceImpl extends ServiceImpl implements IOnlCgformHeadService { @@ -106,7 +90,7 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl addAll(OnlCgformModel model) { + public Result addAll(OnlCgformModel model) { String var2 = UUID.randomUUID().toString().replace("-", ""); OnlCgformHead var3 = model.getHead(); List var4 = model.getFields(); @@ -148,7 +132,7 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl editAll(OnlCgformModel model) { + public Result editAll(OnlCgformModel model) { OnlCgformHead var2 = model.getHead(); OnlCgformHead var3 = super.getById(var2.getId()); if (var3 == null) {