KH/kh-device-admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

【添加】controller修复完毕

Browse Source
This commit is contained in:
zer0Black
2021-03-12 15:28:04 +08:00
parent 262b49f440
commit b82b2c456a
5 changed files with 49 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/b/a.java → jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/controller/OnlCgformApiController.java
+33 -32
View File
@@ -3,7 +3,7 @@
// (powered by FernFlower decompiler) // (powered by FernFlower decompiler)
// //
package org.jeecg.modules.online.cgform.b; package org.jeecg.modules.online.cgform.controller;
import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.FileUtil;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
@@ -32,6 +32,8 @@ import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.sql.DataSource; import javax.sql.DataSource;
import com.jero.generater.modules.online.auth.service.IOnlAuthPageService;
import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.ss.usermodel.Workbook;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.aspect.annotation.AutoLog;
@@ -44,7 +46,6 @@ import com.jero.common.util.BrowserUtils;
import com.jero.common.util.SpringContextUtils; import com.jero.common.util.SpringContextUtils;
import com.jero.common.util.TokenUtils; import com.jero.common.util.TokenUtils;
import com.jero.common.util.oConvertUtils; 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.a.LinkDown;
import org.jeecg.modules.online.cgform.converter.ConvertUtil; import org.jeecg.modules.online.cgform.converter.ConvertUtil;
import org.jeecg.modules.online.cgform.entity.OnlCgformEnhanceJs; import org.jeecg.modules.online.cgform.entity.OnlCgformEnhanceJs;
@@ -88,8 +89,8 @@ import org.springframework.web.multipart.MultipartHttpServletRequest;
@RestController("onlCgformApiController") @RestController("onlCgformApiController")
@RequestMapping({"/online/cgform/api"}) @RequestMapping({"/online/cgform/api"})
public class a { public class OnlCgformApiController {
private static final Logger a = LoggerFactory.getLogger(a.class); private static final Logger a = LoggerFactory.getLogger(OnlCgformApiController.class);
@Autowired @Autowired
private IOnlCgformHeadService onlCgformHeadService; private IOnlCgformHeadService onlCgformHeadService;
@Autowired @Autowired
@@ -107,7 +108,7 @@ public class a {
@Value("${jeecg.uploadType}") @Value("${jeecg.uploadType}")
private String uploadType; private String uploadType;
public a() { public OnlCgformApiController() {
} }
@PostMapping({"/addAll"}) @PostMapping({"/addAll"})
@@ -212,7 +213,7 @@ public class a {
for(int var12 = 0; var12 < var11; ++var12) { for(int var12 = 0; var12 < var11; ++var12) {
String var13 = var10[var12]; String var13 = var10[var12];
OnlCgformHead var14 = (OnlCgformHead)this.onlCgformHeadService.getOne((Wrapper)(new LambdaQueryWrapper()).eq(OnlCgformHead::getTableName, var13)); OnlCgformHead var14 = (OnlCgformHead)this.onlCgformHeadService.getOne((Wrapper)(new LambdaQueryWrapper<OnlCgformHead>()).eq(OnlCgformHead::getTableName, var13));
if (var14 != null) { if (var14 != null) {
var9.add(var14); var9.add(var14);
} }
@@ -220,7 +221,8 @@ public class a {
if (var9.size() > 0) { if (var9.size() > 0) {
Collections.sort(var9, new Comparator<OnlCgformHead>() { Collections.sort(var9, new Comparator<OnlCgformHead>() {
public int a(OnlCgformHead var1, OnlCgformHead var2) { @Override
public int compare(OnlCgformHead var1, OnlCgformHead var2) {
Integer var3 = var1.getTabOrderNum(); Integer var3 = var1.getTabOrderNum();
if (var3 == null) { if (var3 == null) {
var3 = 0; var3 = 0;
@@ -279,7 +281,7 @@ public class a {
@GetMapping({"/getFormItemBytbname/{table}"}) @GetMapping({"/getFormItemBytbname/{table}"})
public Result<?> a(@PathVariable("table") String var1, @RequestParam(name = "taskId",required = false) String var2) { public Result<?> a(@PathVariable("table") String var1, @RequestParam(name = "taskId",required = false) String var2) {
Result var3 = new Result(); Result var3 = new Result();
LambdaQueryWrapper var4 = new LambdaQueryWrapper(); LambdaQueryWrapper<OnlCgformHead> var4 = new LambdaQueryWrapper();
var4.eq(OnlCgformHead::getTableName, var1); var4.eq(OnlCgformHead::getTableName, var1);
OnlCgformHead var5 = (OnlCgformHead)this.onlCgformHeadService.getOne(var4); OnlCgformHead var5 = (OnlCgformHead)this.onlCgformHeadService.getOne(var4);
if (var5 == null) { if (var5 == null) {
@@ -351,7 +353,7 @@ public class a {
@GetMapping({"/form/table_name/{tableName}/{dataId}"}) @GetMapping({"/form/table_name/{tableName}/{dataId}"})
public Result<?> e(@PathVariable("tableName") String var1, @PathVariable("dataId") String var2) { public Result<?> e(@PathVariable("tableName") String var1, @PathVariable("dataId") String var2) {
try { try {
LambdaQueryWrapper var3 = new LambdaQueryWrapper(); LambdaQueryWrapper<OnlCgformHead> var3 = new LambdaQueryWrapper();
var3.eq(OnlCgformHead::getTableName, var1); var3.eq(OnlCgformHead::getTableName, var1);
OnlCgformHead var4 = (OnlCgformHead)this.onlCgformHeadService.getOne(var3); OnlCgformHead var4 = (OnlCgformHead)this.onlCgformHeadService.getOne(var3);
if (var4 == null) { if (var4 == null) {
@@ -478,7 +480,7 @@ public class a {
) )
@DeleteMapping({"/formByCode/{code}/{id}"}) @DeleteMapping({"/formByCode/{code}/{id}"})
public Result<?> g(@PathVariable("code") String var1, @PathVariable("id") String var2) { public Result<?> g(@PathVariable("code") String var1, @PathVariable("id") String var2) {
OnlCgformHead var3 = (OnlCgformHead)this.onlCgformHeadService.getOne((Wrapper)(new LambdaQueryWrapper()).eq(OnlCgformHead::getTableName, var1)); OnlCgformHead var3 = (OnlCgformHead)this.onlCgformHeadService.getOne((Wrapper)(new LambdaQueryWrapper<OnlCgformHead>()).eq(OnlCgformHead::getTableName, var1));
if (var3 == null) { if (var3 == null) {
return Result.error("实体不存在"); return Result.error("实体不存在");
} else { } else {
@@ -541,26 +543,25 @@ public class a {
} }
((Map)var7).put("pageSize", -521); ((Map)var7).put("pageSize", -521);
Map var9 = this.onlCgformFieldService.queryAutolistPage(var4.getTableName(), var4.getId(), (Map)var7, (List)null); Map<String, Object> var9 = this.onlCgformFieldService.queryAutolistPage(var4.getTableName(), var4.getId(), (Map)var7, (List)null);
List var10 = (List)var9.get("fieldList"); List<OnlCgformField> fieldList = (List)var9.get("fieldList");
Object var11 = (List)var9.get("records"); List<Map<String, Object>> records = (List)var9.get("records");
Object var12 = new ArrayList(); List var12 = new ArrayList();
String var13 = ((Map)var7).get("selections") == null ? null : ((Map)var7).get("selections").toString(); String var13 = ((Map)var7).get("selections") == null ? null : ((Map)var7).get("selections").toString();
List var14;
if (oConvertUtils.isNotEmpty(var13)) { if (oConvertUtils.isNotEmpty(var13)) {
var14 = Arrays.asList(var13.split(",")); final List var14 = Arrays.asList(var13.split(","));
var12 = (List)((List)var11).stream().filter((var1x) -> { var12 = records.stream().filter((var1x) -> {
return var14.contains(var1x.get("id")); return var14.contains(var1x.get("id"));
}).collect(Collectors.toList()); }).collect(Collectors.toList());
} else { } else {
if (var11 == null) { if (records == null) {
var11 = new ArrayList(); records = new ArrayList();
} }
var12.addAll(records);
((List)var12).addAll((Collection)var11);
} }
ConvertUtil.a(1, (List)var12, var10); ConvertUtil.a(1, (List)var12, fieldList);
try { try {
this.onlCgformHeadService.executeEnhanceExport(var4, (List)var12); this.onlCgformHeadService.executeEnhanceExport(var4, (List)var12);
@@ -568,7 +569,7 @@ public class a {
a.error("导出java增强处理出错", var31.getMessage()); a.error("导出java增强处理出错", var31.getMessage());
} }
var14 = this.a(var10, "id"); List var14 = this.a(fieldList, "id");
if (var4.getTableType() == 2 && oConvertUtils.isEmpty(((Map)var7).get("exportSingleOnly"))) { if (var4.getTableType() == 2 && oConvertUtils.isEmpty(((Map)var7).get("exportSingleOnly"))) {
String var15 = var4.getSubTableStr(); String var15 = var4.getSubTableStr();
if (oConvertUtils.isNotEmpty(var15)) { if (oConvertUtils.isNotEmpty(var15)) {
@@ -629,7 +630,7 @@ public class a {
return Result.error("数据库不存在该表记录"); return Result.error("数据库不存在该表记录");
} }
LambdaQueryWrapper var9 = new LambdaQueryWrapper(); LambdaQueryWrapper<OnlCgformField> var9 = new LambdaQueryWrapper();
var9.eq(OnlCgformField::getCgformHeadId, var1); var9.eq(OnlCgformField::getCgformHeadId, var1);
List var10 = this.onlCgformFieldService.list(var9); List var10 = this.onlCgformFieldService.list(var9);
String var11 = var2.getParameter("isSingleTableImport"); String var11 = var2.getParameter("isSingleTableImport");
@@ -640,9 +641,9 @@ public class a {
for(int var15 = 0; var15 < var14; ++var15) { for(int var15 = 0; var15 < var14; ++var15) {
String var16 = var13[var15]; String var16 = var13[var15];
OnlCgformHead var17 = (OnlCgformHead)this.onlCgformHeadService.getOne((Wrapper)(new LambdaQueryWrapper()).eq(OnlCgformHead::getTableName, var16)); OnlCgformHead var17 = (OnlCgformHead)this.onlCgformHeadService.getOne((Wrapper)(new LambdaQueryWrapper<OnlCgformHead>()).eq(OnlCgformHead::getTableName, var16));
if (var17 != null) { if (var17 != null) {
List var18 = this.onlCgformFieldService.list((Wrapper)(new LambdaQueryWrapper()).eq(OnlCgformField::getCgformHeadId, var17.getId())); List var18 = this.onlCgformFieldService.list((Wrapper)(new LambdaQueryWrapper<OnlCgformField>()).eq(OnlCgformField::getCgformHeadId, var17.getId()));
List var19 = org.jeecg.modules.online.cgform.util.b.b(var18, var17.getTableTxt()); List var19 = org.jeecg.modules.online.cgform.util.b.b(var18, var17.getTableTxt());
if (var19.size() > 0) { if (var19.size() > 0) {
var12.addAll(var19); var12.addAll(var19);
@@ -726,9 +727,9 @@ public class a {
for(int var56 = 0; var56 < var55; ++var56) { for(int var56 = 0; var56 < var55; ++var56) {
String var57 = var54[var56]; String var57 = var54[var56];
OnlCgformHead var58 = (OnlCgformHead)this.onlCgformHeadService.getOne((Wrapper)(new LambdaQueryWrapper()).eq(OnlCgformHead::getTableName, var57)); OnlCgformHead var58 = (OnlCgformHead)this.onlCgformHeadService.getOne((Wrapper)(new LambdaQueryWrapper<OnlCgformHead>()).eq(OnlCgformHead::getTableName, var57));
if (var58 != null) { if (var58 != null) {
LambdaQueryWrapper var59 = new LambdaQueryWrapper(); LambdaQueryWrapper<OnlCgformField> var59 = new LambdaQueryWrapper();
var59.eq(OnlCgformField::getCgformHeadId, var58.getId()); var59.eq(OnlCgformField::getCgformHeadId, var58.getId());
List var60 = this.onlCgformFieldService.list(var59); List var60 = this.onlCgformFieldService.list(var59);
ArrayList var33 = new ArrayList(); ArrayList var33 = new ArrayList();
@@ -942,8 +943,8 @@ public class a {
} }
private void a(String var1, Map<String, Object> var2, List<Map<String, Object>> var3, List<ExcelExportEntity> var4) { private void a(String var1, Map<String, Object> var2, List<Map<String, Object>> var3, List<ExcelExportEntity> var4) {
OnlCgformHead var5 = (OnlCgformHead)this.onlCgformHeadService.getOne((Wrapper)(new LambdaQueryWrapper()).eq(OnlCgformHead::getTableName, var1)); OnlCgformHead var5 = (OnlCgformHead)this.onlCgformHeadService.getOne((Wrapper)(new LambdaQueryWrapper<OnlCgformHead>()).eq(OnlCgformHead::getTableName, var1));
LambdaQueryWrapper var6 = new LambdaQueryWrapper(); LambdaQueryWrapper<OnlCgformField> var6 = new LambdaQueryWrapper();
var6.eq(OnlCgformField::getCgformHeadId, var5.getId()); var6.eq(OnlCgformField::getCgformHeadId, var5.getId());
var6.orderByAsc(OnlCgformField::getOrderNum); var6.orderByAsc(OnlCgformField::getOrderNum);
List var7 = this.onlCgformFieldService.list(var6); List var7 = this.onlCgformFieldService.list(var6);
@@ -983,7 +984,7 @@ public class a {
return Result.OK(-1); return Result.OK(-1);
} }
var3 = (OnlCgformHead)this.onlCgformHeadService.getOne((Wrapper)(new LambdaQueryWrapper()).eq(OnlCgformHead::getTableName, var1)); var3 = (OnlCgformHead)this.onlCgformHeadService.getOne((Wrapper)(new LambdaQueryWrapper<OnlCgformHead>()).eq(OnlCgformHead::getTableName, var1));
if (oConvertUtils.isNotEmpty(var3)) { if (oConvertUtils.isNotEmpty(var3)) {
return Result.OK(-1); return Result.OK(-1);
} }
@@ -1192,7 +1193,7 @@ public class a {
for(int var10 = 0; var10 < var9; ++var10) { for(int var10 = 0; var10 < var9; ++var10) {
String var11 = var8[var10]; String var11 = var8[var10];
OnlCgformHead var12 = (OnlCgformHead)this.onlCgformHeadService.getOne((Wrapper)(new LambdaQueryWrapper()).eq(OnlCgformHead::getTableName, var11)); OnlCgformHead var12 = (OnlCgformHead)this.onlCgformHeadService.getOne((Wrapper)(new LambdaQueryWrapper<OnlCgformHead>()).eq(OnlCgformHead::getTableName, var11));
if (var12 != null) { if (var12 != null) {
var7.add(this.onlineService.queryOnlineConfig(var12)); var7.add(this.onlineService.queryOnlineConfig(var12));
} }
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/b/b.java → jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/controller/OnlCgformButtonController.java
+4 -4
View File
@@ -3,7 +3,7 @@
// (powered by FernFlower decompiler) // (powered by FernFlower decompiler)
// //
package org.jeecg.modules.online.cgform.b; package org.jeecg.modules.online.cgform.controller;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
@@ -31,12 +31,12 @@ import org.springframework.web.bind.annotation.RestController;
@RestController("onlCgformButtonController") @RestController("onlCgformButtonController")
@RequestMapping({"/online/cgform/button"}) @RequestMapping({"/online/cgform/button"})
public class b { public class OnlCgformButtonController {
private static final Logger a = LoggerFactory.getLogger(b.class); private static final Logger a = LoggerFactory.getLogger(OnlCgformButtonController.class);
@Autowired @Autowired
private IOnlCgformButtonService onlCgformButtonService; private IOnlCgformButtonService onlCgformButtonService;
public b() { public OnlCgformButtonController() {
} }
@GetMapping({"/list/{code}"}) @GetMapping({"/list/{code}"})
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/b/c.java → jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/controller/OnlCgformFieldController.java
+4 -4
View File
@@ -1,4 +1,4 @@
package org.jeecg.modules.online.cgform.b; package org.jeecg.modules.online.cgform.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -27,14 +27,14 @@ import org.springframework.web.bind.annotation.RestController;
@RestController("onlCgformFieldController") @RestController("onlCgformFieldController")
@RequestMapping({"/online/cgform/field"}) @RequestMapping({"/online/cgform/field"})
public class c { public class OnlCgformFieldController {
private static final Logger a = LoggerFactory.getLogger(c.class); private static final Logger a = LoggerFactory.getLogger(OnlCgformFieldController.class);
@Autowired @Autowired
private IOnlCgformHeadService onlCgformHeadService; private IOnlCgformHeadService onlCgformHeadService;
@Autowired @Autowired
private IOnlCgformFieldService onlCgformFieldService; private IOnlCgformFieldService onlCgformFieldService;
public c() { public OnlCgformFieldController() {
} }
@GetMapping({"/listByHeadCode"}) @GetMapping({"/listByHeadCode"})
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/b/d.java → jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/controller/OnlCgformHeadController.java
+4 -6
View File
@@ -1,4 +1,4 @@
package org.jeecg.modules.online.cgform.b; package org.jeecg.modules.online.cgform.controller;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
@@ -33,9 +33,7 @@ import org.jeecg.modules.online.cgform.entity.OnlCgformHead;
import org.jeecg.modules.online.cgform.service.IOnlCgformEnhanceService; import org.jeecg.modules.online.cgform.service.IOnlCgformEnhanceService;
import org.jeecg.modules.online.cgform.service.IOnlCgformFieldService; import org.jeecg.modules.online.cgform.service.IOnlCgformFieldService;
import org.jeecg.modules.online.cgform.service.IOnlCgformHeadService; import org.jeecg.modules.online.cgform.service.IOnlCgformHeadService;
import org.jeecg.modules.online.cgform.util.b;
import org.jeecg.modules.online.config.exception.DBException; import org.jeecg.modules.online.config.exception.DBException;
import org.jeecgframework.codegenerate.a.a;
import org.jeecgframework.codegenerate.database.DbReadTableUtil; import org.jeecgframework.codegenerate.database.DbReadTableUtil;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@@ -54,8 +52,8 @@ import org.springframework.web.bind.annotation.RestController;
@RestController("onlCgformHeadController") @RestController("onlCgformHeadController")
@RequestMapping({"/online/cgform/head"}) @RequestMapping({"/online/cgform/head"})
public class d { public class OnlCgformHeadController {
private static final Logger a = LoggerFactory.getLogger(d.class); private static final Logger a = LoggerFactory.getLogger(OnlCgformHeadController.class);
@Autowired @Autowired
private IOnlCgformHeadService onlCgformHeadService; private IOnlCgformHeadService onlCgformHeadService;
@Autowired @Autowired
@@ -67,7 +65,7 @@ public class d {
ResourceLoader resourceLoader; ResourceLoader resourceLoader;
private static String c; private static String c;
public d() { public OnlCgformHeadController() {
} }
@GetMapping({"/list"}) @GetMapping({"/list"})
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/b/e.java → jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/controller/OnlCgformIndexController.java
+4 -4
View File
@@ -1,4 +1,4 @@
package org.jeecg.modules.online.cgform.b; package org.jeecg.modules.online.cgform.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -25,12 +25,12 @@ import org.springframework.web.bind.annotation.RestController;
@RestController("onlCgformIndexController") @RestController("onlCgformIndexController")
@RequestMapping({"/online/cgform/index"}) @RequestMapping({"/online/cgform/index"})
public class e { public class OnlCgformIndexController {
private static final Logger a = LoggerFactory.getLogger(e.class); private static final Logger a = LoggerFactory.getLogger(OnlCgformIndexController.class);
@Autowired @Autowired
private IOnlCgformIndexService onlCgformIndexService; private IOnlCgformIndexService onlCgformIndexService;
public e() { public OnlCgformIndexController() {
} }
@GetMapping({"/listByHeadId"}) @GetMapping({"/listByHeadId"})