FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

提交本地工具-标准拆分缺失的编辑接口

Browse Source
This commit is contained in:
duanwenbin
2021-07-12 18:10:11 +08:00
parent a160d81c9e
commit 718e261ff6
5 changed files with 234 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitItemsValEOController.java
+132
View File
@@ -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<SarFileSplitItemsValEO> {
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<PageInfo<SarFileSplitItemsValEO>> page(SarFileSplitItemsValEOPage page) throws Exception {
page.setOrderBy("modify_time desc");
List<SarFileSplitItemsValEO> rows = sarFileSplitItemsValEOService.queryByPage(page);
return Result.success(getPageInfo(page.getPager(), rows));
}
@ApiOperation(value = "|SarFileSplitItemsValEO|查询")
@GetMapping("/getItemsValList")
// @RequiresPermissions("lawss:sarFileSplitItemsVal:list")
public ResponseMessage<List<SarFileSplitItemsValEO>> list(SarFileSplitItemsValEOPage page) throws Exception {
page.setOrderBy("DISPLAY_SEQ,ID");
List<SarFileSplitItemsValEO> 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<SarFileSplitItemsTableEO> tableList = sarFileSplitItemsTableEOService.queryByList(tablePage);
List<SarFileSplitItemsTableEO> tableListRow = sarFileSplitItemsTableEOService.queryByRowNum(tablePage);
sarFileSplitItemsValEO.setTableList(tableList);
if (tableListRow != null && !tableListRow.isEmpty()) {
List<List<SarFileSplitItemsTableEO>> getTableList = new ArrayList<>();
for (int i=1; i <= tableListRow.size();i++) {
List<SarFileSplitItemsTableEO> 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<SarFileSplitItemsValEO> 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<SarFileSplitItemsValEO> 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<SarFileSplitItemsValEO> 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<List<SarFileSplitItemsValEO>> getSplitItemsByMenu(String menuId,String infoId) throws Exception {
List<SarFileSplitItemsValEO> getList = sarFileSplitItemsValEOService.getSplitItemsByMenu(menuId,infoId);
return Result.success(getList);
}
}
adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsTableEODao.java
+2
View File
@@ -30,4 +30,6 @@ public interface SarFileSplitItemsTableEODao extends BaseMapper<SarFileSplitItem
List<SarFileSplitItemsTableEO> queryItemsTableByMenuId(@Param("idList") List<String> idList);
List<SarFileSplitItemsTableEO> queryByList(@Param("pager") SarFileSplitItemsTableEOPage pager);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsValEODao.java
+10
View File
@@ -36,4 +36,14 @@ public interface SarFileSplitItemsValEODao extends BaseMapper<SarFileSplitItemsV
List<SarFileSplitItemsValEO> queryByList(SarFileSplitItemsValEOPage valEOPage);
List<SarFileSplitItemsValEO> queryByPage(SarFileSplitItemsValEOPage page);
SarFileSplitItemsValEO selectByPrimaryKey(String id);
void insertSelective(SarFileSplitItemsValEO sarFileSplitItemsValEO);
void updateByPrimaryKeySelective(SarFileSplitItemsValEO sarFileSplitItemsValEO);
void deleteByPrimaryKey(String id);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitItemsValEOService.java
+12
View File
@@ -8,4 +8,16 @@ import java.util.List;
public interface SarFileSplitItemsValEOService {
List<SarFileSplitItemsValEO> queryByList(SarFileSplitItemsValEOPage valEOPage);
List<SarFileSplitItemsValEO> queryByPage(SarFileSplitItemsValEOPage page);
SarFileSplitItemsValEO selectByPrimaryKey(String id);
void insertSelective(SarFileSplitItemsValEO sarFileSplitItemsValEO);
void updateByPrimaryKeySelective(SarFileSplitItemsValEO sarFileSplitItemsValEO);
void deleteByPrimaryKey(String id);
List<SarFileSplitItemsValEO> getSplitItemsByMenu(String menuId,String infoId);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsValEOServiceImpl.java
+78 -2
View File
@@ -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<SarFileSplitItemsValEO> queryByList(SarFileSplitItemsValEOPage valEOPage) {
return sarFileSplitItemsValEODao.queryByList(valEOPage);
}
@Override
public List<SarFileSplitItemsValEO> 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<SarFileSplitItemsValEO> getSplitItemsByMenu(String menuId, String infoId) {
List<SarFileSplitItemsEO> rows = sarFileSplitItemsEODao.queryItemsByMenuId(menuId);;
List<SarFileSplitItemsValEO> 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<SarFileSplitItemsValEO> 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<SarFileSplitItemsTableEO> tableList = sarFileSplitItemsTableEODao.queryByList(tablePage);
List<SarFileSplitItemsTableEO> tableListRow = sarFileSplitItemsTableEODao.queryByRowNum(tablePage);
sarFileSplitItemsValEO.setTableList(tableList);
if (tableListRow != null && !tableListRow.isEmpty()) {
List<List<SarFileSplitItemsTableEO>> getTableList = new ArrayList<>();
for (int i=1; i <= tableListRow.size();i++) {
List<SarFileSplitItemsTableEO> 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;
}
}