diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/enums/CgformConstant.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/enums/CgformConstant.java index 71b569c1..8e3149fe 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/enums/CgformConstant.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/enums/CgformConstant.java @@ -1,9 +1,13 @@ package com.jero.generater.modules.online.cgform.enums; -public interface CgformConstant { - Integer ONLINE_TABLE_TYPE_SUB = 3; - Integer ONLINE_TABLE_TYPE_ONE = 1; - Integer ONLINE_TABLE_TYPE_MAIN = 2; - String ONLINE_JS_CHANGE_FUNCTION_NAME = "onlChange"; +public class CgformConstant { + private CgformConstant(){ + + } + + public static final Integer ONLINE_TABLE_TYPE_SUB = 3; + public static final Integer ONLINE_TABLE_TYPE_ONE = 1; + public static final Integer ONLINE_TABLE_TYPE_MAIN = 2; + public static final String ONLINE_JS_CHANGE_FUNCTION_NAME = "onlChange"; } diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/link/LinkDown.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/link/LinkDown.java index 397fe763..8b9798ee 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/link/LinkDown.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/link/LinkDown.java @@ -11,15 +11,11 @@ public class LinkDown { private String h; private String getQuerySql() { - StringBuffer var1 = new StringBuffer(); - String var2 = " "; + StringBuilder var1 = new StringBuilder(); var1.append("SELECT "); return null; } - public LinkDown() { - } - public String getTable() { return this.a; } @@ -200,7 +196,6 @@ public class LinkDown { } public int hashCode() { - boolean var1 = true; byte var2 = 1; String var3 = this.getTable(); int var11 = var2 * 59 + (var3 == null ? 43 : var3.hashCode()); diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/model/HrefSlots.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/model/HrefSlots.java index fb3bd4a4..bf3049b0 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/model/HrefSlots.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/model/HrefSlots.java @@ -69,7 +69,6 @@ public class HrefSlots { } public int hashCode() { - boolean var1 = true; byte var2 = 1; String var3 = this.getSlotName(); int var5 = var2 * 59 + (var3 == null ? 43 : var3.hashCode()); diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/model/OnlCgformModel.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/model/OnlCgformModel.java index 1be57fc8..ad40b0c1 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/model/OnlCgformModel.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/model/OnlCgformModel.java @@ -13,8 +13,6 @@ public class OnlCgformModel { private List d; private List e; - public OnlCgformModel() { - } public OnlCgformHead getHead() { return this.a; diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/model/OnlComplexModel.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/model/OnlComplexModel.java index 7b690617..7a8d8ed6 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/model/OnlComplexModel.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/model/OnlComplexModel.java @@ -18,7 +18,7 @@ public class OnlComplexModel { private Integer i; private List j; private List k; - private Map> l = new HashMap(); + private Map> l = new HashMap<>(); private List m; List a; private String n; @@ -30,8 +30,6 @@ public class OnlComplexModel { private String t; private Integer u; - public OnlComplexModel() { - } public String getCode() { return this.b; diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/model/OnlGenerateModel.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/model/OnlGenerateModel.java index f1bcc1ff..0e7fee95 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/model/OnlGenerateModel.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/model/OnlGenerateModel.java @@ -16,10 +16,8 @@ public class OnlGenerateModel implements Serializable { private String entityPackage; private String entityName; private String jspMode; - List subList = new ArrayList(); + List subList = new ArrayList<>(); - public OnlGenerateModel() { - } public String getProjectPath() { return this.projectPath; diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/model/ScopedSlots.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/model/ScopedSlots.java index e4576722..2b741ce6 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/model/ScopedSlots.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/model/ScopedSlots.java @@ -52,8 +52,7 @@ public class ScopedSlots { boolean var1 = true; byte var2 = 1; String var3 = this.getCustomRender(); - int var4 = var2 * 59 + (var3 == null ? 43 : var3.hashCode()); - return var4; + return var2 * 59 + (var3 == null ? 43 : var3.hashCode()); } public String toString() { diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/model/TreeModel.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/model/TreeModel.java index 4a387a9a..b36b3ec2 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/model/TreeModel.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/model/TreeModel.java @@ -8,6 +8,7 @@ public class TreeModel { private String pid; public TreeModel() { + // do other } public String getLabel() { @@ -106,7 +107,6 @@ public class TreeModel { } public int hashCode() { - boolean var1 = true; byte var2 = 1; String var3 = this.getLabel(); int var7 = var2 * 59 + (var3 == null ? 43 : var3.hashCode()); diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/model/TreeSelectColumn.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/model/TreeSelectColumn.java index a9830c8a..0f59acdd 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/model/TreeSelectColumn.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/model/TreeSelectColumn.java @@ -11,6 +11,7 @@ public class TreeSelectColumn { private String g; public TreeSelectColumn() { + // do other } public String getFieldName() { diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/rule/OrderNumberRule.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/rule/OrderNumberRule.java index 175f1dd4..903966f0 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/rule/OrderNumberRule.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/rule/OrderNumberRule.java @@ -9,8 +9,10 @@ import com.jero.common.handler.IFillRuleHandler; public class OrderNumberRule implements IFillRuleHandler { public OrderNumberRule() { + // do other } + @Override public Object execute(JSONObject params, JSONObject formData) { String var3 = "CN"; if (params != null) { diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/IOnlCgformHeadService.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/IOnlCgformHeadService.java index f45ebfe0..707a8d93 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/IOnlCgformHeadService.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/IOnlCgformHeadService.java @@ -3,28 +3,25 @@ package com.jero.generater.modules.online.cgform.service; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.common.api.vo.Result; +import com.jero.generater.modules.online.cgform.entity.*; +import com.jero.generater.modules.online.cgform.model.OnlCgformModel; +import com.jero.generater.modules.online.cgform.model.OnlGenerateModel; +import com.jero.generater.modules.online.config.exception.BusinessException; +import com.jero.generater.modules.online.config.exception.DBException; import freemarker.template.TemplateException; +import org.hibernate.HibernateException; + import java.io.IOException; import java.io.UnsupportedEncodingException; import java.sql.SQLException; import java.util.List; import java.util.Map; -import org.hibernate.HibernateException; -import com.jero.common.api.vo.Result; -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.OnlCgformHead; -import com.jero.generater.modules.online.cgform.model.OnlCgformModel; -import com.jero.generater.modules.online.cgform.model.OnlGenerateModel; -import com.jero.generater.modules.online.config.exception.BusinessException; -import com.jero.generater.modules.online.config.exception.DBException; public interface IOnlCgformHeadService extends IService { - Result addAll(OnlCgformModel var1); + Result addAll(OnlCgformModel var1); - Result editAll(OnlCgformModel var1); + Result editAll(OnlCgformModel var1); void doDbSynch(String var1, String var2) throws HibernateException, IOException, TemplateException, SQLException, DBException; diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformButtonServiceImpl.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformButtonServiceImpl.java index e10f27c2..f9d65697 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformButtonServiceImpl.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformButtonServiceImpl.java @@ -10,15 +10,14 @@ import org.springframework.stereotype.Service; @Service("onlCgformButtonServiceImpl") public class OnlCgformButtonServiceImpl extends ServiceImpl implements IOnlCgformButtonService { - public OnlCgformButtonServiceImpl() { - } + @Override public void saveButton(OnlCgformButton onlCgformButton) { - LambdaQueryWrapper buttonQueryWrapper = new LambdaQueryWrapper(); + LambdaQueryWrapper buttonQueryWrapper = new LambdaQueryWrapper<>(); buttonQueryWrapper.eq(OnlCgformButton::getButtonCode, onlCgformButton.getButtonCode()) .eq(OnlCgformButton::getCgformHeadId, onlCgformButton.getCgformHeadId()); - Integer var3 = ((OnlCgformButtonMapper)this.baseMapper).selectCount(buttonQueryWrapper); + Integer var3 = this.baseMapper.selectCount(buttonQueryWrapper); if (var3 == null || var3 == 0) { this.save(onlCgformButton); } diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformEnhanceServiceImpl.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformEnhanceServiceImpl.java index 9dbf82bf..c9470279 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformEnhanceServiceImpl.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformEnhanceServiceImpl.java @@ -19,33 +19,36 @@ public class OnlCgformEnhanceServiceImpl implements IOnlCgformEnhanceService { @Autowired private OnlCgformEnhanceSqlMapper onlCgformEnhanceSqlMapper; - public OnlCgformEnhanceServiceImpl() { - } + @Override public List queryEnhanceJavaList(String cgformId) { LambdaQueryWrapper javaQueryWrapper = (new LambdaQueryWrapper()).eq(OnlCgformEnhanceJava::getCgformHeadId, cgformId); - List list = this.onlCgformEnhanceJavaMapper.selectList(javaQueryWrapper); - return list; + return this.onlCgformEnhanceJavaMapper.selectList(javaQueryWrapper); } + @Override public void saveEnhanceJava(OnlCgformEnhanceJava onlCgformEnhanceJava) { this.onlCgformEnhanceJavaMapper.insert(onlCgformEnhanceJava); } + @Override public void updateEnhanceJava(OnlCgformEnhanceJava onlCgformEnhanceJava) { this.onlCgformEnhanceJavaMapper.updateById(onlCgformEnhanceJava); } + @Override public void deleteEnhanceJava(String id) { this.onlCgformEnhanceJavaMapper.deleteById(id); } + @Override public void deleteBatchEnhanceJava(List idList) { this.onlCgformEnhanceJavaMapper.deleteBatchIds(idList); } + @Override public boolean checkOnlyEnhance(OnlCgformEnhanceJava onlCgformEnhanceJava) { - LambdaQueryWrapper enhanceQueryWrapper = new LambdaQueryWrapper(); + LambdaQueryWrapper enhanceQueryWrapper = new LambdaQueryWrapper<>(); enhanceQueryWrapper.eq(OnlCgformEnhanceJava::getButtonCode, onlCgformEnhanceJava.getButtonCode()); enhanceQueryWrapper.eq(OnlCgformEnhanceJava::getCgformHeadId, onlCgformEnhanceJava.getCgformHeadId()); enhanceQueryWrapper.eq(OnlCgformEnhanceJava::getEvent, onlCgformEnhanceJava.getEvent()); @@ -63,8 +66,9 @@ public class OnlCgformEnhanceServiceImpl implements IOnlCgformEnhanceService { return true; } + @Override public boolean checkOnlyEnhance(OnlCgformEnhanceSql onlCgformEnhanceSql) { - LambdaQueryWrapper sqlQueryWrapper = new LambdaQueryWrapper(); + LambdaQueryWrapper sqlQueryWrapper = new LambdaQueryWrapper<>(); sqlQueryWrapper.eq(OnlCgformEnhanceSql::getButtonCode, onlCgformEnhanceSql.getButtonCode()); sqlQueryWrapper.eq(OnlCgformEnhanceSql::getCgformHeadId, onlCgformEnhanceSql.getCgformHeadId()); Integer count = this.onlCgformEnhanceSqlMapper.selectCount(sqlQueryWrapper); @@ -80,24 +84,29 @@ public class OnlCgformEnhanceServiceImpl implements IOnlCgformEnhanceService { return true; } + @Override public List queryEnhanceSqlList(String cgformId) { - LambdaQueryWrapper sqlQueryWrapper = (new LambdaQueryWrapper()).eq(OnlCgformEnhanceSql::getCgformHeadId, cgformId); - List sqlList = this.onlCgformEnhanceSqlMapper.selectList(sqlQueryWrapper); - return sqlList; + LambdaQueryWrapper sqlQueryWrapper = new LambdaQueryWrapper<>(); + sqlQueryWrapper.eq(OnlCgformEnhanceSql::getCgformHeadId, cgformId); + return this.onlCgformEnhanceSqlMapper.selectList(sqlQueryWrapper); } + @Override public void saveEnhanceSql(OnlCgformEnhanceSql onlCgformEnhanceSql) { this.onlCgformEnhanceSqlMapper.insert(onlCgformEnhanceSql); } + @Override public void updateEnhanceSql(OnlCgformEnhanceSql onlCgformEnhanceSql) { this.onlCgformEnhanceSqlMapper.updateById(onlCgformEnhanceSql); } + @Override public void deleteEnhanceSql(String id) { this.onlCgformEnhanceSqlMapper.deleteById(id); } + @Override public void deleteBatchEnhanceSql(List idList) { this.onlCgformEnhanceSqlMapper.deleteBatchIds(idList); } diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformFieldServiceImpl.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformFieldServiceImpl.java index 1169cf17..b6a67aa8 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformFieldServiceImpl.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformFieldServiceImpl.java @@ -2,38 +2,33 @@ package com.jero.generater.modules.online.cgform.service.impl; import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - +import com.jero.common.system.api.ISysBaseAPI; import com.jero.common.system.util.JeroDataAutorUtils; +import com.jero.common.system.vo.LoginUser; +import com.jero.common.system.vo.SysPermissionDataRuleModel; +import com.jero.common.util.oConvertUtils; import com.jero.generater.modules.online.auth.mapper.OnlAuthDataMapper; import com.jero.generater.modules.online.auth.service.IOnlAuthPageService; -import lombok.extern.slf4j.Slf4j; -import org.apache.shiro.SecurityUtils; -import com.jero.common.system.api.ISysBaseAPI; -import com.jero.common.system.vo.LoginUser; -import com.jero.common.util.oConvertUtils; -import com.jero.generater.modules.online.cgform.link.LinkDown; 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.link.LinkDown; import com.jero.generater.modules.online.cgform.mapper.OnlCgformFieldMapper; import com.jero.generater.modules.online.cgform.mapper.OnlCgformHeadMapper; import com.jero.generater.modules.online.cgform.model.TreeModel; import com.jero.generater.modules.online.cgform.service.IOnlCgformFieldService; import com.jero.generater.modules.online.cgform.util.CgformUtil; +import lombok.extern.slf4j.Slf4j; +import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.*; + @Slf4j @Service("onlCgformFieldServiceImpl") public class OnlCgformFieldServiceImpl extends ServiceImpl implements IOnlCgformFieldService { @@ -49,30 +44,40 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl queryAutolistPage(String tbname, String headId, Map params, List needList) { - HashMap var5 = new HashMap(); - LambdaQueryWrapper var6 = new LambdaQueryWrapper(); + HashMap var5 = new HashMap<>(); + LambdaQueryWrapper var6 = new LambdaQueryWrapper<>(); var6.eq(OnlCgformField::getCgformHeadId, headId); var6.orderByAsc(OnlCgformField::getOrderNum); - List var7 = this.list(var6); - List var8 = this.queryAvailableFields(headId, tbname, true, var7, needList); - StringBuffer var9 = new StringBuffer(); + List var7 = this.list(var6); + List var8 = this.queryAvailableFields(headId, tbname, true, var7, needList); + StringBuilder var9 = new StringBuilder(); CgformUtil.a(tbname, var8, var9); LoginUser var10 = (LoginUser)SecurityUtils.getSubject().getPrincipal(); String var11 = var10.getId(); - List var12 = this.onlAuthDataMapper.queryOwnerAuth(var11, headId); - if (var12 != null && var12.size() > 0) { + List var12 = this.onlAuthDataMapper.queryOwnerAuth(var11, headId); + if (var12 != null && !var12.isEmpty()) { JeroDataAutorUtils.installUserInfo(this.sysBaseAPI.getCacheUser(var10.getUsername())); } String var13 = CgformUtil.a(var7, params, needList, var12); String var14 = CgformUtil.a(params); - var9.append(" where 1=1 " + var13 + var14); + var9.append(WHERE_1).append(var13).append(var14); Object var15 = params.get("column"); if (var15 != null) { String var16 = var15.toString(); @@ -87,55 +92,56 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl> var21 = this.onlCgformFieldMapper.queryListBySql(var9.toString()); log.debug("---Online查询sql 不分页 :>>" + var9.toString()); - if (var21 != null && var21.size() != 0) { - var5.put("total", var21.size()); - var5.put("fieldList", var8); - var5.put("records", CgformUtil.d(var21)); + if (var21 != null && !var21.isEmpty()) { + var5.put(TOTAL, var21.size()); + var5.put(FIELD_LIST, var8); + var5.put(RECORDS, CgformUtil.d(var21)); } else { - var5.put("total", 0); - var5.put("fieldList", var8); + var5.put(TOTAL, 0); + var5.put(FIELD_LIST, var8); } } else { - Integer var22 = params.get("pageNo") == null ? 1 : Integer.parseInt(params.get("pageNo").toString()); - Page var18 = new Page((long)var22, (long)var20); + Integer var22 = params.get(PAGE_NO) == null ? 1 : Integer.parseInt(params.get(PAGE_NO).toString()); + Page var18 = new Page<>(var22, var20); log.debug("---Online查询sql:>>" + var9.toString()); IPage var19 = this.onlCgformFieldMapper.selectPageBySql(var18, var9.toString()); - var5.put("total", var19.getTotal()); - var5.put("records", CgformUtil.d(var19.getRecords())); + var5.put(TOTAL, var19.getTotal()); + var5.put(RECORDS, CgformUtil.d(var19.getRecords())); } return var5; } + @Override public Map queryAutoTreeNoPage(String tbname, String headId, Map params, List needList, String pidField) { - HashMap var6 = new HashMap(); - LambdaQueryWrapper var7 = new LambdaQueryWrapper(); + HashMap var6 = new HashMap<>(); + LambdaQueryWrapper var7 = new LambdaQueryWrapper<>(); var7.eq(OnlCgformField::getCgformHeadId, headId); var7.orderByAsc(OnlCgformField::getOrderNum); - List var8 = this.list(var7); - List var9 = this.queryAvailableFields(headId, tbname, true, var8, needList); - StringBuffer var10 = new StringBuffer(); + List var8 = this.list(var7); + List var9 = this.queryAvailableFields(headId, tbname, true, var8, needList); + StringBuilder var10 = new StringBuilder(); CgformUtil.a(tbname, var9, var10); LoginUser var11 = (LoginUser)SecurityUtils.getSubject().getPrincipal(); String var12 = var11.getId(); - List var13 = this.onlAuthDataMapper.queryOwnerAuth(var12, headId); - if (var13 != null && var13.size() > 0) { + List var13 = this.onlAuthDataMapper.queryOwnerAuth(var12, headId); + if (var13 != null && !var13.isEmpty()) { JeroDataAutorUtils.installUserInfo(this.sysBaseAPI.getCacheUser(var11.getUsername())); } String var14 = CgformUtil.a(var8, params, needList, var13); String var15 = CgformUtil.a(params); - var10.append(" where 1=1 " + var14 + var15); + var10.append(WHERE_1).append(var14).append(var15); Object var16 = params.get("column"); if (var16 != null) { String var17 = var16.toString(); String var18 = params.get("order").toString(); if (this.a(var17, var8)) { - var10.append(" ORDER BY " + oConvertUtils.camelToUnderline(var17)); + var10.append(" ORDER BY ").append(oConvertUtils.camelToUnderline(var17)); if ("asc".equals(var18)) { var10.append(" asc"); } else { @@ -144,11 +150,11 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl(); Iterator var20 = ((List)var25).iterator(); while(true) { @@ -171,66 +177,68 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl>" + var10.toString()); - if (var25 != null && ((List)var25).size() != 0) { - var6.put("total", ((List)var25).size()); - var6.put("fieldList", var9); - var6.put("records", CgformUtil.d((List)var25)); + if (var25 != null && !((List)var25).isEmpty()) { + var6.put(TOTAL, ((List)var25).size()); + var6.put(FIELD_LIST, var9); + var6.put(RECORDS, CgformUtil.d((List)var25)); } else { - var6.put("total", 0); - var6.put("fieldList", var9); + var6.put(TOTAL, 0); + var6.put(FIELD_LIST, var9); } } else { - Integer var26 = params.get("pageNo") == null ? 1 : Integer.parseInt(params.get("pageNo").toString()); - Page var27 = new Page((long)var26, (long)var24); + Integer var26 = params.get(PAGE_NO) == null ? 1 : Integer.parseInt(params.get(PAGE_NO).toString()); + Page var27 = new Page<>(var26, var24); log.debug("---Online查询sql:>>" + var10.toString()); IPage var28 = this.onlCgformFieldMapper.selectPageBySql(var27, var10.toString()); - var6.put("total", var28.getTotal()); - var6.put("records", CgformUtil.d(var28.getRecords())); + var6.put(TOTAL, var28.getTotal()); + var6.put(RECORDS, CgformUtil.d(var28.getRecords())); } return var6; } private Map a(String var1, String var2, String var3, List var4, String var5) { - HashMap var6 = new HashMap(); + HashMap var6 = new HashMap<>(); var6.put("id", var1); - LambdaQueryWrapper var7 = new LambdaQueryWrapper(); + LambdaQueryWrapper var7 = new LambdaQueryWrapper<>(); var7.eq(OnlCgformField::getCgformHeadId, var3); var7.orderByAsc(OnlCgformField::getOrderNum); - List var8 = this.list(var7); - List var9 = this.queryAvailableFields(var3, var2, true, var8, var4); - StringBuffer var10 = new StringBuffer(); + List var8 = this.list(var7); + List var9 = this.queryAvailableFields(var3, var2, true, var8, var4); + StringBuilder var10 = new StringBuilder(); CgformUtil.a(var2, var9, var10); LoginUser var11 = (LoginUser)SecurityUtils.getSubject().getPrincipal(); String var12 = var11.getId(); List var13 = this.onlAuthDataMapper.queryOwnerAuth(var12, var3); - if (var13 != null && var13.size() > 0) { + if (var13 != null && !var13.isEmpty()) { JeroDataAutorUtils.installUserInfo(this.sysBaseAPI.getCacheUser(var11.getUsername())); } String var14 = CgformUtil.a(var8, var6, var4, var13); - var10.append(" where 1=1 " + var14 + "and id='" + var1 + "'"); + var10.append(WHERE_1 + var14 + "and id='" + var1 + "'"); List var15 = this.onlCgformFieldMapper.queryListBySql(var10.toString()); - if (var15 != null && var15.size() > 0) { + if (var15 != null && !var15.isEmpty()) { Map var16 = (Map)var15.get(0); return var16 != null && var16.get(var5) != null && !"0".equals(var16.get(var5)) ? this.a(var16.get(var5).toString(), var2, var3, var4, var5) : var16; } else { - return null; + return Collections.emptyMap(); } } + @Override public void saveFormData(String code, String tbname, JSONObject json, boolean isCrazy) { - LambdaQueryWrapper var5 = new LambdaQueryWrapper(); + LambdaQueryWrapper var5 = new LambdaQueryWrapper<>(); var5.eq(OnlCgformField::getCgformHeadId, code); List var6 = this.list(var5); if (isCrazy) { - ((OnlCgformFieldMapper)this.baseMapper).executeInsertSQL(CgformUtil.c(tbname, var6, json)); + this.baseMapper.executeInsertSQL(CgformUtil.c(tbname, var6, json)); } else { - ((OnlCgformFieldMapper)this.baseMapper).executeInsertSQL(CgformUtil.a(tbname, var6, json)); + this.baseMapper.executeInsertSQL(CgformUtil.a(tbname, var6, json)); } } + @Override public void saveTreeFormData(String code, String tbname, JSONObject json, String hasChildField, String pidField) { LambdaQueryWrapper var6 = new LambdaQueryWrapper(); var6.eq(OnlCgformField::getCgformHeadId, code); @@ -250,36 +258,39 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl fieldList, String tbname, JSONObject json) { Map var4 = CgformUtil.a(tbname, fieldList, json); - ((OnlCgformFieldMapper)this.baseMapper).executeInsertSQL(var4); + this.baseMapper.executeInsertSQL(var4); } + @Override public void editFormData(String code, String tbname, JSONObject json, boolean isCrazy) { - LambdaQueryWrapper var5 = new LambdaQueryWrapper(); + LambdaQueryWrapper var5 = new LambdaQueryWrapper<>(); var5.eq(OnlCgformField::getCgformHeadId, code); List var6 = this.list(var5); if (isCrazy) { - ((OnlCgformFieldMapper)this.baseMapper).executeUpdatetSQL(CgformUtil.d(tbname, var6, json)); + this.baseMapper.executeUpdatetSQL(CgformUtil.d(tbname, var6, json)); } else { - ((OnlCgformFieldMapper)this.baseMapper).executeUpdatetSQL(CgformUtil.b(tbname, var6, json)); + this.baseMapper.executeUpdatetSQL(CgformUtil.b(tbname, var6, json)); } } + @Override public void editTreeFormData(String code, String tbname, JSONObject json, String hasChildField, String pidField) { String var6 = CgformUtil.f(tbname); - String var7 = "select * from " + var6 + " where id = '" + json.getString("id") + "'"; - Map var8 = ((OnlCgformFieldMapper)this.baseMapper).queryFormData(var7); + String var7 = SELECT_FROM + var6 + " where id = '" + json.getString("id") + "'"; + Map var8 = this.baseMapper.queryFormData(var7); Map var9 = CgformUtil.b(var8); String var10 = var9.get(pidField).toString(); LambdaQueryWrapper var11 = new LambdaQueryWrapper(); @@ -296,18 +307,18 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl()).eq(OnlCgformHead::getTableName, var13)); + OnlCgformHead var14 = this.cgformHeadMapper.selectOne(new LambdaQueryWrapper().eq(OnlCgformHead::getTableName, var13)); if (var14 != null) { - LambdaQueryWrapper fieldQueryWrapper = new LambdaQueryWrapper(); + LambdaQueryWrapper fieldQueryWrapper = new LambdaQueryWrapper<>(); fieldQueryWrapper.eq(OnlCgformField::getCgformHeadId, var14.getId()).eq(OnlCgformField::getMainTable, head.getTableName()); List list = this.list(fieldQueryWrapper); - if (list != null && list.size() != 0) { + if (list != null && !list.isEmpty()) { OnlCgformField onlCgformField = (OnlCgformField)list.get(0); - HashMap var18 = new HashMap(); + HashMap var18 = new HashMap<>(); var18.put(var6, onlCgformField.getDbFieldName()); var18.put(var8, onlCgformField.getMainField()); var18.put(var5, var13); @@ -409,14 +420,16 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl" + var11); this.onlCgformFieldMapper.deleteAutoList(var11); } } + @Override public List> getAutoListQueryInfo(String code) { LambdaQueryWrapper var2 = new LambdaQueryWrapper(); var2.eq(OnlCgformField::getCgformHeadId, code); @@ -510,10 +524,11 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl queryFormFieldsByTableName(String tableName) { - OnlCgformHead var2 = (OnlCgformHead)this.cgformHeadMapper.selectOne((Wrapper)(new LambdaQueryWrapper()).eq(OnlCgformHead::getTableName, tableName)); + OnlCgformHead var2 = this.cgformHeadMapper.selectOne(new LambdaQueryWrapper().eq(OnlCgformHead::getTableName, tableName)); if (var2 != null) { - LambdaQueryWrapper var3 = new LambdaQueryWrapper(); + LambdaQueryWrapper var3 = new LambdaQueryWrapper<>(); var3.eq(OnlCgformField::getCgformHeadId, var2.getId()); return this.list(var3); } else { @@ -521,44 +536,50 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl()).eq(OnlCgformHead::getTableName, tableName)); + OnlCgformHead var3 = this.cgformHeadMapper.selectOne(new LambdaQueryWrapper().eq(OnlCgformHead::getTableName, tableName)); if (var3 != null) { - LambdaQueryWrapper var4 = new LambdaQueryWrapper(); + LambdaQueryWrapper var4 = new LambdaQueryWrapper<>(); var4.eq(OnlCgformField::getCgformHeadId, var3.getId()); var4.eq(OnlCgformField::getDbFieldName, fieldName); - if (this.list(var4) != null && this.list(var4).size() > 0) { - return (OnlCgformField)this.list(var4).get(0); + if (this.list(var4) != null && !this.list(var4).isEmpty()) { + return this.list(var4).get(0); } } return null; } + @Override public Map queryFormData(List fieldList, String tbname, String id) { String var4 = CgformUtil.a(tbname, fieldList, id); return this.onlCgformFieldMapper.queryFormData(var4); } + @Override public List> querySubFormData(List fieldList, String tbname, String linkField, String value) { String var5 = CgformUtil.a(tbname, fieldList, linkField, value); return this.onlCgformFieldMapper.queryListData(var5); } + @Override public IPage> selectPageBySql(Page> page, String sql) { - return ((OnlCgformFieldMapper)this.baseMapper).selectPageBySql(page, sql); + return this.baseMapper.selectPageBySql(page, sql); } + @Override public List selectOnlineHideColumns(String tbname) { - String var2 = "online:" + tbname + ":%"; + String var2 = ONLINE + tbname + ":%"; LoginUser var3 = (LoginUser)SecurityUtils.getSubject().getPrincipal(); String var4 = var3.getId(); - List var5 = ((OnlCgformFieldMapper)this.baseMapper).selectOnlineHideColumns(var4, var2); + List var5 = this.baseMapper.selectOnlineHideColumns(var4, var2); return this.a(var5); } + @Override public List queryAvailableFields(String cgFormId, String tbname, String taskId, boolean isList) { - LambdaQueryWrapper var5 = new LambdaQueryWrapper(); + LambdaQueryWrapper var5 = new LambdaQueryWrapper<>(); var5.eq(OnlCgformField::getCgformHeadId, cgFormId); if (isList) { var5.eq(OnlCgformField::getIsShowList, 1); @@ -568,27 +589,26 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl 0 && var11.get(0) != null) { + var11 = this.baseMapper.selectFlowAuthColumns(tbname, taskId, "1"); + if (var11 != null && !var11.isEmpty() && var11.get(0) != null) { var10.addAll(var11); } } - if (var10.size() == 0) { + if (var10.isEmpty()) { return var6; } else { - ArrayList var14 = new ArrayList(); + ArrayList var14 = new ArrayList<>(); for(int var12 = 0; var12 < var6.size(); ++var12) { OnlCgformField var13 = (OnlCgformField)var6.get(var12); @@ -601,14 +621,16 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl queryDisabledFields(String tbname) { - String var2 = "online:" + tbname + "%"; + String var2 = ONLINE + tbname + "%"; LoginUser var3 = (LoginUser)SecurityUtils.getSubject().getPrincipal(); String var4 = var3.getId(); List var5 = ((OnlCgformFieldMapper)this.baseMapper).selectOnlineDisabledColumns(var4, var2); return this.a(var5); } + @Override public List queryDisabledFields(String tbname, String taskId) { if (oConvertUtils.isEmpty(taskId)) { return null; @@ -639,14 +661,16 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl queryAvailableFields(String tbname, boolean isList, List List, List needList) { - String var5 = "online:" + tbname + "%"; + String var5 = ONLINE + tbname + "%"; LoginUser var6 = (LoginUser)SecurityUtils.getSubject().getPrincipal(); String var7 = var6.getId(); List var8 = ((OnlCgformFieldMapper)this.baseMapper).selectOnlineHideColumns(var7, var5); return this.a(var8, isList, List, needList); } + @Override public List queryAvailableFields(String cgformId, String tbname, boolean isList, List List, List needList) { LoginUser var6 = (LoginUser)SecurityUtils.getSubject().getPrincipal(); String var7 = var6.getId(); @@ -727,28 +751,33 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl params) { ((OnlCgformFieldMapper)this.baseMapper).executeInsertSQL(params); } + @Override public void executeUpdatetSQL(Map params) { ((OnlCgformFieldMapper)this.baseMapper).executeUpdatetSQL(params); } + @Override public List queryDataListByLinkDown(LinkDown linkDown) { return ((OnlCgformFieldMapper)this.baseMapper).queryDataListByLinkDown(linkDown); } + @Override public void updateTreeNodeNoChild(String tableName, String filed, String id) { Map var4 = CgformUtil.a(tableName, filed, id); ((OnlCgformFieldMapper)this.baseMapper).executeUpdatetSQL(var4); } + @Override public String queryTreeChildIds(OnlCgformHead head, String ids) { String var3 = head.getTreeParentIdField(); String var4 = head.getTableName(); String[] var5 = ids.split(","); - StringBuffer var6 = new StringBuffer(); + StringBuilder var6 = new StringBuilder(); String[] var7 = var5; int var8 = var5.length; @@ -767,10 +796,11 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl> var17 = this.onlCgformFieldMapper.queryListBySql(var16); if ((var17 == null || var17.size() == 0) && !Arrays.asList(var6).contains(var15) && !var5.toString().contains(var15)) { var5.append(var15).append(","); } @@ -794,11 +824,11 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl 0) { + if (var6 != null && !var6.isEmpty()) { for(Iterator var7 = var6.iterator(); var7.hasNext(); this.a(var9.get("id").toString(), var2, var3, var4)) { Map var8 = (Map)var7.next(); var9 = CgformUtil.b(var8); 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 0a26b056..430b2fbd 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 @@ -13,16 +13,11 @@ import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import java.sql.SQLException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.UUID; +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; @@ -95,22 +90,30 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl addAll(OnlCgformModel model) { String var2 = UUID.randomUUID().toString().replace("-", ""); OnlCgformHead var3 = model.getHead(); - List var4 = model.getFields(); - List var5 = model.getIndexs(); + List var4 = model.getFields(); + List var5 = model.getIndexs(); var3.setId(var2); for(int var6 = 0; var6 < var4.size(); ++var6) { - OnlCgformField var7 = (OnlCgformField)var4.get(var6); - var7.setId((String)null); + OnlCgformField var7 = var4.get(var6); + var7.setId(null); var7.setCgformHeadId(var2); if (var7.getOrderNum() == null) { var7.setOrderNum(var6); @@ -119,11 +122,8 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl editAll(OnlCgformModel model) { OnlCgformHead var2 = model.getHead(); - OnlCgformHead var3 = (OnlCgformHead)super.getById(var2.getId()); + OnlCgformHead var3 = super.getById(var2.getId()); if (var3 == null) { return Result.error("未找到对应实体"); } else { @@ -164,12 +165,10 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl var6 = model.getFields(); List var7 = model.getIndexs(); - ArrayList var8 = new ArrayList(); - ArrayList var9 = new ArrayList(); - Iterator var10 = var6.iterator(); + ArrayList var8 = new ArrayList<>(); + ArrayList var9 = new ArrayList<>(); - while(var10.hasNext()) { - OnlCgformField var11 = (OnlCgformField)var10.next(); + for (OnlCgformField var11 : var6) { String var12 = String.valueOf(var11.getId()); this.a(var11); if (var12.length() == 32) { @@ -177,14 +176,14 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl 0) { + if (!var8.isEmpty()) { var4 = "N"; } @@ -194,7 +193,7 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl var20 = this.indexService.getCgformIndexsByCgformId(var2.getId()); + ArrayList var22 = new ArrayList<>(); + ArrayList var24 = new ArrayList<>(); Iterator var25 = var7.iterator(); OnlCgformIndex var15; @@ -238,9 +237,7 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl { - return cgformIndexCopy.getId().equals(var1.getId()); - }); + boolean var26 = var7.stream().anyMatch((var1) -> cgformIndexCopy.getId().equals(var1.getId())); if (!var26) { var15.setDelFlag(CommonConstant.DEL_FLAG_1); var24.add(var15); @@ -248,14 +245,14 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl 0) { + if (!var22.isEmpty()) { var4 = "N"; this.indexService.saveBatch(var22); } for(var25 = var24.iterator(); var25.hasNext(); this.indexService.updateById(var15)) { var15 = (OnlCgformIndex)var25.next(); - OnlCgformIndex var27 = (OnlCgformIndex)this.indexService.getById(var15.getId()); + OnlCgformIndex var27 = this.indexService.getById(var15.getId()); boolean var17 = CgformUtil.a(var27, var15); if (var17) { var4 = "N"; @@ -263,7 +260,7 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl 0) { + if (!model.getDeleteFieldIds().isEmpty()) { var4 = "N"; this.fieldService.removeByIds(model.getDeleteFieldIds()); } @@ -276,16 +273,17 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl var5 = new LambdaQueryWrapper(); + LambdaQueryWrapper var5 = new LambdaQueryWrapper<>(); var5.eq(OnlCgformField::getCgformHeadId, code); var5.orderByAsc(OnlCgformField::getOrderNum); - List var6 = this.fieldService.list(var5); + List var6 = this.fieldService.list(var5); CgformConfigModel var7 = new CgformConfigModel(); var7.setTableName(var4); var7.setJformPkType(var3.getIdType()); @@ -299,17 +297,15 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl var12 = var11.b(var7); - while(var13.hasNext()) { - String var14 = (String)var13.next(); + for (String var14 : var12) { if (!oConvertUtils.isEmpty(var14) && !oConvertUtils.isEmpty(var14.trim())) { - ((OnlCgformHeadMapper)this.baseMapper).executeDDL(var14); + this.baseMapper.executeDDL(var14); } } - List var21 = this.indexService.list((Wrapper)(new LambdaQueryWrapper()).eq(OnlCgformIndex::getCgformHeadId, code)); + List var21 = this.indexService.list(new LambdaQueryWrapper().eq(OnlCgformIndex::getCgformHeadId, code)); Iterator var22 = var21.iterator(); label58: @@ -329,7 +325,7 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl()).eq(OnlCgformField::getCgformHeadId, var1.getId()); - List var3 = this.fieldService.list(var2); + LambdaQueryWrapper var2 = new LambdaQueryWrapper().eq(OnlCgformField::getCgformHeadId, var1.getId()); + List var3 = this.fieldService.list(var2); String var4 = null; - Iterator var5 = var3.iterator(); - while(var5.hasNext()) { - OnlCgformField var6 = (OnlCgformField)var5.next(); + for (OnlCgformField var6 : var3) { var4 = var6.getMainTable(); if (oConvertUtils.isNotEmpty(var4)) { break; @@ -406,14 +401,14 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl()).eq(OnlCgformHead::getTableName, var4)); + OnlCgformHead var8 = this.baseMapper.selectOne(new LambdaQueryWrapper().eq(OnlCgformHead::getTableName, var4)); if (var8 != null) { String var9 = var8.getSubTableStr(); if (oConvertUtils.isNotEmpty(var9)) { - List var7 = (List)Arrays.asList(var9.split(",")).stream().collect(Collectors.toList()); + List var7 = new ArrayList<>(Arrays.asList(var9.split(","))); var7.remove(var1.getTableName()); var8.setSubTableStr(String.join(",", var7)); - ((OnlCgformHeadMapper)this.baseMapper).updateById(var8); + this.baseMapper.updateById(var8); } } } @@ -421,45 +416,52 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl> queryListData(String sql) { - return ((OnlCgformHeadMapper)this.baseMapper).queryList(sql); + return this.baseMapper.queryList(sql); } + @Override public void saveEnhance(OnlCgformEnhanceJs onlCgformEnhanceJs) { this.onlCgformEnhanceJsMapper.insert(onlCgformEnhanceJs); } + @Override public OnlCgformEnhanceJs queryEnhance(String code, String type) { - LambdaQueryWrapper jsQueryWrapper = new LambdaQueryWrapper(); + LambdaQueryWrapper jsQueryWrapper = new LambdaQueryWrapper<>(); jsQueryWrapper.eq(OnlCgformEnhanceJs::getCgJsType, type).eq(OnlCgformEnhanceJs::getCgformHeadId, code); - return (OnlCgformEnhanceJs)this.onlCgformEnhanceJsMapper.selectOne(jsQueryWrapper); + return this.onlCgformEnhanceJsMapper.selectOne(jsQueryWrapper); } + @Override public void editEnhance(OnlCgformEnhanceJs onlCgformEnhanceJs) { this.onlCgformEnhanceJsMapper.updateById(onlCgformEnhanceJs); } + @Override public OnlCgformEnhanceSql queryEnhanceSql(String formId, String buttonCode) { - LambdaQueryWrapper sqlQueryWrapper = new LambdaQueryWrapper(); + LambdaQueryWrapper sqlQueryWrapper = new LambdaQueryWrapper<>(); sqlQueryWrapper.eq(OnlCgformEnhanceSql::getCgformHeadId, formId).eq(OnlCgformEnhanceSql::getButtonCode, buttonCode); - return (OnlCgformEnhanceSql)this.onlCgformEnhanceSqlMapper.selectOne(sqlQueryWrapper); + return this.onlCgformEnhanceSqlMapper.selectOne(sqlQueryWrapper); } + @Override public OnlCgformEnhanceJava queryEnhanceJava(OnlCgformEnhanceJava onlCgformEnhanceJava) { - LambdaQueryWrapper var2 = new LambdaQueryWrapper(); + LambdaQueryWrapper var2 = new LambdaQueryWrapper<>(); var2.eq(OnlCgformEnhanceJava::getButtonCode, onlCgformEnhanceJava.getButtonCode()); var2.eq(OnlCgformEnhanceJava::getCgformHeadId, onlCgformEnhanceJava.getCgformHeadId()); var2.eq(OnlCgformEnhanceJava::getCgJavaType, onlCgformEnhanceJava.getCgJavaType()); var2.eq(OnlCgformEnhanceJava::getEvent, onlCgformEnhanceJava.getEvent()); - return (OnlCgformEnhanceJava)this.onlCgformEnhanceJavaMapper.selectOne(var2); + return this.onlCgformEnhanceJavaMapper.selectOne(var2); } + @Override public List queryButtonList(String code, boolean isListButton) { - LambdaQueryWrapper var3 = new LambdaQueryWrapper(); + LambdaQueryWrapper var3 = new LambdaQueryWrapper<>(); var3.eq(OnlCgformButton::getButtonStatus, "1"); var3.eq(OnlCgformButton::getCgformHeadId, code); if (isListButton) { - var3.in(OnlCgformButton::getButtonStyle, new Object[]{"link", "button"}); + var3.in(OnlCgformButton::getButtonStyle, "link", "button"); } else { var3.eq(OnlCgformButton::getButtonStyle, "form"); } @@ -468,18 +470,21 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl queryButtonList(String code) { - LambdaQueryWrapper var2 = new LambdaQueryWrapper(); + LambdaQueryWrapper var2 = new LambdaQueryWrapper<>(); var2.eq(OnlCgformButton::getButtonStatus, "1"); var2.eq(OnlCgformButton::getCgformHeadId, code); var2.orderByAsc(OnlCgformButton::getOrderNum); return this.onlCgformButtonMapper.selectList(var2); } + @Override public List queryOnlinetables() { - return ((OnlCgformHeadMapper)this.baseMapper).queryOnlinetables(); + return this.baseMapper.queryOnlinetables(); } + @Override @Transactional( rollbackFor = {Exception.class} ) @@ -501,13 +506,13 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl var4 = new ArrayList<>(); try { - List originalColumnsList = DbReadTableUtil.listOriginalColumns(tbname); + List originalColumnsList = DbReadTableUtil.listOriginalColumns(tbname); for(int i = 0; i < originalColumnsList.size(); ++i) { - ColumnVo columnVo = (ColumnVo)originalColumnsList.get(i); + ColumnVo columnVo = originalColumnsList.get(i); log.info(" columnt : " + columnVo.toString()); String fieldDbName = columnVo.getFieldDbName(); OnlCgformField onlCgformField = new OnlCgformField(); @@ -534,7 +539,7 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl= 3000L) { + if (Long.parseLong(columnVo.getCharmaxLength()) >= 3000L) { onlCgformField.setDbType("Text"); onlCgformField.setFieldShowType("textarea"); @@ -634,30 +639,30 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl var2) { if (var1.getTableType() == 3) { - var1 = (OnlCgformHead)((OnlCgformHeadMapper)this.baseMapper).selectById(var1.getId()); + var1 = this.baseMapper.selectById(var1.getId()); for(int var3 = 0; var3 < var2.size(); ++var3) { - OnlCgformField var4 = (OnlCgformField)var2.get(var3); + OnlCgformField var4 = var2.get(var3); String var5 = var4.getMainTable(); if (!oConvertUtils.isEmpty(var5)) { - OnlCgformHead var6 = (OnlCgformHead)((OnlCgformHeadMapper)this.baseMapper).selectOne((Wrapper)(new LambdaQueryWrapper()).eq(OnlCgformHead::getTableName, var5)); + OnlCgformHead var6 = this.baseMapper.selectOne(new LambdaQueryWrapper().eq(OnlCgformHead::getTableName, var5)); if (var6 != null) { String var7 = var6.getSubTableStr(); if (oConvertUtils.isEmpty(var7)) { var7 = var1.getTableName(); - } else if (var7.indexOf(var1.getTableName()) < 0) { - ArrayList var8 = new ArrayList(Arrays.asList(var7.split(","))); + } else if (!var7.contains(var1.getTableName())) { + ArrayList var8 = new ArrayList<>(Arrays.asList(var7.split(","))); for(int var9 = 0; var9 < var8.size(); ++var9) { - String var10 = (String)var8.get(var9); - OnlCgformHead var11 = (OnlCgformHead)((OnlCgformHeadMapper)this.baseMapper).selectOne((Wrapper)(new LambdaQueryWrapper()).eq(OnlCgformHead::getTableName, var10)); + String var10 = var8.get(var9); + OnlCgformHead var11 = this.baseMapper.selectOne(new LambdaQueryWrapper().eq(OnlCgformHead::getTableName, var10)); if (var11 != null && var1.getTabOrderNum() < oConvertUtils.getInt(var11.getTabOrderNum(), 0)) { var8.add(var9, var1.getTableName()); break; } } - if (var8.indexOf(var1.getTableName()) < 0) { + if (!var8.contains(var1.getTableName())) { var8.add(var1.getTableName()); } @@ -665,18 +670,17 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl()).like(OnlCgformHead::getSubTableStr, var1.getTableName())); - if (var12 != null && var12.size() > 0) { - Iterator var13 = var12.iterator(); + List var12 = this.baseMapper.selectList(new LambdaQueryWrapper().like(OnlCgformHead::getSubTableStr, var1.getTableName())); + if (var12 != null && !var12.isEmpty()) { - while(var13.hasNext()) { - OnlCgformHead var14 = (OnlCgformHead)var13.next(); + for (Object o : var12) { + OnlCgformHead var14 = (OnlCgformHead) o; String var15 = var14.getSubTableStr(); if (var14.getSubTableStr().equals(var1.getTableName())) { var15 = ""; @@ -689,23 +693,24 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl()).eq(OnlCgformHead::getTableName, var12)); + if (var13 != null && !var13.isEmpty()) { + OnlCgformHead var14 = (this.baseMapper).selectOne((new LambdaQueryWrapper()).eq(OnlCgformHead::getTableName, var12)); if (var14 != null) { - List var15 = this.fieldService.list((Wrapper)(new LambdaQueryWrapper()).eq(OnlCgformField::getCgformHeadId, var14.getId())); + List var15 = this.fieldService.list((new LambdaQueryWrapper()).eq(OnlCgformField::getCgformHeadId, var14.getId())); String var16 = ""; String var17 = null; - Iterator var18 = var15.iterator(); - while(var18.hasNext()) { - OnlCgformField var19 = (OnlCgformField)var18.next(); + for (Object o : var15) { + OnlCgformField var19 = (OnlCgformField) o; if (!oConvertUtils.isEmpty(var19.getMainField())) { var16 = var19.getDbFieldName(); String var20 = var19.getMainField(); @@ -774,7 +778,7 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl querySubFormData(String table, String mainId) throws DBException { new HashMap(); - OnlCgformHead var4 = (OnlCgformHead)this.getOne((Wrapper)(new LambdaQueryWrapper()).eq(OnlCgformHead::getTableName, table)); + OnlCgformHead var4 = this.getOne((new LambdaQueryWrapper()).eq(OnlCgformHead::getTableName, table)); if (var4 == null) { - throw new DBException("数据库子表[" + table + "]不存在"); + throw new DBException(DB_SUB_ID + table + "]不存在"); } else { List var5 = this.fieldService.queryFormFields(var4.getId(), false); String var6 = null; @@ -807,21 +812,25 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl 1) { - throw new DBException("数据库子表[" + table + "]存在多条记录,主表ID为" + mainId); + if (var9 != null && var9.isEmpty()) { + throw new DBException(DB_SUB_ID + table + "]未找到相关信息,主表ID为" + mainId); + } else if (var9 != null && var9.size() > 1) { + throw new DBException(DB_SUB_ID + table + "]存在多条记录,主表ID为" + mainId); } else { - Map var3 = (Map)var9.get(0); - return var3; + if(!CollectionUtils.isEmpty(var9)){ + return (Map)var9.get(0); + }else{ + return Collections.emptyMap(); + } } } } + @Override public List> queryManySubFormData(String table, String mainId) throws DBException { - OnlCgformHead var3 = (OnlCgformHead)this.getOne((Wrapper)(new LambdaQueryWrapper()).eq(OnlCgformHead::getTableName, table)); + OnlCgformHead var3 = this.getOne((new LambdaQueryWrapper()).eq(OnlCgformHead::getTableName, table)); if (var3 == null) { - throw new DBException("数据库子表[" + table + "]不存在"); + throw new DBException(DB_SUB_ID + table + "]不存在"); } else { List var4 = this.fieldService.queryFormFields(var3.getId(), false); String var5 = null; @@ -845,11 +854,14 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl queryManyFormData(String code, String id) throws DBException { - OnlCgformHead var3 = (OnlCgformHead)this.getById(code); + OnlCgformHead var3 = this.getById(code); if (var3 == null) { - throw new DBException("数据库主表ID[" + code + "]不存在"); + throw new DBException(DB_ID + code + "]不存在"); } else { List var4 = this.fieldService.queryFormFields(code, true); Map var5 = this.fieldService.queryFormData(var4, var3.getTableName(), id); @@ -879,7 +892,7 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl()).eq(OnlCgformHead::getTableName, var11)); + OnlCgformHead var12 = this.baseMapper.selectOne(new LambdaQueryWrapper().eq(OnlCgformHead::getTableName, var11)); if (var12 != null) { List var13 = this.fieldService.queryFormFields(var12.getId(), false); String var14 = ""; @@ -900,7 +913,7 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl()).eq(OnlCgformHead::getTableName, var11)); + OnlCgformHead var12 = this.baseMapper.selectOne(new LambdaQueryWrapper().eq(OnlCgformHead::getTableName, var11)); if (var12 != null) { - List var13 = this.fieldService.list((Wrapper)(new LambdaQueryWrapper()).eq(OnlCgformField::getCgformHeadId, var12.getId())); + List var13 = this.fieldService.list(new LambdaQueryWrapper().eq(OnlCgformField::getCgformHeadId, var12.getId())); String var14 = ""; String var15 = null; Iterator var16 = var13.iterator(); @@ -965,7 +979,7 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl var5 = new LambdaQueryWrapper(); var5.eq(OnlCgformEnhanceJava::getActiveStatus, "1"); var5.eq(OnlCgformEnhanceJava::getButtonCode, buttonCode); var5.eq(OnlCgformEnhanceJava::getCgformHeadId, head.getId()); var5.eq(OnlCgformEnhanceJava::getEvent, eventType); - OnlCgformEnhanceJava var6 = (OnlCgformEnhanceJava)this.onlCgformEnhanceJavaMapper.selectOne(var5); + OnlCgformEnhanceJava var6 = this.onlCgformEnhanceJavaMapper.selectOne(var5); Object var7 = this.a(var6); if (var7 != null && var7 instanceof CgformEnhanceJavaInter) { CgformEnhanceJavaInter var8 = (CgformEnhanceJavaInter)var7; @@ -1003,17 +1018,19 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl> dataList) throws BusinessException { this.executeEnhanceList(head, "export", dataList); } + @Override public void executeEnhanceList(OnlCgformHead head, String buttonCode, List> dataList) throws BusinessException { - LambdaQueryWrapper var4 = new LambdaQueryWrapper(); + LambdaQueryWrapper var4 = new LambdaQueryWrapper<>(); var4.eq(OnlCgformEnhanceJava::getActiveStatus, "1"); var4.eq(OnlCgformEnhanceJava::getButtonCode, buttonCode); var4.eq(OnlCgformEnhanceJava::getCgformHeadId, head.getId()); List var5 = this.onlCgformEnhanceJavaMapper.selectList(var4); - if (var5 != null && var5.size() > 0) { + if (var5 != null && !var5.isEmpty()) { Object var6 = this.a((OnlCgformEnhanceJava)var5.get(0)); if (var6 != null && var6 instanceof CgformEnhanceJavaListInter) { CgformEnhanceJavaListInter var7 = (CgformEnhanceJavaListInter)var6; @@ -1048,11 +1065,12 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl var4 = new LambdaQueryWrapper(); var4.eq(OnlCgformEnhanceSql::getButtonCode, buttonCode); var4.eq(OnlCgformEnhanceSql::getCgformHeadId, formId); - OnlCgformEnhanceSql var5 = (OnlCgformEnhanceSql)this.onlCgformEnhanceSqlMapper.selectOne(var4); + OnlCgformEnhanceSql var5 = this.onlCgformEnhanceSqlMapper.selectOne(var4); if (var5 != null && oConvertUtils.isNotEmpty(var5.getCgbSql())) { String var6 = CgformUtil.a(var5.getCgbSql(), json); String[] var7 = var6.split(";"); @@ -1061,28 +1079,30 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl queryValidButtonList(String headId) { LambdaQueryWrapper var2 = new LambdaQueryWrapper(); var2.eq(OnlCgformButton::getCgformHeadId, headId); @@ -1091,36 +1111,38 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl var3 = new LambdaQueryWrapper(); var3.eq(OnlCgformEnhanceJs::getCgformHeadId, formId); var3.eq(OnlCgformEnhanceJs::getCgJsType, cgJsType); - return (OnlCgformEnhanceJs)this.onlCgformEnhanceJsMapper.selectOne(var3); + return this.onlCgformEnhanceJsMapper.selectOne(var3); } + @Override @Transactional( rollbackFor = {Exception.class} ) public void deleteOneTableInfo(String formId, String dataId) throws BusinessException { - OnlCgformHead var3 = (OnlCgformHead)this.getById(formId); + OnlCgformHead var3 = this.getById(formId); if (var3 == null) { throw new BusinessException("未找到表配置信息"); } else { String var4 = CgformUtil.f(var3.getTableName()); - Map var5 = ((OnlCgformHeadMapper)this.baseMapper).queryOneByTableNameAndId(var4, dataId); + Map var5 = this.baseMapper.queryOneByTableNameAndId(var4, dataId); if (var5 == null) { throw new BusinessException("未找到数据信息"); } else { Map var6 = CgformUtil.b(var5); String var7 = "delete"; - JSONObject var8 = JSONObject.parseObject(JSON.toJSONString(var6)); - this.executeEnhanceJava(var7, "start", var3, var8); + JSONObject var8 = JSON.parseObject(JSON.toJSONString(var6)); + this.executeEnhanceJava(var7, START, var3, var8); this.updateParentNode(var3, dataId); if (var3.getTableType() == 2) { this.fieldService.deleteAutoListMainAndSub(var3, dataId); } else { String var9 = "delete from " + var4 + " where id = '" + dataId + "'"; - ((OnlCgformHeadMapper)this.baseMapper).deleteOne(var9); + this.baseMapper.deleteOne(var9); } this.executeEnhanceSql(var7, formId, var8); @@ -1129,23 +1151,24 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl 0 && var4.get(0) != null) { + if (var4 != null && !var4.isEmpty() && var4.get(0) != null) { var3.addAll(var4); } } else { var4 = this.fieldService.queryDisabledFields(head.getTableName(), head.getTaskId()); - if (var4 != null && var4.size() > 0 && var4.get(0) != null) { + if (var4 != null && !var4.isEmpty() && var4.get(0) != null) { var3.addAll(var4); } } - JSONObject var14 = CgformUtil.a(var2, var3, (TreeSelectColumn)null); + JSONObject var14 = CgformUtil.a(var2, var3, null); if (head.getTableType() == 2) { String var5 = head.getSubTableStr(); if (oConvertUtils.isNotEmpty(var5)) { @@ -1154,7 +1177,7 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl()).eq(OnlCgformHead::getTableName, var9)); + OnlCgformHead var10 = this.baseMapper.selectOne(new LambdaQueryWrapper().eq(OnlCgformHead::getTableName, var9)); if (var10 != null) { List var11 = this.fieldService.queryAvailableFields(var10.getId(), var10.getTableName(), head.getTaskId(), false); new ArrayList(); @@ -1167,7 +1190,7 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl()).eq(OnlCgformHead::getId, model.getCode())); + OnlCgformHead onlCgformHead = this.baseMapper.selectOne(new LambdaQueryWrapper().eq(OnlCgformHead::getId, model.getCode())); HashMap hashMap = new HashMap(); hashMap.put("scroll", onlCgformHead.getScroll() == null ? "0" : onlCgformHead.getScroll().toString()); String var7 = onlCgformHead.getFormTemplate(); @@ -1216,17 +1239,17 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl generateOneToMany(OnlGenerateModel model) throws Exception { MainTableVo var2 = new MainTableVo(); var2.setEntityName(model.getEntityName()); var2.setEntityPackage(model.getEntityPackage()); var2.setFtlDescription(model.getFtlDescription()); var2.setTableName(model.getTableName()); - OnlCgformHead var3 = (OnlCgformHead)((OnlCgformHeadMapper)this.baseMapper).selectOne((Wrapper)(new LambdaQueryWrapper()).eq(OnlCgformHead::getId, model.getCode())); + OnlCgformHead var3 = this.baseMapper.selectOne(new LambdaQueryWrapper().eq(OnlCgformHead::getId, model.getCode())); String var4 = var3.getFormTemplate(); if (oConvertUtils.isEmpty(var4)) { var2.setFieldRowNum(1); @@ -1243,7 +1266,7 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl()).eq(OnlCgformHead::getTableName, var10.getTableName())); + OnlCgformHead var11 = this.baseMapper.selectOne(new LambdaQueryWrapper().eq(OnlCgformHead::getTableName, var10.getTableName())); if (var11 != null) { SubTableVo var12 = new SubTableVo(); var12.setEntityName(var10.getEntityName()); @@ -1266,8 +1289,7 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl var2, List var3) { @@ -1304,7 +1326,7 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl 0) { + if (oConvertUtils.isNotEmpty(var8.getDictTable()) && var8.getDictTable().indexOf("where") >= 0) { var9.setDictTable(var8.getDictTable().split("where")[0].trim()); } else { var9.setDictTable(var8.getDictTable()); @@ -1335,7 +1357,7 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl= 0) { - return "java.lang.Integer"; + return INTEGER; } else if (var1.indexOf("double") >= 0) { return "java.lang.Double"; } else if (var1.indexOf("decimal") >= 0) { @@ -1361,8 +1383,9 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl()).eq(OnlCgformHead::getTableName, tbname)); + OnlCgformHead var3 = this.getOne(new LambdaQueryWrapper().eq(OnlCgformHead::getTableName, tbname)); if (var3 == null) { throw new DBException("数据库主表[" + tbname + "]不存在"); } else { @@ -1377,17 +1400,15 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl()).eq(OnlCgformHead::getTableName, var9)); + JSONArray var11 = JSON.parseArray(URLDecoder.decode(var10, "UTF-8")); + if (var11 != null && !var11.isEmpty()) { + OnlCgformHead var12 = this.baseMapper.selectOne(new LambdaQueryWrapper().eq(OnlCgformHead::getTableName, var9)); if (var12 != null) { - List var13 = this.fieldService.list((Wrapper)(new LambdaQueryWrapper()).eq(OnlCgformField::getCgformHeadId, var12.getId())); + List var13 = this.fieldService.list(new LambdaQueryWrapper().eq(OnlCgformField::getCgformHeadId, var12.getId())); String var14 = ""; String var15 = null; - Iterator var16 = var13.iterator(); - while(var16.hasNext()) { - OnlCgformField var17 = (OnlCgformField)var16.next(); + for (OnlCgformField var17 : var13) { if (!oConvertUtils.isEmpty(var17.getMainField())) { var14 = var17.getDbFieldName(); String var18 = var17.getMainField(); @@ -1414,8 +1435,9 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl()).eq(OnlCgformHead::getTableName, tbname)); + OnlCgformHead var3 = this.getOne(new LambdaQueryWrapper().eq(OnlCgformHead::getTableName, tbname)); if (var3 == null) { throw new DBException("数据库主表[" + tbname + "]不存在"); } else { @@ -1427,9 +1449,9 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl()).eq(OnlCgformHead::getTableName, var9)); + OnlCgformHead var10 = this.baseMapper.selectOne(new LambdaQueryWrapper().eq(OnlCgformHead::getTableName, var9)); if (var10 != null) { - List var11 = this.fieldService.list((Wrapper)(new LambdaQueryWrapper()).eq(OnlCgformField::getCgformHeadId, var10.getId())); + List var11 = this.fieldService.list(new LambdaQueryWrapper().eq(OnlCgformField::getCgformHeadId, var10.getId())); String var12 = ""; String var13 = null; Iterator var14 = var11.iterator(); @@ -1447,8 +1469,8 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl()).eq(OnlCgformField::getCgformHeadId, var2)); + List var5 = this.fieldService.list(new LambdaQueryWrapper().eq(OnlCgformField::getCgformHeadId, var2)); Iterator var6 = var5.iterator(); while(var6.hasNext()) { @@ -1516,11 +1540,12 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl headList) { - List var2 = ((OnlCgformHeadMapper)this.baseMapper).queryCopyPhysicId(); + List var2 = this.baseMapper.queryCopyPhysicId(); Iterator var3 = headList.iterator(); while(var3.hasNext()) { @@ -1534,6 +1559,7 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl var2) { - List var3 = this.list((Wrapper)(new LambdaQueryWrapper()).eq(OnlCgformHead::getPhysicId, var1.getId())); - if (var3 != null && var3.size() > 0) { + List var3 = this.list(new LambdaQueryWrapper().eq(OnlCgformHead::getPhysicId, var1.getId())); + if (var3 != null && !var3.isEmpty()) { Iterator var4 = var3.iterator(); while(true) { @@ -1594,9 +1621,9 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl()).eq(OnlCgformField::getCgformHeadId, var5.getId())); + var6 = this.fieldService.list(new LambdaQueryWrapper().eq(OnlCgformField::getCgformHeadId, var5.getId())); OnlCgformField var9; - if (var6 != null && var6.size() != 0) { + if (var6 != null && !var6.isEmpty()) { HashMap var15 = new HashMap(); Iterator var16 = var6.iterator(); @@ -1626,7 +1653,7 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl(); var22 = var15.keySet().iterator(); while(var22.hasNext()) { @@ -1637,7 +1664,7 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl 0) { + if (!var21.isEmpty()) { var22 = var6.iterator(); while(var22.hasNext()) { @@ -1648,7 +1675,7 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl 0) { + if (!var20.isEmpty()) { var22 = var2.iterator(); while(var22.hasNext()) { @@ -1664,10 +1691,7 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl var2, List var3) { OnlCgformField var4 = null; - Iterator var5 = var2.iterator(); - while(var5.hasNext()) { - OnlCgformField var6 = (OnlCgformField)var5.next(); + for (OnlCgformField var6 : var2) { if (var1.equals(var6.getDbFieldName())) { var4 = var6; } } OnlCgformField var8 = null; - Iterator var9 = var3.iterator(); - while(var9.hasNext()) { - OnlCgformField var7 = (OnlCgformField)var9.next(); + for (OnlCgformField var7 : var3) { if (var1.equals(var7.getDbFieldName())) { var8 = var7; } @@ -1721,12 +1741,12 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl 0) { + if (!CollectionUtils.isEmpty(var3)) { for(int var5 = 0; var5 < var3.size(); ++var5) { String var6 = (String)var3.get(var5); int var7 = Integer.parseInt(var6.split("\\$")[1]); diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformIndexServiceImpl.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformIndexServiceImpl.java index 1aa62064..ced42b20 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformIndexServiceImpl.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformIndexServiceImpl.java @@ -22,25 +22,21 @@ public class OnlCgformIndexServiceImpl extends ServiceImpl var4 = new LambdaQueryWrapper(); - var4.eq(OnlCgformIndex::getCgformHeadId, code); - List var5 = this.list(var4); - if (var5 != null && var5.size() > 0) { - Iterator var6 = var5.iterator(); - - while(var6.hasNext()) { - OnlCgformIndex var7 = (OnlCgformIndex)var6.next(); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(OnlCgformIndex::getCgformHeadId, code); + List list = this.list(queryWrapper); + if (list != null && !list.isEmpty()) { + for (OnlCgformIndex var7 : list) { if (!CommonConstant.DEL_FLAG_1.equals(var7.getDelFlag()) && "N".equals(var7.getIsDbSynch())) { String var8 = ""; String var9 = var7.getIndexName(); String var10 = var7.getIndexField(); String var11 = "normal".equals(var7.getIndexType()) ? " index " : var7.getIndexType() + " index "; byte var13 = -1; - switch(databaseType.hashCode()) { + switch (databaseType.hashCode()) { case -1955532418: if (databaseType.equals("ORACLE")) { var13 = 1; @@ -60,23 +56,26 @@ public class OnlCgformIndexServiceImpl extends ServiceImpl 0; } } + @Override public List getCgformIndexsByCgformId(String cgformId) { - return ((OnlCgformIndexMapper)this.baseMapper).selectList((Wrapper)(new LambdaQueryWrapper()).in(OnlCgformIndex::getCgformHeadId, new Object[]{cgformId})); + return this.baseMapper.selectList(new LambdaQueryWrapper().in(OnlCgformIndex::getCgformHeadId, new Object[]{cgformId})); } } diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformSqlServiceImpl.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformSqlServiceImpl.java index 561f38a2..f04eabb4 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformSqlServiceImpl.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformSqlServiceImpl.java @@ -27,16 +27,13 @@ public class OnlCgformSqlServiceImpl implements IOnlCgformSqlService { @Autowired private IOnlCgformHeadService onlCgformHeadService; - public OnlCgformSqlServiceImpl() { - } + @Override public void saveBatchOnlineTable(OnlCgformHead head, List fieldList, List> dataList) throws BusinessException { - SqlSession var4 = null; - try { + try(SqlSession var4 = this.sqlSessionTemplate.getSqlSessionFactory().openSession(ExecutorType.BATCH, false)) { ConvertUtil.a(2, dataList, fieldList); - var4 = this.sqlSessionTemplate.getSqlSessionFactory().openSession(ExecutorType.BATCH, false); - OnlCgformFieldMapper var5 = (OnlCgformFieldMapper)var4.getMapper(OnlCgformFieldMapper.class); + OnlCgformFieldMapper var5 = var4.getMapper(OnlCgformFieldMapper.class); short var6 = 1000; int var7; String var8; @@ -59,22 +56,20 @@ public class OnlCgformSqlServiceImpl implements IOnlCgformSqlService { var4.commit(); } catch (Exception var12) { throw new BusinessException(var12.getMessage()); - } finally { - var4.close(); } - } + @Override public void saveOrUpdateSubData(String subDataJsonStr, OnlCgformHead head, List subFiledList) throws BusinessException { - OnlCgformFieldMapper var4 = (OnlCgformFieldMapper)SpringContextUtils.getBean(OnlCgformFieldMapper.class); + OnlCgformFieldMapper var4 = SpringContextUtils.getBean(OnlCgformFieldMapper.class); this.a(subDataJsonStr, head, subFiledList, var4); } private void a(String var1, OnlCgformHead var2, List var3, OnlCgformFieldMapper var4) throws BusinessException { - JSONObject var5 = JSONObject.parseObject(var1); + JSONObject var5 = JSON.parseObject(var1); int var6 = this.onlCgformHeadService.executeEnhanceJava("import", "start", var2, var5); String var7 = var2.getTableName(); - Map var8; + Map var8; if (1 == var6) { var8 = CgformUtil.a(var7, var3, var5); var4.executeInsertSQL(var8); @@ -82,6 +77,7 @@ public class OnlCgformSqlServiceImpl implements IOnlCgformSqlService { var8 = CgformUtil.b(var7, var3, var5); var4.executeUpdatetSQL(var8); } else if (0 == var6) { + // other } } diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlineBaseAPIServiceImpl.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlineBaseAPIServiceImpl.java index c8b698c2..80f5af3a 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlineBaseAPIServiceImpl.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlineBaseAPIServiceImpl.java @@ -20,16 +20,13 @@ public class OnlineBaseAPIServiceImpl implements IOnlineBaseAPI { @Autowired private OnlCgformFieldMapper onlCgformFieldMapper; - public OnlineBaseAPIServiceImpl() { - } - public String getOnlineErpCode(String code, String tableType) { if ("3".equals(tableType)) { String var3 = code.substring(1); - OnlCgformHead var4 = (OnlCgformHead)this.onlCgformHeadMapper.selectById(var3); + OnlCgformHead var4 = this.onlCgformHeadMapper.selectById(var3); if (var4 != null && var4.getTableType() == 3) { List var6 = this.onlCgformFieldMapper.selectList(new LambdaQueryWrapper().eq(OnlCgformField::getCgformHeadId, var3)); - if (var6 != null && var6.size() > 0) { + if (var6 != null && !var6.isEmpty()) { String var7 = null; Iterator var8 = var6.iterator(); @@ -41,8 +38,8 @@ public class OnlineBaseAPIServiceImpl implements IOnlineBaseAPI { } } - LambdaQueryWrapper var10 = (LambdaQueryWrapper)(new LambdaQueryWrapper()).eq(OnlCgformHead::getTableName, var7); - OnlCgformHead var11 = (OnlCgformHead)this.onlCgformHeadMapper.selectOne(var10); + LambdaQueryWrapper var10 = new LambdaQueryWrapper().eq(OnlCgformHead::getTableName, var7); + OnlCgformHead var11 = this.onlCgformHeadMapper.selectOne(var10); if (var11 != null && "erp".equals(var11.getThemeTemplate())) { code = "/" + var11.getId(); } diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlineServiceImpl.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlineServiceImpl.java index 1b74c381..5e4c1b28 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlineServiceImpl.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlineServiceImpl.java @@ -4,37 +4,32 @@ package com.jero.generater.modules.online.cgform.service.impl; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.stream.Collectors; - -import com.jero.generater.modules.online.auth.service.IOnlAuthPageService; -import org.apache.commons.lang.StringUtils; -import org.apache.shiro.SecurityUtils; import com.jero.common.system.api.ISysBaseAPI; import com.jero.common.system.vo.LoginUser; import com.jero.common.util.oConvertUtils; -import com.jero.generater.modules.online.cgform.link.LinkDown; +import com.jero.generater.modules.online.auth.service.IOnlAuthPageService; import com.jero.generater.modules.online.cgform.entity.OnlCgformButton; import com.jero.generater.modules.online.cgform.entity.OnlCgformEnhanceJs; 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.model.HrefSlots; -import com.jero.generater.modules.online.cgform.model.OnlColumn; -import com.jero.generater.modules.online.cgform.model.OnlComplexModel; -import com.jero.generater.modules.online.cgform.model.OnlForeignKey; -import com.jero.generater.modules.online.cgform.model.ScopedSlots; -import com.jero.generater.modules.online.cgform.model.TreeSelectColumn; +import com.jero.generater.modules.online.cgform.link.LinkDown; +import com.jero.generater.modules.online.cgform.model.*; 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.IOnlineService; import com.jero.generater.modules.online.cgform.util.CgformUtil; import com.jero.generater.modules.online.cgform.util.EnhanceJsUtil; +import org.apache.commons.lang.StringUtils; +import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.stream.Collectors; + @Service("onlineService") public class OnlineServiceImpl implements IOnlineService { @Autowired @@ -47,6 +42,7 @@ public class OnlineServiceImpl implements IOnlineService { private IOnlAuthPageService onlAuthPageService; public OnlineServiceImpl() { + // do other } public OnlComplexModel queryOnlineConfig(OnlCgformHead head) { @@ -98,7 +94,7 @@ public class OnlineServiceImpl implements IOnlineService { String var31; if ("link_down".equals(var17)) { var31 = var11.getDictTable(); - LinkDown var19 = (LinkDown)JSONObject.parseObject(var31, LinkDown.class); + LinkDown var19 = JSON.parseObject(var31, LinkDown.class); var20 = this.sysBaseAPI.queryTableDictItemsByCode(var19.getTable(), var19.getTxt(), var19.getKey()); var6.put(var12, var20); var28.setCustomRender(var12); @@ -159,12 +155,12 @@ public class OnlineServiceImpl implements IOnlineService { if ("1".equals(var11.getSortFlag())) { var28.setSorter(true); } - + String showLength = "showLength"; var31 = var11.getFieldExtendJson(); - if (oConvertUtils.isNotEmpty(var31) && var31.indexOf("showLength") > 0) { + if (oConvertUtils.isNotEmpty(var31) && var31.indexOf(showLength) > -1) { JSONObject var34 = JSON.parseObject(var31); - if (var34 != null && var34.get("showLength") != null) { - var28.setShowLength(oConvertUtils.getInt(var34.get("showLength"))); + if (var34 != null && var34.get(showLength) != null) { + var28.setShowLength(oConvertUtils.getInt(var34.get(showLength))); } } @@ -245,7 +241,7 @@ public class OnlineServiceImpl implements IOnlineService { public JSONObject queryOnlineFormObj(OnlCgformHead head, OnlCgformEnhanceJs onlCgformEnhanceJs) { JSONObject var3 = new JSONObject(); String var4 = head.getId(); - List var5 = this.onlCgformFieldService.queryAvailableFields(head.getId(), head.getTableName(), (String)null, false); + List var5 = this.onlCgformFieldService.queryAvailableFields(head.getId(), head.getTableName(), null, false); List var6 = this.onlAuthPageService.queryFormDisabledCode(var4); EnhanceJsUtil.a(onlCgformEnhanceJs, head.getTableName(), var5); TreeSelectColumn var7 = null; @@ -266,7 +262,7 @@ public class OnlineServiceImpl implements IOnlineService { var3.put("schema", var8); var3.put("head", head); List var9 = this.queryFormValidButton(var4); - if (var9 != null && var9.size() > 0) { + if (var9 != null && !var9.isEmpty()) { var3.put("cgButtonList", var9); } @@ -287,20 +283,18 @@ public class OnlineServiceImpl implements IOnlineService { public List queryFormValidButton(String headId) { List var2 = this.onlCgformHeadService.queryButtonList(headId, false); List var3 = null; - if (var2 != null && var2.size() > 0) { + if (var2 != null && !var2.isEmpty()) { LoginUser var4 = (LoginUser)SecurityUtils.getSubject().getPrincipal(); String var5 = var4.getId(); List var6 = this.onlAuthPageService.queryFormHideButton(var5, headId); - var3 = (List)var2.stream().filter((var1) -> { - return var6 == null || var6.indexOf(var1.getButtonCode()) < 0; - }).collect(Collectors.toList()); + var3 = var2.stream().filter(var1 -> var6 == null || !var6.contains(var1.getButtonCode())).collect(Collectors.toList()); } return var3; } private List a(String var1) { - LambdaQueryWrapper var2 = new LambdaQueryWrapper(); + LambdaQueryWrapper var2 = new LambdaQueryWrapper<>(); var2.eq(OnlCgformField::getCgformHeadId, var1); var2.orderByAsc(OnlCgformField::getOrderNum); return this.onlCgformFieldService.list(var2); diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/util/CgFormExcelHandler.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/util/CgFormExcelHandler.java index ed138ac4..f02d93bd 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/util/CgFormExcelHandler.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/util/CgFormExcelHandler.java @@ -23,27 +23,28 @@ public class CgFormExcelHandler extends ExcelDataHandlerDefaultImpl { this.c = var2; this.d = "online"; this.e = var3; - this.b = (ISysBaseAPI)SpringContextUtils.getBean(ISysBaseAPI.class); + this.b = SpringContextUtils.getBean(ISysBaseAPI.class); } private Map a(List var1) { - HashMap var2 = new HashMap(); - Iterator var3 = var1.iterator(); + HashMap var2 = new HashMap<>(); + Iterator var3 = var1.iterator(); while(var3.hasNext()) { - OnlCgformField var4 = (OnlCgformField)var3.next(); + OnlCgformField var4 = var3.next(); var2.put(var4.getDbFieldTxt(), var4); } return var2; } + @Override public void setMapValue(Map map, String originKey, Object value) { String var4 = this.a(originKey); if (value instanceof Double) { map.put(var4, PoiPublicUtil.doubleToString((Double)value)); } else if (value instanceof byte[]) { - byte[] var5 = (byte[])((byte[])value); + byte[] var5 = ((byte[])value); String var6 = CgformUtil.a(var5, this.c, this.d, this.e); if (var6 != null) { map.put(var4, var6); @@ -55,6 +56,6 @@ public class CgFormExcelHandler extends ExcelDataHandlerDefaultImpl { } private String a(String var1) { - return this.a.containsKey(var1) ? "$mainTable$" + ((OnlCgformField)this.a.get(var1)).getDbFieldName() : "$subTable$" + var1; + return this.a.containsKey(var1) ? "$mainTable$" + this.a.get(var1).getDbFieldName() : "$subTable$" + var1; } } diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/util/CgformUtil.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/util/CgformUtil.java index 6d33d620..d093d656 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/util/CgformUtil.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/util/CgformUtil.java @@ -1,36 +1,10 @@ package com.jero.generater.modules.online.cgform.util; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.toolkit.IdWorker; -import java.io.IOException; -import java.io.Reader; -import java.io.UnsupportedEncodingException; -import java.net.URLDecoder; -import java.sql.Blob; -import java.sql.Clob; -import java.sql.SQLException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.Map.Entry; -import java.util.regex.Matcher; -import java.util.regex.Pattern; -import java.util.stream.Collectors; -import javax.servlet.http.HttpServletRequest; - -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang.StringUtils; -import org.apache.shiro.SecurityUtils; import com.jero.common.exception.JeroBootException; import com.jero.common.system.api.ISysBaseAPI; import com.jero.common.system.query.MatchTypeEnum; @@ -39,140 +13,104 @@ import com.jero.common.system.query.QueryRuleEnum; import com.jero.common.system.vo.DictModel; import com.jero.common.system.vo.LoginUser; import com.jero.common.system.vo.SysPermissionDataRuleModel; -import com.jero.common.util.CommonUtils; -import com.jero.common.util.DateUtils; -import com.jero.common.util.SpringContextUtils; -import com.jero.common.util.UUIDGenerator; -import com.jero.common.util.oConvertUtils; +import com.jero.common.util.*; import com.jero.common.util.jsonschema.BaseColumn; import com.jero.common.util.jsonschema.CommonProperty; import com.jero.common.util.jsonschema.JsonSchemaDescrip; import com.jero.common.util.jsonschema.JsonschemaUtil; -import com.jero.common.util.jsonschema.validate.DictProperty; -import com.jero.common.util.jsonschema.validate.HiddenProperty; -import com.jero.common.util.jsonschema.validate.LinkDownProperty; -import com.jero.common.util.jsonschema.validate.NumberProperty; -import com.jero.common.util.jsonschema.validate.PopupProperty; -import com.jero.common.util.jsonschema.validate.StringProperty; -import com.jero.common.util.jsonschema.validate.SwitchProperty; -import com.jero.common.util.jsonschema.validate.TreeSelectProperty; -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.OnlCgformField; -import com.jero.generater.modules.online.cgform.entity.OnlCgformHead; -import com.jero.generater.modules.online.cgform.entity.OnlCgformIndex; +import com.jero.common.util.jsonschema.validate.*; +import com.jero.generater.modules.online.cgform.entity.*; import com.jero.generater.modules.online.cgform.enums.CgformValidPatternEnum; import com.jero.generater.modules.online.cgform.mapper.OnlCgformHeadMapper; import com.jero.generater.modules.online.cgform.model.TreeSelectColumn; import com.jero.generater.modules.online.cgform.service.IOnlCgformFieldService; -import com.jero.generater.modules.online.config.util.DbTableUtil; import com.jero.generater.modules.online.config.exception.DBException; +import com.jero.generater.modules.online.config.util.DbTableUtil; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; +import org.apache.shiro.SecurityUtils; import org.jeecgframework.poi.excel.entity.params.ExcelExportEntity; +import javax.servlet.http.HttpServletRequest; +import java.io.IOException; +import java.io.Reader; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import java.nio.charset.StandardCharsets; +import java.sql.Blob; +import java.sql.Clob; +import java.sql.SQLException; +import java.util.*; +import java.util.Map.Entry; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import java.util.stream.Collectors; + @Slf4j public class CgformUtil { - public static final String a = "SELECT "; - public static final String b = " FROM "; - public static final String c = " AND "; - public static final String d = " like "; - public static final String e = " COUNT(*) "; - public static final String f = " where 1=1 "; - public static final String g = " where "; - public static final String h = " ORDER BY "; - public static final String i = "asc"; - public static final String j = "desc"; - public static final String k = "="; - public static final String l = "!="; - public static final String m = ">="; - public static final String n = ">"; - public static final String o = "<="; - public static final String p = "<"; - public static final String q = " or "; - public static final String r = "Y"; - public static final String s = "$"; - public static final String t = "CREATE_TIME"; - public static final String u = "CREATE_BY"; - public static final String v = "UPDATE_TIME"; - public static final String w = "UPDATE_BY"; - public static final String x = "SYS_ORG_CODE"; - public static final int y = 2; - public static final String z = "'"; - public static final String A = "N"; - public static final String B = ","; - public static final String C = "single"; - public static final String D = "id"; - public static final String E = "bpm_status"; - public static final String F = "1"; - public static final String G = "force"; - public static final String H = "normal"; - public static final String I = "switch"; - public static final String J = "popup"; - public static final String K = "image"; - public static final String L = "file"; - public static final String M = "sel_tree"; - public static final String N = "cat_tree"; - public static final String O = "link_down"; - public static final String P = "SYS_USER"; - public static final String Q = "REALNAME"; - public static final String R = "USERNAME"; - public static final String S = "SYS_DEPART"; - public static final String T = "DEPART_NAME"; - public static final String U = "ID"; - public static final String V = "SYS_CATEGORY"; - public static final String W = "NAME"; - public static final String X = "CODE"; - public static final String Y = "ID"; - public static final String Z = "PID"; - public static final String aa = "HAS_CHILD"; - public static final String ab = "sel_search"; - public static final String ac = "sub-table-design_"; - public static final String ad = "import"; - public static final String ae = "export"; - public static final String af = "query"; - public static final String ag = "form"; - public static final String ah = "list"; - public static final String ai = "1"; - public static final String aj = "start"; - public static final String ak = "erp"; - public static final String al = "exportSingleOnly"; - public static final String am = "isSingleTableImport"; - public static final String an = "foreignKeys"; - public static final int ao = 1; - public static final int ap = 2; - public static final int aq = 0; - public static final int ar = 1; - public static final String as = "1"; - public static final String at = "id"; - public static final String au = "center"; - public static final String av = "showLength"; - private static final String ax = "beforeAdd,beforeEdit,afterAdd,afterEdit,beforeDelete,afterDelete,mounted,created"; - private static String ay; + public static final String SELECT = "SELECT "; + public static final String FROM = " FROM "; + public static final String AND = " AND "; + public static final String LIKE = " like "; + public static final String WHERE = " where "; + public static final String CREATE_TIME = "CREATE_TIME"; + public static final String CREATE_BY = "CREATE_BY"; + public static final String UPDATE_TIME = "UPDATE_TIME"; + public static final String UPDATE_BY = "UPDATE_BY"; + public static final String SYS_ORG_CODE = "SYS_ORG_CODE"; + public static final String SINGLE = "single"; + public static final String SWITCH = "switch"; + public static final String POPUP = "popup"; + public static final String IMAGE = "image"; + public static final String CAT_TREE = "cat_tree"; + public static final String SEL_SEARCH = "sel_search"; + public static final String RADIO = "radio"; + public static final String CHECKBOX = "checkbox"; + public static final String LIST_MULTI = "list_multi"; + public static final String AND_L = " AND ("; + public static final String ORACLE = "ORACLE"; + public static final String NUMBER = "number"; + public static final String ONLINE_NOT_LOGIN_INFO = "online保存表单数据异常:系统未找到当前登陆用户信息"; + public static final String EXECUTE_SQL_STRING = "execute_sql_string"; + public static final String UPDATE = "update "; + public static final String SET = " set "; + public static final String DATETIME = "datetime"; + public static final String S_S = "\\s*\\(\\)\\s*\\{)"; + public static final String THAT_1 = "(that){const getAction=this._getAction,postAction=this._postAction,deleteAction=this._deleteAction;"; + public static final String WIDTH = "width"; + public static final String SEL_DEPART = "sel_depart"; + public static final String SEL_USER = "sel_user"; + public static final String MESSAGE = "message"; + public static final String DATE = "date"; - public CgformUtil() { + private static String databaseType; + + + private CgformUtil() { + // do other } - public static void a(String var0, List var1, StringBuffer var2) { - if (var1 != null && var1.size() != 0) { - var2.append("SELECT "); + public static void a(String var0, List var1, StringBuilder var2) { + if (var1 != null && !var1.isEmpty()) { + var2.append(SELECT); int var3 = var1.size(); boolean var4 = false; for(int var5 = 0; var5 < var3; ++var5) { - OnlCgformField var6 = (OnlCgformField)var1.get(var5); + OnlCgformField var6 = var1.get(var5); if ("id".equals(var6.getDbFieldName())) { var4 = true; } - if ("cat_tree".equals(var6.getFieldShowType()) && oConvertUtils.isNotEmpty(var6.getDictText())) { - var2.append(var6.getDictText() + ","); + if (CAT_TREE.equals(var6.getFieldShowType()) && oConvertUtils.isNotEmpty(var6.getDictText())) { + var2.append(var6.getDictText()).append(","); } if (var5 == var3 - 1) { - var2.append(var6.getDbFieldName() + " "); + var2.append(var6.getDbFieldName()).append(" "); } else { - var2.append(var6.getDbFieldName() + ","); + var2.append(var6.getDbFieldName()).append(","); } } @@ -183,7 +121,7 @@ public class CgformUtil { var2.append("SELECT id"); } - var2.append(" FROM " + f(var0)); + var2.append(FROM).append(f(var0)); } public static String a(String var0) { @@ -197,21 +135,21 @@ public class CgformUtil { public static boolean c(String var0) { if ("list".equals(var0)) { return true; - } else if ("radio".equals(var0)) { + } else if (RADIO.equals(var0)) { return true; - } else if ("checkbox".equals(var0)) { + } else if (CHECKBOX.equals(var0)) { return true; } else { - return "list_multi".equals(var0); + return LIST_MULTI.equals(var0); } } public static String a(List var0, Map var1, List var2) { - return a((List)var0, (Map)var1, (List)var2, (List)null); + return a(var0, var1, var2, null); } public static String a(List var0, Map var1, List var2, List var3) { - StringBuffer var4 = new StringBuffer(); + StringBuilder var4 = new StringBuilder(); String var5 = ""; try { @@ -222,17 +160,15 @@ public class CgformUtil { var16.printStackTrace(); } - Map var6 = QueryGenerator.getRuleMap(var3); - Iterator var7 = var6.keySet().iterator(); - - while(var7.hasNext()) { - String var8 = (String)var7.next(); + Map var6 = QueryGenerator.getRuleMap(var3); + for (Map.Entry entry : var6.entrySet()) { + String var8 = entry.getKey(); if (oConvertUtils.isNotEmpty(var8) && var8.startsWith("SQL_RULES_COLUMN")) { - var4.append(" AND (" + QueryGenerator.getSqlRuleValue(((SysPermissionDataRuleModel)var6.get(var8)).getRuleValue()) + ")"); + var4.append(AND_L).append(QueryGenerator.getSqlRuleValue(entry.getValue().getRuleValue())).append(")"); } } - var7 = var0.iterator(); + Iterator var7 = var0.iterator(); while(true) { while(true) { @@ -247,81 +183,79 @@ public class CgformUtil { return var4.toString(); } - var17 = (OnlCgformField)var7.next(); + var17 = var7.next(); var9 = var17.getDbFieldName(); var10 = var17.getDbType(); - if (var6.containsKey(var9)) { - a(var5, (SysPermissionDataRuleModel)var6.get(var9), var9, var10, var4); - } else if (var6.containsKey(oConvertUtils.camelNames(var9))) { - a(var5, (SysPermissionDataRuleModel)var6.get(var9), var9, var10, var4); + if (var6.containsKey(var9) || var6.containsKey(oConvertUtils.camelNames(var9))) { + a(var5, var6.get(var9), var9, var10, var4); } if (var2 != null && var2.contains(var9)) { var17.setIsQuery(1); - var17.setQueryMode("single"); + var17.setQueryMode(SINGLE); } if (oConvertUtils.isNotEmpty(var17.getMainField()) && oConvertUtils.isNotEmpty(var17.getMainTable())) { var17.setIsQuery(1); - var17.setQueryMode("single"); + var17.setQueryMode(SINGLE); } } while(1 != var17.getIsQuery()); - if ("single".equals(var17.getQueryMode())) { + if (SINGLE.equals(var17.getQueryMode())) { var11 = var1.get(var9); break; } var11 = var1.get(var9 + "_begin"); if (var11 != null) { - var4.append(" AND " + var9 + ">="); + var4.append(AND).append(var9).append(">="); if (OnlineDbHandler.a(var10)) { var4.append(var11.toString()); - } else if ("ORACLE".equals(var5) && var10.toLowerCase().indexOf("date") >= 0) { + } else if (ORACLE.equals(var5) && var10.toLowerCase().contains(DATE)) { var4.append(a(var11.toString())); } else { - var4.append("'" + var11.toString() + "'"); + var4.append("'").append(var11.toString()).append("'"); } } Object var12 = var1.get(var9 + "_end"); if (var12 != null) { - var4.append(" AND " + var9 + "<="); + var4.append(AND).append(var9).append("<="); if (OnlineDbHandler.a(var10)) { var4.append(var12.toString()); - } else if ("ORACLE".equals(var5) && var10.toLowerCase().indexOf("date") >= 0) { + } else if (ORACLE.equals(var5) && var10.toLowerCase().contains(DATE)) { var4.append(a(var12.toString())); } else { - var4.append("'" + var12.toString() + "'"); + var4.append("'").append(var12.toString()).append("'"); } } } } while(var11 == null); String var13; - if ("list_multi".equals(var17.getFieldShowType())) { + if (LIST_MULTI.equals(var17.getFieldShowType())) { String[] var18 = var11.toString().split(","); var13 = ""; for(int var14 = 0; var14 < var18.length; ++var14) { if (oConvertUtils.isNotEmpty(var13)) { - var13 = var13 + " or " + var9 + " like " + "'%" + var18[var14] + ",%'" + " or " + var9 + " like " + "'%," + var18[var14] + "%'"; + var13 = var13 + " or " + var9 + LIKE + "'%" + var18[var14] + ",%'" + " or " + var9 + LIKE + "'%," + var18[var14] + "%'"; } else { - var13 = var9 + " like " + "'%" + var18[var14] + ",%'" + " or " + var9 + " like " + "'%," + var18[var14] + "%'"; + var13 = var9 + LIKE + "'%" + var18[var14] + ",%'" + " or " + var9 + LIKE + "'%," + var18[var14] + "%'"; } } - var4.append(" AND (" + var13 + ")"); + var4.append(AND_L).append(var13).append(")"); } - if ("popup".equals(var17.getFieldShowType())) { - var4.append(" AND (" + b(var9, var11.toString()) + ")"); - } else if ("ORACLE".equals(var5) && var10.toLowerCase().indexOf("date") >= 0) { - var4.append(" AND " + var9 + "=" + a(var11.toString())); + if (POPUP.equals(var17.getFieldShowType())) { + var4.append(AND_L).append(b(var9, var11.toString())).append(")"); + } else if (ORACLE.equals(var5) && var10.toLowerCase().contains(DATE)) { + var4.append(AND).append(var9).append("=").append(a(var11.toString())); } else { boolean var19 = !OnlineDbHandler.a(var10); var13 = QueryGenerator.getSingleQueryConditionSql(var9, "", var11, var19); - var4.append(" AND " + var13); + var4.append(AND).append(var13); } } } @@ -330,25 +264,25 @@ public class CgformUtil { public static String a(Map var0) { Object var1 = var0.get("superQueryParams"); if (var1 != null && !StringUtils.isBlank(var1.toString())) { - IOnlCgformFieldService var2 = (IOnlCgformFieldService)SpringContextUtils.getBean(IOnlCgformFieldService.class); - String var3 = null; + IOnlCgformFieldService var2 = SpringContextUtils.getBean(IOnlCgformFieldService.class); + String var3; try { - var3 = URLDecoder.decode(var1.toString(), "UTF-8"); + var3 = URLDecoder.decode(var1.toString(), "UTF_8"); } catch (UnsupportedEncodingException var19) { var19.printStackTrace(); return ""; } - JSONArray var4 = JSONArray.parseArray(var3); + JSONArray var4 = JSON.parseArray(var3); Object var5 = var0.get("superQueryMatchType"); MatchTypeEnum var6 = MatchTypeEnum.getByValue(var5); if (var6 == null) { var6 = MatchTypeEnum.AND; } - HashMap var7 = new HashMap(); - StringBuilder var8 = (new StringBuilder(" AND ")).append("("); + HashMap var7 = new HashMap<>(); + StringBuilder var8 = (new StringBuilder(AND)).append("("); for(int var9 = 0; var9 < var4.size(); ++var9) { JSONObject var10 = var4.getJSONObject(var9); @@ -361,12 +295,12 @@ public class CgformUtil { String var14 = var12[1]; JSONObject var15 = (JSONObject)var7.get(var13); if (var15 == null) { - List var16 = var2.queryFormFieldsByTableName(var13); + List var16 = var2.queryFormFieldsByTableName(var13); var15 = new JSONObject(3); - Iterator var17 = var16.iterator(); + Iterator var17 = var16.iterator(); while(var17.hasNext()) { - OnlCgformField var18 = (OnlCgformField)var17.next(); + OnlCgformField var18 = var17.next(); if (StringUtils.isNotBlank(var18.getMainTable())) { var15.put("subTableName", var13); var15.put("subField", var18.getDbFieldName()); @@ -404,10 +338,9 @@ public class CgformUtil { if (var4 != null) { String var10 = var4.getString("subTableName"); String var11 = var4.getString("subField"); - String var12 = var4.getString("mainTable"); String var13 = var4.getString("mainField"); - var0.append("(").append(var13).append(" IN (SELECT ").append(var11).append(" FROM ").append(var10).append(" WHERE "); - if ("popup".equals(var6)) { + var0.append("(").append(var13).append(" IN (SELECT ").append(var11).append(FROM).append(var10).append(" WHERE "); + if (POPUP.equals(var6)) { var0.append(b(var1, var7)); } else { var0.append(var1); @@ -415,7 +348,7 @@ public class CgformUtil { } var0.append("))"); - } else if ("popup".equals(var6)) { + } else if (POPUP.equals(var6)) { var0.append(b(var1, var7)); } else { var0.append(var1); @@ -425,7 +358,7 @@ public class CgformUtil { } private static void a(StringBuilder var0, QueryRuleEnum var1, String var2, String var3, String var4) { - if ("date".equals(var4) && "ORACLE".equalsIgnoreCase(getDatabseType())) { + if (DATE.equals(var4) && ORACLE.equalsIgnoreCase(getDatabseType())) { var3 = var3.replace("'", ""); if (var3.length() == 10) { var3 = b(var3); @@ -468,13 +401,13 @@ public class CgformUtil { var0.append(")"); break; case LIKE: - var0.append(" like ").append("N").append("'").append("%").append(var2).append("%").append("'"); + var0.append(LIKE).append("N").append("'").append("%").append(var2).append("%").append("'"); break; case LEFT_LIKE: - var0.append(" like ").append("N").append("'").append("%").append(var2).append("'"); + var0.append(LIKE).append("N").append("'").append("%").append(var2).append("'"); break; case RIGHT_LIKE: - var0.append(" like ").append("N").append("'").append(var2).append("%").append("'"); + var0.append(LIKE).append("N").append("'").append(var2).append("%").append("'"); break; case EQ: default: @@ -484,8 +417,8 @@ public class CgformUtil { } private static String a(String var0, String var1) { - if (!"int".equals(var0) && !"number".equals(var0)) { - if ("date".equals(var0)) { + if (!"int".equals(var0) && !NUMBER.equals(var0)) { + if (DATE.equals(var0)) { return "'" + var1 + "'"; } else { return "SQLSERVER".equals(getDatabseType()) ? "N'" + var1 + "'" : "'" + var1 + "'"; @@ -496,21 +429,21 @@ public class CgformUtil { } public static Map a(HttpServletRequest var0) { - Map var1 = var0.getParameterMap(); - HashMap var2 = new HashMap(); - Iterator var3 = var1.entrySet().iterator(); + Map var1 = var0.getParameterMap(); + HashMap var2 = new HashMap<>(); + Iterator> var3 = var1.entrySet().iterator(); String var5 = ""; String var6 = ""; - for(Object var7 = null; var3.hasNext(); var2.put(var5, var6)) { - Entry var4 = (Entry)var3.next(); - var5 = (String)var4.getKey(); + for(Object var7; var3.hasNext(); var2.put(var5, var6)) { + Entry var4 = var3.next(); + var5 = var4.getKey(); var7 = var4.getValue(); if (!"_t".equals(var5) && null != var7) { if (!(var7 instanceof String[])) { var6 = var7.toString(); } else { - String[] var8 = (String[])((String[])var7); + String[] var8 = (String[]) var7; for(int var9 = 0; var9 < var8.length; ++var9) { var6 = var8[var9] + ","; @@ -527,7 +460,7 @@ public class CgformUtil { } public static boolean a(String var0, List var1) { - Iterator var2 = var1.iterator(); + Iterator var2 = var1.iterator(); OnlCgformField var3; do { @@ -535,7 +468,7 @@ public class CgformUtil { return false; } - var3 = (OnlCgformField)var2.next(); + var3 = var2.next(); } while(!var0.equals(var3.getDbFieldName())); return true; @@ -543,12 +476,12 @@ public class CgformUtil { public static JSONObject a(List var0, List var1, TreeSelectColumn var2) { new JSONObject(); - ArrayList var4 = new ArrayList(); - ArrayList var5 = new ArrayList(); - ISysBaseAPI var6 = (ISysBaseAPI)SpringContextUtils.getBean(ISysBaseAPI.class); - OnlCgformHeadMapper var7 = (OnlCgformHeadMapper)SpringContextUtils.getBean(OnlCgformHeadMapper.class); - ArrayList var8 = new ArrayList(); - Iterator var9 = var0.iterator(); + ArrayList var4 = new ArrayList<>(); + ArrayList var5 = new ArrayList<>(); + ISysBaseAPI var6 = SpringContextUtils.getBean(ISysBaseAPI.class); + OnlCgformHeadMapper var7 = SpringContextUtils.getBean(OnlCgformHeadMapper.class); + ArrayList var8 = new ArrayList<>(); + Iterator var9 = var0.iterator(); while(true) { OnlCgformField var10; @@ -558,7 +491,7 @@ public class CgformUtil { if (!var9.hasNext()) { JSONObject var3; JsonSchemaDescrip var23; - if (var4.size() > 0) { + if (!var4.isEmpty()) { var23 = new JsonSchemaDescrip(var4); var3 = JsonschemaUtil.getJsonSchema(var23, var5); } else { @@ -569,7 +502,7 @@ public class CgformUtil { return var3; } - var10 = (OnlCgformField)var9.next(); + var10 = var9.next(); var11 = var10.getDbFieldName(); } while("id".equals(var11)); } while(var8.contains(var11)); @@ -580,11 +513,11 @@ public class CgformUtil { } String var13 = var10.getFieldShowType(); - Object var14 = null; - if ("switch".equals(var13)) { + CommonProperty var14; + if (SWITCH.equals(var13)) { var14 = new SwitchProperty(var11, var12, var10.getFieldExtendJson()); } else if (c(var13)) { - Object var30 = new ArrayList(); + Object var30 = new ArrayList<>(); if (oConvertUtils.isNotEmpty(var10.getDictTable())) { var30 = var6.queryTableDictItemsByCode(var10.getDictTable(), var10.getDictText(), var10.getDictField()); } else if (oConvertUtils.isNotEmpty(var10.getDictField())) { @@ -593,10 +526,10 @@ public class CgformUtil { var14 = new StringProperty(var11, var12, var13, var10.getDbLength(), (List)var30); if (OnlineDbHandler.a(var10.getDbType())) { - ((CommonProperty)var14).setType("number"); + var14.setType(NUMBER); } } else if (OnlineDbHandler.a(var10.getDbType())) { - NumberProperty var29 = new NumberProperty(var11, var12, "number"); + NumberProperty var29 = new NumberProperty(var11, var12, NUMBER); if (CgformValidPatternEnum.INTEGER.getType().equals(var10.getFieldValidType())) { var29.setPattern(CgformValidPatternEnum.INTEGER.getPattern()); } @@ -604,12 +537,12 @@ public class CgformUtil { var14 = var29; } else { String var16; - if (!"popup".equals(var13)) { - if ("sel_search".equals(var13)) { + if (!POPUP.equals(var13)) { + if (SEL_SEARCH.equals(var13)) { var14 = new DictProperty(var11, var12, var10.getDictTable(), var10.getDictField(), var10.getDictText()); } else if ("link_down".equals(var13)) { LinkDownProperty var27 = new LinkDownProperty(var11, var12, var10.getDictTable()); - a((LinkDownProperty)var27, (List)var0, (List)var8); + a(var27, var0, var8); var14 = var27; } else { String var25; @@ -624,7 +557,7 @@ public class CgformUtil { } var14 = var34; - } else if ("cat_tree".equals(var13)) { + } else if (CAT_TREE.equals(var13)) { var25 = var10.getDictText(); var16 = var10.getDictField(); var32 = "0"; @@ -687,27 +620,27 @@ public class CgformUtil { } } - if (var10.getIsReadOnly() == 1 || var1 != null && var1.indexOf(var11) >= 0) { - ((CommonProperty)var14).setDisabled(true); + if (var10.getIsReadOnly() == 1 || var1 != null && var1.contains(var11)) { + var14.setDisabled(true); } - ((CommonProperty)var14).setOrder(var10.getOrderNum()); - ((CommonProperty)var14).setDefVal(var10.getFieldDefaultValue()); - ((CommonProperty)var14).setFieldExtendJson(var10.getFieldExtendJson()); - ((CommonProperty)var14).setDbPointLength(var10.getDbPointLength()); + var14.setOrder(var10.getOrderNum()); + var14.setDefVal(var10.getFieldDefaultValue()); + var14.setFieldExtendJson(var10.getFieldExtendJson()); + var14.setDbPointLength(var10.getDbPointLength()); var5.add(var14); } } public static JSONObject b(String var0, List var1) { new JSONObject(); - ArrayList var3 = new ArrayList(); - ArrayList var4 = new ArrayList(); - ISysBaseAPI var5 = (ISysBaseAPI)SpringContextUtils.getBean(ISysBaseAPI.class); - Iterator var6 = var1.iterator(); + ArrayList var3 = new ArrayList<>(); + ArrayList var4 = new ArrayList<>(); + ISysBaseAPI var5 = SpringContextUtils.getBean(ISysBaseAPI.class); + Iterator var6 = var1.iterator(); while(var6.hasNext()) { - OnlCgformField var7 = (OnlCgformField)var6.next(); + OnlCgformField var7 = var6.next(); String var8 = var7.getDbFieldName(); if (!"id".equals(var8)) { String var9 = var7.getDbFieldTxt(); @@ -717,41 +650,40 @@ public class CgformUtil { String var10 = var7.getFieldShowType(); String var11 = var7.getDictField(); - Object var12 = null; + CommonProperty var12; if (OnlineDbHandler.a(var7.getDbType())) { - var12 = new NumberProperty(var8, var9, "number"); + var12 = new NumberProperty(var8, var9, NUMBER); } else if (c(var10)) { - List var13 = var5.queryDictItemsByCode(var11); + List var13 = var5.queryDictItemsByCode(var11); var12 = new StringProperty(var8, var9, var10, var7.getDbLength(), var13); } else { var12 = new StringProperty(var8, var9, var10, var7.getDbLength()); } - ((CommonProperty)var12).setOrder(var7.getOrderNum()); + var12.setOrder(var7.getOrderNum()); var4.add(var12); } } - JSONObject var2 = JsonschemaUtil.getSubJsonSchema(var0, var3, var4); - return var2; + return JsonschemaUtil.getSubJsonSchema(var0, var3, var4); } public static Set a(List var0) { - HashSet var1 = new HashSet(); - Iterator var2 = var0.iterator(); + HashSet var1 = new HashSet<>(); + Iterator var2 = var0.iterator(); OnlCgformField var3; String var4; while(var2.hasNext()) { - var3 = (OnlCgformField)var2.next(); - if ("popup".equals(var3.getFieldShowType())) { + var3 = var2.next(); + if (POPUP.equals(var3.getFieldShowType())) { var4 = var3.getDictText(); - if (var4 != null && !var4.equals("")) { - var1.addAll((Collection)Arrays.stream(var4.split(",")).collect(Collectors.toSet())); + if (var4 != null && !"".equals(var4)) { + var1.addAll(Arrays.stream(var4.split(",")).collect(Collectors.toSet())); } } - if ("cat_tree".equals(var3.getFieldShowType())) { + if (CAT_TREE.equals(var3.getFieldShowType())) { var4 = var3.getDictText(); if (oConvertUtils.isNotEmpty(var4)) { var1.add(var4); @@ -762,7 +694,7 @@ public class CgformUtil { var2 = var0.iterator(); while(var2.hasNext()) { - var3 = (OnlCgformField)var2.next(); + var3 = var2.next(); var4 = var3.getDbFieldName(); if (var3.getIsShowForm() == 1 && var1.contains(var4)) { var1.remove(var4); @@ -773,8 +705,8 @@ public class CgformUtil { } public static Map a(String var0, List var1, JSONObject var2) { - StringBuffer var3 = new StringBuffer(); - StringBuffer var4 = new StringBuffer(); + StringBuilder var3 = new StringBuilder(); + StringBuilder var4 = new StringBuilder(); String var5 = ""; try { @@ -785,36 +717,36 @@ public class CgformUtil { var16.printStackTrace(); } - HashMap var6 = new HashMap(); + HashMap var6 = new HashMap<>(); boolean var7 = false; String var8 = null; LoginUser var9 = (LoginUser)SecurityUtils.getSubject().getPrincipal(); if (var9 == null) { - throw new JeroBootException("online保存表单数据异常:系统未找到当前登陆用户信息"); + throw new JeroBootException(ONLINE_NOT_LOGIN_INFO); } else { - Set var10 = a(var1); - Iterator var11 = var1.iterator(); + Set var10 = a(var1); + Iterator var11 = var1.iterator(); while(true) { while(var11.hasNext()) { - OnlCgformField var12 = (OnlCgformField)var11.next(); + OnlCgformField var12 = var11.next(); String var13 = var12.getDbFieldName(); if (null == var13) { log.info("--------online保存表单数据遇见空名称的字段------->>" + var12.getId()); - } else if ("id".equals(var13.toLowerCase())) { + } else if (Objects.equals("id",var13.toLowerCase())) { var7 = true; var8 = var2.getString(var13); } else { - a(var12, var9, var2, "CREATE_BY", "CREATE_TIME", "SYS_ORG_CODE"); - if ("bpm_status".equals(var13.toLowerCase())) { - var3.append("," + var13); + a(var12, var9, var2, CREATE_BY, CREATE_TIME, SYS_ORG_CODE); + if (Objects.equals("bpm_status",var13.toLowerCase())) { + var3.append(",").append(var13); var4.append(",'1'"); } else { String var14; if (var10.contains(var13)) { - var3.append("," + var13); + var3.append(",").append(var13); var14 = OnlineDbHandler.a(var5, var12, var2, var6); - var4.append("," + var14); + var4.append(",").append(var14); } else if (var12.getIsShowForm() == 1 || !oConvertUtils.isEmpty(var12.getMainField()) || !oConvertUtils.isEmpty(var12.getDbDefaultVal())) { if (var2.get(var13) == null) { if (oConvertUtils.isEmpty(var12.getDbDefaultVal())) { @@ -831,9 +763,9 @@ public class CgformUtil { } } - var3.append("," + var13); + var3.append(",").append(var13); var14 = OnlineDbHandler.a(var5, var12, var2, var6); - var4.append("," + var14); + var4.append(",").append(var14); } } } @@ -848,7 +780,7 @@ public class CgformUtil { } String var17 = "insert into " + f(var0) + "(" + "id" + var3.toString() + ") values(" + "'" + var8 + "'" + var4.toString() + ")"; - var6.put("execute_sql_string", var17); + var6.put(EXECUTE_SQL_STRING, var17); log.info("--动态表单保存sql-->" + var17); return var6; } @@ -856,8 +788,8 @@ public class CgformUtil { } public static Map b(String var0, List var1, JSONObject var2) { - StringBuffer var3 = new StringBuffer(); - HashMap var4 = new HashMap(); + StringBuilder var3 = new StringBuilder(); + HashMap var4 = new HashMap<>(); String var5 = ""; try { @@ -872,21 +804,21 @@ public class CgformUtil { if (var6 == null) { throw new JeroBootException("online修改表单数据异常:系统未找到当前登陆用户信息"); } else { - Set var7 = a(var1); - Iterator var8 = var1.iterator(); + Set var7 = a(var1); + Iterator var8 = var1.iterator(); while(true) { while(var8.hasNext()) { - OnlCgformField var9 = (OnlCgformField)var8.next(); + OnlCgformField var9 = var8.next(); String var10 = var9.getDbFieldName(); if (null == var10) { log.info("--------online修改表单数据遇见空名称的字段------->>" + var9.getId()); } else { - a(var9, var6, var2, "UPDATE_BY", "UPDATE_TIME"); + a(var9, var6, var2, UPDATE_BY, UPDATE_TIME); String var11; if (var7.contains(var10) && var2.get(var10) != null && !"".equals(var2.getString(var10))) { var11 = OnlineDbHandler.a(var5, var9, var2, var4); - var3.append(var10 + "=" + var11 + ","); + var3.append(var10).append("=").append(var11).append(","); } else if (var9.getIsShowForm() == 1 && !"id".equals(var10)) { if ("".equals(var2.get(var10))) { var11 = var9.getDbType(); @@ -897,7 +829,7 @@ public class CgformUtil { if (!oConvertUtils.isNotEmpty(var9.getMainTable()) || !oConvertUtils.isNotEmpty(var9.getMainField())) { var11 = OnlineDbHandler.a(var5, var9, var2, var4); - var3.append(var10 + "=" + var11 + ","); + var3.append(var10).append("=").append(var11).append(","); } } } @@ -908,9 +840,9 @@ public class CgformUtil { var14 = var14.substring(0, var14.length() - 1); } - String var15 = "update " + f(var0) + " set " + var14 + " where " + "id" + "=" + "'" + var2.getString("id") + "'"; + String var15 = UPDATE + f(var0) + SET + var14 + WHERE + "id" + "=" + "'" + var2.getString("id") + "'"; log.info("--动态表单编辑sql-->" + var15); - var4.put("execute_sql_string", var15); + var4.put(EXECUTE_SQL_STRING, var15); return var4; } } @@ -921,13 +853,13 @@ public class CgformUtil { } public static String a(String var0, List var1, String var2, String var3) { - StringBuffer var4 = new StringBuffer(); - var4.append("SELECT "); + StringBuilder var4 = new StringBuilder(); + var4.append(SELECT); int var5 = var1.size(); boolean var6 = false; for(int var7 = 0; var7 < var5; ++var7) { - String var8 = ((OnlCgformField)var1.get(var7)).getDbFieldName(); + String var8 = var1.get(var7).getDbFieldName(); if ("id".equals(var8)) { var6 = true; } @@ -942,7 +874,7 @@ public class CgformUtil { var4.append(",id"); } - var4.append(" FROM " + f(var0) + " where 1=1 " + " AND " + var2 + "=" + "'" + var3 + "'"); + var4.append(FROM + f(var0) + " where 1=1 " + AND + var2 + "=" + "'" + var3 + "'"); return var4.toString(); } @@ -968,48 +900,45 @@ public class CgformUtil { byte var11 = -1; switch(var9.hashCode()) { case -909973894: - if (var9.equals("CREATE_BY")) { + if (var9.equals(CREATE_BY)) { var11 = 0; } break; case -99751974: - if (var9.equals("SYS_ORG_CODE")) { + if (var9.equals(SYS_ORG_CODE)) { var11 = 4; } break; case 837427085: - if (var9.equals("UPDATE_BY")) { + if (var9.equals(UPDATE_BY)) { var11 = 2; } break; case 1609067651: - if (var9.equals("UPDATE_TIME")) { + if (var9.equals(UPDATE_TIME)) { var11 = 3; } break; case 1688939568: - if (var9.equals("CREATE_TIME")) { + if (var9.equals(CREATE_TIME)) { var11 = 1; } + break; + default:break; } switch(var11) { - case 0: + case 0: case 2: var2.put(var4, var1.getUsername()); return; - case 1: - var0.setFieldShowType("datetime"); - var2.put(var4, DateUtils.formatDateTime()); - return; - case 2: - var2.put(var4, var1.getUsername()); - return; - case 3: - var0.setFieldShowType("datetime"); + case 1: case 3: + var0.setFieldShowType(DATETIME); var2.put(var4, DateUtils.formatDateTime()); return; case 4: var2.put(var4, var1.getOrgCode()); + break; + default:break; } } break; @@ -1027,28 +956,28 @@ public class CgformUtil { } public static boolean a(OnlCgformField var0, OnlCgformField var1) { - return !a((Object)var0.getDbFieldName(), (Object)var1.getDbFieldName()) || !a((Object)var0.getDbFieldTxt(), (Object)var1.getDbFieldTxt()) || !a((Object)var0.getDbLength(), (Object)var1.getDbLength()) || !a((Object)var0.getDbPointLength(), (Object)var1.getDbPointLength()) || !a((Object)var0.getDbType(), (Object)var1.getDbType()) || !a((Object)var0.getDbIsNull(), (Object)var1.getDbIsNull()) || !a((Object)var0.getDbIsKey(), (Object)var1.getDbIsKey()) || !a((Object)var0.getDbDefaultVal(), (Object)var1.getDbDefaultVal()); + return !a(var0.getDbFieldName(), (Object)var1.getDbFieldName()) || !a(var0.getDbFieldTxt(), (Object)var1.getDbFieldTxt()) || !a(var0.getDbLength(), var1.getDbLength()) || !a(var0.getDbPointLength(), var1.getDbPointLength()) || !a(var0.getDbType(), (Object)var1.getDbType()) || !a(var0.getDbIsNull(), var1.getDbIsNull()) || !a(var0.getDbIsKey(), var1.getDbIsKey()) || !a(var0.getDbDefaultVal(), (Object)var1.getDbDefaultVal()); } public static boolean a(OnlCgformIndex var0, OnlCgformIndex var1) { - return !a((Object)var0.getIndexName(), (Object)var1.getIndexName()) || !a((Object)var0.getIndexField(), (Object)var1.getIndexField()) || !a((Object)var0.getIndexType(), (Object)var1.getIndexType()); + return !a(var0.getIndexName(), (Object)var1.getIndexName()) || !a(var0.getIndexField(), (Object)var1.getIndexField()) || !a(var0.getIndexType(), (Object)var1.getIndexType()); } public static boolean a(OnlCgformHead var0, OnlCgformHead var1) { - return !a((Object)var0.getTableName(), (Object)var1.getTableName()) || !a((Object)var0.getTableTxt(), (Object)var1.getTableTxt()); + return !a(var0.getTableName(), (Object)var1.getTableName()) || !a(var0.getTableTxt(), (Object)var1.getTableTxt()); } public static String a(String var0, List var1, Map var2) { - StringBuffer var3 = new StringBuffer(); - StringBuffer var4 = new StringBuffer(); - Iterator var5 = var1.iterator(); + StringBuilder var3 = new StringBuilder(); + StringBuilder var4 = new StringBuilder(); + Iterator var5 = var1.iterator(); while(var5.hasNext()) { - OnlCgformField var6 = (OnlCgformField)var5.next(); + OnlCgformField var6 = var5.next(); String var7 = var6.getDbFieldName(); String var8 = var6.getDbType(); if (var6.getIsShowList() == 1) { - var4.append("," + var7); + var4.append(",").append(var7); } boolean var9; @@ -1057,56 +986,57 @@ public class CgformUtil { var9 = !OnlineDbHandler.a(var8); var10 = QueryGenerator.getSingleQueryConditionSql(var7, "", var2.get(var7), var9); if (!"".equals(var10)) { - var3.append(" AND " + var10); + var3.append(AND).append(var10); } } if (var6.getIsQuery() == 1) { - if ("single".equals(var6.getQueryMode())) { + if (SINGLE.equals(var6.getQueryMode())) { if (var2.get(var7) != null) { var9 = !OnlineDbHandler.a(var8); var10 = QueryGenerator.getSingleQueryConditionSql(var7, "", var2.get(var7), var9); if (!"".equals(var10)) { - var3.append(" AND " + var10); + var3.append(AND).append(var10); } } } else { Object var11 = var2.get(var7 + "_begin"); if (var11 != null) { - var3.append(" AND " + var7 + ">="); + var3.append(AND).append(var7).append(">="); if (OnlineDbHandler.a(var8)) { var3.append(var11.toString()); } else { - var3.append("'" + var11.toString() + "'"); + var3.append("'").append(var11.toString()).append("'"); } } Object var12 = var2.get(var7 + "_end"); if (var12 != null) { - var3.append(" AND " + var7 + "<="); + var3.append(AND).append(var7).append("<="); if (OnlineDbHandler.a(var8)) { var3.append(var12.toString()); } else { - var3.append("'" + var12.toString() + "'"); + var3.append("'").append(var12.toString()).append("'"); } } } } } - return "SELECT id" + var4.toString() + " FROM " + f(var0) + " where 1=1 " + var3.toString(); + return "SELECT id" + var4.toString() + FROM + f(var0) + " where 1=1 " + var3.toString(); } public static List a(List var0, String var1) { - ArrayList var2 = new ArrayList(); + ArrayList var2 = new ArrayList<>(); for(int var3 = 0; var3 < var0.size(); ++var3) { - if ((null == var1 || !var1.equals(((OnlCgformField)var0.get(var3)).getDbFieldName())) && ((OnlCgformField)var0.get(var3)).getIsShowList() == 1) { - ExcelExportEntity var4 = new ExcelExportEntity(((OnlCgformField)var0.get(var3)).getDbFieldTxt(), ((OnlCgformField)var0.get(var3)).getDbFieldName()); - int var5 = ((OnlCgformField)var0.get(var3)).getDbLength() == 0 ? 12 : (((OnlCgformField)var0.get(var3)).getDbLength() > 30 ? 30 : ((OnlCgformField)var0.get(var3)).getDbLength()); - if (((OnlCgformField)var0.get(var3)).getFieldShowType().equals("date")) { + if ((null == var1 || !var1.equals(var0.get(var3).getDbFieldName())) && var0.get(var3).getIsShowList() == 1) { + ExcelExportEntity var4 = new ExcelExportEntity(var0.get(var3).getDbFieldTxt(), var0.get(var3).getDbFieldName()); + int s = var0.get(var3).getDbLength() > 30 ? 30 : var0.get(var3).getDbLength(); + int var5 = var0.get(var3).getDbLength() == 0 ? 12 : s; + if (var0.get(var3).getFieldShowType().equals(DATE)) { var4.setFormat("yyyy-MM-dd"); - } else if (((OnlCgformField)var0.get(var3)).getFieldShowType().equals("datetime")) { + } else if (var0.get(var3).getFieldShowType().equals(DATETIME)) { var4.setFormat("yyyy-MM-dd HH:mm:ss"); } @@ -1114,7 +1044,7 @@ public class CgformUtil { var5 = 10; } - var4.setWidth((double)var5); + var4.setWidth(var5); var2.add(var4); } } @@ -1129,17 +1059,17 @@ public class CgformUtil { try { if ("class".equals(var1)) { Class var3 = Class.forName(var2); - if (var3 == null || var3.newInstance() == null) { - return false; - } - } - - if ("spring".equals(var1)) { - Object var5 = SpringContextUtils.getBean(var2); - if (var5 == null) { + if (var3 == null) { return false; } } + // 总是false +// if ("spring".equals(var1)) { +// Object var5 = SpringContextUtils.getBean(var2); +// if (var5 == null) { +// return false; +// } +// } } catch (Exception var4) { log.error(var4.getMessage(), var4); return false; @@ -1150,41 +1080,37 @@ public class CgformUtil { } public static void b(List var0) { - Collections.sort(var0, new Comparator() { - public int compare(String var1, String var2) { - if (var1 != null && var2 != null) { - if (var1.compareTo(var2) > 0) { - return 1; - } else if (var1.compareTo(var2) < 0) { - return -1; - } else { - return var1.compareTo(var2) == 0 ? 0 : 0; - } - } else { + Collections.sort(var0, (var1, var2) -> { + if (var1 != null && var2 != null) { + if (var1.compareTo(var2) > 0) { + return 1; + } else if (var1.compareTo(var2) < 0) { return -1; + } else { + return 0; } + } else { + return -1; } }); } public static void c(List var0) { - Collections.sort(var0, new Comparator() { - public int compare(String var1, String var2) { - if (var1 != null && var2 != null) { - if (var1.length() > var2.length()) { - return 1; - } else if (var1.length() < var2.length()) { - return -1; - } else if (var1.compareTo(var2) > 0) { - return 1; - } else if (var1.compareTo(var2) < 0) { - return -1; - } else { - return var1.compareTo(var2) == 0 ? 0 : 0; - } - } else { + Collections.sort(var0, (var1, var2) -> { + if (var1 != null && var2 != null) { + if (var1.length() > var2.length()) { + return 1; + } else if (var1.length() < var2.length()) { return -1; + } else if (var1.compareTo(var2) > 0) { + return 1; + } else if (var1.compareTo(var2) < 0) { + return -1; + } else { + return 0; } + } else { + return -1; } }); } @@ -1201,7 +1127,7 @@ public class CgformUtil { if (var0 != null && var0.length() != 0) { var0 = QueryGenerator.converRuleValue(var0); String[] var2 = var0.split(","); - ArrayList var3 = new ArrayList(); + ArrayList var3 = new ArrayList<>(); String[] var4 = var2; int var5 = var2.length; @@ -1222,12 +1148,12 @@ public class CgformUtil { } } - private static void a(String var0, SysPermissionDataRuleModel var1, String var2, String var3, StringBuffer var4) { + private static void a(String var0, SysPermissionDataRuleModel var1, String var2, String var3, StringBuilder var4) { QueryRuleEnum var5 = QueryRuleEnum.getByValue(var1.getRuleConditions()); boolean var6 = !OnlineDbHandler.a(var3); String var7 = a(var1.getRuleValue(), var6, var5); if (var7 != null && var5 != null) { - if ("ORACLE".equalsIgnoreCase(var0) && "Date".equals(var3)) { + if (ORACLE.equalsIgnoreCase(var0) && "Date".equals(var3)) { var7 = var7.replace("'", ""); if (var7.length() == 10) { var7 = b(var7); @@ -1238,34 +1164,34 @@ public class CgformUtil { switch(var5) { case GT: - var4.append(" AND " + var2 + ">" + var7); + var4.append(AND + var2 + ">" + var7); break; case GE: - var4.append(" AND " + var2 + ">=" + var7); + var4.append(AND + var2 + ">=" + var7); break; case LT: - var4.append(" AND " + var2 + "<" + var7); + var4.append(AND + var2 + "<" + var7); break; case LE: - var4.append(" AND " + var2 + "<=" + var7); + var4.append(AND + var2 + "<=" + var7); break; case NE: - var4.append(" AND " + var2 + " <> " + var7); + var4.append(AND + var2 + " <> " + var7); break; case IN: - var4.append(" AND " + var2 + " IN " + var7); + var4.append(AND + var2 + " IN " + var7); break; case LIKE: - var4.append(" AND " + var2 + " LIKE '%" + QueryGenerator.trimSingleQuote(var7) + "%'"); + var4.append(AND + var2 + " LIKE '%" + QueryGenerator.trimSingleQuote(var7) + "%'"); break; case LEFT_LIKE: - var4.append(" AND " + var2 + " LIKE '%" + QueryGenerator.trimSingleQuote(var7) + "'"); + var4.append(AND + var2 + " LIKE '%" + QueryGenerator.trimSingleQuote(var7) + "'"); break; case RIGHT_LIKE: - var4.append(" AND " + var2 + " LIKE '" + QueryGenerator.trimSingleQuote(var7) + "%'"); + var4.append(AND + var2 + " LIKE '" + QueryGenerator.trimSingleQuote(var7) + "%'"); break; case EQ: - var4.append(" AND " + var2 + "=" + var7); + var4.append(AND + var2 + "=" + var7); break; default: log.info("--查询规则未匹配到---"); @@ -1279,12 +1205,13 @@ public class CgformUtil { return var0; } else { var0 = var0.replace("#{UUID}", UUIDGenerator.generate()); - Set var2 = QueryGenerator.getSqlRuleParams(var0); - Iterator var3 = var2.iterator(); + Set var2 = QueryGenerator.getSqlRuleParams(var0); + assert var2 != null; + Iterator var3 = var2.iterator(); while(true) { while(var3.hasNext()) { - String var4 = (String)var3.next(); + String var4 = var3.next(); String var5; if (var1.get(var4.toUpperCase()) == null && var1.get(var4.toLowerCase()) == null) { var5 = QueryGenerator.converRuleValue(var4); @@ -1316,10 +1243,10 @@ public class CgformUtil { Pattern var6; Matcher var7; if ("beforeAdd,afterAdd,mounted,created".indexOf(var5) >= 0) { - var6 = Pattern.compile("(" + var5 + "\\s*\\(\\)\\s*\\{)"); + var6 = Pattern.compile("(" + var5 + S_S); var7 = var6.matcher(var0); if (var7.find()) { - var0 = var0.replace(var7.group(0), var5 + "(that){const getAction=this._getAction,postAction=this._postAction,deleteAction=this._deleteAction;"); + var0 = var0.replace(var7.group(0), var5 + THAT_1); } } else { var6 = Pattern.compile("(" + var5 + "\\s*\\(row\\)\\s*\\{)"); @@ -1327,10 +1254,10 @@ public class CgformUtil { if (var7.find()) { var0 = var0.replace(var7.group(0), var5 + "(that,row){const getAction=this._getAction,postAction=this._postAction,deleteAction=this._deleteAction;"); } else { - Pattern var8 = Pattern.compile("(" + var5 + "\\s*\\(\\)\\s*\\{)"); + Pattern var8 = Pattern.compile("(" + var5 + S_S); Matcher var9 = var8.matcher(var0); if (var9.find()) { - var0 = var0.replace(var9.group(0), var5 + "(that){const getAction=this._getAction,postAction=this._postAction,deleteAction=this._deleteAction;"); + var0 = var0.replace(var9.group(0), var5 + THAT_1); } } } @@ -1343,14 +1270,12 @@ public class CgformUtil { if (var0 != null && !oConvertUtils.isEmpty(var0.getCgJs())) { String var3 = var0.getCgJs(); String var4 = "onlChange"; - Pattern var5 = Pattern.compile("(" + var1 + "_" + var4 + "\\s*\\(\\)\\s*\\{)"); + Pattern var5 = Pattern.compile("(" + var1 + "_" + var4 + S_S); Matcher var6 = var5.matcher(var3); if (var6.find()) { var3 = var3.replace(var6.group(0), var1 + "_" + var4 + "(){const getAction=this._getAction,postAction=this._postAction,deleteAction=this._deleteAction;"); - Iterator var7 = var2.iterator(); - while(var7.hasNext()) { - OnlCgformField var8 = (OnlCgformField)var7.next(); + for (OnlCgformField var8 : var2) { Pattern var9 = Pattern.compile("(" + var8.getDbFieldName() + "\\s*\\(\\))"); Matcher var10 = var9.matcher(var3); if (var10.find()) { @@ -1367,14 +1292,12 @@ public class CgformUtil { if (var0 != null && !oConvertUtils.isEmpty(var0.getCgJs())) { String var4 = var0.getCgJs(); String var5 = "onlChange"; - Pattern var6 = Pattern.compile("([^_]" + var5 + "\\s*\\(\\)\\s*\\{)"); + Pattern var6 = Pattern.compile("([^_]" + var5 + S_S); Matcher var7 = var6.matcher(var4); if (var7.find()) { var4 = var4.replace(var7.group(0), var5 + "(){const getAction=this._getAction,postAction=this._postAction,deleteAction=this._deleteAction;"); - Iterator var8 = var2.iterator(); - while(var8.hasNext()) { - OnlCgformField var9 = (OnlCgformField)var8.next(); + for (OnlCgformField var9 : var2) { Pattern var10 = Pattern.compile("(" + var9.getDbFieldName() + "\\s*\\(\\))"); Matcher var11 = var10.matcher(var4); if (var11.find()) { @@ -1392,10 +1315,10 @@ public class CgformUtil { public static void a(OnlCgformEnhanceJs var0) { String var1 = var0.getCgJs(); String var2 = "show"; - Pattern var3 = Pattern.compile("(" + var2 + "\\s*\\(\\)\\s*\\{)"); + Pattern var3 = Pattern.compile("(" + var2 + S_S); Matcher var4 = var3.matcher(var1); if (var4.find()) { - var1 = var1.replace(var4.group(0), var2 + "(that){const getAction=this._getAction,postAction=this._postAction,deleteAction=this._deleteAction;"); + var1 = var1.replace(var4.group(0), var2 + THAT_1); } var0.setCgJs(var1); @@ -1408,11 +1331,11 @@ public class CgformUtil { public static String d(String var0, List var1) { if (var1 != null) { - Iterator var2 = var1.iterator(); + Iterator var2 = var1.iterator(); while(true) { while(var2.hasNext()) { - OnlCgformButton var3 = (OnlCgformButton)var2.next(); + OnlCgformButton var3 = var2.next(); String var4 = var3.getButtonCode(); Pattern var5; Matcher var6; @@ -1422,17 +1345,17 @@ public class CgformUtil { if (var6.find()) { var0 = var0.replace(var6.group(0), var4 + "(that,row){const getAction=this._getAction,postAction=this._postAction,deleteAction=this._deleteAction;"); } else { - Pattern var7 = Pattern.compile("(" + var4 + "\\s*\\(\\)\\s*\\{)"); + Pattern var7 = Pattern.compile("(" + var4 + S_S); Matcher var8 = var7.matcher(var0); if (var8.find()) { - var0 = var0.replace(var8.group(0), var4 + "(that){const getAction=this._getAction,postAction=this._postAction,deleteAction=this._deleteAction;"); + var0 = var0.replace(var8.group(0), var4 + THAT_1); } } } else if ("button".equals(var3.getButtonStyle()) || "form".equals(var3.getButtonStyle())) { - var5 = Pattern.compile("(" + var4 + "\\s*\\(\\)\\s*\\{)"); + var5 = Pattern.compile("(" + var4 + S_S); var6 = var5.matcher(var0); if (var6.find()) { - var0 = var0.replace(var6.group(0), var4 + "(that){const getAction=this._getAction,postAction=this._postAction,deleteAction=this._deleteAction;"); + var0 = var0.replace(var6.group(0), var4 + THAT_1); } } } @@ -1446,8 +1369,8 @@ public class CgformUtil { public static JSONArray a(List var0, List var1) { JSONArray var2 = new JSONArray(); - ISysBaseAPI var3 = (ISysBaseAPI)SpringContextUtils.getBean(ISysBaseAPI.class); - Iterator var4 = var0.iterator(); + ISysBaseAPI var3 = SpringContextUtils.getBean(ISysBaseAPI.class); + Iterator var4 = var0.iterator(); while(true) { OnlCgformField var5; @@ -1457,12 +1380,12 @@ public class CgformUtil { return var2; } - var5 = (OnlCgformField)var4.next(); + var5 = var4.next(); var6 = var5.getDbFieldName(); } while("id".equals(var6)); JSONObject var7 = new JSONObject(); - if (var1.indexOf(var6) >= 0) { + if (var1.contains(var6)) { var7.put("disabled", true); } @@ -1475,38 +1398,38 @@ public class CgformUtil { String var8 = c(var5); var7.put("type", var8); if (var5.getFieldLength() == null) { - var7.put("width", "186px"); - } else if (!"sel_depart".equals(var8) && !"sel_user".equals(var8)) { - var7.put("width", var5.getFieldLength() + "px"); + var7.put(WIDTH, "186px"); + } else if (!SEL_DEPART.equals(var8) && !SEL_USER.equals(var8)) { + var7.put(WIDTH, var5.getFieldLength() + "px"); } else { - var7.put("width", ""); + var7.put(WIDTH, ""); } - if (var8.equals("file") || var8.equals("image")) { - var7.put("responseName", "message"); + if ("file".equals(var8) || IMAGE.equals(var8)) { + var7.put("responseName", MESSAGE); var7.put("token", true); } - if (var8.equals("switch")) { - var7.put("type", "checkbox"); + if (var8.equals(SWITCH)) { + var7.put("type", CHECKBOX); JSONArray var9 = new JSONArray(); if (oConvertUtils.isEmpty(var5.getFieldExtendJson())) { var9.add("Y"); var9.add("N"); } else { - var9 = JSONArray.parseArray(var5.getFieldExtendJson()); + var9 = JSON.parseArray(var5.getFieldExtendJson()); } var7.put("customValue", var9); } - if (var8.equals("popup")) { + if (var8.equals(POPUP)) { var7.put("popupCode", var5.getDictTable()); var7.put("orgFields", var5.getDictField()); var7.put("destFields", var5.getDictText()); String var17 = var5.getDictText(); - if (var17 != null && !var17.equals("")) { - ArrayList var10 = new ArrayList(); + if (var17 != null && !"".equals(var17)) { + ArrayList var10 = new ArrayList<>(); String[] var11 = var17.split(","); String[] var12 = var11; int var13 = var11.length; @@ -1529,8 +1452,8 @@ public class CgformUtil { var7.put("fieldDefaultValue", var5.getFieldDefaultValue()); var7.put("placeholder", "请输入" + var5.getDbFieldTxt()); var7.put("validateRules", b(var5)); - if ("list".equals(var5.getFieldShowType()) || "radio".equals(var5.getFieldShowType()) || "checkbox_meta".equals(var5.getFieldShowType()) || "list_multi".equals(var5.getFieldShowType()) || "sel_search".equals(var5.getFieldShowType())) { - Object var18 = new ArrayList(); + if ("list".equals(var5.getFieldShowType()) || RADIO.equals(var5.getFieldShowType()) || "checkbox_meta".equals(var5.getFieldShowType()) || LIST_MULTI.equals(var5.getFieldShowType()) || SEL_SEARCH.equals(var5.getFieldShowType())) { + Object var18 = new ArrayList<>(); if (oConvertUtils.isNotEmpty(var5.getDictTable())) { var18 = var3.queryTableDictItemsByCode(var5.getDictTable(), var5.getDictText(), var5.getDictField()); } else if (oConvertUtils.isNotEmpty(var5.getDictField())) { @@ -1538,8 +1461,8 @@ public class CgformUtil { } var7.put("options", var18); - if ("list_multi".equals(var5.getFieldShowType())) { - var7.put("width", "230px"); + if (LIST_MULTI.equals(var5.getFieldShowType())) { + var7.put(WIDTH, "230px"); } } @@ -1554,7 +1477,7 @@ public class CgformUtil { if (var0.getDbIsNull() == 0 || "1".equals(var0.getFieldMustInput())) { var2 = new JSONObject(); var2.put("required", true); - var2.put("message", var0.getDbFieldTxt() + "不能为空!"); + var2.put(MESSAGE, var0.getDbFieldTxt() + "不能为空!"); var1.add(var2); } @@ -1562,10 +1485,10 @@ public class CgformUtil { var2 = new JSONObject(); if ("only".equals(var0.getFieldValidType())) { var2.put("unique", true); - var2.put("message", var0.getDbFieldTxt() + "不能重复"); + var2.put(MESSAGE, var0.getDbFieldTxt() + "不能重复"); } else { var2.put("pattern", var0.getFieldValidType()); - var2.put("message", var0.getDbFieldTxt() + "格式不正确"); + var2.put(MESSAGE, var0.getDbFieldTxt() + "格式不正确"); } var1.add(var2); @@ -1575,35 +1498,33 @@ public class CgformUtil { } public static Map b(Map var0) { - HashMap var1 = new HashMap(); + HashMap var1 = new HashMap<>(); if (var0 != null && !var0.isEmpty()) { - Set var2 = var0.keySet(); + Set var2 = var0.keySet(); Object var5; String var9; - for(Iterator var3 = var2.iterator(); var3.hasNext(); var1.put(var9, var5 == null ? "" : var5)) { - String var4 = (String)var3.next(); + for(Iterator var3 = var2.iterator(); var3.hasNext(); var1.put(var9, var5 == null ? "" : var5)) { + String var4 = var3.next(); var5 = var0.get(var4); if (var5 instanceof Clob) { var5 = a((Clob)var5); } else if (var5 instanceof byte[]) { - var5 = new String((byte[])((byte[])var5)); + var5 = new String((byte[])var5); } else if (var5 instanceof Blob) { try { - if (var5 != null) { - Blob var6 = (Blob)var5; - var5 = new String(var6.getBytes(1L, (int)var6.length()), "UTF-8"); - } + Blob var6 = (Blob)var5; + var5 = new String(var6.getBytes(1L, (int)var6.length()), StandardCharsets.UTF_8); } catch (Exception var8) { var8.printStackTrace(); } } var9 = var4.toLowerCase(); - if (var5 != null && var5 instanceof String) { + if (var5 instanceof String) { String var7 = var5.toString(); if (var7.startsWith("[") && var7.endsWith("]")) { - var5 = JSONArray.parseArray(var7); + var5 = JSON.parseArray(var7); } } } @@ -1620,11 +1541,9 @@ public class CgformUtil { } else { JSONObject var1 = new JSONObject(); if (var0 != null && !var0.isEmpty()) { - Set var2 = var0.keySet(); - Iterator var3 = var2.iterator(); + Set var2 = var0.keySet(); - while(var3.hasNext()) { - String var4 = (String)var3.next(); + for (String var4 : var2) { String var5 = var4.toLowerCase(); var1.put(var5, var0.get(var4)); } @@ -1637,28 +1556,28 @@ public class CgformUtil { } public static List> d(List> var0) { - ArrayList var1 = new ArrayList(); - Iterator var2 = var0.iterator(); + ArrayList> var1 = new ArrayList<>(); + Iterator> var2 = var0.iterator(); while(var2.hasNext()) { - Map var3 = (Map)var2.next(); - HashMap var4 = new HashMap(); - Set var5 = var3.keySet(); + Map var3 = var2.next(); + HashMap var4 = new HashMap<>(); + Set var5 = var3.keySet(); Object var8; String var12; - for(Iterator var6 = var5.iterator(); var6.hasNext(); var4.put(var12, var8 == null ? "" : var8)) { - String var7 = (String)var6.next(); + for(Iterator var6 = var5.iterator(); var6.hasNext(); var4.put(var12, var8 == null ? "" : var8)) { + String var7 = var6.next(); var8 = var3.get(var7); if (var8 instanceof Clob) { var8 = a((Clob)var8); } else if (var8 instanceof byte[]) { - var8 = new String((byte[])((byte[])var8)); + var8 = new String((byte[])var8); } else if (var8 instanceof Blob) { try { if (var8 != null) { Blob var9 = (Blob)var8; - var8 = new String(var9.getBytes(1L, (int)var9.length()), "UTF-8"); + var8 = new String(var9.getBytes(1L, (int)var9.length()), StandardCharsets.UTF_8); } } catch (Exception var11) { var11.printStackTrace(); @@ -1666,10 +1585,10 @@ public class CgformUtil { } var12 = var7.toLowerCase(); - if (var8 != null && var8 instanceof String) { + if (var8 instanceof String) { String var10 = var8.toString(); if (var10.startsWith("[") && var10.endsWith("]")) { - var8 = JSONArray.parseArray(var10); + var8 = JSON.parseArray(var10); } } } @@ -1699,8 +1618,8 @@ public class CgformUtil { } public static Map c(String var0, List var1, JSONObject var2) { - StringBuffer var3 = new StringBuffer(); - StringBuffer var4 = new StringBuffer(); + StringBuilder var3 = new StringBuilder(); + StringBuilder var4 = new StringBuilder(); String var5 = ""; try { @@ -1711,23 +1630,23 @@ public class CgformUtil { var15.printStackTrace(); } - HashMap var6 = new HashMap(); + HashMap var6 = new HashMap<>(); boolean var7 = false; String var8 = null; LoginUser var9 = (LoginUser)SecurityUtils.getSubject().getPrincipal(); if (var9 == null) { - throw new JeroBootException("online保存表单数据异常:系统未找到当前登陆用户信息"); + throw new JeroBootException(ONLINE_NOT_LOGIN_INFO); } else { - Iterator var10 = var1.iterator(); + Iterator var10 = var1.iterator(); while(true) { while(var10.hasNext()) { - OnlCgformField var11 = (OnlCgformField)var10.next(); + OnlCgformField var11 = var10.next(); String var12 = var11.getDbFieldName(); if (null == var12) { log.info("--------online保存表单数据遇见空名称的字段------->>" + var11.getId()); - } else if (var2.get(var12) != null || "CREATE_BY".equalsIgnoreCase(var12) || "CREATE_TIME".equalsIgnoreCase(var12) || "SYS_ORG_CODE".equalsIgnoreCase(var12)) { - a(var11, var9, var2, "CREATE_BY", "CREATE_TIME", "SYS_ORG_CODE"); + } else if (var2.get(var12) != null || CREATE_BY.equalsIgnoreCase(var12) || CREATE_TIME.equalsIgnoreCase(var12) || SYS_ORG_CODE.equalsIgnoreCase(var12)) { + a(var11, var9, var2, CREATE_BY, CREATE_TIME, SYS_ORG_CODE); String var13; if ("".equals(var2.get(var12))) { var13 = var11.getDbType(); @@ -1736,13 +1655,13 @@ public class CgformUtil { } } - if ("id".equals(var12.toLowerCase())) { + if (Objects.equals("id",var12.toLowerCase())) { var7 = true; var8 = var2.getString(var12); } else { - var3.append("," + var12); + var3.append(",").append(var12); var13 = OnlineDbHandler.a(var5, var11, var2, var6); - var4.append("," + var13); + var4.append(",").append(var13); } } } @@ -1752,7 +1671,7 @@ public class CgformUtil { } String var16 = "insert into " + f(var0) + "(" + "id" + var3.toString() + ") values(" + "'" + var8 + "'" + var4.toString() + ")"; - var6.put("execute_sql_string", var16); + var6.put(EXECUTE_SQL_STRING, var16); log.info("--表单设计器表单保存sql-->" + var16); return var6; } @@ -1760,8 +1679,8 @@ public class CgformUtil { } public static Map d(String var0, List var1, JSONObject var2) { - StringBuffer var3 = new StringBuffer(); - HashMap var4 = new HashMap(); + StringBuilder var3 = new StringBuilder(); + HashMap var4 = new HashMap<>(); String var5 = ""; try { @@ -1774,18 +1693,18 @@ public class CgformUtil { LoginUser var6 = (LoginUser)SecurityUtils.getSubject().getPrincipal(); if (var6 == null) { - throw new JeroBootException("online保存表单数据异常:系统未找到当前登陆用户信息"); + throw new JeroBootException(ONLINE_NOT_LOGIN_INFO); } else { - Iterator var7 = var1.iterator(); + Iterator var7 = var1.iterator(); while(true) { while(var7.hasNext()) { - OnlCgformField var8 = (OnlCgformField)var7.next(); + OnlCgformField var8 = var7.next(); String var9 = var8.getDbFieldName(); if (null == var9) { log.info("--------online修改表单数据遇见空名称的字段------->>" + var8.getId()); - } else if (!"id".equals(var9) && (var2.get(var9) != null || "UPDATE_BY".equalsIgnoreCase(var9) || "UPDATE_TIME".equalsIgnoreCase(var9) || "SYS_ORG_CODE".equalsIgnoreCase(var9))) { - a(var8, var6, var2, "UPDATE_BY", "UPDATE_TIME", "SYS_ORG_CODE"); + } else if (!"id".equals(var9) && (var2.get(var9) != null || UPDATE_BY.equalsIgnoreCase(var9) || UPDATE_TIME.equalsIgnoreCase(var9) || SYS_ORG_CODE.equalsIgnoreCase(var9))) { + a(var8, var6, var2, UPDATE_BY, UPDATE_TIME, SYS_ORG_CODE); String var10; if ("".equals(var2.get(var9))) { var10 = var8.getDbType(); @@ -1795,7 +1714,7 @@ public class CgformUtil { } var10 = OnlineDbHandler.a(var5, var8, var2, var4); - var3.append(var9 + "=" + var10 + ","); + var3.append(var9).append("=").append(var10).append(","); } } @@ -1804,19 +1723,19 @@ public class CgformUtil { var13 = var13.substring(0, var13.length() - 1); } - String var14 = "update " + f(var0) + " set " + var13 + " where " + "id" + "=" + "'" + var2.getString("id") + "'"; + String var14 = UPDATE + f(var0) + SET + var13 + WHERE + "id" + "=" + "'" + var2.getString("id") + "'"; log.info("--表单设计器表单编辑sql-->" + var14); - var4.put("execute_sql_string", var14); + var4.put(EXECUTE_SQL_STRING, var14); return var4; } } } public static Map a(String var0, String var1, String var2) { - HashMap var3 = new HashMap(); - String var4 = "update " + f(var0) + " set " + var1 + "=" + "'" + 0 + "'" + " where " + "id" + "=" + "'" + var2 + "'"; + HashMap var3 = new HashMap<>(); + String var4 = UPDATE + f(var0) + SET + var1 + "=" + "'" + 0 + "'" + WHERE + "id" + "=" + "'" + var2 + "'"; log.info("--修改树节点状态：为无子节点sql-->" + var4); - var3.put("execute_sql_string", var4); + var3.put(EXECUTE_SQL_STRING, var4); return var3; } @@ -1830,12 +1749,12 @@ public class CgformUtil { public static void a(LinkDownProperty var0, List var1, List var2) { String var3 = var0.getDictTable(); - JSONObject var4 = JSONObject.parseObject(var3); + JSONObject var4 = JSON.parseObject(var3); String var5 = var4.getString("linkField"); - ArrayList var6 = new ArrayList(); + ArrayList var6 = new ArrayList<>(); if (oConvertUtils.isNotEmpty(var5)) { String[] var7 = var5.split(","); - Iterator var8 = var1.iterator(); + Iterator var8 = var1.iterator(); label26: while(true) { @@ -1844,7 +1763,7 @@ public class CgformUtil { break label26; } - OnlCgformField var9 = (OnlCgformField)var8.next(); + OnlCgformField var9 = var8.next(); String var10 = var9.getDbFieldName(); String[] var11 = var7; int var12 = var7.length; @@ -1869,12 +1788,10 @@ public class CgformUtil { } public static List e(List var0) { - ArrayList var1 = new ArrayList(); - Iterator var2 = var0.iterator(); + ArrayList var1 = new ArrayList<>(); - while(var2.hasNext()) { - OnlCgformField var3 = (OnlCgformField)var2.next(); - if ("image".equals(var3.getFieldShowType())) { + for (OnlCgformField var3 : var0) { + if (IMAGE.equals(var3.getFieldShowType())) { var1.add(var3.getDbFieldTxt()); } } @@ -1883,12 +1800,10 @@ public class CgformUtil { } public static List b(List var0, String var1) { - ArrayList var2 = new ArrayList(); - Iterator var3 = var0.iterator(); + ArrayList var2 = new ArrayList<>(); - while(var3.hasNext()) { - OnlCgformField var4 = (OnlCgformField)var3.next(); - if ("image".equals(var4.getFieldShowType())) { + for (OnlCgformField var4 : var0) { + if (IMAGE.equals(var4.getFieldShowType())) { var2.add(var1 + "_" + var4.getDbFieldTxt()); } } @@ -1913,13 +1828,13 @@ public class CgformUtil { } public static List a(OnlCgformField var0) { - ArrayList var1 = new ArrayList(); + ArrayList var1 = new ArrayList<>(); String var2 = var0.getFieldExtendJson(); String var3 = "是"; String var4 = "否"; - JSONArray var5 = JSONArray.parseArray("[\"Y\",\"N\"]"); + JSONArray var5 = JSON.parseArray("[\"Y\",\"N\"]"); if (oConvertUtils.isNotEmpty(var2)) { - var5 = JSONArray.parseArray(var2); + var5 = JSON.parseArray(var2); } DictModel var6 = new DictModel(var5.getString(0), var3); @@ -1930,21 +1845,21 @@ public class CgformUtil { } private static String c(OnlCgformField var0) { - if ("checkbox".equals(var0.getFieldShowType())) { - return "checkbox"; + if (CHECKBOX.equals(var0.getFieldShowType())) { + return CHECKBOX; } else if ("list".equals(var0.getFieldShowType())) { return "select"; - } else if ("switch".equals(var0.getFieldShowType())) { - return "switch"; - } else if ("sel_user".equals(var0.getFieldShowType())) { - return "sel_user"; - } else if ("sel_depart".equals(var0.getFieldShowType())) { - return "sel_depart"; - } else if (!"image".equals(var0.getFieldShowType()) && !"file".equals(var0.getFieldShowType()) && !"radio".equals(var0.getFieldShowType()) && !"popup".equals(var0.getFieldShowType()) && !"list_multi".equals(var0.getFieldShowType()) && !"sel_search".equals(var0.getFieldShowType())) { - if ("datetime".equals(var0.getFieldShowType())) { - return "datetime"; - } else if ("date".equals(var0.getFieldShowType())) { - return "date"; + } else if (SWITCH.equals(var0.getFieldShowType())) { + return SWITCH; + } else if (SEL_USER.equals(var0.getFieldShowType())) { + return SEL_USER; + } else if (SEL_DEPART.equals(var0.getFieldShowType())) { + return SEL_DEPART; + } else if (!IMAGE.equals(var0.getFieldShowType()) && !"file".equals(var0.getFieldShowType()) && !RADIO.equals(var0.getFieldShowType()) && !POPUP.equals(var0.getFieldShowType()) && !LIST_MULTI.equals(var0.getFieldShowType()) && !SEL_SEARCH.equals(var0.getFieldShowType())) { + if (DATETIME.equals(var0.getFieldShowType())) { + return DATETIME; + } else if (DATE.equals(var0.getFieldShowType())) { + return DATE; } else if ("int".equals(var0.getDbType())) { return "inputNumber"; } else { @@ -1956,25 +1871,22 @@ public class CgformUtil { } private static String getDatabseType() { - if (oConvertUtils.isNotEmpty(ay)) { - return ay; + if (oConvertUtils.isNotEmpty(databaseType)) { + return databaseType; } else { try { - ay = DbTableUtil.getDatabaseType(); - return ay; + databaseType = DbTableUtil.getDatabaseType(); + return databaseType; } catch (Exception var1) { var1.printStackTrace(); - return ay; + return databaseType; } } } public static List f(List var0) { - ArrayList var1 = new ArrayList(); - Iterator var2 = var0.iterator(); - - while(var2.hasNext()) { - String var3 = (String)var2.next(); + ArrayList var1 = new ArrayList<>(); + for (String var3 : var0) { var1.add(var3.toLowerCase()); } @@ -1982,27 +1894,27 @@ public class CgformUtil { } private static String b(String var0, String var1) { - String var2 = ""; + StringBuilder var2 = new StringBuilder(); if (var1 != null && !"".equals(var1)) { String[] var3 = var1.split(","); for(int var4 = 0; var4 < var3.length; ++var4) { if (var4 > 0) { - var2 = var2 + " AND "; + var2.append(AND); } - var2 = var2 + var0 + " like "; + var2.append(var0).append(LIKE); if ("SQLSERVER".equals(getDatabseType())) { - var2 = var2 + "N"; + var2.append("N"); } - var2 = var2 + "'%" + var3[var4] + "%" + "'"; + var2.append("'%").append(var3[var4]).append("%").append("'"); } log.info(" POPUP fieldSql: " + var2); - return var2; + return var2.toString(); } else { - return var2; + return var2.toString(); } } } diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/util/EnhanceJsUtil.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/util/EnhanceJsUtil.java index a660a307..6672bfe5 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/util/EnhanceJsUtil.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/util/EnhanceJsUtil.java @@ -14,18 +14,19 @@ import lombok.extern.slf4j.Slf4j; @Slf4j public class EnhanceJsUtil { - private static final String b = "beforeSubmit,beforeAdd,beforeEdit,afterAdd,afterEdit,beforeDelete,afterDelete,mounted,created,show,loaded"; - private static final String c = "\\}\\s*\r*\n*\\s*"; - private static final String d = ","; - public EnhanceJsUtil() { + private static final String S_R_N_S = "\\}\\s*\r*\n*\\s*"; + private static final String S_S = "\\s*\\(\\)\\s*\\{)"; + private static final String LAST_JS = "最终的增强JS"; + + private EnhanceJsUtil() { } public static void main(String[] args) { String var1 = "aa(row){console.log(112);}\nbb(row){console.log(row);}"; String var2 = "bb"; - System.out.println(a(var1, var2)); - ArrayList var3 = new ArrayList(); + log.info(a(var1, var2)); + ArrayList var3 = new ArrayList<>(); OnlCgformButton var4 = new OnlCgformButton(); var4.setButtonCode("bb"); var4.setButtonStyle("link"); @@ -34,27 +35,27 @@ public class EnhanceJsUtil { var5.setButtonCode("aa"); var5.setButtonStyle("link"); var3.add(var5); - System.out.println(b(var1, (List)var3)); + log.info(b(var1, var3)); } public static String a(String var0, String var1) { String var2 = "(" + var1 + "\\s*\\(row\\)\\s*\\{)"; String var3 = var1 + ":function(that,row){const getAction=this._getAction,postAction=this._postAction,deleteAction=this._deleteAction;"; - String var4 = b(var0, "\\}\\s*\r*\n*\\s*" + var2, "}," + var3); + String var4 = b(var0, S_R_N_S + var2, "}," + var3); if (var4 == null) { var0 = c(var0, var2, var3); } else { var0 = var4; } - var0 = a((String)var0, var1, (String)null); + var0 = a(var0, var1, null); return var0; } public static String a(String var0, String var1, String var2) { - String var3 = "(" + oConvertUtils.getString(var2) + var1 + "\\s*\\(\\)\\s*\\{)"; + String var3 = "(" + oConvertUtils.getString(var2) + var1 + S_S; String var4 = var1 + ":function(that){const getAction=this._getAction,postAction=this._postAction,deleteAction=this._deleteAction;"; - String var5 = b(var0, "\\}\\s*\r*\n*\\s*" + var3, "}," + var4); + String var5 = b(var0, S_R_N_S + var3, "}," + var4); if (var5 == null) { var0 = c(var0, var3, var4); } else { @@ -81,14 +82,14 @@ public class EnhanceJsUtil { } public static String a(String var0, List var1) { - log.info("最终的增强JS", var0); + log.info(LAST_JS, var0); return "class OnlineEnhanceJs{constructor(getAction,postAction,deleteAction){this._getAction=getAction;this._postAction=postAction;this._deleteAction=deleteAction;}" + var0 + "}"; } public static String b(String var0, String var1) { - String var2 = "(\\s+" + var1 + "\\s*\\(\\)\\s*\\{)"; + String var2 = "(\\s+" + var1 + S_S; String var3 = var1 + ":function(that,event){"; - String var4 = b(var0, "\\}\\s*\r*\n*\\s*" + var2, "}," + var3); + String var4 = b(var0, S_R_N_S + var2, "}," + var3); if (var4 == null) { var0 = c(var0, var2, var3); } else { @@ -100,20 +101,20 @@ public class EnhanceJsUtil { public static String a(String var0) { String var1 = "function OnlineEnhanceJs(getAction,postAction,deleteAction){return {_getAction:getAction,_postAction:postAction,_deleteAction:deleteAction," + var0 + "}}"; - log.info("最终的增强JS", var1); + log.info(LAST_JS, var1); return var1; } public static String b(String var0, List var1) { var0 = c(var0, var1); String var2 = "function OnlineEnhanceJs(getAction,postAction,deleteAction){return {_getAction:getAction,_postAction:postAction,_deleteAction:deleteAction," + var0 + "}}"; - log.info("最终的增强JS", var2); + log.info(LAST_JS, var2); return var2; } public static String c(String var0, List var1) { if (var1 != null) { - Iterator var2 = var1.iterator(); + Iterator var2 = var1.iterator(); label37: while(true) { @@ -122,12 +123,12 @@ public class EnhanceJsUtil { break label37; } - OnlCgformButton var3 = (OnlCgformButton)var2.next(); + OnlCgformButton var3 = var2.next(); String var4 = var3.getButtonCode(); if ("link".equals(var3.getButtonStyle())) { var0 = a(var0, var4); } else if ("button".equals(var3.getButtonStyle()) || "form".equals(var3.getButtonStyle())) { - var0 = a((String)var0, var4, (String)null); + var0 = a(var0, var4, null); } } } @@ -139,7 +140,7 @@ public class EnhanceJsUtil { for(int var8 = 0; var8 < var7; ++var8) { String var5 = var6[var8]; if ("beforeAdd,afterAdd,mounted,created,show,loaded".indexOf(var5) >= 0) { - var0 = a((String)var0, var5, (String)null); + var0 = a(var0, var5, null); } else { var0 = a(var0, var5); } @@ -159,8 +160,8 @@ public class EnhanceJsUtil { var3 = a(var3, "onlChange", "\\s{1}"); OnlCgformField var7; - for(Iterator var6 = var2.iterator(); var6.hasNext(); var3 = b(var3, var7.getDbFieldName())) { - var7 = (OnlCgformField)var6.next(); + for(Iterator var6 = var2.iterator(); var6.hasNext(); var3 = b(var3, var7.getDbFieldName())) { + var7 = var6.next(); } } @@ -174,15 +175,15 @@ public class EnhanceJsUtil { log.info(" sub enhanceJs begin==> " + var0); String var3 = var0.getCgJs(); String var4 = var1 + "_" + "onlChange"; - Pattern var5 = Pattern.compile("(" + var4 + "\\s*\\(\\)\\s*\\{)"); + Pattern var5 = Pattern.compile("(" + var4 + S_S); Matcher var6 = var5.matcher(var3); if (var6.find()) { log.info("---JS 增强转换-sub-- enhanceJsFunctionName----" + var4); - var3 = a((String)var3, var4, (String)null); + var3 = a(var3, var4, null); OnlCgformField var8; - for(Iterator var7 = var2.iterator(); var7.hasNext(); var3 = b(var3, var8.getDbFieldName())) { - var8 = (OnlCgformField)var7.next(); + for(Iterator var7 = var2.iterator(); var7.hasNext(); var3 = b(var3, var8.getDbFieldName())) { + var8 = var7.next(); } } diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/util/GenerateCodeFileToZip.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/util/GenerateCodeFileToZip.java index cd847a17..1ed53f11 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/util/GenerateCodeFileToZip.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/util/GenerateCodeFileToZip.java @@ -2,52 +2,43 @@ package com.jero.generater.modules.online.cgform.util; import cn.hutool.core.io.FileUtil; +import com.jero.common.exception.JeroBootException; +import lombok.extern.slf4j.Slf4j; + import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; -import java.io.IOException; import java.net.URLDecoder; import java.util.Iterator; import java.util.List; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; +@Slf4j public class GenerateCodeFileToZip { - public GenerateCodeFileToZip() { + private GenerateCodeFileToZip() { } - public static File a(List var0, String var1) throws RuntimeException { + public static File a(List var0, String var1) throws JeroBootException { File var2 = FileUtil.touch(var1); if (var2 == null) { return null; } else if (!var2.getName().endsWith(".zip")) { return null; } else { - ZipOutputStream var3 = null; - - try { - FileOutputStream var4 = new FileOutputStream(var2); - var3 = new ZipOutputStream(var4); - Iterator var5 = var0.iterator(); + try (FileOutputStream var4 = new FileOutputStream(var2); + ZipOutputStream var3 = new ZipOutputStream(var4)){ + Iterator var5 = var0.iterator(); while(true) { File var7; do { do { if (!var5.hasNext()) { - if (var3 != null) { - try { - var3.close(); - } catch (IOException var12) { - System.out.println("ZipUtil toZip close exception" + var12); - } - } - - var4.close(); return var2; } - String var6 = (String)var5.next(); + String var6 = var5.next(); var6 = URLDecoder.decode(var6, "UTF-8").replace("生成成功：", ""); var7 = new File(var6); } while(var7 == null); @@ -73,7 +64,7 @@ public class GenerateCodeFileToZip { var3.closeEntry(); } } catch (Exception var13) { - throw new RuntimeException("zipFile error from ZipUtils", var13); + throw new JeroBootException("zipFile error from ZipUtils", var13); } } } diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/util/OnlineDbHandler.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/util/OnlineDbHandler.java index 21f61b85..735734fa 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/util/OnlineDbHandler.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/util/OnlineDbHandler.java @@ -7,24 +7,24 @@ import java.util.Map; import com.jero.generater.modules.online.cgform.entity.OnlCgformField; public class OnlineDbHandler { - public static final String a = "int"; - public static final String b = "Integer"; - public static final String c = "double"; - public static final String d = "BigDecimal"; - public static final String e = "Blob"; - public static final String f = "Date"; - public static final String g = "datetime"; - public static final String h = "Timestamp"; + public static final String INT = "int"; + public static final String INTEGER = "Integer"; + public static final String DOUBLE = "double"; + public static final String BIG_DECIMAL = "BigDecimal"; + public static final String BLOB = "Blob"; + public static final String DATE = "Date"; + public static final String DATETIME = "datetime"; + public static final String TIMESTAMP = "Timestamp"; - public OnlineDbHandler() { + private OnlineDbHandler() { } public static boolean a(String var0) { - return "int".equals(var0) || "double".equals(var0) || "BigDecimal".equals(var0) || "Integer".equals(var0); + return INT.equals(var0) || DOUBLE.equals(var0) || BIG_DECIMAL.equals(var0) || INTEGER.equals(var0); } public static boolean b(String var0) { - return "Date".equalsIgnoreCase(var0) || "datetime".equalsIgnoreCase(var0) || "Timestamp".equalsIgnoreCase(var0); + return DATE.equalsIgnoreCase(var0) || DATETIME.equalsIgnoreCase(var0) || TIMESTAMP.equalsIgnoreCase(var0); } public static String a(String var0, OnlCgformField var1, JSONObject var2, Map var3) { @@ -33,19 +33,19 @@ public class OnlineDbHandler { String var6 = var1.getFieldShowType(); if (var2.get(var5) == null) { return "null"; - } else if ("int".equals(var4)) { + } else if (INT.equals(var4)) { var3.put(var5, var2.getIntValue(var5)); return "#{" + var5 + ",jdbcType=INTEGER}"; - } else if ("double".equals(var4)) { + } else if (DOUBLE.equals(var4)) { var3.put(var5, var2.getDoubleValue(var5)); return "#{" + var5 + ",jdbcType=DOUBLE}"; - } else if ("BigDecimal".equals(var4)) { + } else if (BIG_DECIMAL.equals(var4)) { var3.put(var5, new BigDecimal(var2.getString(var5))); return "#{" + var5 + ",jdbcType=DECIMAL}"; - } else if ("Blob".equals(var4)) { + } else if (BLOB.equals(var4)) { var3.put(var5, var2.getString(var5) != null ? var2.getString(var5).getBytes() : null); return "#{" + var5 + ",jdbcType=BLOB}"; - } else if ("Date".equals(var4)) { + } else if (DATE.equals(var4)) { String var7 = var2.getString(var5); if ("ORACLE".equals(var0)) { if ("date".equals(var6)) {