From e61dc85909c32aeb40536d6050a5c98623e60e8b Mon Sep 17 00:00:00 2001 From: zer0Black Date: Fri, 12 Mar 2021 16:03:06 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=B7=BB=E5=8A=A0=E3=80=91=E5=AE=9E?= =?UTF-8?q?=E7=8E=B0=E7=B1=BB=E4=BF=AE=E5=A4=8D=E5=AE=8C=E6=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...b.java => OnlCgformButtonServiceImpl.java} | 11 ++- ....java => OnlCgformEnhanceServiceImpl.java} | 49 +++++----- ...{d.java => OnlCgformFieldServiceImpl.java} | 77 +++++++-------- .../{e.java => OnlCgformHeadServiceImpl.java} | 95 ++++++++++--------- ...{f.java => OnlCgformIndexServiceImpl.java} | 10 +- .../{g.java => OnlCgformSqlServiceImpl.java} | 4 +- .../{h.java => OnlineBaseAPIServiceImpl.java} | 9 +- .../impl/{i.java => OnlineServiceImpl.java} | 11 ++- 8 files changed, 138 insertions(+), 128 deletions(-) rename jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/service/impl/{b.java => OnlCgformButtonServiceImpl.java} (59%) rename jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/service/impl/{c.java => OnlCgformEnhanceServiceImpl.java} (58%) rename jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/service/impl/{d.java => OnlCgformFieldServiceImpl.java} (91%) rename jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/service/impl/{e.java => OnlCgformHeadServiceImpl.java} (94%) rename jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/service/impl/{f.java => OnlCgformIndexServiceImpl.java} (90%) rename jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/service/impl/{g.java => OnlCgformSqlServiceImpl.java} (96%) rename jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/service/impl/{h.java => OnlineBaseAPIServiceImpl.java} (88%) rename jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/service/impl/{i.java => OnlineServiceImpl.java} (97%) diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/service/impl/b.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/service/impl/OnlCgformButtonServiceImpl.java similarity index 59% rename from jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/service/impl/b.java rename to jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/service/impl/OnlCgformButtonServiceImpl.java index e7bb9548..7f2c9f70 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/service/impl/b.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/service/impl/OnlCgformButtonServiceImpl.java @@ -9,13 +9,16 @@ import org.jeecg.modules.online.cgform.service.IOnlCgformButtonService; import org.springframework.stereotype.Service; @Service("onlCgformButtonServiceImpl") -public class b extends ServiceImpl implements IOnlCgformButtonService { - public b() { +public class OnlCgformButtonServiceImpl extends ServiceImpl implements IOnlCgformButtonService { + public OnlCgformButtonServiceImpl() { } public void saveButton(OnlCgformButton onlCgformButton) { - LambdaQueryWrapper var2 = (LambdaQueryWrapper)((LambdaQueryWrapper)(new LambdaQueryWrapper()).eq(OnlCgformButton::getButtonCode, onlCgformButton.getButtonCode())).eq(OnlCgformButton::getCgformHeadId, onlCgformButton.getCgformHeadId()); - Integer var3 = ((OnlCgformButtonMapper)this.baseMapper).selectCount(var2); + LambdaQueryWrapper buttonQueryWrapper = new LambdaQueryWrapper(); + buttonQueryWrapper.eq(OnlCgformButton::getButtonCode, onlCgformButton.getButtonCode()) + .eq(OnlCgformButton::getCgformHeadId, onlCgformButton.getCgformHeadId()); + + Integer var3 = ((OnlCgformButtonMapper)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/org/jeecg/modules/online/cgform/service/impl/c.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/service/impl/OnlCgformEnhanceServiceImpl.java similarity index 58% rename from jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/service/impl/c.java rename to jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/service/impl/OnlCgformEnhanceServiceImpl.java index 7f40ee54..ef339188 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/service/impl/c.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/service/impl/OnlCgformEnhanceServiceImpl.java @@ -13,19 +13,19 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @Service("onlCgformEnhanceService") -public class c implements IOnlCgformEnhanceService { +public class OnlCgformEnhanceServiceImpl implements IOnlCgformEnhanceService { @Autowired private OnlCgformEnhanceJavaMapper onlCgformEnhanceJavaMapper; @Autowired private OnlCgformEnhanceSqlMapper onlCgformEnhanceSqlMapper; - public c() { + public OnlCgformEnhanceServiceImpl() { } public List queryEnhanceJavaList(String cgformId) { - LambdaQueryWrapper var2 = (LambdaQueryWrapper)(new LambdaQueryWrapper()).eq(OnlCgformEnhanceJava::getCgformHeadId, cgformId); - List var3 = this.onlCgformEnhanceJavaMapper.selectList(var2); - return var3; + LambdaQueryWrapper javaQueryWrapper = (new LambdaQueryWrapper()).eq(OnlCgformEnhanceJava::getCgformHeadId, cgformId); + List list = this.onlCgformEnhanceJavaMapper.selectList(javaQueryWrapper); + return list; } public void saveEnhanceJava(OnlCgformEnhanceJava onlCgformEnhanceJava) { @@ -45,46 +45,45 @@ public class c implements IOnlCgformEnhanceService { } public boolean checkOnlyEnhance(OnlCgformEnhanceJava onlCgformEnhanceJava) { - LambdaQueryWrapper var2 = new LambdaQueryWrapper(); - var2.eq(OnlCgformEnhanceJava::getButtonCode, onlCgformEnhanceJava.getButtonCode()); - var2.eq(OnlCgformEnhanceJava::getCgformHeadId, onlCgformEnhanceJava.getCgformHeadId()); - var2.eq(OnlCgformEnhanceJava::getEvent, onlCgformEnhanceJava.getEvent()); - Integer var3 = this.onlCgformEnhanceJavaMapper.selectCount(var2); - if (var3 != null) { - if (var3 == 1 && oConvertUtils.isEmpty(onlCgformEnhanceJava.getId())) { + LambdaQueryWrapper enhanceQueryWrapper = new LambdaQueryWrapper(); + enhanceQueryWrapper.eq(OnlCgformEnhanceJava::getButtonCode, onlCgformEnhanceJava.getButtonCode()); + enhanceQueryWrapper.eq(OnlCgformEnhanceJava::getCgformHeadId, onlCgformEnhanceJava.getCgformHeadId()); + enhanceQueryWrapper.eq(OnlCgformEnhanceJava::getEvent, onlCgformEnhanceJava.getEvent()); + + Integer count = this.onlCgformEnhanceJavaMapper.selectCount(enhanceQueryWrapper); + if (count != null) { + if (count == 1 && oConvertUtils.isEmpty(onlCgformEnhanceJava.getId())) { return false; } - if (var3 == 2) { + if (count == 2) { return false; } } - return true; } public boolean checkOnlyEnhance(OnlCgformEnhanceSql onlCgformEnhanceSql) { - LambdaQueryWrapper var2 = new LambdaQueryWrapper(); - var2.eq(OnlCgformEnhanceSql::getButtonCode, onlCgformEnhanceSql.getButtonCode()); - var2.eq(OnlCgformEnhanceSql::getCgformHeadId, onlCgformEnhanceSql.getCgformHeadId()); - Integer var3 = this.onlCgformEnhanceSqlMapper.selectCount(var2); - if (var3 != null) { - if (var3 == 1 && oConvertUtils.isEmpty(onlCgformEnhanceSql.getId())) { + LambdaQueryWrapper sqlQueryWrapper = new LambdaQueryWrapper(); + sqlQueryWrapper.eq(OnlCgformEnhanceSql::getButtonCode, onlCgformEnhanceSql.getButtonCode()); + sqlQueryWrapper.eq(OnlCgformEnhanceSql::getCgformHeadId, onlCgformEnhanceSql.getCgformHeadId()); + Integer count = this.onlCgformEnhanceSqlMapper.selectCount(sqlQueryWrapper); + if (count != null) { + if (count == 1 && oConvertUtils.isEmpty(onlCgformEnhanceSql.getId())) { return false; } - if (var3 > 1) { + if (count > 1) { return false; } } - return true; } public List queryEnhanceSqlList(String cgformId) { - LambdaQueryWrapper var2 = (LambdaQueryWrapper)(new LambdaQueryWrapper()).eq(OnlCgformEnhanceSql::getCgformHeadId, cgformId); - List var3 = this.onlCgformEnhanceSqlMapper.selectList(var2); - return var3; + LambdaQueryWrapper sqlQueryWrapper = (new LambdaQueryWrapper()).eq(OnlCgformEnhanceSql::getCgformHeadId, cgformId); + List sqlList = this.onlCgformEnhanceSqlMapper.selectList(sqlQueryWrapper); + return sqlList; } public void saveEnhanceSql(OnlCgformEnhanceSql onlCgformEnhanceSql) { diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/service/impl/d.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/service/impl/OnlCgformFieldServiceImpl.java similarity index 91% rename from jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/service/impl/d.java rename to jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/service/impl/OnlCgformFieldServiceImpl.java index e6b4a669..1a2a7180 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/service/impl/d.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/service/impl/OnlCgformFieldServiceImpl.java @@ -13,13 +13,14 @@ import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; + +import com.jero.common.system.util.JeroDataAutorUtils; +import com.jero.generater.modules.online.auth.mapper.OnlAuthDataMapper; +import com.jero.generater.modules.online.auth.service.IOnlAuthPageService; import org.apache.shiro.SecurityUtils; import com.jero.common.system.api.ISysBaseAPI; -import com.jero.common.system.util.JeecgDataAutorUtils; import com.jero.common.system.vo.LoginUser; import com.jero.common.util.oConvertUtils; -import org.jeecg.modules.online.auth.mapper.OnlAuthDataMapper; -import org.jeecg.modules.online.auth.service.IOnlAuthPageService; import org.jeecg.modules.online.cgform.a.LinkDown; import org.jeecg.modules.online.cgform.entity.OnlCgformField; import org.jeecg.modules.online.cgform.entity.OnlCgformHead; @@ -34,8 +35,8 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @Service("onlCgformFieldServiceImpl") -public class d extends ServiceImpl implements IOnlCgformFieldService { - private static final Logger a = LoggerFactory.getLogger(d.class); +public class OnlCgformFieldServiceImpl extends ServiceImpl implements IOnlCgformFieldService { + private static final Logger a = LoggerFactory.getLogger(OnlCgformFieldServiceImpl.class); @Autowired private OnlCgformFieldMapper onlCgformFieldMapper; @Autowired @@ -48,12 +49,12 @@ public class d extends ServiceImpl impleme private ISysBaseAPI sysBaseAPI; private static final String b = "0"; - public d() { + public OnlCgformFieldServiceImpl() { } public Map 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); @@ -64,7 +65,7 @@ public class d extends ServiceImpl impleme String var11 = var10.getId(); List var12 = this.onlAuthDataMapper.queryOwnerAuth(var11, headId); if (var12 != null && var12.size() > 0) { - JeecgDataAutorUtils.installUserInfo(this.sysBaseAPI.getCacheUser(var10.getUsername())); + JeroDataAutorUtils.installUserInfo(this.sysBaseAPI.getCacheUser(var10.getUsername())); } String var13 = org.jeecg.modules.online.cgform.util.b.a(var7, params, needList, var12); @@ -110,7 +111,7 @@ public class d extends ServiceImpl impleme public Map queryAutoTreeNoPage(String tbname, String headId, Map params, List needList, String pidField) { HashMap var6 = new HashMap(); - LambdaQueryWrapper var7 = new LambdaQueryWrapper(); + LambdaQueryWrapper var7 = new LambdaQueryWrapper(); var7.eq(OnlCgformField::getCgformHeadId, headId); var7.orderByAsc(OnlCgformField::getOrderNum); List var8 = this.list(var7); @@ -121,7 +122,7 @@ public class d extends ServiceImpl impleme String var12 = var11.getId(); List var13 = this.onlAuthDataMapper.queryOwnerAuth(var12, headId); if (var13 != null && var13.size() > 0) { - JeecgDataAutorUtils.installUserInfo(this.sysBaseAPI.getCacheUser(var11.getUsername())); + JeroDataAutorUtils.installUserInfo(this.sysBaseAPI.getCacheUser(var11.getUsername())); } String var14 = org.jeecg.modules.online.cgform.util.b.a(var8, params, needList, var13); @@ -191,7 +192,7 @@ public class d extends ServiceImpl impleme private Map a(String var1, String var2, String var3, List var4, String var5) { 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); @@ -202,7 +203,7 @@ public class d extends ServiceImpl impleme String var12 = var11.getId(); List var13 = this.onlAuthDataMapper.queryOwnerAuth(var12, var3); if (var13 != null && var13.size() > 0) { - JeecgDataAutorUtils.installUserInfo(this.sysBaseAPI.getCacheUser(var11.getUsername())); + JeroDataAutorUtils.installUserInfo(this.sysBaseAPI.getCacheUser(var11.getUsername())); } String var14 = org.jeecg.modules.online.cgform.util.b.a(var8, var6, var4, var13); @@ -217,7 +218,7 @@ public class d extends ServiceImpl impleme } 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) { @@ -229,7 +230,7 @@ public class d extends ServiceImpl impleme } public void saveTreeFormData(String code, String tbname, JSONObject json, String hasChildField, String pidField) { - LambdaQueryWrapper var6 = new LambdaQueryWrapper(); + LambdaQueryWrapper var6 = new LambdaQueryWrapper(); var6.eq(OnlCgformField::getCgformHeadId, code); List var7 = this.list(var6); Iterator var8 = var7.iterator(); @@ -262,7 +263,7 @@ public class d extends ServiceImpl impleme } 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) { @@ -279,7 +280,7 @@ public class d extends ServiceImpl impleme Map var8 = ((OnlCgformFieldMapper)this.baseMapper).queryFormData(var7); Map var9 = org.jeecg.modules.online.cgform.util.b.b(var8); String var10 = var9.get(pidField).toString(); - LambdaQueryWrapper var11 = new LambdaQueryWrapper(); + LambdaQueryWrapper var11 = new LambdaQueryWrapper(); var11.eq(OnlCgformField::getCgformHeadId, code); List var12 = this.list(var11); Iterator var13 = var12.iterator(); @@ -311,7 +312,7 @@ public class d extends ServiceImpl impleme } public Map queryFormData(String code, String tbname, String id) { - LambdaQueryWrapper var4 = new LambdaQueryWrapper(); + LambdaQueryWrapper var4 = new LambdaQueryWrapper(); var4.eq(OnlCgformField::getCgformHeadId, code); var4.eq(OnlCgformField::getIsShowForm, 1); List var5 = this.list(var4); @@ -330,22 +331,24 @@ public class d extends ServiceImpl impleme String var6 = "linkField"; String var7 = "linkValueStr"; String var8 = "mainField"; - ArrayList var9 = new ArrayList(); + ArrayList> var9 = new ArrayList(); if (oConvertUtils.isNotEmpty(head.getSubTableStr())) { String[] var10 = head.getSubTableStr().split(","); int var11 = var10.length; for(int var12 = 0; var12 < var11; ++var12) { String var13 = var10[var12]; - OnlCgformHead var14 = (OnlCgformHead)this.cgformHeadMapper.selectOne((Wrapper)(new LambdaQueryWrapper()).eq(OnlCgformHead::getTableName, var13)); + OnlCgformHead var14 = (OnlCgformHead)this.cgformHeadMapper.selectOne((Wrapper)(new LambdaQueryWrapper()).eq(OnlCgformHead::getTableName, var13)); if (var14 != null) { - LambdaQueryWrapper var15 = (LambdaQueryWrapper)((LambdaQueryWrapper)(new LambdaQueryWrapper()).eq(OnlCgformField::getCgformHeadId, var14.getId())).eq(OnlCgformField::getMainTable, head.getTableName()); - List var16 = this.list(var15); - if (var16 != null && var16.size() != 0) { - OnlCgformField var17 = (OnlCgformField)var16.get(0); - HashMap var18 = new HashMap(); - var18.put(var6, var17.getDbFieldName()); - var18.put(var8, var17.getMainField()); + 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) { + OnlCgformField onlCgformField = (OnlCgformField)list.get(0); + HashMap var18 = new HashMap(); + var18.put(var6, onlCgformField.getDbFieldName()); + var18.put(var8, onlCgformField.getMainField()); var18.put(var5, var13); var18.put(var7, ""); var9.add(var18); @@ -353,9 +356,9 @@ public class d extends ServiceImpl impleme } } - LambdaQueryWrapper var24 = new LambdaQueryWrapper(); - var24.eq(OnlCgformField::getCgformHeadId, var3); - List var25 = this.list(var24); + LambdaQueryWrapper headIdQueryWrapper = new LambdaQueryWrapper(); + headIdQueryWrapper.eq(OnlCgformField::getCgformHeadId, var3); + List var25 = this.list(headIdQueryWrapper); String[] var26 = ids.split(","); String[] var27 = var26; int var29 = var26.length; @@ -431,7 +434,7 @@ public class d extends ServiceImpl impleme } public List> getAutoListQueryInfo(String code) { - LambdaQueryWrapper var2 = new LambdaQueryWrapper(); + LambdaQueryWrapper var2 = new LambdaQueryWrapper(); var2.eq(OnlCgformField::getCgformHeadId, code); var2.eq(OnlCgformField::getIsQuery, 1); var2.orderByAsc(OnlCgformField::getOrderNum); @@ -496,7 +499,7 @@ public class d extends ServiceImpl impleme } public List queryFormFields(String code, boolean isform) { - LambdaQueryWrapper var3 = new LambdaQueryWrapper(); + LambdaQueryWrapper var3 = new LambdaQueryWrapper(); var3.eq(OnlCgformField::getCgformHeadId, code); if (isform) { var3.eq(OnlCgformField::getIsShowForm, 1); @@ -506,9 +509,9 @@ public class d extends ServiceImpl impleme } public List queryFormFieldsByTableName(String tableName) { - OnlCgformHead var2 = (OnlCgformHead)this.cgformHeadMapper.selectOne((Wrapper)(new LambdaQueryWrapper()).eq(OnlCgformHead::getTableName, tableName)); + OnlCgformHead var2 = (OnlCgformHead)this.cgformHeadMapper.selectOne((Wrapper)(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 { @@ -517,9 +520,9 @@ public class d extends ServiceImpl impleme } public OnlCgformField queryFormFieldByTableNameAndField(String tableName, String fieldName) { - OnlCgformHead var3 = (OnlCgformHead)this.cgformHeadMapper.selectOne((Wrapper)(new LambdaQueryWrapper()).eq(OnlCgformHead::getTableName, tableName)); + OnlCgformHead var3 = (OnlCgformHead)this.cgformHeadMapper.selectOne((Wrapper)(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) { @@ -553,7 +556,7 @@ public class d extends ServiceImpl impleme } 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); diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/service/impl/e.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/service/impl/OnlCgformHeadServiceImpl.java similarity index 94% rename from jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/service/impl/e.java rename to jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/service/impl/OnlCgformHeadServiceImpl.java index 1045df99..7099e0d0 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/service/impl/e.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/service/impl/OnlCgformHeadServiceImpl.java @@ -7,6 +7,7 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.generater.modules.online.auth.service.IOnlAuthPageService; import freemarker.template.TemplateException; import java.io.IOException; import java.io.UnsupportedEncodingException; @@ -29,7 +30,6 @@ import com.jero.common.util.RestUtil; import com.jero.common.util.SpringContextUtils; import com.jero.common.util.UUIDGenerator; import com.jero.common.util.oConvertUtils; -import org.jeecg.modules.online.auth.service.IOnlAuthPageService; import org.jeecg.modules.online.cgform.enhance.CgformEnhanceJavaInter; import org.jeecg.modules.online.cgform.enhance.CgformEnhanceJavaListInter; import org.jeecg.modules.online.cgform.entity.OnlCgformButton; @@ -73,8 +73,8 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @Service("onlCgformHeadServiceImpl") -public class e extends ServiceImpl implements IOnlCgformHeadService { - private static final Logger a = LoggerFactory.getLogger(e.class); +public class OnlCgformHeadServiceImpl extends ServiceImpl implements IOnlCgformHeadService { + private static final Logger a = LoggerFactory.getLogger(OnlCgformHeadServiceImpl.class); @Autowired private IOnlCgformFieldService fieldService; @Autowired @@ -92,7 +92,7 @@ public class e extends ServiceImpl implement @Autowired private IOnlAuthPageService onlAuthPageService; - public e() { + public OnlCgformHeadServiceImpl() { } @Transactional( @@ -159,8 +159,8 @@ public class e extends ServiceImpl implement } var2.setTableVersion(var5 + 1); - List var6 = model.getFields(); - List var7 = model.getIndexs(); + List var6 = model.getFields(); + List var7 = model.getIndexs(); ArrayList var8 = new ArrayList(); ArrayList var9 = new ArrayList(); Iterator var10 = var6.iterator(); @@ -234,8 +234,9 @@ public class e extends ServiceImpl implement while(var25.hasNext()) { var15 = (OnlCgformIndex)var25.next(); + final OnlCgformIndex cgformIndexCopy = var15; boolean var26 = var7.stream().anyMatch((var1) -> { - return var15.getId().equals(var1.getId()); + return cgformIndexCopy.getId().equals(var1.getId()); }); if (!var26) { var15.setDelFlag(CommonConstant.DEL_FLAG_1); @@ -278,7 +279,7 @@ public class e extends ServiceImpl implement throw new DBException("实体配置不存在"); } else { String var4 = var3.getTableName(); - LambdaQueryWrapper var5 = new LambdaQueryWrapper(); + LambdaQueryWrapper var5 = new LambdaQueryWrapper(); var5.eq(OnlCgformField::getCgformHeadId, code); var5.orderByAsc(OnlCgformField::getOrderNum); List var6 = this.fieldService.list(var5); @@ -305,7 +306,7 @@ public class e extends ServiceImpl implement } } - List var21 = this.indexService.list((Wrapper)(new LambdaQueryWrapper()).eq(OnlCgformIndex::getCgformHeadId, code)); + List var21 = this.indexService.list((Wrapper)(new LambdaQueryWrapper()).eq(OnlCgformIndex::getCgformHeadId, code)); Iterator var22 = var21.iterator(); label58: @@ -387,7 +388,7 @@ public class e extends ServiceImpl implement private void a(OnlCgformHead var1) { if (var1.getTableType() == 3) { - LambdaQueryWrapper var2 = (LambdaQueryWrapper)(new LambdaQueryWrapper()).eq(OnlCgformField::getCgformHeadId, var1.getId()); + LambdaQueryWrapper var2 = (LambdaQueryWrapper)(new LambdaQueryWrapper()).eq(OnlCgformField::getCgformHeadId, var1.getId()); List var3 = this.fieldService.list(var2); String var4 = null; Iterator var5 = var3.iterator(); @@ -401,7 +402,7 @@ public class e extends ServiceImpl implement } if (oConvertUtils.isNotEmpty(var4)) { - OnlCgformHead var8 = (OnlCgformHead)((OnlCgformHeadMapper)this.baseMapper).selectOne((Wrapper)(new LambdaQueryWrapper()).eq(OnlCgformHead::getTableName, var4)); + OnlCgformHead var8 = (OnlCgformHead)((OnlCgformHeadMapper)this.baseMapper).selectOne((Wrapper)(new LambdaQueryWrapper()).eq(OnlCgformHead::getTableName, var4)); if (var8 != null) { String var9 = var8.getSubTableStr(); if (oConvertUtils.isNotEmpty(var9)) { @@ -425,7 +426,9 @@ public class e extends ServiceImpl implement } public OnlCgformEnhanceJs queryEnhance(String code, String type) { - return (OnlCgformEnhanceJs)this.onlCgformEnhanceJsMapper.selectOne((Wrapper)((LambdaQueryWrapper)(new LambdaQueryWrapper()).eq(OnlCgformEnhanceJs::getCgJsType, type)).eq(OnlCgformEnhanceJs::getCgformHeadId, code)); + LambdaQueryWrapper jsQueryWrapper = new LambdaQueryWrapper(); + jsQueryWrapper.eq(OnlCgformEnhanceJs::getCgJsType, type).eq(OnlCgformEnhanceJs::getCgformHeadId, code); + return (OnlCgformEnhanceJs)this.onlCgformEnhanceJsMapper.selectOne(jsQueryWrapper); } public void editEnhance(OnlCgformEnhanceJs onlCgformEnhanceJs) { @@ -433,11 +436,13 @@ public class e extends ServiceImpl implement } public OnlCgformEnhanceSql queryEnhanceSql(String formId, String buttonCode) { - return (OnlCgformEnhanceSql)this.onlCgformEnhanceSqlMapper.selectOne((Wrapper)((LambdaQueryWrapper)(new LambdaQueryWrapper()).eq(OnlCgformEnhanceSql::getCgformHeadId, formId)).eq(OnlCgformEnhanceSql::getButtonCode, buttonCode)); + LambdaQueryWrapper sqlQueryWrapper = new LambdaQueryWrapper(); + sqlQueryWrapper.eq(OnlCgformEnhanceSql::getCgformHeadId, formId).eq(OnlCgformEnhanceSql::getButtonCode, buttonCode); + return (OnlCgformEnhanceSql)this.onlCgformEnhanceSqlMapper.selectOne(sqlQueryWrapper); } 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()); @@ -446,7 +451,7 @@ public class e extends ServiceImpl implement } 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) { @@ -460,7 +465,7 @@ public class e extends ServiceImpl implement } public List 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); @@ -631,7 +636,7 @@ public class e extends ServiceImpl implement OnlCgformField var4 = (OnlCgformField)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 = (OnlCgformHead)((OnlCgformHeadMapper)this.baseMapper).selectOne((Wrapper)(new LambdaQueryWrapper()).eq(OnlCgformHead::getTableName, var5)); if (var6 != null) { String var7 = var6.getSubTableStr(); if (oConvertUtils.isEmpty(var7)) { @@ -641,7 +646,7 @@ public class e extends ServiceImpl implement 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)); + OnlCgformHead var11 = (OnlCgformHead)((OnlCgformHeadMapper)this.baseMapper).selectOne((Wrapper)(new LambdaQueryWrapper()).eq(OnlCgformHead::getTableName, var10)); if (var11 != null && var1.getTabOrderNum() < oConvertUtils.getInt(var11.getTabOrderNum(), 0)) { var8.add(var9, var1.getTableName()); break; @@ -662,7 +667,7 @@ public class e extends ServiceImpl implement } } } else { - List var12 = ((OnlCgformHeadMapper)this.baseMapper).selectList((Wrapper)(new LambdaQueryWrapper()).like(OnlCgformHead::getSubTableStr, var1.getTableName())); + List var12 = ((OnlCgformHeadMapper)this.baseMapper).selectList((Wrapper)(new LambdaQueryWrapper()).like(OnlCgformHead::getSubTableStr, var1.getTableName())); if (var12 != null && var12.size() > 0) { Iterator var13 = var12.iterator(); @@ -709,9 +714,9 @@ public class e extends ServiceImpl implement String var12 = var9[var11]; JSONArray var13 = json.getJSONArray(var12); if (var13 != null && var13.size() != 0) { - OnlCgformHead var14 = (OnlCgformHead)((OnlCgformHeadMapper)this.baseMapper).selectOne((Wrapper)(new LambdaQueryWrapper()).eq(OnlCgformHead::getTableName, var12)); + OnlCgformHead var14 = (OnlCgformHead)((OnlCgformHeadMapper)this.baseMapper).selectOne((Wrapper)(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((Wrapper)(new LambdaQueryWrapper()).eq(OnlCgformField::getCgformHeadId, var14.getId())); String var16 = ""; String var17 = null; Iterator var18 = var15.iterator(); @@ -781,7 +786,7 @@ public class e extends ServiceImpl implement public Map querySubFormData(String table, String mainId) throws DBException { new HashMap(); - OnlCgformHead var4 = (OnlCgformHead)this.getOne((Wrapper)(new LambdaQueryWrapper()).eq(OnlCgformHead::getTableName, table)); + OnlCgformHead var4 = (OnlCgformHead)this.getOne((Wrapper)(new LambdaQueryWrapper()).eq(OnlCgformHead::getTableName, table)); if (var4 == null) { throw new DBException("数据库子表[" + table + "]不存在"); } else { @@ -810,7 +815,7 @@ public class e extends ServiceImpl implement } public List> queryManySubFormData(String table, String mainId) throws DBException { - OnlCgformHead var3 = (OnlCgformHead)this.getOne((Wrapper)(new LambdaQueryWrapper()).eq(OnlCgformHead::getTableName, table)); + OnlCgformHead var3 = (OnlCgformHead)this.getOne((Wrapper)(new LambdaQueryWrapper()).eq(OnlCgformHead::getTableName, table)); if (var3 == null) { throw new DBException("数据库子表[" + table + "]不存在"); } else { @@ -870,7 +875,7 @@ public class e extends ServiceImpl implement for(int var10 = 0; var10 < var9; ++var10) { String var11 = var8[var10]; - OnlCgformHead var12 = (OnlCgformHead)((OnlCgformHeadMapper)this.baseMapper).selectOne((Wrapper)(new LambdaQueryWrapper()).eq(OnlCgformHead::getTableName, var11)); + OnlCgformHead var12 = (OnlCgformHead)((OnlCgformHeadMapper)this.baseMapper).selectOne((Wrapper)(new LambdaQueryWrapper()).eq(OnlCgformHead::getTableName, var11)); if (var12 != null) { List var13 = this.fieldService.queryFormFields(var12.getId(), false); String var14 = ""; @@ -931,9 +936,9 @@ public class e extends ServiceImpl implement for(int var10 = 0; var10 < var9; ++var10) { String var11 = var8[var10]; - OnlCgformHead var12 = (OnlCgformHead)((OnlCgformHeadMapper)this.baseMapper).selectOne((Wrapper)(new LambdaQueryWrapper()).eq(OnlCgformHead::getTableName, var11)); + OnlCgformHead var12 = (OnlCgformHead)((OnlCgformHeadMapper)this.baseMapper).selectOne((Wrapper)(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((Wrapper)(new LambdaQueryWrapper()).eq(OnlCgformField::getCgformHeadId, var12.getId())); String var14 = ""; String var15 = null; Iterator var16 = var13.iterator(); @@ -979,7 +984,7 @@ public class e extends ServiceImpl implement } public int executeEnhanceJava(String buttonCode, String eventType, OnlCgformHead head, JSONObject json) throws BusinessException { - LambdaQueryWrapper var5 = new LambdaQueryWrapper(); + LambdaQueryWrapper var5 = new LambdaQueryWrapper(); var5.eq(OnlCgformEnhanceJava::getActiveStatus, "1"); var5.eq(OnlCgformEnhanceJava::getButtonCode, buttonCode); var5.eq(OnlCgformEnhanceJava::getCgformHeadId, head.getId()); @@ -999,7 +1004,7 @@ public class e extends ServiceImpl implement } 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()); @@ -1040,7 +1045,7 @@ public class e extends ServiceImpl implement } public void executeEnhanceSql(String buttonCode, String formId, JSONObject json) { - LambdaQueryWrapper var4 = new LambdaQueryWrapper(); + LambdaQueryWrapper var4 = new LambdaQueryWrapper(); var4.eq(OnlCgformEnhanceSql::getButtonCode, buttonCode); var4.eq(OnlCgformEnhanceSql::getCgformHeadId, formId); OnlCgformEnhanceSql var5 = (OnlCgformEnhanceSql)this.onlCgformEnhanceSqlMapper.selectOne(var4); @@ -1075,7 +1080,7 @@ public class e extends ServiceImpl implement } public List queryValidButtonList(String headId) { - LambdaQueryWrapper var2 = new LambdaQueryWrapper(); + LambdaQueryWrapper var2 = new LambdaQueryWrapper(); var2.eq(OnlCgformButton::getCgformHeadId, headId); var2.eq(OnlCgformButton::getButtonStatus, "1"); var2.orderByAsc(OnlCgformButton::getOrderNum); @@ -1083,7 +1088,7 @@ public class e extends ServiceImpl implement } public OnlCgformEnhanceJs queryEnhanceJs(String formId, String cgJsType) { - LambdaQueryWrapper var3 = new LambdaQueryWrapper(); + LambdaQueryWrapper var3 = new LambdaQueryWrapper(); var3.eq(OnlCgformEnhanceJs::getCgformHeadId, formId); var3.eq(OnlCgformEnhanceJs::getCgJsType, cgJsType); return (OnlCgformEnhanceJs)this.onlCgformEnhanceJsMapper.selectOne(var3); @@ -1145,7 +1150,7 @@ public class e extends ServiceImpl implement for(int var8 = 0; var8 < var7; ++var8) { String var9 = var6[var8]; - OnlCgformHead var10 = (OnlCgformHead)((OnlCgformHeadMapper)this.baseMapper).selectOne((Wrapper)(new LambdaQueryWrapper()).eq(OnlCgformHead::getTableName, var9)); + OnlCgformHead var10 = (OnlCgformHead)((OnlCgformHeadMapper)this.baseMapper).selectOne((Wrapper)(new LambdaQueryWrapper()).eq(OnlCgformHead::getTableName, var9)); if (var10 != null) { List var11 = this.fieldService.queryAvailableFields(var10.getId(), var10.getTableName(), head.getTaskId(), false); new ArrayList(); @@ -1188,7 +1193,7 @@ public class e extends ServiceImpl implement ArrayList var3 = new ArrayList(); ArrayList var4 = new ArrayList(); this.a(model.getCode(), var3, var4); - OnlCgformHead var5 = (OnlCgformHead)((OnlCgformHeadMapper)this.baseMapper).selectOne((Wrapper)(new LambdaQueryWrapper()).eq(OnlCgformHead::getId, model.getCode())); + OnlCgformHead var5 = (OnlCgformHead)((OnlCgformHeadMapper)this.baseMapper).selectOne((Wrapper)(new LambdaQueryWrapper()).eq(OnlCgformHead::getId, model.getCode())); HashMap var6 = new HashMap(); var6.put("scroll", var5.getScroll() == null ? "0" : var5.getScroll().toString()); String var7 = var5.getFormTemplate(); @@ -1216,7 +1221,7 @@ public class e extends ServiceImpl implement 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 = (OnlCgformHead)((OnlCgformHeadMapper)this.baseMapper).selectOne((Wrapper)(new LambdaQueryWrapper()).eq(OnlCgformHead::getId, model.getCode())); String var4 = var3.getFormTemplate(); if (oConvertUtils.isEmpty(var4)) { var2.setFieldRowNum(1); @@ -1233,7 +1238,7 @@ public class e extends ServiceImpl implement while(var9.hasNext()) { OnlGenerateModel var10 = (OnlGenerateModel)var9.next(); - OnlCgformHead var11 = (OnlCgformHead)((OnlCgformHeadMapper)this.baseMapper).selectOne((Wrapper)(new LambdaQueryWrapper()).eq(OnlCgformHead::getTableName, var10.getTableName())); + OnlCgformHead var11 = (OnlCgformHead)((OnlCgformHeadMapper)this.baseMapper).selectOne((Wrapper)(new LambdaQueryWrapper()).eq(OnlCgformHead::getTableName, var10.getTableName())); if (var11 != null) { SubTableVo var12 = new SubTableVo(); var12.setEntityName(var10.getEntityName()); @@ -1261,7 +1266,7 @@ public class e extends ServiceImpl implement } private OnlCgformField a(String var1, List var2, List var3) { - LambdaQueryWrapper var4 = new LambdaQueryWrapper(); + LambdaQueryWrapper var4 = new LambdaQueryWrapper(); var4.eq(OnlCgformField::getCgformHeadId, var1); var4.orderByAsc(OnlCgformField::getOrderNum); List var5 = this.fieldService.list(var4); @@ -1352,7 +1357,7 @@ public class e extends ServiceImpl implement } public void addCrazyFormData(String tbname, JSONObject json) throws DBException, UnsupportedEncodingException { - OnlCgformHead var3 = (OnlCgformHead)this.getOne((Wrapper)(new LambdaQueryWrapper()).eq(OnlCgformHead::getTableName, tbname)); + OnlCgformHead var3 = (OnlCgformHead)this.getOne((Wrapper)(new LambdaQueryWrapper()).eq(OnlCgformHead::getTableName, tbname)); if (var3 == null) { throw new DBException("数据库主表[" + tbname + "]不存在"); } else { @@ -1369,9 +1374,9 @@ public class e extends ServiceImpl implement if (!oConvertUtils.isEmpty(var10)) { JSONArray var11 = JSONArray.parseArray(URLDecoder.decode(var10, "UTF-8")); if (var11 != null && var11.size() != 0) { - OnlCgformHead var12 = (OnlCgformHead)((OnlCgformHeadMapper)this.baseMapper).selectOne((Wrapper)(new LambdaQueryWrapper()).eq(OnlCgformHead::getTableName, var9)); + OnlCgformHead var12 = (OnlCgformHead)((OnlCgformHeadMapper)this.baseMapper).selectOne((Wrapper)(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((Wrapper)(new LambdaQueryWrapper()).eq(OnlCgformField::getCgformHeadId, var12.getId())); String var14 = ""; String var15 = null; Iterator var16 = var13.iterator(); @@ -1405,7 +1410,7 @@ public class e extends ServiceImpl implement } public void editCrazyFormData(String tbname, JSONObject json) throws DBException, UnsupportedEncodingException { - OnlCgformHead var3 = (OnlCgformHead)this.getOne((Wrapper)(new LambdaQueryWrapper()).eq(OnlCgformHead::getTableName, tbname)); + OnlCgformHead var3 = (OnlCgformHead)this.getOne((Wrapper)(new LambdaQueryWrapper()).eq(OnlCgformHead::getTableName, tbname)); if (var3 == null) { throw new DBException("数据库主表[" + tbname + "]不存在"); } else { @@ -1417,9 +1422,9 @@ public class e extends ServiceImpl implement for(int var8 = 0; var8 < var7; ++var8) { String var9 = var6[var8]; - OnlCgformHead var10 = (OnlCgformHead)((OnlCgformHeadMapper)this.baseMapper).selectOne((Wrapper)(new LambdaQueryWrapper()).eq(OnlCgformHead::getTableName, var9)); + OnlCgformHead var10 = (OnlCgformHead)((OnlCgformHeadMapper)this.baseMapper).selectOne((Wrapper)(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((Wrapper)(new LambdaQueryWrapper()).eq(OnlCgformField::getCgformHeadId, var10.getId())); String var12 = ""; String var13 = null; Iterator var14 = var11.iterator(); @@ -1495,7 +1500,7 @@ public class e extends ServiceImpl implement var3.setSubTableStr((String)null); var3.setThemeTemplate(physicTable.getThemeTemplate()); var3.setScroll(physicTable.getScroll()); - List var5 = this.fieldService.list((Wrapper)(new LambdaQueryWrapper()).eq(OnlCgformField::getCgformHeadId, var2)); + List var5 = this.fieldService.list((Wrapper)(new LambdaQueryWrapper()).eq(OnlCgformField::getCgformHeadId, var2)); Iterator var6 = var5.iterator(); while(var6.hasNext()) { @@ -1571,7 +1576,7 @@ public class e extends ServiceImpl implement } private void b(OnlCgformHead var1, List var2) { - List var3 = this.list((Wrapper)(new LambdaQueryWrapper()).eq(OnlCgformHead::getPhysicId, var1.getId())); + List var3 = this.list((Wrapper)(new LambdaQueryWrapper()).eq(OnlCgformHead::getPhysicId, var1.getId())); if (var3 != null && var3.size() > 0) { Iterator var4 = var3.iterator(); @@ -1584,7 +1589,7 @@ public class e extends ServiceImpl implement do { while(var4.hasNext()) { OnlCgformHead var5 = (OnlCgformHead)var4.next(); - var6 = this.fieldService.list((Wrapper)(new LambdaQueryWrapper()).eq(OnlCgformField::getCgformHeadId, var5.getId())); + var6 = this.fieldService.list((Wrapper)(new LambdaQueryWrapper()).eq(OnlCgformField::getCgformHeadId, var5.getId())); OnlCgformField var9; if (var6 != null && var6.size() != 0) { HashMap var15 = new HashMap(); diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/service/impl/f.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/service/impl/OnlCgformIndexServiceImpl.java similarity index 90% rename from jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/service/impl/f.java rename to jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/service/impl/OnlCgformIndexServiceImpl.java index ff45f8a7..8b0c5e0d 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/service/impl/f.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/service/impl/OnlCgformIndexServiceImpl.java @@ -17,16 +17,16 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @Service("onlCgformIndexServiceImpl") -public class f extends ServiceImpl implements IOnlCgformIndexService { - private static final Logger a = LoggerFactory.getLogger(f.class); +public class OnlCgformIndexServiceImpl extends ServiceImpl implements IOnlCgformIndexService { + private static final Logger a = LoggerFactory.getLogger(OnlCgformIndexServiceImpl.class); @Autowired private OnlCgformHeadMapper onlCgformHeadMapper; - public f() { + public OnlCgformIndexServiceImpl() { } public void createIndex(String code, String databaseType, String tbname) { - LambdaQueryWrapper var4 = new LambdaQueryWrapper(); + LambdaQueryWrapper var4 = new LambdaQueryWrapper(); var4.eq(OnlCgformIndex::getCgformHeadId, code); List var5 = this.list(var4); if (var5 != null && var5.size() > 0) { @@ -99,6 +99,6 @@ public class f extends ServiceImpl impleme } public List getCgformIndexsByCgformId(String cgformId) { - return ((OnlCgformIndexMapper)this.baseMapper).selectList((Wrapper)(new LambdaQueryWrapper()).in(OnlCgformIndex::getCgformHeadId, new Object[]{cgformId})); + return ((OnlCgformIndexMapper)this.baseMapper).selectList((Wrapper)(new LambdaQueryWrapper()).in(OnlCgformIndex::getCgformHeadId, new Object[]{cgformId})); } } diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/service/impl/g.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/service/impl/OnlCgformSqlServiceImpl.java similarity index 96% rename from jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/service/impl/g.java rename to jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/service/impl/OnlCgformSqlServiceImpl.java index b1149766..bfacc25e 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/service/impl/g.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/service/impl/OnlCgformSqlServiceImpl.java @@ -20,13 +20,13 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @Service("onlCgformSqlServiceImpl") -public class g implements IOnlCgformSqlService { +public class OnlCgformSqlServiceImpl implements IOnlCgformSqlService { @Autowired private SqlSessionTemplate sqlSessionTemplate; @Autowired private IOnlCgformHeadService onlCgformHeadService; - public g() { + public OnlCgformSqlServiceImpl() { } public void saveBatchOnlineTable(OnlCgformHead head, List fieldList, List> dataList) throws BusinessException { diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/service/impl/h.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/service/impl/OnlineBaseAPIServiceImpl.java similarity index 88% rename from jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/service/impl/h.java rename to jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/service/impl/OnlineBaseAPIServiceImpl.java index 5c97c466..03bb0770 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/service/impl/h.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/service/impl/OnlineBaseAPIServiceImpl.java @@ -14,13 +14,13 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @Service("onlineBaseAPI") -public class h implements IOnlineBaseAPI { +public class OnlineBaseAPIServiceImpl implements IOnlineBaseAPI { @Autowired private OnlCgformHeadMapper onlCgformHeadMapper; @Autowired private OnlCgformFieldMapper onlCgformFieldMapper; - public h() { + public OnlineBaseAPIServiceImpl() { } public String getOnlineErpCode(String code, String tableType) { @@ -28,8 +28,7 @@ public class h implements IOnlineBaseAPI { String var3 = code.substring(1); OnlCgformHead var4 = (OnlCgformHead)this.onlCgformHeadMapper.selectById(var3); if (var4 != null && var4.getTableType() == 3) { - LambdaQueryWrapper var5 = (LambdaQueryWrapper)(new LambdaQueryWrapper()).eq(OnlCgformField::getCgformHeadId, var3); - List var6 = this.onlCgformFieldMapper.selectList(var5); + List var6 = this.onlCgformFieldMapper.selectList(new LambdaQueryWrapper().eq(OnlCgformField::getCgformHeadId, var3)); if (var6 != null && var6.size() > 0) { String var7 = null; Iterator var8 = var6.iterator(); @@ -42,7 +41,7 @@ public class h implements IOnlineBaseAPI { } } - LambdaQueryWrapper var10 = (LambdaQueryWrapper)(new LambdaQueryWrapper()).eq(OnlCgformHead::getTableName, var7); + LambdaQueryWrapper var10 = (LambdaQueryWrapper)(new LambdaQueryWrapper()).eq(OnlCgformHead::getTableName, var7); OnlCgformHead var11 = (OnlCgformHead)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/org/jeecg/modules/online/cgform/service/impl/i.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/service/impl/OnlineServiceImpl.java similarity index 97% rename from jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/service/impl/i.java rename to jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/service/impl/OnlineServiceImpl.java index f60a8159..3364c582 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/service/impl/i.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/service/impl/OnlineServiceImpl.java @@ -9,12 +9,13 @@ 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 org.jeecg.modules.online.auth.service.IOnlAuthPageService; import org.jeecg.modules.online.cgform.a.LinkDown; import org.jeecg.modules.online.cgform.entity.OnlCgformButton; import org.jeecg.modules.online.cgform.entity.OnlCgformEnhanceJs; @@ -34,7 +35,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @Service("onlineService") -public class i implements IOnlineService { +public class OnlineServiceImpl implements IOnlineService { @Autowired private IOnlCgformFieldService onlCgformFieldService; @Autowired @@ -44,7 +45,7 @@ public class i implements IOnlineService { @Autowired private IOnlAuthPageService onlAuthPageService; - public i() { + public OnlineServiceImpl() { } public OnlComplexModel queryOnlineConfig(OnlCgformHead head) { @@ -283,7 +284,7 @@ public class i implements IOnlineService { } public List queryFormValidButton(String headId) { - List var2 = this.onlCgformHeadService.queryButtonList(headId, false); + List var2 = this.onlCgformHeadService.queryButtonList(headId, false); List var3 = null; if (var2 != null && var2.size() > 0) { LoginUser var4 = (LoginUser)SecurityUtils.getSubject().getPrincipal(); @@ -298,7 +299,7 @@ public class i implements IOnlineService { } 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);