diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/controller/OnlCgreportHeadController.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/controller/OnlCgreportHeadController.java index 169b4809..11f8f949 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/controller/OnlCgreportHeadController.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/controller/OnlCgreportHeadController.java @@ -4,13 +4,6 @@ package com.jero.generater.modules.online.cgreport.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - -import java.util.*; -import javax.servlet.http.HttpServletRequest; - -import com.jero.modules.base.service.BaseCommonService; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang.StringUtils; import com.jero.common.api.vo.Result; import com.jero.common.system.api.ISysBaseAPI; import com.jero.common.system.query.QueryGenerator; @@ -24,15 +17,14 @@ import com.jero.generater.modules.online.cgreport.model.OnlCgreportModel; import com.jero.generater.modules.online.cgreport.service.IOnlCgreportHeadService; import com.jero.generater.modules.online.cgreport.service.IOnlCgreportItemService; import com.jero.generater.modules.online.cgreport.service.IOnlCgreportParamService; +import com.jero.modules.base.service.BaseCommonService; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletRequest; +import java.util.*; @RestController("onlCgreportHeadController") @RequestMapping({"/online/cgreport/head"}) @@ -51,7 +43,7 @@ public class OnlCgreportHeadController { private BaseCommonService baseCommonService; @GetMapping({"/parseSql"}) - public Result a(@RequestParam(name = "sql") String var1, @RequestParam(name = "dbKey",required = false) String var2) { + public Result> a(@RequestParam(name = "sql") String var1, @RequestParam(name = "dbKey",required = false) String var2) { if (StringUtils.isNotBlank(var2)) { DynamicDataSourceModel var3 = this.sysBaseAPI.getDynamicDbSourceByCode(var2); if (var3 == null) { @@ -59,7 +51,7 @@ public class OnlCgreportHeadController { } } - HashMap var13 = new HashMap<>(); + HashMap var13 = new HashMap<>(); ArrayList var4 = new ArrayList<>(); ArrayList var5 = new ArrayList<>(); List var6; @@ -74,9 +66,9 @@ public class OnlCgreportHeadController { int var8 = 1; String var14; - Iterator var15; + Iterator var15; for(var15 = var6.iterator(); var15.hasNext(); ++var8) { - var14 = (String)var15.next(); + var14 = var15.next(); OnlCgreportItem var11 = new OnlCgreportItem(); var11.setFieldName(var14.toLowerCase()); var11.setFieldTxt(var14); @@ -90,7 +82,7 @@ public class OnlCgreportHeadController { var15 = var7.iterator(); while(var15.hasNext()) { - var14 = (String)var15.next(); + var14 = var15.next(); OnlCgreportParam var16 = new OnlCgreportParam(); var16.setParamName(var14); var16.setParamTxt(var14); @@ -122,7 +114,7 @@ public class OnlCgreportHeadController { @GetMapping({"/list"}) public Result> a(OnlCgreportHead var1, @RequestParam(name = "pageNo",defaultValue = "1") Integer var2, @RequestParam(name = "pageSize",defaultValue = "10") Integer var3, HttpServletRequest var4) { - Result var5 = new Result<>(); + Result> var5 = new Result<>(); QueryWrapper var6 = QueryGenerator.initQueryWrapper(var1, var4.getParameterMap()); Page var7 = new Page<>(var2, var3); IPage var8 = this.onlCgreportHeadService.page(var7, var6); @@ -132,25 +124,24 @@ public class OnlCgreportHeadController { } @PostMapping({"/add"}) - public Result add(@RequestBody OnlCgreportModel var1) { + public Result add(@RequestBody OnlCgreportModel var1) { try { String var3 = CgformUtil.a(); OnlCgreportHead var4 = var1.getHead(); List var5 = var1.getParams(); List var6 = var1.getItems(); var4.setId(var3); - Iterator var7 = var5.iterator(); + Iterator var7 = var5.iterator(); + Iterator var9 = var6.iterator(); while(var7.hasNext()) { - OnlCgreportParam var8 = (OnlCgreportParam)var7.next(); + OnlCgreportParam var8 = var7.next(); var8.setId(null); var8.setCgrheadId(var3); } - var7 = var6.iterator(); - - while(var7.hasNext()) { - OnlCgreportItem var10 = (OnlCgreportItem)var7.next(); + while(var9.hasNext()) { + OnlCgreportItem var10 = var9.next(); var10.setId(null); var10.setFieldName(var10.getFieldName().trim().toLowerCase()); var10.setCgrheadId(var3); @@ -167,7 +158,7 @@ public class OnlCgreportHeadController { } @PostMapping({"/editAll"}) - public Result editAll(@RequestBody OnlCgreportModel cgreportModel) { + public Result editAll(@RequestBody OnlCgreportModel cgreportModel) { try { return this.onlCgreportHeadService.editAll(cgreportModel); } catch (Exception e) { @@ -177,7 +168,7 @@ public class OnlCgreportHeadController { } @PostMapping({"/delete"}) - public Result delete(@RequestBody Map map) { + public Result delete(@RequestBody Map map) { String id = map.get("id"); if(StringUtils.isBlank(id)){ return Result.error("参数不识别!"); @@ -186,7 +177,7 @@ public class OnlCgreportHeadController { } @PostMapping({"/deleteBatch"}) - public Result deleteBatch(@RequestBody Map map) { + public Result deleteBatch(@RequestBody Map map) { String ids = map.get("ids"); if(StringUtils.isBlank(ids)){ return Result.error("参数不识别!"); @@ -196,7 +187,7 @@ public class OnlCgreportHeadController { @GetMapping({"/queryById"}) public Result queryById(@RequestParam(name = "id",required = true) String id) { - Result result = new Result(); + Result result = new Result<>(); OnlCgreportHead cgreportHead = this.onlCgreportHeadService.getById(id); result.setResult(cgreportHead); return result;