From 718e261ff66d5a2012843066b76763cef9e60d7f Mon Sep 17 00:00:00 2001 From: duanwenbin <12345678> Date: Mon, 12 Jul 2021 18:10:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=9C=AC=E5=9C=B0=E5=B7=A5?= =?UTF-8?q?=E5=85=B7-=E6=A0=87=E5=87=86=E6=8B=86=E5=88=86=E7=BC=BA?= =?UTF-8?q?=E5=A4=B1=E7=9A=84=E7=BC=96=E8=BE=91=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarFileSplitItemsValEOController.java | 132 ++++++++++++++++++ .../dao/SarFileSplitItemsTableEODao.java | 2 + .../dao/SarFileSplitItemsValEODao.java | 10 ++ .../SarFileSplitItemsValEOService.java | 12 ++ .../SarFileSplitItemsValEOServiceImpl.java | 80 ++++++++++- 5 files changed, 234 insertions(+), 2 deletions(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitItemsValEOController.java diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitItemsValEOController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitItemsValEOController.java new file mode 100644 index 00000000..c0204cdb --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitItemsValEOController.java @@ -0,0 +1,132 @@ +package com.adc.da.slrs.standardSplit.controller; + +import com.adc.da.base.web.BaseController; +import com.adc.da.http.PageInfo; +import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsValEO; +import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsValEOPage; +import com.adc.da.slrs.standardSplit.service.SarFileSplitItemsEOService; +import com.adc.da.slrs.standardSplit.service.SarFileSplitItemsTableEOService; +import com.adc.da.slrs.standardSplit.service.SarFileSplitItemsValEOService; +import com.adc.da.util.http.ResponseMessage; +import com.adc.da.util.http.Result; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +import static org.springframework.http.MediaType.APPLICATION_JSON_UTF8_VALUE; + +@RestController +@RequestMapping("/${restPath}/lawss/sarFileSplitItemsVal") +@Api(description = "|SarFileSplitItemsValEO|") +public class SarFileSplitItemsValEOController extends BaseController { + + private static final Logger logger = LoggerFactory.getLogger(SarFileSplitItemsValEOController.class); + + @Autowired + private SarFileSplitItemsValEOService sarFileSplitItemsValEOService; + + @Autowired + private SarFileSplitItemsTableEOService sarFileSplitItemsTableEOService; + + @Autowired + private SarFileSplitItemsEOService sarFileSplitItemsEOService; + + @ApiOperation(value = "|SarFileSplitItemsValEO|分页查询") + @GetMapping("/page") + //401问题2021-03-31暂时注释掉 liuhuiwen +// @RequiresPermissions("lawss:sarFileSplitItemsVal:page") + public ResponseMessage> page(SarFileSplitItemsValEOPage page) throws Exception { + page.setOrderBy("modify_time desc"); + List rows = sarFileSplitItemsValEOService.queryByPage(page); + return Result.success(getPageInfo(page.getPager(), rows)); + } + + @ApiOperation(value = "|SarFileSplitItemsValEO|查询") + @GetMapping("/getItemsValList") +// @RequiresPermissions("lawss:sarFileSplitItemsVal:list") + public ResponseMessage> list(SarFileSplitItemsValEOPage page) throws Exception { + page.setOrderBy("DISPLAY_SEQ,ID"); + List getList = sarFileSplitItemsValEOService.queryByList(page); + if (getList != null && !getList.isEmpty()) { + for (SarFileSplitItemsValEO sarFileSplitItemsValEO : getList) { + String imgPath = sarFileSplitItemsValEO.getItemContent(); + if ("IMG".equals(sarFileSplitItemsValEO.getType()) && StringUtils.isNotEmpty(imgPath)) { + String imgName = imgPath.substring(imgPath.lastIndexOf("/")+1, imgPath.length()); + sarFileSplitItemsValEO.setImgName(imgName); + } + /*else if ("TABLE".equals(sarFileSplitItemsValEO.getType())) { + SarFileSplitItemsTableEOPage tablePage = new SarFileSplitItemsTableEOPage(); + tablePage.setItemsValId(sarFileSplitItemsValEO.getId()); + List tableList = sarFileSplitItemsTableEOService.queryByList(tablePage); + List tableListRow = sarFileSplitItemsTableEOService.queryByRowNum(tablePage); + sarFileSplitItemsValEO.setTableList(tableList); + if (tableListRow != null && !tableListRow.isEmpty()) { + List> getTableList = new ArrayList<>(); + for (int i=1; i <= tableListRow.size();i++) { + List rowList = new ArrayList<>(); + for (int j=0; j < tableList.size();j++) { + if (tableList.get(j).getRowNum() == i) { + rowList.add(tableList.get(j)); + } + } + getTableList.add(rowList); + } + sarFileSplitItemsValEO.setTableListShow(getTableList); + } + }*/ + } + } + return Result.success(getList); + } + + @ApiOperation(value = "|SarFileSplitItemsValEO|详情") + @GetMapping("/{id}") + //401问题2021-03-31暂时注释掉 liuhuiwen +// @RequiresPermissions("lawss:sarFileSplitItemsVal:get") + public ResponseMessage find(@PathVariable String id) throws Exception { + return Result.success(sarFileSplitItemsValEOService.selectByPrimaryKey(id)); + } + + @ApiOperation(value = "|SarFileSplitItemsValEO|新增") + @PostMapping(consumes = APPLICATION_JSON_UTF8_VALUE) + //401问题2021-03-31暂时注释掉 liuhuiwen +// @RequiresPermissions("lawss:sarFileSplitItemsVal:save") + public ResponseMessage create(@RequestBody SarFileSplitItemsValEO sarFileSplitItemsValEO) throws Exception { + sarFileSplitItemsValEOService.insertSelective(sarFileSplitItemsValEO); + return Result.success(sarFileSplitItemsValEO); + } + + @ApiOperation(value = "|SarFileSplitItemsValEO|修改") + @PutMapping(consumes = APPLICATION_JSON_UTF8_VALUE) + //401问题2021-03-31暂时注释掉 liuhuiwen +// @RequiresPermissions("lawss:sarFileSplitItemsVal:update") + public ResponseMessage update(@RequestBody SarFileSplitItemsValEO sarFileSplitItemsValEO) throws Exception { + sarFileSplitItemsValEOService.updateByPrimaryKeySelective(sarFileSplitItemsValEO); + return Result.success(sarFileSplitItemsValEO); + } + + @ApiOperation(value = "|SarFileSplitItemsValEO|删除") + @DeleteMapping("/{id}") + //401问题2021-03-31暂时注释掉 liuhuiwen +// @RequiresPermissions("lawss:sarFileSplitItemsVal:delete") + public ResponseMessage delete(@PathVariable String id) throws Exception { + sarFileSplitItemsValEOService.deleteByPrimaryKey(id); + logger.info("delete from SAR_FILE_SPLIT_ITEMS_VAL where id = {}", id); + return Result.success(); + } + + @ApiOperation(value = "|SarFileSplitItemsEO|根据目录查询") + @GetMapping("/getSplitItemsByMenu") +// @RequiresPermissions("lawss:sarFileSplitItems:page") + public ResponseMessage> getSplitItemsByMenu(String menuId,String infoId) throws Exception { + List getList = sarFileSplitItemsValEOService.getSplitItemsByMenu(menuId,infoId); + return Result.success(getList); + } + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsTableEODao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsTableEODao.java index c71a60f0..96a1514c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsTableEODao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsTableEODao.java @@ -30,4 +30,6 @@ public interface SarFileSplitItemsTableEODao extends BaseMapper queryItemsTableByMenuId(@Param("idList") List idList); + List queryByList(@Param("pager") SarFileSplitItemsTableEOPage pager); + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsValEODao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsValEODao.java index e78a0a09..7e762ccc 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsValEODao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsValEODao.java @@ -36,4 +36,14 @@ public interface SarFileSplitItemsValEODao extends BaseMapper queryByList(SarFileSplitItemsValEOPage valEOPage); + List queryByPage(SarFileSplitItemsValEOPage page); + + SarFileSplitItemsValEO selectByPrimaryKey(String id); + + void insertSelective(SarFileSplitItemsValEO sarFileSplitItemsValEO); + + void updateByPrimaryKeySelective(SarFileSplitItemsValEO sarFileSplitItemsValEO); + + void deleteByPrimaryKey(String id); + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitItemsValEOService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitItemsValEOService.java index 60aa46ac..553aac1b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitItemsValEOService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitItemsValEOService.java @@ -8,4 +8,16 @@ import java.util.List; public interface SarFileSplitItemsValEOService { List queryByList(SarFileSplitItemsValEOPage valEOPage); + + List queryByPage(SarFileSplitItemsValEOPage page); + + SarFileSplitItemsValEO selectByPrimaryKey(String id); + + void insertSelective(SarFileSplitItemsValEO sarFileSplitItemsValEO); + + void updateByPrimaryKeySelective(SarFileSplitItemsValEO sarFileSplitItemsValEO); + + void deleteByPrimaryKey(String id); + + List getSplitItemsByMenu(String menuId,String infoId); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsValEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsValEOServiceImpl.java index e2011de7..72ab7888 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsValEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsValEOServiceImpl.java @@ -1,9 +1,11 @@ package com.adc.da.slrs.standardSplit.service.impl; +import com.adc.da.slrs.standardSplit.dao.SarFileSplitItemsEODao; +import com.adc.da.slrs.standardSplit.dao.SarFileSplitItemsTableEODao; import com.adc.da.slrs.standardSplit.dao.SarFileSplitItemsValEODao; -import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsValEO; -import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsValEOPage; +import com.adc.da.slrs.standardSplit.entity.*; import com.adc.da.slrs.standardSplit.service.SarFileSplitItemsValEOService; +import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -11,6 +13,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.List; @Service @@ -20,9 +23,82 @@ public class SarFileSplitItemsValEOServiceImpl implements SarFileSplitItemsValEO @Autowired private SarFileSplitItemsValEODao sarFileSplitItemsValEODao; + @Autowired + private SarFileSplitItemsEODao sarFileSplitItemsEODao; + @Autowired + private SarFileSplitItemsTableEODao sarFileSplitItemsTableEODao; @Override public List queryByList(SarFileSplitItemsValEOPage valEOPage) { return sarFileSplitItemsValEODao.queryByList(valEOPage); } + + @Override + public List queryByPage(SarFileSplitItemsValEOPage page) { + return sarFileSplitItemsValEODao.queryByPage(page); + } + + @Override + public SarFileSplitItemsValEO selectByPrimaryKey(String id) { + return sarFileSplitItemsValEODao.selectByPrimaryKey(id); + } + + @Override + public void insertSelective(SarFileSplitItemsValEO sarFileSplitItemsValEO) { + sarFileSplitItemsValEODao.insertSelective(sarFileSplitItemsValEO); + } + + @Override + public void updateByPrimaryKeySelective(SarFileSplitItemsValEO sarFileSplitItemsValEO) { + sarFileSplitItemsValEODao.updateByPrimaryKeySelective(sarFileSplitItemsValEO); + } + + @Override + public void deleteByPrimaryKey(String id) { + sarFileSplitItemsValEODao.deleteByPrimaryKey(id); + } + + @Override + public List getSplitItemsByMenu(String menuId, String infoId) { + List rows = sarFileSplitItemsEODao.queryItemsByMenuId(menuId);; + List getList = new ArrayList<>(); + if (rows != null && !rows.isEmpty()) { + for (SarFileSplitItemsEO sarFileSplitItemsEO : rows) { + SarFileSplitItemsValEOPage valpage = new SarFileSplitItemsValEOPage(); + valpage.setItemId(sarFileSplitItemsEO.getId()); + valpage.setOrderBy("DISPLAY_SEQ,ID"); + List getListVal = sarFileSplitItemsValEODao.queryByList(valpage); + if (getList != null && !getList.isEmpty()) { + for (SarFileSplitItemsValEO sarFileSplitItemsValEO : getList) { + String imgPath = sarFileSplitItemsValEO.getItemContent(); + if ("IMG".equals(sarFileSplitItemsValEO.getType()) && StringUtils.isNotEmpty(imgPath)) { + String imgName = imgPath.substring(imgPath.lastIndexOf("/")+1, imgPath.length()); + sarFileSplitItemsValEO.setImgName(imgName); + } else if ("TABLE".equals(sarFileSplitItemsValEO.getType())) { + SarFileSplitItemsTableEOPage tablePage = new SarFileSplitItemsTableEOPage(); + tablePage.setItemsValId(sarFileSplitItemsValEO.getId()); + List tableList = sarFileSplitItemsTableEODao.queryByList(tablePage); + List tableListRow = sarFileSplitItemsTableEODao.queryByRowNum(tablePage); + sarFileSplitItemsValEO.setTableList(tableList); + if (tableListRow != null && !tableListRow.isEmpty()) { + List> getTableList = new ArrayList<>(); + for (int i=1; i <= tableListRow.size();i++) { + List rowList = new ArrayList<>(); + for (int j=0; j < tableList.size();j++) { + if (tableList.get(j).getRowNum() == i) { + rowList.add(tableList.get(j)); + } + } + getTableList.add(rowList); + } + sarFileSplitItemsValEO.setTableListShow(getTableList); + } + } + } + } + getList.addAll(getListVal); + } + } + return getList; + } }