diff --git a/adc-da-activiti/src/main/java/com/adc/da/common/TableToExcel.java b/adc-da-activiti/src/main/java/com/adc/da/common/TableToExcel.java new file mode 100644 index 00000000..99d2e19f --- /dev/null +++ b/adc-da-activiti/src/main/java/com/adc/da/common/TableToExcel.java @@ -0,0 +1,92 @@ +package com.adc.da.common; + +import org.apache.commons.beanutils.BeanUtils; +import org.apache.poi.hssf.usermodel.HSSFCellStyle; +import org.apache.poi.ss.usermodel.*; +import org.apache.poi.ss.util.CellRangeAddress; +import org.apache.poi.xssf.streaming.SXSSFWorkbook; + +import java.util.*; + +public class TableToExcel { + + public static Workbook createExcel(Map columnMap, List dataList, String sheelName, String fileName) { + + if(sheelName==null)sheelName="sheet1"; + + int sheetRow=500; + sheetRow=sheetRow<0?200:sheetRow; + //第一步，创建一个webbook，对应一个excel文件，内存中sheetRow条记录后提交。 + Workbook wb=new SXSSFWorkbook(sheetRow); + if(columnMap!=null&&dataList!=null) { + //获取需要生成的sheet数，以防数据量过大报错 + int sheetCount=getSheetCount(sheetRow,dataList.size()); + //循环生成sheet + for(int i=0;i keys=columnMap.keySet(); + //第一行（标题行）合并并设置标题 + + + //创建表头行 + Row headRow=sheet.createRow(0); + //生成表头行 + int j=0; + for(String key:keys) { + Cell hCell=headRow.createCell(j++); + hCell.setCellValue(columnMap.get(key)); + } + //从第三行开始填充数据 + int c=2; + for(int k=i*sheetRow;k columnMap) { + if(sheet!=null&&columnMap!=null) { + List list=new ArrayList(columnMap.keySet()); + for(int i=0;i0?total/sheelRow+1:total/sheelRow; + } + +} diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java index 54fecda7..fcd59455 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java @@ -3,6 +3,7 @@ package com.adc.da.workFlow.controller; import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.entity.ExportParams; import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; +import cn.hutool.core.lang.UUID; import com.adc.da.FeignClientImpl.workFlowFeignClientImpl; import com.adc.da.Timer.ProcessTimer; import com.adc.da.common.*; @@ -15,7 +16,11 @@ import com.adc.da.sys.common.EmailUtils; import com.adc.da.sys.entity.UserEO; import com.adc.da.sys.service.IUserEOService; import com.adc.da.util.LoginUserUtil; +import com.adc.da.workFlow.dao.ExportExcelMapper; +import com.adc.da.workFlow.entity.ExportExcel; +import com.adc.da.workFlow.entity.ExportExcelEO; import com.adc.da.workFlow.entity.ProcessDetailExport; +import com.adc.da.workFlow.service.WorkFlowService; import com.alibaba.fastjson.JSON; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -29,6 +34,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.OutputStream; +import java.io.UnsupportedEncodingException; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -42,6 +48,46 @@ public class WorkFlowController { @Autowired private workFlowFeignClientImpl workFlowFeignClient; +// @Autowired +// private ExportExcelMapper exportExcelMapper; + + @ApiOperation(value = "导出excel") + @PostMapping("/export_excel") + public void exportExcel(@RequestBody ExportExcelEO exportExcelEO, HttpServletResponse response, HttpServletRequest request) throws IOException { + +// ExportExcel exportExcel = exportExcelMapper.selectById(id); +// if(exportExcel==null||exportExcel.getJson()==null)return; +// ExportExcelEO exportExcelEO=JSON.parseObject(exportExcel.getJson(),ExportExcelEO.class); + + if(exportExcelEO.getFileName()==null||exportExcelEO.getFileName().trim().length()==0){ + exportExcelEO.setFileName(UUID.fastUUID().toString(true)); + } + + Workbook excel = TableToExcel.createExcel(exportExcelEO.getColumnName(), exportExcelEO.getDataList(), null, exportExcelEO.getFileName()); + + response.reset(); + + response.setContentType("application/vnd.ms-excel"); + + response.setHeader("Content-disposition", "attachment; filename=" + exportExcelEO.getFileName() + ".xls"); + OutputStream outputStream = response.getOutputStream(); + + excel.write(outputStream); + outputStream.flush(); + outputStream.close(); + } + +// @ApiOperation(value = "导出excel数据暂留") +// @PostMapping("/save_excel") +// public ResponseMessage saveExcel(@RequestBody ExportExcel exportExcel){ +// +// exportExcelMapper.insert(exportExcel); +// return Result.success(exportExcel); +// +// } + + + @ApiOperation(value = "启动流程-以流程定义id") @GetMapping("/activiti_define_start") public ResponseMessage activiti_define_start(@RequestParam("id") String id, @RequestParam("userId") String userId, @RequestParam(value = "bpnId",required = false) String bpnId){ diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/dao/ExportExcelMapper.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/dao/ExportExcelMapper.java new file mode 100644 index 00000000..e6b082f5 --- /dev/null +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/dao/ExportExcelMapper.java @@ -0,0 +1,8 @@ +package com.adc.da.workFlow.dao; + + +import com.adc.da.workFlow.entity.ExportExcel; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +public interface ExportExcelMapper extends BaseMapper { +} diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/ExportExcel.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/ExportExcel.java new file mode 100644 index 00000000..4a99c762 --- /dev/null +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/ExportExcel.java @@ -0,0 +1,20 @@ +package com.adc.da.workFlow.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.models.auth.In; +import lombok.*; + +@TableName("t_export_excel") +@Data +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class ExportExcel { + @TableId(value = "id",type = IdType.AUTO) + private Integer id; + @TableField(value = "json") + private String json; +} diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/ExportExcelEO.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/ExportExcelEO.java new file mode 100644 index 00000000..b5b8e1cf --- /dev/null +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/ExportExcelEO.java @@ -0,0 +1,17 @@ +package com.adc.da.workFlow.entity; + +import lombok.Data; + +import java.util.List; +import java.util.Map; + +@Data +public class ExportExcelEO { + + private Map columnName; + + private List> dataList; + + private String fileName; + +} diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/WorkFlowService.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/WorkFlowService.java index 81c27557..1190c6b2 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/WorkFlowService.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/WorkFlowService.java @@ -31,4 +31,5 @@ public class WorkFlowService { /** * 后续优化工作流 */ + } diff --git a/adc-da-base/pom.xml b/adc-da-base/pom.xml index df6ad64a..cbf24270 100644 --- a/adc-da-base/pom.xml +++ b/adc-da-base/pom.xml @@ -37,6 +37,8 @@ UserAgentUtils 1.21 + + diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarTree/controller/TreeController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarTree/controller/TreeController.java new file mode 100644 index 00000000..d66960c4 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarTree/controller/TreeController.java @@ -0,0 +1,51 @@ +package com.adc.da.slrs.sarTree.controller; + +import com.adc.da.base.web.BaseController; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.slrs.sarRole.entity.TsRole; +import com.adc.da.slrs.sarTree.entity.SarModel; +import com.adc.da.slrs.sarTree.entity.SarVPPS; +import com.adc.da.slrs.sarTree.service.SarModelService; +import com.adc.da.slrs.sarTree.service.SarVPPSService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; +import java.util.List; +import java.util.Map; + +@RestController +@Api(tags = "|获取树列表|") +@RequestMapping("/api/sarVpps") +public class TreeController extends BaseController { + + @Autowired + private SarVPPSService sarVPPSService; + @Autowired + private SarModelService sarModelService; + + @ApiOperation("VPPS树列表") + @GetMapping("/tree/list1") + public ResponseMessage> getTreeList1(){ + List sarVpps = sarVPPSService.findTreeAll(); + return Result.success(sarVpps); + } + + @ApiOperation("模块结构单元树列表") + @GetMapping("/tree/list2") + public ResponseMessage> getTreeList2(){ + List sarVpps = sarModelService.findTreeAll(); + return Result.success(sarVpps); + } + +// @ApiOperation("根据角色名筛选角色") +// @GetMapping("/tree/node/list") +// public ResponseMessage> getTreeNodeList(String code){ +// Map map = sarVPPSService.findTreeAll(code); +// return Result.success(map); +// } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarTree/dao/SarModelDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarTree/dao/SarModelDao.java new file mode 100644 index 00000000..735b69dc --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarTree/dao/SarModelDao.java @@ -0,0 +1,15 @@ +package com.adc.da.slrs.sarTree.dao; + +import com.adc.da.slrs.sarTree.entity.SarModel; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; +import java.util.List; + +public interface SarModelDao extends BaseMapper { + + @Select("select id,pid,CONCAT(name,model) name,features from sar_model_tree where 1=1 and isnull(pid)") + List findTreeAll(); + @Select("select id,pid,CONCAT(name,model) name,features from sar_model_tree where 1=1 and pid = #{pid}") + List selectList(@Param("pid") String pid); +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarTree/dao/SarVPPSDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarTree/dao/SarVPPSDao.java new file mode 100644 index 00000000..92e7ff25 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarTree/dao/SarVPPSDao.java @@ -0,0 +1,15 @@ +package com.adc.da.slrs.sarTree.dao; + +import com.adc.da.slrs.sarTree.entity.SarVPPS; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; +import java.util.List; + +public interface SarVPPSDao extends BaseMapper { + + @Select("select id,pid,CONCAT(VPPS_CODE,CHINESE_NAME,ENGLISH_NAME) name,code from sar_vpps_tree where 1=1 and isnull(pid)") + List findTreeAll(); + @Select("select id,pid,CONCAT(VPPS_CODE,CHINESE_NAME,ENGLISH_NAME) name,code from sar_vpps_tree where 1=1 and pid = #{pid}") + List selectList(@Param("pid") String pid); +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarTree/entity/SarModel.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarTree/entity/SarModel.java new file mode 100644 index 00000000..dab25cd9 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarTree/entity/SarModel.java @@ -0,0 +1,35 @@ +package com.adc.da.slrs.sarTree.entity; + +import com.adc.da.base.entity.BaseEntity; +import io.swagger.annotations.ApiModel; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.springframework.data.annotation.Transient; + +import java.util.List; + +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(value="SarModel对象", description="") +public class SarModel extends BaseEntity { + private static final long serialVersionUID = 1L; + + private String id; + + private String name; + + private String pid; + + private String model; + + private String features; + + private String delFlag; + + @Transient + private List children; + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarTree/entity/SarVPPS.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarTree/entity/SarVPPS.java new file mode 100644 index 00000000..af7f22c2 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarTree/entity/SarVPPS.java @@ -0,0 +1,38 @@ +package com.adc.da.slrs.sarTree.entity; + +import com.adc.da.base.entity.BaseEntity; +import io.swagger.annotations.ApiModel; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.springframework.data.annotation.Transient; +import java.util.List; + +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(value="SarVPPS对象", description="") +public class SarVPPS extends BaseEntity { + private static final long serialVersionUID = 1L; + + private String id; + + private String vppsCode; + + private String pid; + + private String code; + + private String chineseName; + + private String englishName; + + private String delFlag; + + @Transient + private List children; + + @Transient + private String name; + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarTree/service/SarModelService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarTree/service/SarModelService.java new file mode 100644 index 00000000..8c02b113 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarTree/service/SarModelService.java @@ -0,0 +1,11 @@ +package com.adc.da.slrs.sarTree.service; + +import com.adc.da.slrs.sarTree.entity.SarModel; +import com.adc.da.slrs.sarTree.entity.SarVPPS; + +import java.util.List; + +public interface SarModelService { + + List findTreeAll(); +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarTree/service/SarVPPSService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarTree/service/SarVPPSService.java new file mode 100644 index 00000000..b9e4ac3f --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarTree/service/SarVPPSService.java @@ -0,0 +1,9 @@ +package com.adc.da.slrs.sarTree.service; + +import com.adc.da.slrs.sarTree.entity.SarVPPS; +import java.util.List; + +public interface SarVPPSService { + + List findTreeAll(); +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarTree/service/impl/SarModelServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarTree/service/impl/SarModelServiceImpl.java new file mode 100644 index 00000000..729a9f06 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarTree/service/impl/SarModelServiceImpl.java @@ -0,0 +1,47 @@ +package com.adc.da.slrs.sarTree.service.impl; + +import com.adc.da.slrs.sarTree.dao.SarModelDao; +import com.adc.da.slrs.sarTree.entity.SarModel; +import com.adc.da.slrs.sarTree.service.SarModelService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +@Service +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) +public class SarModelServiceImpl implements SarModelService { + private static final Logger logger = LoggerFactory.getLogger(SarModelServiceImpl.class); + + @Autowired + private SarModelDao sarModelDao; + + @Override + public List findTreeAll() { + //查询父级都为null的数据 + List sarVppsList = sarModelDao.findTreeAll(); + for (SarModel sarVppsOne : sarVppsList) { + sarVppsOne.setChildren(getChildren(sarVppsOne)); + } + return sarVppsList; + } + + /** + * 递归调用获取子节点 + * + * @param parent：父节点 + * @return List + */ + private List getChildren(SarModel parent) { + String pid = parent.getId(); + List children = sarModelDao.selectList(pid); + for (SarModel sarVppsOne : children) { + sarVppsOne.setChildren(getChildren((sarVppsOne))); + } + return children; + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarTree/service/impl/SarVPPSServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarTree/service/impl/SarVPPSServiceImpl.java new file mode 100644 index 00000000..30db1809 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarTree/service/impl/SarVPPSServiceImpl.java @@ -0,0 +1,48 @@ +package com.adc.da.slrs.sarTree.service.impl; + +import com.adc.da.slrs.sarResource.entity.TsResource; +import com.adc.da.slrs.sarTree.dao.SarVPPSDao; +import com.adc.da.slrs.sarTree.entity.SarVPPS; +import com.adc.da.slrs.sarTree.service.SarVPPSService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; +import java.util.List; + +@Service +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) +public class SarVPPSServiceImpl implements SarVPPSService { + private static final Logger logger = LoggerFactory.getLogger(SarVPPSServiceImpl.class); + + @Autowired + private SarVPPSDao sarVPPSDao; + + @Override + public List findTreeAll() { + //查询父级都为null的数据 + List sarVppsList = sarVPPSDao.findTreeAll(); + for (SarVPPS sarVppsOne:sarVppsList) { + sarVppsOne.setChildren(getChildren(sarVppsOne)); + } + return sarVppsList; + } + + /** + * 递归调用获取子节点 + * @param parent：父节点 + * @return List + */ + private List getChildren(SarVPPS parent){ + String pid = parent.getId(); + List children = sarVPPSDao.selectList(pid); + for(SarVPPS sarVppsOne:children){ + sarVppsOne.setChildren(getChildren((sarVppsOne))); + } + return children; + } + +} 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; + } }