From f41d94bbd9e45c29d4c052c54f9d0a7aea490b92 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Mon, 12 Jul 2021 11:02:11 +0800 Subject: [PATCH 01/16] =?UTF-8?q?feat:=20=E6=A0=87=E5=87=86=E6=96=87?= =?UTF-8?q?=E6=9C=AC=E4=BF=A1=E6=81=AF=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarStandardsInfoServiceImpl.java | 3 ++- .../java/com/adc/da/att/service/impl/AttFileEOServiceImpl.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java index c432ee27..88d3d02f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java @@ -504,11 +504,12 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl fileMap) throws Exception { if (fileMap != null && fileMap.size() > 0) { List standFileList = new ArrayList<>(); + List fileList = new ArrayList<>(); for (Map.Entry entry : fileMap.entrySet()) { String value = entry.getValue(); String field = entry.getKey(); if (StringUtils.isNotBlank(value)) { - List fileList = attFileEOService.getMultiFileInfos(value); + fileList = attFileEOService.getMultiFileInfos(value); if (fileList != null && !fileList.isEmpty()) { createStandFileAppend(standId, field, fileList, standFileList); } diff --git a/adc-da-sys/src/main/java/com/adc/da/att/service/impl/AttFileEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/att/service/impl/AttFileEOServiceImpl.java index f2d24b35..e81fdfff 100644 --- a/adc-da-sys/src/main/java/com/adc/da/att/service/impl/AttFileEOServiceImpl.java +++ b/adc-da-sys/src/main/java/com/adc/da/att/service/impl/AttFileEOServiceImpl.java @@ -281,7 +281,7 @@ public class AttFileEOServiceImpl extends ServiceImpl i if(StringUtils.isNotEmpty(idList[i])){ attFileEO.setId(idList[i]); AttFileEO getFile = this.baseMapper.selectFileInfoById(attFileEO); - if(attFileEO != null){ + if(attFileEO != null && getFile != null){ fileObj.add(getFile); } } From 51ed1c269dd4f0d5f18ea766a08fe36064eab530 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Mon, 12 Jul 2021 18:09:24 +0800 Subject: [PATCH 02/16] =?UTF-8?q?feat:=20=E6=A0=87=E5=87=86=E5=BA=93=20?= =?UTF-8?q?=E8=AF=A6=E6=83=85=20=E6=96=87=E4=BB=B6=E7=B1=BB=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sarStandardsInfo/entity/SarStandardsInfo.java | 2 ++ .../service/impl/SarStandardsInfoServiceImpl.java | 15 +++++++++++++++ .../da/att/controller/AttFileEOController.java | 12 ++++++++---- .../service/ISarMenuStandardService.java | 3 +++ .../service/impl/SarMenuStandardServiceImpl.java | 5 +++++ 5 files changed, 33 insertions(+), 4 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java index 7e4f80fd..df2df62e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java @@ -187,5 +187,7 @@ public class SarStandardsInfo extends BaseEntity { @TableField(exist = false) private String putTime2; + @TableField(exist = false) + private String standSystemName; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java index 88d3d02f..33c619a5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java @@ -32,6 +32,7 @@ import com.adc.da.slrs.sarStandItems.page.SarStandItemsEOPage; import com.adc.da.slrs.sarStandItems.service.ISarStandItemsService; import com.adc.da.slrs.sarStandMenu.dao.SarStandMenuDao; import com.adc.da.slrs.sarStandMenu.entity.SarStandMenu; +import com.adc.da.slrs.sarStandMenu.service.ISarStandMenuService; import com.adc.da.slrs.sarStandPutTime.dao.SarStandPutTimeDao; import com.adc.da.slrs.sarStandPutTime.entity.SarStandPutTime; import com.adc.da.slrs.sarStandVal.dao.SarStandValDao; @@ -47,6 +48,8 @@ import com.adc.da.sys.common.SelectionResult; import com.adc.da.sys.constant.ValueStateEnum; import com.adc.da.sys.dao.DicTypeEODao; import com.adc.da.sys.entity.DicTypeEO; +import com.adc.da.sys.sarMenuStandard.entity.SarMenuStandard; +import com.adc.da.sys.sarMenuStandard.service.ISarMenuStandardService; import com.adc.da.util.LoginUserUtil; import com.adc.da.util.UUIDUtils; import com.adc.da.utils.util.*; @@ -96,6 +99,9 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl { * @return List */ List getMenuByIds(List menuIds); + + SarMenuStandard selectMenuById(String id); + } diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/service/impl/SarMenuStandardServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/service/impl/SarMenuStandardServiceImpl.java index 16887956..c5c3fd33 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/service/impl/SarMenuStandardServiceImpl.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/service/impl/SarMenuStandardServiceImpl.java @@ -29,6 +29,11 @@ public class SarMenuStandardServiceImpl extends ServiceImpl Date: Mon, 12 Jul 2021 18:10:11 +0800 Subject: [PATCH 03/16] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=9C=AC=E5=9C=B0?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E6=A0=87=E5=87=86=E6=8B=86=E5=88=86?= =?UTF-8?q?=E7=BC=BA=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; + } } From 9930cbae9bc1a315715bf80f38f41a764a1c46b1 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Tue, 13 Jul 2021 14:25:06 +0800 Subject: [PATCH 04/16] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E4=BC=81?= =?UTF-8?q?=E4=B8=9A=E6=A0=87=E5=87=86=E5=BA=93=20=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarBussionessStandController.java | 23 + .../dao/SarBussionessStandDao.java | 20 + .../entity/SarBussionessStand.java | 186 ++++ .../service/ISarBussionessStandService.java | 20 + .../impl/SarBussionessStandServiceImpl.java | 27 + .../SarStandardsInfoController.java | 33 + .../entity/SarBussionessStandEOPage.java | 896 +++++++++++++++++ .../SarBussionessStandMapper.xml | 906 ++++++++++++++++++ 8 files changed, 2111 insertions(+) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarBussionessStandEOPage.java create mode 100644 adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java new file mode 100644 index 00000000..dc247155 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java @@ -0,0 +1,23 @@ +package com.adc.da.slrs.sarBussionessStand.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; +import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand; +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.RestController; +import com.adc.da.base.web.BaseController; + +/** +*

+ * 企业标准信息表 前端控制器 + *

+* +* @author super_liu +* @since 2021-07-13 +*/ +@RestController +@Api(tags = "福田标准法规--企业标准信息") +@RequestMapping("/${restPath}/lawss/sarBussionessStand") +public class SarBussionessStandController extends BaseController { + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java new file mode 100644 index 00000000..782a06da --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java @@ -0,0 +1,20 @@ +package com.adc.da.slrs.sarBussionessStand.dao; + +import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand; +import com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +import java.util.List; + +/** + *

+ * 企业标准信息表 Mapper 接口 + *

+ * + * @author super_liu + * @since 2021-07-13 + */ +public interface SarBussionessStandDao extends BaseMapper { + + List queryByList(SarBussionessStandEOPage sarBussionessStandEOPage); +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java new file mode 100644 index 00000000..b4601b3a --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java @@ -0,0 +1,186 @@ +package com.adc.da.slrs.sarBussionessStand.entity; + +import com.adc.da.att.vo.AttFileVo; +import com.adc.da.base.entity.BaseEntity; +import java.math.BigDecimal; +import java.time.LocalDate; + +import com.adc.da.slrs.standardSplit.entity.SarStandAttrDetailsEO; +import com.baomidou.mybatisplus.annotation.TableId; +import java.time.LocalDateTime; +import java.util.*; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + *

+ * 企业标准信息表 + *

+ * + * @author super_liu + * @since 2021-07-13 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(value="SarBussionessStand对象", description="企业标准信息表") +public class SarBussionessStand extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键") + @TableId("ID") + private String id; + + @ApiModelProperty(value = "标准编号") + @TableField("STAND_CODE") + private String standCode; + + @ApiModelProperty(value = "标准名称") + @TableField("STAND_NAME") + private String standName; + + @ApiModelProperty(value = "标准英文名称") + @TableField("STAND_EN_NAME") + private String standEnName; + + @ApiModelProperty(value = "发布日期") + @TableField("ISSUE_TIME") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + private Date issueTime; + + @ApiModelProperty(value = "实施日期") + @TableField("PUT_TIME") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + private Date putTime; + + @ApiModelProperty(value = "代替标准号") + @TableField("REPLACE_STAND_NUM") + private String replaceStandNum; + + @ApiModelProperty(value = "被代替标准号") + @TableField("REPLACED_STAND_NUM") + private String replacedStandNum; + + @ApiModelProperty(value = "标准状态") + @TableField("STAND_STATUS") + private String standStatus; + + @ApiModelProperty(value = "适用国家/地区") + @TableField("APPLY_COUNTRY") + private String applyCountry; + + @ApiModelProperty(value = "标准性质") + @TableField("STAND_NATURE") + private String standNature; + + @ApiModelProperty(value = "标准类别") + @TableField("STAND_SORT") + private String standSort; + + @ApiModelProperty(value = "标准年份") + @TableField("STAND_YEAR") + private String standYear; + + @ApiModelProperty(value = "是否有效") + @TableField("VALID_FLAG") + private Integer validFlag; + + @ApiModelProperty(value = "创建时间") + @TableField("CREATION_TIME") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date creationTime; + + @ApiModelProperty(value = "修改时间") + @TableField("MODIFY_TIME") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date modifyTime; + + @TableField(exist = false) + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private String firstPutTime; + + @TableField(exist = false) + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + private String putTimeShow; + + @TableField(exist = false) + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + private String issueTimeShow; + + @TableField(exist = false) + private String issueTimeStr; + + @TableField(exist = false) + private String putTimeStr; + + //目录ID 非标准信息表中的字段 + @TableField(exist = false) + private String menuId; + + @TableField(exist = false) + private String menuParentId; + + @TableField(exist = false) + private String standStatusShow; // 标准状态下拉框 --单选 + + @TableField(exist = false) + private String standNatrueShow; + + @TableField(exist = false) + private String standSortShow; + + @TableField(exist = false) + private String applyCountryShow; + + @TableField(exist = false) + private List standFileList = new ArrayList(); + + @TableField(exist = false) + private List opinionFilesList = new ArrayList(); + + @TableField(exist = false) + private List relevanceFileList = new ArrayList(); + + @TableField(exist = false) + private String collectId; + + //文件的类型 + @TableField(exist = false) + private String standFileClassify; + + //文件的下载id + @TableField(exist = false) + private String attId; + + //记录是否修改了替代文件号 + @TableField(exist = false) + private int upReplaceNumFlag; + //记录是否修改了文件号 + @TableField(exist = false) + private int upNumFlag; + // 数据库新加的字段 + + @TableField(exist = false) + private String remark;//备注 + + @TableField(exist = false) + private Map attrInfoMap = new LinkedHashMap<>(); //属性表字段与值 + + @TableField(exist = false) + private String sarStandAttrEOStr; //新增修改时属性表信息 + + @TableField(exist = false) + private String fileIds; //全部文件ID + + @TableField(exist = false) + private List attrInfoList = new ArrayList<>(); + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java new file mode 100644 index 00000000..3277b429 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java @@ -0,0 +1,20 @@ +package com.adc.da.slrs.sarBussionessStand.service; + +import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand; +import com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +/** + *

+ * 企业标准信息表 服务类 + *

+ * + * @author super_liu + * @since 2021-07-13 + */ +public interface ISarBussionessStandService extends IService { + + List queryByList(SarBussionessStandEOPage sarBussionessStandEOPage); +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java new file mode 100644 index 00000000..bc23039e --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -0,0 +1,27 @@ +package com.adc.da.slrs.sarBussionessStand.service.impl; + +import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand; +import com.adc.da.slrs.sarBussionessStand.dao.SarBussionessStandDao; +import com.adc.da.slrs.sarBussionessStand.service.ISarBussionessStandService; +import com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + *

+ * 企业标准信息表 服务实现类 + *

+ * + * @author super_liu + * @since 2021-07-13 + */ +@Service +public class SarBussionessStandServiceImpl extends ServiceImpl implements ISarBussionessStandService { + + @Override + public List queryByList(SarBussionessStandEOPage sarBussionessStandEOPage){ + return this.baseMapper.queryByList(sarBussionessStandEOPage); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java index d9b83f2d..8c3a3177 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java @@ -11,6 +11,8 @@ import com.adc.da.exception.AdcDaBaseException; import com.adc.da.http.PageInfo; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; +import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand; +import com.adc.da.slrs.sarBussionessStand.service.ISarBussionessStandService; import com.adc.da.slrs.sarLawsInfo.service.ISarLawsInfoService; import com.adc.da.slrs.sarStandardsInfo.entity.*; import com.adc.da.slrs.sarStandardsInfo.service.ISarStandardsInfoService; @@ -63,6 +65,9 @@ public class SarStandardsInfoController extends BaseController @Autowired private ISarStandardsInfoService sarStandardsInfoEOService; + @Autowired + private ISarBussionessStandService iSarBussionessStandService; + @Value("${file.path}") private String filePath; @@ -556,5 +561,33 @@ public class SarStandardsInfoController extends BaseController } + @ApiOperation(value = "|SarStandardsInfoEO|根据标准号查询") + @GetMapping("/queryInfoByStandNum") + //@RequiresPermissions("lawss:sarStandardsInfo:list") + public ResponseMessage queryInfoByStandNum(SarStandardsInfoEOPage page) throws Exception { + if (org.apache.commons.lang.StringUtils.isNotBlank(page.getStandNumber())){ + String sort = ""; + if (page.getStandNumber().length()>3) { + sort = page.getStandNumber().substring(0, 3); + } + if ("ECE".equals(sort)) { + int length = page.getStandNumber().length(); + String number = page.getStandNumber().substring(3,length); + page.setStandNumber("UN(ECE)" + number); + } + } + List getList = sarStandardsInfoEOService.selectStandardsByStandnumber(page.getStandNumber(),page.getStandType()); + SarBussionessStandEOPage sarBussionessStandEOPage = new SarBussionessStandEOPage(); + sarBussionessStandEOPage.setStandCode(page.getStandNumber()); + List list = iSarBussionessStandService.queryByList(sarBussionessStandEOPage); + if(getList.size()>0){ + return Result.success(getList.get(0)); + } + if (list.size()>0){ + return Result.success(list.get(0)); + } + return Result.success("0","标准/企标已不存在"); + } + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarBussionessStandEOPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarBussionessStandEOPage.java new file mode 100644 index 00000000..a2263387 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarBussionessStandEOPage.java @@ -0,0 +1,896 @@ +package com.adc.da.slrs.sarStandardsInfo.entity; + +import com.adc.da.sys.common.BasePage; + +import java.util.List; + +/** + * 功能：SAR_BUSSIONESS_STAND SarBussionessStandEOPage
+ * 作者：code generator
+ * 日期： 2018-09-03
+ * 版权所有：版权归北京卡达克数据技术中心所有。
+ */ +public class SarBussionessStandEOPage extends BasePage { + + private String modifyTime; + private String modifyTime1; + private String modifyTime2; + private String modifyTimeOperator = "="; + private String creationTime; + private String creationTime1; + private String creationTime2; + private String creationTimeOperator = "="; + private String validFlag; + private String validFlagOperator = "="; + private String putUser; + private String putUserOperator = "="; + private String citationUser; + private String citationUserOperator = "="; + private String responsibleUnit; + private String responsibleUnitOperator = "="; + private String standFile; + private String standFileOperator = "="; + private String tags; + private String tagsOperator = "="; + private String standStatus; + private String standStatusOperator = "="; + private String replacedStandNum; + private String replacedStandNumOperator = "="; + private String replaceStandNum; + private String replaceStandNumOperator = "="; + private String quoteStand; + private String quoteStandOperator = "="; + private String firstPutTime; + private String firstPutTime1; + private String firstPutTime2; + private String firstPutTimeOperator = "="; + private String putYear; + private String putYear1; + private String putYear2; + private String putYearOperator = "="; + private String putTime; + private String putTime1; + private String putTime2; + private String putTimeOperator = "="; + private String issueTime; + private String issueTime1; + private String issueTime2; + private String issueTimeOperator = "="; + private String energyKind; + private String energyKindOperator = "="; + private String applyArctic; + private String applyArcticOperator = "="; + private String standEnName; + private String standEnNameOperator = "="; + private String standName; + private String standNameOperator = "="; + private String standCode; + private String standCodeOperator = "="; + private String classifyCode; + private String classifyCodeOperator = "="; + private String standSubclass; + private String standSubclassOperator = "="; + private String standGenera; + private String standGeneraOperator = "="; + private String id; + private String idOperator = "="; + // 数据库新增字段 + private String applyCountry; + private String standYear; + private String applyCountryOperator = "="; + private String standNature; + private String standNatureOperator = "="; + private String synopsis; + private String synopsisOperator = "="; + private String standSort; + private String standSortOperator = "="; + private String opinionFile; + private String opinionFileOperator = "="; + private String relevanceFile; + private String relevanceFileOperator = "="; + private String remark; + private String remarkOperator = "="; + + private List roleIds; + private String rootMenuId; + private String orgName; + private List menuRoleList; + private String[] replacedStandNumList; + private String numberName; + // 树结构增加搜索条件 + private String collectMenuId; + private String advanceSearchVOStr; + private String advanceSearchStr; + private List menuAllChildrenIdList; + private String userId; + + private String zqcrId; + + //页面排序 + private String paixu; + private String shunxu; + private String sql; + + public String getZqcrId() { + return zqcrId; + } + + public void setZqcrId(String zqcrId) { + this.zqcrId = zqcrId; + } + + public String getModifyTime() { + return this.modifyTime; + } + + public void setModifyTime(String modifyTime) { + this.modifyTime = modifyTime; + } + + public String getModifyTime1() { + return this.modifyTime1; + } + + public void setModifyTime1(String modifyTime1) { + this.modifyTime1 = modifyTime1; + } + + public String getModifyTime2() { + return this.modifyTime2; + } + + public void setModifyTime2(String modifyTime2) { + this.modifyTime2 = modifyTime2; + } + + public String getModifyTimeOperator() { + return this.modifyTimeOperator; + } + + public void setModifyTimeOperator(String modifyTimeOperator) { + this.modifyTimeOperator = modifyTimeOperator; + } + + public String getCreationTime() { + return this.creationTime; + } + + public void setCreationTime(String creationTime) { + this.creationTime = creationTime; + } + + public String getCreationTime1() { + return this.creationTime1; + } + + public void setCreationTime1(String creationTime1) { + this.creationTime1 = creationTime1; + } + + public String getCreationTime2() { + return this.creationTime2; + } + + public void setCreationTime2(String creationTime2) { + this.creationTime2 = creationTime2; + } + + public String getCreationTimeOperator() { + return this.creationTimeOperator; + } + + public void setCreationTimeOperator(String creationTimeOperator) { + this.creationTimeOperator = creationTimeOperator; + } + + public String getValidFlag() { + return this.validFlag; + } + + public void setValidFlag(String validFlag) { + this.validFlag = validFlag; + } + + public String getValidFlagOperator() { + return this.validFlagOperator; + } + + public void setValidFlagOperator(String validFlagOperator) { + this.validFlagOperator = validFlagOperator; + } + + public String getPutUser() { + return this.putUser; + } + + public void setPutUser(String putUser) { + this.putUser = putUser; + } + + public String getPutUserOperator() { + return this.putUserOperator; + } + + public void setPutUserOperator(String putUserOperator) { + this.putUserOperator = putUserOperator; + } + + public String getCitationUser() { + return this.citationUser; + } + + public void setCitationUser(String citationUser) { + this.citationUser = citationUser; + } + + public String getCitationUserOperator() { + return this.citationUserOperator; + } + + public void setCitationUserOperator(String citationUserOperator) { + this.citationUserOperator = citationUserOperator; + } + + public String getResponsibleUnit() { + return this.responsibleUnit; + } + + public void setResponsibleUnit(String responsibleUnit) { + this.responsibleUnit = responsibleUnit; + } + + public String getResponsibleUnitOperator() { + return this.responsibleUnitOperator; + } + + public void setResponsibleUnitOperator(String responsibleUnitOperator) { + this.responsibleUnitOperator = responsibleUnitOperator; + } + + public String getStandFile() { + return this.standFile; + } + + public void setStandFile(String standFile) { + this.standFile = standFile; + } + + public String getStandFileOperator() { + return this.standFileOperator; + } + + public void setStandFileOperator(String standFileOperator) { + this.standFileOperator = standFileOperator; + } + + public String getTags() { + return this.tags; + } + + public void setTags(String tags) { + this.tags = tags; + } + + public String getTagsOperator() { + return this.tagsOperator; + } + + public void setTagsOperator(String tagsOperator) { + this.tagsOperator = tagsOperator; + } + + public String getStandStatus() { + return this.standStatus; + } + + public void setStandStatus(String standStatus) { + this.standStatus = standStatus; + } + + public String getStandStatusOperator() { + return this.standStatusOperator; + } + + public void setStandStatusOperator(String standStatusOperator) { + this.standStatusOperator = standStatusOperator; + } + + public String getReplacedStandNum() { + return this.replacedStandNum; + } + + public void setReplacedStandNum(String replacedStandNum) { + this.replacedStandNum = replacedStandNum; + } + + public String getReplacedStandNumOperator() { + return this.replacedStandNumOperator; + } + + public void setReplacedStandNumOperator(String replacedStandNumOperator) { + this.replacedStandNumOperator = replacedStandNumOperator; + } + + public String getReplaceStandNum() { + return this.replaceStandNum; + } + + public void setReplaceStandNum(String replaceStandNum) { + this.replaceStandNum = replaceStandNum; + } + + public String getReplaceStandNumOperator() { + return this.replaceStandNumOperator; + } + + public void setReplaceStandNumOperator(String replaceStandNumOperator) { + this.replaceStandNumOperator = replaceStandNumOperator; + } + + public String getQuoteStand() { + return this.quoteStand; + } + + public void setQuoteStand(String quoteStand) { + this.quoteStand = quoteStand; + } + + public String getQuoteStandOperator() { + return this.quoteStandOperator; + } + + public void setQuoteStandOperator(String quoteStandOperator) { + this.quoteStandOperator = quoteStandOperator; + } + + public String getFirstPutTime() { + return this.firstPutTime; + } + + public void setFirstPutTime(String firstPutTime) { + this.firstPutTime = firstPutTime; + } + + public String getFirstPutTime1() { + return this.firstPutTime1; + } + + public void setFirstPutTime1(String firstPutTime1) { + this.firstPutTime1 = firstPutTime1; + } + + public String getFirstPutTime2() { + return this.firstPutTime2; + } + + public void setFirstPutTime2(String firstPutTime2) { + this.firstPutTime2 = firstPutTime2; + } + + public String getFirstPutTimeOperator() { + return this.firstPutTimeOperator; + } + + public void setFirstPutTimeOperator(String firstPutTimeOperator) { + this.firstPutTimeOperator = firstPutTimeOperator; + } + + public String getPutYear() { + return this.putYear; + } + + public void setPutYear(String putYear) { + this.putYear = putYear; + } + + public String getPutYear1() { + return this.putYear1; + } + + public void setPutYear1(String putYear1) { + this.putYear1 = putYear1; + } + + public String getPutYear2() { + return this.putYear2; + } + + public void setPutYear2(String putYear2) { + this.putYear2 = putYear2; + } + + public String getPutYearOperator() { + return this.putYearOperator; + } + + public void setPutYearOperator(String putYearOperator) { + this.putYearOperator = putYearOperator; + } + + public String getPutTime() { + return this.putTime; + } + + public void setPutTime(String putTime) { + this.putTime = putTime; + } + + public String getPutTime1() { + return this.putTime1; + } + + public void setPutTime1(String putTime1) { + this.putTime1 = putTime1; + } + + public String getPutTime2() { + return this.putTime2; + } + + public void setPutTime2(String putTime2) { + this.putTime2 = putTime2; + } + + public String getPutTimeOperator() { + return this.putTimeOperator; + } + + public void setPutTimeOperator(String putTimeOperator) { + this.putTimeOperator = putTimeOperator; + } + + public String getIssueTime() { + return this.issueTime; + } + + public void setIssueTime(String issueTime) { + this.issueTime = issueTime; + } + + public String getIssueTime1() { + return this.issueTime1; + } + + public void setIssueTime1(String issueTime1) { + this.issueTime1 = issueTime1; + } + + public String getIssueTime2() { + return this.issueTime2; + } + + public void setIssueTime2(String issueTime2) { + this.issueTime2 = issueTime2; + } + + public String getIssueTimeOperator() { + return this.issueTimeOperator; + } + + public void setIssueTimeOperator(String issueTimeOperator) { + this.issueTimeOperator = issueTimeOperator; + } + + public String getEnergyKind() { + return this.energyKind; + } + + public void setEnergyKind(String energyKind) { + this.energyKind = energyKind; + } + + public String getEnergyKindOperator() { + return this.energyKindOperator; + } + + public void setEnergyKindOperator(String energyKindOperator) { + this.energyKindOperator = energyKindOperator; + } + + public String getApplyArctic() { + return this.applyArctic; + } + + public void setApplyArctic(String applyArctic) { + this.applyArctic = applyArctic; + } + + public String getApplyArcticOperator() { + return this.applyArcticOperator; + } + + public void setApplyArcticOperator(String applyArcticOperator) { + this.applyArcticOperator = applyArcticOperator; + } + + public String getStandEnName() { + return this.standEnName; + } + + public void setStandEnName(String standEnName) { + this.standEnName = standEnName; + } + + public String getStandEnNameOperator() { + return this.standEnNameOperator; + } + + public void setStandEnNameOperator(String standEnNameOperator) { + this.standEnNameOperator = standEnNameOperator; + } + + public String getStandName() { + return this.standName; + } + + public void setStandName(String standName) { + this.standName = standName; + } + + public String getStandNameOperator() { + return this.standNameOperator; + } + + public void setStandNameOperator(String standNameOperator) { + this.standNameOperator = standNameOperator; + } + + public String getStandCode() { + return this.standCode; + } + + public void setStandCode(String standCode) { + this.standCode = standCode; + } + + public String getStandCodeOperator() { + return this.standCodeOperator; + } + + public void setStandCodeOperator(String standCodeOperator) { + this.standCodeOperator = standCodeOperator; + } + + public String getClassifyCode() { + return this.classifyCode; + } + + public void setClassifyCode(String classifyCode) { + this.classifyCode = classifyCode; + } + + public String getClassifyCodeOperator() { + return this.classifyCodeOperator; + } + + public void setClassifyCodeOperator(String classifyCodeOperator) { + this.classifyCodeOperator = classifyCodeOperator; + } + + public String getStandSubclass() { + return this.standSubclass; + } + + public void setStandSubclass(String standSubclass) { + this.standSubclass = standSubclass; + } + + public String getStandSubclassOperator() { + return this.standSubclassOperator; + } + + public void setStandSubclassOperator(String standSubclassOperator) { + this.standSubclassOperator = standSubclassOperator; + } + + public String getStandGenera() { + return this.standGenera; + } + + public void setStandGenera(String standGenera) { + this.standGenera = standGenera; + } + + public String getStandGeneraOperator() { + return this.standGeneraOperator; + } + + public void setStandGeneraOperator(String standGeneraOperator) { + this.standGeneraOperator = standGeneraOperator; + } + + public String getId() { + return this.id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIdOperator() { + return this.idOperator; + } + + public void setIdOperator(String idOperator) { + this.idOperator = idOperator; + } + + private String menuId; + private String[] idlist; //用于导出数据过程中传递选择的标准id + private String[] replaceStandNumList; + + public String getMenuId() { + return menuId; + } + + public void setMenuId(String menuId) { + this.menuId = menuId; + } + + public String[] getIdlist() { + return idlist; + } + + public void setIdlist(String[] idlist) { + this.idlist = idlist; + } + + public String[] getReplaceStandNumList() { + return replaceStandNumList; + } + + public void setReplaceStandNumList(String[] replaceStandNumList) { + this.replaceStandNumList = replaceStandNumList; + } + + private String[] applyArcticList; + private String[] energyKindList; + + public String[] getApplyArcticList() { + return applyArcticList; + } + + public void setApplyArcticList(String[] applyArcticList) { + this.applyArcticList = applyArcticList; + } + + public String[] getEnergyKindList() { + return energyKindList; + } + + public void setEnergyKindList(String[] energyKindList) { + this.energyKindList = energyKindList; + } + + public String getApplyCountry() { + return applyCountry; + } + + public void setApplyCountry(String applyCountry) { + this.applyCountry = applyCountry; + } + + public String getApplyCountryOperator() { + return applyCountryOperator; + } + + public void setApplyCountryOperator(String applyCountryOperator) { + this.applyCountryOperator = applyCountryOperator; + } + + public String getStandNature() { + return standNature; + } + + public void setStandNature(String standNature) { + this.standNature = standNature; + } + + public String getStandNatureOperator() { + return standNatureOperator; + } + + public void setStandNatureOperator(String standNatureOperator) { + this.standNatureOperator = standNatureOperator; + } + + public String getSynopsis() { + return synopsis; + } + + public void setSynopsis(String synopsis) { + this.synopsis = synopsis; + } + + public String getSynopsisOperator() { + return synopsisOperator; + } + + public void setSynopsisOperator(String synopsisOperator) { + this.synopsisOperator = synopsisOperator; + } + + public String getStandSort() { + return standSort; + } + + public void setStandSort(String standSort) { + this.standSort = standSort; + } + + public String getStandSortOperator() { + return standSortOperator; + } + + public void setStandSortOperator(String standSortOperator) { + this.standSortOperator = standSortOperator; + } + + public String getOpinionFile() { + return opinionFile; + } + + public void setOpinionFile(String opinionFile) { + this.opinionFile = opinionFile; + } + + public String getOpinionFileOperator() { + return opinionFileOperator; + } + + public void setOpinionFileOperator(String opinionFileOperator) { + this.opinionFileOperator = opinionFileOperator; + } + + public String getRelevanceFile() { + return relevanceFile; + } + + public void setRelevanceFile(String relevanceFile) { + this.relevanceFile = relevanceFile; + } + + public String getRelevanceFileOperator() { + return relevanceFileOperator; + } + + public void setRelevanceFileOperator(String relevanceFileOperator) { + this.relevanceFileOperator = relevanceFileOperator; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getRemarkOperator() { + return remarkOperator; + } + + public void setRemarkOperator(String remarkOperator) { + this.remarkOperator = remarkOperator; + } + + public List getRoleIds() { + return roleIds; + } + + public void setRoleIds(List roleIds) { + this.roleIds = roleIds; + } + + public String getStandYear() { + return standYear; + } + + public void setStandYear(String standYear) { + this.standYear = standYear; + } + + public List getMenuRoleList() { + return menuRoleList; + } + + public void setMenuRoleList(List menuRoleList) { + this.menuRoleList = menuRoleList; + } + + public String getNumberName() { + return numberName; + } + + public void setNumberName(String numberName) { + this.numberName = numberName; + } + + public String[] getReplacedStandNumList() { + return replacedStandNumList; + } + + public void setReplacedStandNumList(String[] replacedStandNumList) { + this.replacedStandNumList = replacedStandNumList; + } + + public String getRootMenuId() { + return rootMenuId; + } + + public void setRootMenuId(String rootMenuId) { + this.rootMenuId = rootMenuId; + } + + public String getCollectMenuId() { + return collectMenuId; + } + + public void setCollectMenuId(String collectMenuId) { + this.collectMenuId = collectMenuId; + } + + public String getAdvanceSearchVOStr() { + return advanceSearchVOStr; + } + + public void setAdvanceSearchVOStr(String advanceSearchVOStr) { + this.advanceSearchVOStr = advanceSearchVOStr; + } + + public String getAdvanceSearchStr() { + return advanceSearchStr; + } + + public void setAdvanceSearchStr(String advanceSearchStr) { + this.advanceSearchStr = advanceSearchStr; + } + + public String getOrgName() { + return orgName; + } + + public void setOrgName(String orgName) { + this.orgName = orgName; + } + + public List getMenuAllChildrenIdList() { + return menuAllChildrenIdList; + } + + public void setMenuAllChildrenIdList(List menuAllChildrenIdList) { + this.menuAllChildrenIdList = menuAllChildrenIdList; + } + + public String getUserId() { + return userId; + } + + public void setUserId(String userId) { + this.userId = userId; + } + + public String getPaixu() { + return paixu; + } + + public void setPaixu(String paixu) { + this.paixu = paixu; + } + + public String getShunxu() { + return shunxu; + } + + public void setShunxu(String shunxu) { + this.shunxu = shunxu; + } + + public String getSql() { + return sql; + } + + public void setSql(String sql) { + this.sql = sql; + } +} diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml new file mode 100644 index 00000000..5170a5ec --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml @@ -0,0 +1,906 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + modify_time, creation_time, valid_flag, stand_status, replaced_stand_num,replace_stand_num, + put_time, issue_time,stand_en_name,stand_name, stand_code, id,apply_country, stand_nature, stand_sort + + + stand_year,dicapplyCountry.DIC_TYPE_NAME as applyCountryShow,dicstandSort.DIC_TYPE_NAME as standSortShow, + dicstandNature.DIC_TYPE_NAME as standNatrueShow,SAR_BUSSIONESS_STAND.modify_time, + SAR_BUSSIONESS_STAND.creation_time, SAR_BUSSIONESS_STAND.valid_flag, + SAR_BUSSIONESS_STAND.apply_country, SAR_BUSSIONESS_STAND.stand_nature,SAR_BUSSIONESS_STAND.stand_sort, + stand_status, replaced_stand_num,replace_stand_num,put_time,issue_time,stand_en_name, + stand_name, stand_code,SAR_BUSSIONESS_STAND.id,dicstandStatus.DIC_TYPE_NAME as standStatusShow + + + + stand_year,dicapplyCountry.DIC_TYPE_NAME,dicstandSort.DIC_TYPE_NAME,dicstandNature.DIC_TYPE_NAME,SAR_BUSSIONESS_STAND.modify_time, + SAR_BUSSIONESS_STAND.creation_time, SAR_BUSSIONESS_STAND.valid_flag, + SAR_BUSSIONESS_STAND.apply_country, SAR_BUSSIONESS_STAND.stand_nature, + SAR_BUSSIONESS_STAND.stand_sort, + stand_status, replaced_stand_num, replace_stand_num,put_time, + issue_time, stand_en_name, stand_name, stand_code, + SAR_BUSSIONESS_STAND.id,dicstandStatus.DIC_TYPE_NAME + + + + + + where 1=1 + + + and modify_time ${modifyTimeOperator} #{modifyTime} + + + and modify_time >= #{modifyTime1} + + + and modify_time <= #{modifyTime2} + + + and creation_time ${creationTimeOperator} #{creationTime} + + + and creation_time >= #{creationTime1} + + + and creation_time <= #{creationTime2} + + + and valid_flag ${validFlagOperator} #{validFlag} + + + and stand_status ${standStatusOperator} #{standStatus} + + + and replaced_stand_num ${replacedStandNumOperator} #{replacedStandNum} + + + and replace_stand_num ${replaceStandNumOperator} #{replaceStandNum} + + + and put_time ${putTimeOperator} #{putTime} + + + and put_time >= #{putTime1} + + + and put_time <= #{putTime2} + + + and issue_time ${issueTimeOperator} #{issueTime} + + + and issue_time >= #{issueTime1} + + + and issue_time <= #{issueTime2} + + + and stand_en_name ${standEnNameOperator} #{standEnName} + + + and stand_name ${standNameOperator} #{standName} + + + and stand_code ${standCodeOperator} #{standCode} + + + and id ${idOperator} #{id} + + + + and apply_country ${applyCountryOperator} #{applyCountry} + + + and stand_nature ${standNatureOperator} #{standNature} + + + and stand_sort ${standSortOperator} #{standSort} + + + and opinion_file ${opinionFileOperator} #{opinionFile} + + + and relevance_file ${relevanceFileOperator} #{relevanceFile} + + + and remark ${remarkOperator} #{remark} + + + + + + + insert into SAR_BUSSIONESS_STAND + + modify_time, + creation_time, + valid_flag, + stand_status, + replaced_stand_num, + replace_stand_num, + put_time, + issue_time, + stand_en_name, + stand_name, + stand_code, + id, + + apply_country, + stand_Nature, + stand_sort, + stand_year, + + + #{modifyTime, jdbcType=TIMESTAMP}, + #{creationTime, jdbcType=TIMESTAMP}, + #{validFlag, jdbcType=INTEGER}, + #{standStatus, jdbcType=VARCHAR}, + #{replacedStandNum, jdbcType=VARCHAR}, + #{replaceStandNum, jdbcType=VARCHAR}, + #{putTime, jdbcType=TIMESTAMP}, + #{issueTime, jdbcType=TIMESTAMP}, + #{standEnName, jdbcType=VARCHAR}, + #{standName, jdbcType=VARCHAR}, + #{standCode, jdbcType=VARCHAR}, + #{id, jdbcType=VARCHAR}, + + #{applyCountry, jdbcType=VARCHAR}, + #{standNature, jdbcType=VARCHAR}, + #{standSort, jdbcType=VARCHAR}, + #{standYear, jdbcType=VARCHAR}, + + + + + + update SAR_BUSSIONESS_STAND + + + modify_time = #{modifyTime}, + + + creation_time = #{creationTime}, + + + valid_flag = #{validFlag}, + + + stand_status = #{standStatus}, + + + replaced_stand_num = #{replacedStandNum}, + + + replace_stand_num = #{replaceStandNum}, + + + put_time = #{putTime}, + + + put_time = null, + + + issue_time = #{issueTime}, + + + issue_time = null, + + + stand_en_name = #{standEnName}, + + + stand_name = #{standName}, + + + stand_code = #{standCode}, + + + + apply_country = #{applyCountry}, + + + stand_nature = #{standNature}, + + + stand_sort = #{standSort}, + + + stand_year = #{standYear}, + + + where id = #{id} + + + + + + update SAR_BUSSIONESS_STAND + + + modify_time = #{modifyTime}, + + + creation_time = #{creationTime}, + + + valid_flag = #{validFlag}, + + + stand_status = #{standStatus}, + + + replaced_stand_num = #{replacedStandNum}, + + + replace_stand_num = #{replaceStandNum}, + + + put_time = #{putTime}, + + + issue_time = #{issueTime}, + + + stand_en_name = #{standEnName}, + + + stand_name = #{standName}, + + + stand_code = #{standCode}, + + + + apply_country = #{applyCountry}, + + + stand_nature = #{standNature}, + + + stand_sort = #{standSort}, + + + stand_year = #{standYear}, + + + where id = #{id} + + + + + + + + delete from SAR_BUSSIONESS_STAND + where id = #{value} + + + + + + + + + + + + + + + left join TS_DICTYPE dicstandStatus ON ( dicstandStatus.dic_type_code = SAR_BUSSIONESS_STAND.STAND_STATUS AND dicstandStatus.dic_id IS NOT NULL and dicstandStatus.valid_flag = 0) + left join TS_DICTYPE dicstandNature ON ( dicstandNature.dic_type_code = SAR_BUSSIONESS_STAND.STAND_NATURE AND dicstandNature.dic_id IS NOT NULL and dicstandNature.valid_flag = 0) + left join TS_DICTYPE dicstandSort ON ( dicstandSort.dic_type_code = SAR_BUSSIONESS_STAND.STAND_SORT AND dicstandSort.dic_id IS NOT NULL and dicstandSort.valid_flag = 0) + left join TS_DICTYPE dicapplyCountry ON ( dicapplyCountry.dic_type_code = SAR_BUSSIONESS_STAND.APPLY_COUNTRY AND dicapplyCountry.dic_id IS NOT NULL and dicapplyCountry.valid_flag = 0) + left join SAR_BUSS_STAND_MENU ON SAR_BUSSIONESS_STAND.id = SAR_BUSS_STAND_MENU.buss_stand_id + left join SAR_MENU on SAR_BUSS_STAND_MENU.menu_id = SAR_MENU.id + left join SAR_BUSS_STAND_ATTR_INFO on (SAR_BUSS_STAND_ATTR_INFO.STAND_ID = SAR_BUSSIONESS_STAND.id and SAR_BUSS_STAND_ATTR_INFO.valid_flag=0) + where 1=1 + + + + and SAR_BUSSIONESS_STAND.STAND_CODE like concat('%', #{standCode}, '%') + + + and ( + + SAR_BUSSIONESS_STAND.STAND_CODE like concat(concat('%',#{numberName}),'%') + or stand_name like concat(concat('%',#{numberName}),'%') + ) + + + and stand_name like concat(concat('%',#{standName}),'%') + + + + and DATE_FORMAT(put_time,'%Y-%m-%D') >= #{putTime1} + + + and DATE_FORMAT(put_time,'%Y-%m-%D') <= #{putTime2} + + + and DATE_FORMAT(issue_time,'%Y-%m-%D') >= #{issueTime1} + + + -- and to_char(issue_time,'YYYY-MM-DD') <= #{issueTime2} + and DATE_FORMAT(issue_time,'%Y-%m-%D') <= #{issueTime2} + + + + and SAR_BUSS_STAND_MENU.MENU_ID in + + #{item} + + + + + and SAR_BUSS_STAND_MENU.MENU_ID = (select SAR_MENU.id from SAR_MENU WHERE parent_id is null and sor_divide ='BUSINESS_STAND' and valid_flag=0) + + + + and SAR_BUSS_STAND_MENU.MENU_ID in ( SELECT SAR_MENU.id FROM SAR_MENU START WITH id =( + SELECT SAR_MENU.id FROM SAR_MENU WHERE parent_id IS NULL AND sor_divide = 'BUSINESS_STAND' and valid_flag=0 ) CONNECT BY PRIOR id = parent_id ) + + + + and SAR_BUSS_STAND_MENU.MENU_ID in + + #{item} + + + + and SAR_BUSSIONESS_STAND.id in ( + select COLLECT_RES_ID from TS_PERSON_COLLECT where TS_PERSON_COLLECT.VALID_FLAG=0 + and collect_type='BUSINESS_STAND' + and TS_PERSON_COLLECT.user_id=#{userId} + ) + + + and SAR_BUSSIONESS_STAND.valid_flag = #{validFlag} + + + + and SAR_BUSSIONESS_STAND.id in + + #{item} + + + + and SAR_BUSSIONESS_STAND.stand_sort = #{standSort} + + + and replace_stand_num like concat(concat('%',#{replaceStandNum}),'%') + + + and SAR_BUSSIONESS_STAND.STAND_STATUS = #{standStatus} + + + and (${advanceSearchStr}) + + + and (SELECT ZYQCR + FROM SAR_BUSS_STAND_ATTR_INFO + WHERE valid_flag = 0 + and stand_id = SAR_BUSSIONESS_STAND.id) = #{zqcrId} + + + + + + + left join TS_DICTYPE dicstandStatus ON ( dicstandStatus.dic_type_code = SAR_BUSSIONESS_STAND.STAND_STATUS AND dicstandStatus.dic_id IS NOT NULL and dicstandStatus.valid_flag = 0) + left join TS_DICTYPE dicstandNature ON ( dicstandNature.dic_type_code = SAR_BUSSIONESS_STAND.STAND_NATURE AND dicstandNature.dic_id IS NOT NULL and dicstandNature.valid_flag = 0) + left join TS_DICTYPE dicstandSort ON ( dicstandSort.dic_type_code = SAR_BUSSIONESS_STAND.STAND_SORT AND dicstandSort.dic_id IS NOT NULL and dicstandSort.valid_flag = 0) + left join TS_DICTYPE dicapplyCountry ON ( dicapplyCountry.dic_type_code = SAR_BUSSIONESS_STAND.APPLY_COUNTRY AND dicapplyCountry.dic_id IS NOT NULL and dicapplyCountry.valid_flag = 0) + left join SAR_BUSS_STAND_MENU ON SAR_BUSSIONESS_STAND.id = SAR_BUSS_STAND_MENU.buss_stand_id + left join SAR_MENU on SAR_BUSS_STAND_MENU.menu_id = SAR_MENU.id + where 1=1 + + + + and stand_code like concat(concat('%',#{standCode}),'%') + + + and stand_name like concat(concat('%',#{standName}),'%') + + + + -- and to_char(put_time,'YYYY-MM-DD') >= #{putTime1} + and DATE_FORMAT(put_time,'%Y-%m-%D') >= #{putTime1} + + + -- and to_char(put_time,'YYYY-MM-DD') <= #{putTime2} + and DATE_FORMAT(put_time,'%Y-%m-%D') <= #{putTime2} + + + -- and to_char(issue_time,'YYYY-MM-DD') >= #{issueTime1} + and DATE_FORMAT(issue_time,'%Y-%m-%D') >= #{issueTime1} + + + and DATE_FORMAT(issue_time,'%Y-%m-%D') <= #{issueTime2} + + + + and SAR_BUSS_STAND_MENU.MENU_ID in ( + select a.* from ( + select SAR_MENU.id from SAR_MENU,TS_ROLE_SAR_MENU start with id=#{menuId} connect by prior id= parent_id + )a,TS_ROLE_SAR_MENU + where a.id = TS_ROLE_SAR_MENU.SAR_MENU_ID and TS_ROLE_SAR_MENU.ROLE_ID in + + #{item} + + GROUP BY ID + ) + + + + and SAR_BUSS_STAND_MENU.MENU_ID = (select SAR_MENU.id from SAR_MENU WHERE parent_id is null and sor_divide ='BUSINESS_STAND' and valid_flag=0) + + + + and SAR_BUSS_STAND_MENU.MENU_ID in ( + select a.* from ( + SELECT SAR_MENU.id FROM SAR_MENU START WITH id =( + SELECT SAR_MENU.id FROM SAR_MENU WHERE parent_id IS NULL AND sor_divide = 'BUSINESS_STAND' and valid_flag=0) connect by prior id= parent_id + )a,TS_ROLE_SAR_MENU + where a.id = TS_ROLE_SAR_MENU.SAR_MENU_ID and TS_ROLE_SAR_MENU.ROLE_ID in + + #{item} + + GROUP BY ID + ) + + + and SAR_BUSSIONESS_STAND.valid_flag = #{validFlag} + + + + and SAR_BUSSIONESS_STAND.id in + + #{item} + + + + and SAR_BUSSIONESS_STAND.stand_sort = #{standSort} + + + and replace_stand_num like concat(concat('%',#{replaceStandNum}),'%') + + + + + + + left join TS_DICTYPE dicstandStatus ON ( dicstandStatus.dic_type_code = SAR_BUSSIONESS_STAND.STAND_STATUS AND dicstandStatus.dic_id IS NOT NULL and dicstandStatus.valid_flag = 0) + left join TS_DICTYPE dicstandNature ON ( dicstandNature.dic_type_code = SAR_BUSSIONESS_STAND.STAND_NATURE AND dicstandNature.dic_id IS NOT NULL and dicstandNature.valid_flag = 0) + left join TS_DICTYPE dicstandSort ON ( dicstandSort.dic_type_code = SAR_BUSSIONESS_STAND.STAND_SORT AND dicstandSort.dic_id IS NOT NULL and dicstandSort.valid_flag = 0) + left join TS_DICTYPE dicapplyCountry ON ( dicapplyCountry.dic_type_code = SAR_BUSSIONESS_STAND.APPLY_COUNTRY AND dicapplyCountry.dic_id IS NOT NULL and dicapplyCountry.valid_flag = 0) + left join SAR_BUSS_STAND_MENU ON SAR_BUSSIONESS_STAND.id = SAR_BUSS_STAND_MENU.buss_stand_id + left join SAR_MENU on SAR_BUSS_STAND_MENU.menu_id = SAR_MENU.id + where 1=1 + + + + and stand_code like concat(concat('%',#{standCode}),'%') + + + and stand_name like concat(concat('%',#{standName}),'%') + + + and SAR_BUSSIONESS_STAND.valid_flag = #{validFlag} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + update SAR_BUSSIONESS_STAND + + + modify_time = #{modifyTime}, + + + creation_time = #{creationTime}, + + + valid_flag = #{validFlag}, + + + replaced_stand_num = #{replacedStandNum}, + + + replace_stand_num = #{replaceStandNum}, + + + put_time = #{putTime}, + + + issue_time = #{issueTime}, + + + stand_en_name = #{standEnName}, + + + stand_name = #{standName}, + + + where STAND_CODE = #{standCode} + + + + update SAR_BUSSIONESS_STAND set REPLACED_STAND_NUM = #{replacedStandNum} where + STAND_CODE in + + #{item} + + + + + update SAR_BUSSIONESS_STAND set REPLACE_STAND_NUM = #{replaceStandNum} where + STAND_CODE in + + #{item} + + + + + + + update SAR_BUSSIONESS_STAND set REPLACED_STAND_NUM = #{replacedStandNum} where id = #{id} + + + + + + + + insert into SAR_BUSSIONESS_PERSON(ID,QBID,USID) VALUE + + (#{Person.id}, #{Person.qbid}, #{Person.usid}) + + + + + DELETE FROM SAR_BUSSIONESS_PERSON + where qbid=#{qbid} + + + + + From 35d86a7222bb665d4296d0312f7e72a3b0ac8d65 Mon Sep 17 00:00:00 2001 From: yinglong zhang <1679309912@qq.com> Date: Tue, 13 Jul 2021 15:36:17 +0800 Subject: [PATCH 05/16] =?UTF-8?q?feat=20=E6=9C=AA=E5=90=88=E8=A7=84?= =?UTF-8?q?=E9=A1=B9=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/adc/da/common/TableToExcel.java | 92 +++++++++++++++++++ .../controller/WorkFlowController.java | 46 ++++++++++ .../da/workFlow/dao/ExportExcelMapper.java | 8 ++ .../adc/da/workFlow/entity/ExportExcel.java | 20 ++++ .../adc/da/workFlow/entity/ExportExcelEO.java | 17 ++++ .../da/workFlow/service/WorkFlowService.java | 1 + adc-da-base/pom.xml | 2 + 7 files changed, 186 insertions(+) create mode 100644 adc-da-activiti/src/main/java/com/adc/da/common/TableToExcel.java create mode 100644 adc-da-activiti/src/main/java/com/adc/da/workFlow/dao/ExportExcelMapper.java create mode 100644 adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/ExportExcel.java create mode 100644 adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/ExportExcelEO.java 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 + + From 78b99accc93bbfd88f0c1ae4188967776b7adb58 Mon Sep 17 00:00:00 2001 From: duanwenbin <12345678> Date: Wed, 14 Jul 2021 16:17:50 +0800 Subject: [PATCH 06/16] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=A0=91=E5=BD=A2?= =?UTF-8?q?=E7=BB=93=E6=9E=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sarTree/controller/TreeController.java | 51 +++++++++++++++++++ .../adc/da/slrs/sarTree/dao/SarModelDao.java | 15 ++++++ .../adc/da/slrs/sarTree/dao/SarVPPSDao.java | 15 ++++++ .../adc/da/slrs/sarTree/entity/SarModel.java | 35 +++++++++++++ .../adc/da/slrs/sarTree/entity/SarVPPS.java | 38 ++++++++++++++ .../slrs/sarTree/service/SarModelService.java | 11 ++++ .../slrs/sarTree/service/SarVPPSService.java | 9 ++++ .../service/impl/SarModelServiceImpl.java | 47 +++++++++++++++++ .../service/impl/SarVPPSServiceImpl.java | 48 +++++++++++++++++ 9 files changed, 269 insertions(+) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarTree/controller/TreeController.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarTree/dao/SarModelDao.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarTree/dao/SarVPPSDao.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarTree/entity/SarModel.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarTree/entity/SarVPPS.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarTree/service/SarModelService.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarTree/service/SarVPPSService.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarTree/service/impl/SarModelServiceImpl.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarTree/service/impl/SarVPPSServiceImpl.java 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; + } + +} From de97f459fdce8f273db98f8136e2915b59635fae Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Thu, 15 Jul 2021 17:14:54 +0800 Subject: [PATCH 07/16] =?UTF-8?q?feat:=20=E6=A0=87=E5=87=86=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E6=B5=81=E7=A8=8B=20=E5=B8=A6=E5=85=A5=20=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/SarStandardsInfo.java | 2 ++ .../impl/SarStandardsInfoServiceImpl.java | 26 +++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java index df2df62e..f61bd816 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java @@ -154,6 +154,8 @@ public class SarStandardsInfo extends BaseEntity { @TableField(exist = false) private Map attrInfoMap = new LinkedHashMap<>(); //属性表字段与值 @TableField(exist = false) + private Map attrInfoCaseMap = new LinkedHashMap<>(); //属性表字段与值小写前端带入渲染 + @TableField(exist = false) private String sarStandAttrEOStr; //新增修改时属性表信息 @TableField(exist = false) private String menuId; //目录ID diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java index 33c619a5..277fdd53 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java @@ -286,10 +286,36 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl transformUpperCase(Map orgMap) { + Map resultMap = new HashMap<>(); + + for (Map.Entry entry : orgMap.entrySet()) { + String newKey = entry.getKey().toLowerCase(); + resultMap.put(newKey, orgMap.get(entry.getKey())); + if (entry.getValue() != null && InitStandAttrUtil.fileFieldList != null && !InitStandAttrUtil.fileFieldList.isEmpty() && InitStandAttrUtil.fileFieldList.contains(entry.getKey())) { + String value = entry.getValue().toString(); + if (StringUtils.isNotBlank(value)) { + List fileObj = attFileEOService.getMultiFileInfos(value); + if(!fileObj.isEmpty()){ + resultMap.put(newKey + "Name", fileObj.get(0).getOldFileName()); + } + } + } + } + + return resultMap; + } + public void attrInfoShow(List sarlist) throws Exception { for (SarStandardsInfo row : sarlist) { attrInfoDetails(row); From 7751c75ccf738ed94c2c4e9c5e88b52ae33ef834 Mon Sep 17 00:00:00 2001 From: yinglong zhang <1679309912@qq.com> Date: Thu, 15 Jul 2021 17:16:21 +0800 Subject: [PATCH 08/16] feat --- ...ndardComplianceAssessResultController.java | 105 +++++++++++++++++- 1 file changed, 102 insertions(+), 3 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java index b637499d..d3a8822d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java @@ -1,6 +1,7 @@ package com.adc.da.slrs.sarStandardComplianceAssessResult.controller; +import cn.hutool.core.map.MapUtil; import com.adc.da.base.web.BaseController; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; @@ -16,12 +17,17 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import oracle.ucp.proxy.annotation.Post; +import org.apache.commons.beanutils.BeanUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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.RestController; +import org.springframework.web.bind.annotation.*; + +import java.lang.reflect.InvocationTargetException; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; /** *

@@ -98,6 +104,55 @@ public class SarStandardComplianceAssessResultController { } } } + + private static class InsertEntity{ + List entityList; + T eo; + } + + @ApiOperation(value="（插入/更新）标准清单") + @PostMapping("/standard") + public ResponseMessage insertStandard(@RequestBody InsertEntity insertEntity) throws InvocationTargetException, IllegalAccessException { + + SarStandardsInfoEO eo = insertEntity.eo; + + if (eo.getStandApplicationType() == 1) { + + List entityList = new ArrayList<>(); + for (int i = 0; i < insertEntity.entityList.size(); i++) { + SarStandardComplianceProductAssess obj=new SarStandardComplianceProductAssess(); + BeanUtils.populate(obj, insertEntity.entityList.get(i)); + entityList.add(obj); + } + + iSarStandardComplianceProductAssessService.saveOrUpdateBatch(entityList); + + }else { + if(eo.getPosition()==1){ + List entityList = new ArrayList<>(); + for (int i = 0; i < insertEntity.entityList.size(); i++) { + SarInterpretationNationalStandard obj=new SarInterpretationNationalStandard(); + BeanUtils.populate(obj, insertEntity.entityList.get(i)); + entityList.add(obj); + } + iSarInterpretationNationalStandardService.saveOrUpdateBatch(entityList); + + }else{ + List entityList = new ArrayList<>(); + for (int i = 0; i < insertEntity.entityList.size(); i++) { + SarInterpretationForeignStandard obj=new SarInterpretationForeignStandard(); + BeanUtils.populate(obj, insertEntity.entityList.get(i)); + entityList.add(obj); + } + iSarInterpretationForeignStandardService.saveOrUpdateBatch(entityList); + + } + } + + + return Result.success(); + } + @ApiOperation(value = "条件查询标准涉及项目符合性清单") @GetMapping("/product") public ResponseMessage> selectProduct(SarStandardComplianceProductAssessEO eo) throws Exception { @@ -114,6 +169,17 @@ public class SarStandardComplianceAssessResultController { return Result.success(page); } + @ApiOperation(value = "插入标准涉及项目符合性清单") + @PostMapping("/product") + public ResponseMessage insertProduct(List eo) throws Exception { + + iSarStandardComplianceProductAssessService.saveOrUpdateBatch(eo); + + + return Result.success(); + } + + @ApiOperation(value = "条件查询技术审核符合性清单") @GetMapping("/interpretation") public ResponseMessage selectNationalStandard(InterpretationEO eo) throws Exception { @@ -137,4 +203,37 @@ public class SarStandardComplianceAssessResultController { return Result.success(page); } } + + + @ApiOperation(value = "插入技术审核符合性清单") + @PostMapping("/interpretation") + public ResponseMessage insertInterpretation(InsertEntity insertEntity) throws Exception { + + InterpretationEO eo = insertEntity.eo; + + if (eo.getPosition()==1) { + + List entityList = new ArrayList<>(); + for (int i = 0; i < insertEntity.entityList.size(); i++) { + SarInterpretationNationalStandard obj=new SarInterpretationNationalStandard(); + BeanUtils.populate(obj, insertEntity.entityList.get(i)); + entityList.add(obj); + } + iSarInterpretationNationalStandardService.saveOrUpdateBatch(entityList); + } else { + + + + List entityList = new ArrayList<>(); + for (int i = 0; i < insertEntity.entityList.size(); i++) { + SarInterpretationForeignStandard obj=new SarInterpretationForeignStandard(); + BeanUtils.populate(obj, insertEntity.entityList.get(i)); + entityList.add(obj); + } + iSarInterpretationForeignStandardService.saveOrUpdateBatch(entityList); + + } + + return Result.success(); + } } From 5efce6f2d119487ab694581fc4c39efb739949fe Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Thu, 15 Jul 2021 18:37:49 +0800 Subject: [PATCH 09/16] =?UTF-8?q?feat:=20vpps=20model=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=A0=91=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SarModelTreeController.java | 40 ++++++++++ .../sarModelTree/dao/SarModelTreeDao.java | 16 ++++ .../sarModelTree/entity/SarModelTree.java | 68 +++++++++++++++++ .../service/ISarModelTreeService.java | 20 +++++ .../service/impl/SarModelTreeServiceImpl.java | 53 +++++++++++++ .../adc/da/slrs/sarTree/dao/SarModelDao.java | 8 +- .../adc/da/slrs/sarTree/entity/SarVPPS.java | 2 + .../service/impl/SarModelServiceImpl.java | 16 ++-- .../service/impl/SarVPPSServiceImpl.java | 8 +- .../controller/SarVppsTreeController.java | 41 ++++++++++ .../slrs/sarVppsTree/dao/SarVppsTreeDao.java | 16 ++++ .../slrs/sarVppsTree/entity/SarVppsTree.java | 76 +++++++++++++++++++ .../service/ISarVppsTreeService.java | 19 +++++ .../service/impl/SarVppsTreeServiceImpl.java | 53 +++++++++++++ .../sarModelTree/SarModelTreeMapper.xml | 5 ++ .../mapper/sarVppsTree/SarVppsTreeMapper.xml | 5 ++ 16 files changed, 434 insertions(+), 12 deletions(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/controller/SarModelTreeController.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/dao/SarModelTreeDao.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/entity/SarModelTree.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/ISarModelTreeService.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/impl/SarModelTreeServiceImpl.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/controller/SarVppsTreeController.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/dao/SarVppsTreeDao.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/entity/SarVppsTree.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/service/ISarVppsTreeService.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/service/impl/SarVppsTreeServiceImpl.java create mode 100644 adc-da-slrs/src/main/resources/mybatis/mapper/sarModelTree/SarModelTreeMapper.xml create mode 100644 adc-da-slrs/src/main/resources/mybatis/mapper/sarVppsTree/SarVppsTreeMapper.xml diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/controller/SarModelTreeController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/controller/SarModelTreeController.java new file mode 100644 index 00000000..7b10eccb --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/controller/SarModelTreeController.java @@ -0,0 +1,40 @@ +package com.adc.da.slrs.sarModelTree.controller; + + +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.slrs.sarModelTree.service.ISarModelTreeService; +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 com.adc.da.slrs.sarModelTree.entity.SarModelTree; +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.RestController; +import com.adc.da.base.web.BaseController; + +import java.util.List; + +/** +*

+ * 前端控制器 + *

+* +* @author super_liu +* @since 2021-07-15 +*/ +@RestController +@Api(tags = "福田标准法规--标准法规库-模块树结构") +@RequestMapping("/${restPath}/sarModelTree") +public class SarModelTreeController extends BaseController { + + @Autowired + private ISarModelTreeService iSarModelTreeService; + + @ApiOperation("查询所有资源") + @GetMapping("/list") + public ResponseMessage> getAll(SarModelTree sarVppsTree){ + List tsResources = iSarModelTreeService.getAll(sarVppsTree); + return Result.success(tsResources); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/dao/SarModelTreeDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/dao/SarModelTreeDao.java new file mode 100644 index 00000000..f26aeef4 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/dao/SarModelTreeDao.java @@ -0,0 +1,16 @@ +package com.adc.da.slrs.sarModelTree.dao; + +import com.adc.da.slrs.sarModelTree.entity.SarModelTree; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * Mapper 接口 + *

+ * + * @author super_liu + * @since 2021-07-15 + */ +public interface SarModelTreeDao extends BaseMapper { + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/entity/SarModelTree.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/entity/SarModelTree.java new file mode 100644 index 00000000..cbdd10d2 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/entity/SarModelTree.java @@ -0,0 +1,68 @@ +package com.adc.da.slrs.sarModelTree.entity; + +import com.adc.da.base.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableField; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.util.List; + +/** + *

+ * + *

+ * + * @author super_liu + * @since 2021-07-15 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(value="SarModelTree对象", description="") +public class SarModelTree extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @TableId("ID") + private String id; + + @TableField("NAME") + private String name; + + @TableField("PID") + private String pid; + + @TableField("MODEL") + private String model; + + @ApiModelProperty(value = "模块结构特性") + @TableField("FEATURES") + private String features; + + @ApiModelProperty(value = "删除标识 1：未删除 2：已删除") + @TableField("DEL_FLAG") + private String delFlag; + + @ApiModelProperty(value = "排序序号") + @TableField("SORT") + private Integer sort; + + @ApiModelProperty(value = "子菜单") + @TableField(exist = false) + private List children; + + @ApiModelProperty(value = "上级菜单名称") + @TableField(exist = false) + private String parentIdsName; + + @TableField(exist=false) + private List roleIds; + + @TableField(exist=false) + private List childMenuIds; + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/ISarModelTreeService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/ISarModelTreeService.java new file mode 100644 index 00000000..b1d2c3f3 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/ISarModelTreeService.java @@ -0,0 +1,20 @@ +package com.adc.da.slrs.sarModelTree.service; + +import com.adc.da.slrs.sarModelTree.entity.SarModelTree; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +/** + *

+ * 服务类 + *

+ * + * @author super_liu + * @since 2021-07-15 + */ +public interface ISarModelTreeService extends IService { + + List getAll(SarModelTree sarModelTree); + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/impl/SarModelTreeServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/impl/SarModelTreeServiceImpl.java new file mode 100644 index 00000000..e3e3c907 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/impl/SarModelTreeServiceImpl.java @@ -0,0 +1,53 @@ +package com.adc.da.slrs.sarModelTree.service.impl; + +import com.adc.da.slrs.sarModelTree.entity.SarModelTree; +import com.adc.da.slrs.sarModelTree.dao.SarModelTreeDao; +import com.adc.da.slrs.sarModelTree.service.ISarModelTreeService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + *

+ * 服务实现类 + *

+ * + * @author super_liu + * @since 2021-07-15 + */ +@Service +public class SarModelTreeServiceImpl extends ServiceImpl implements ISarModelTreeService { + + /** + * 查询所有菜单 + * @param sarModelTree + */ + @Override + public List getAll(SarModelTree sarModelTree) { + QueryWrapper tsResourceQueryWrapper=new QueryWrapper<>(); + tsResourceQueryWrapper.isNull("PID"); + List list = this.baseMapper.selectList(tsResourceQueryWrapper); + for(SarModelTree tree:list){ + tree.setChildren(recursionGetChildren((tree))); + } + return list; + } + + /** + * 递归调用获取子节点 + * @param parent：父节点 + * @return List + */ + private List recursionGetChildren(SarModelTree parent){ + QueryWrapper sarMenuQueryWrapper=new QueryWrapper<>(); + sarMenuQueryWrapper.orderByAsc("SORT"); + sarMenuQueryWrapper.eq("PID",parent.getId()); + List children=this.baseMapper.selectList(sarMenuQueryWrapper); + for(SarModelTree sarMenu:children){ + sarMenu.setChildren(recursionGetChildren((sarMenu))); + } + return children; + } +} 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 index 735b69dc..5eb54a3a 100644 --- 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 @@ -8,8 +8,8 @@ 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); +// @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/entity/SarVPPS.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarTree/entity/SarVPPS.java index af7f22c2..d50927e7 100644 --- 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 @@ -1,6 +1,7 @@ package com.adc.da.slrs.sarTree.entity; import com.adc.da.base.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import lombok.Data; import lombok.EqualsAndHashCode; @@ -12,6 +13,7 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Accessors(chain = true) @ApiModel(value="SarVPPS对象", description="") +@TableName(value = "sar_vpps_tree") public class SarVPPS extends BaseEntity { private static final long serialVersionUID = 1L; 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 index 729a9f06..586be308 100644 --- 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 @@ -3,6 +3,7 @@ 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 com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -23,8 +24,10 @@ public class SarModelServiceImpl implements SarModelService { @Override public List findTreeAll() { //查询父级都为null的数据 - List sarVppsList = sarModelDao.findTreeAll(); - for (SarModel sarVppsOne : sarVppsList) { + QueryWrapper qw = new QueryWrapper<>(); + qw.isNull("pid"); + List sarVppsList = sarModelDao.selectList(qw); + for (SarModel sarVppsOne:sarVppsList) { sarVppsOne.setChildren(getChildren(sarVppsOne)); } return sarVppsList; @@ -32,14 +35,15 @@ public class SarModelServiceImpl implements SarModelService { /** * 递归调用获取子节点 - * * @param parent：父节点 * @return List */ - private List getChildren(SarModel parent) { + private List getChildren(SarModel parent){ String pid = parent.getId(); - List children = sarModelDao.selectList(pid); - for (SarModel sarVppsOne : children) { + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("pid",parent.getId()); + List children=sarModelDao.selectList(qw); + 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 index 30db1809..d4ce1aba 100644 --- 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 @@ -24,7 +24,9 @@ public class SarVPPSServiceImpl implements SarVPPSService { @Override public List findTreeAll() { //查询父级都为null的数据 - List sarVppsList = sarVPPSDao.findTreeAll(); + QueryWrapper qw = new QueryWrapper<>(); + qw.isNull("pid"); + List sarVppsList = sarVPPSDao.selectList(qw); for (SarVPPS sarVppsOne:sarVppsList) { sarVppsOne.setChildren(getChildren(sarVppsOne)); } @@ -38,7 +40,9 @@ public class SarVPPSServiceImpl implements SarVPPSService { */ private List getChildren(SarVPPS parent){ String pid = parent.getId(); - List children = sarVPPSDao.selectList(pid); + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("pid",parent.getId()); + List children=sarVPPSDao.selectList(qw); for(SarVPPS sarVppsOne:children){ sarVppsOne.setChildren(getChildren((sarVppsOne))); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/controller/SarVppsTreeController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/controller/SarVppsTreeController.java new file mode 100644 index 00000000..9f78cba2 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/controller/SarVppsTreeController.java @@ -0,0 +1,41 @@ +package com.adc.da.slrs.sarVppsTree.controller; + + +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.slrs.sarVppsTree.service.ISarVppsTreeService; +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 com.adc.da.slrs.sarVppsTree.entity.SarVppsTree; +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.RestController; +import com.adc.da.base.web.BaseController; + +import java.util.List; + +/** +*

+ * 前端控制器 + *

+* +* @author super_liu +* @since 2021-07-15 +*/ +@RestController +@Api(tags = "福田标准法规--标准法规库-Vpps树结构") +@RequestMapping("/${restPath}/sarVppsTree") +public class SarVppsTreeController extends BaseController { + + @Autowired + private ISarVppsTreeService iSarVppsTreeService; + + @ApiOperation("查询所有资源") + @GetMapping("/list") + public ResponseMessage> getAll(SarVppsTree sarVppsTree){ + List tsResources = iSarVppsTreeService.getAll(sarVppsTree); + return Result.success(tsResources); + } + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/dao/SarVppsTreeDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/dao/SarVppsTreeDao.java new file mode 100644 index 00000000..b91948c6 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/dao/SarVppsTreeDao.java @@ -0,0 +1,16 @@ +package com.adc.da.slrs.sarVppsTree.dao; + +import com.adc.da.slrs.sarVppsTree.entity.SarVppsTree; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * Mapper 接口 + *

+ * + * @author super_liu + * @since 2021-07-15 + */ +public interface SarVppsTreeDao extends BaseMapper { + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/entity/SarVppsTree.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/entity/SarVppsTree.java new file mode 100644 index 00000000..e9fb22cf --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/entity/SarVppsTree.java @@ -0,0 +1,76 @@ +package com.adc.da.slrs.sarVppsTree.entity; + +import com.adc.da.base.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableField; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.util.List; + +/** + *

+ * + *

+ * + * @author super_liu + * @since 2021-07-15 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(value="SarVppsTree对象", description="") +public class SarVppsTree extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @TableId("ID") + private String id; + + @ApiModelProperty(value = "VPPS编码") + @TableField("VPPS_CODE") + private String vppsCode; + + @ApiModelProperty(value = "父级id") + @TableField("PID") + private String pid; + + @ApiModelProperty(value = "编码") + @TableField("CODE") + private String code; + + @ApiModelProperty(value = "中文名称") + @TableField("CHINESE_NAME") + private String chineseName; + + @ApiModelProperty(value = "中文名称") + @TableField("ENGLISH_NAME") + private String englishName; + + @ApiModelProperty(value = "删除标识 1：未删除 2：已删除") + @TableField("DEL_FLAG") + private String delFlag; + + @ApiModelProperty(value = "排序序号") + @TableField("SORT") + private Integer sort; + + @ApiModelProperty(value = "子菜单") + @TableField(exist = false) + private List children; + + @ApiModelProperty(value = "上级菜单名称") + @TableField(exist = false) + private String parentIdsName; + + @TableField(exist=false) + private List roleIds; + + @TableField(exist=false) + private List childMenuIds; + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/service/ISarVppsTreeService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/service/ISarVppsTreeService.java new file mode 100644 index 00000000..910b46ec --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/service/ISarVppsTreeService.java @@ -0,0 +1,19 @@ +package com.adc.da.slrs.sarVppsTree.service; + +import com.adc.da.slrs.sarVppsTree.entity.SarVppsTree; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +/** + *

+ * 服务类 + *

+ * + * @author super_liu + * @since 2021-07-15 + */ +public interface ISarVppsTreeService extends IService { + + List getAll(SarVppsTree sarVppsTree); +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/service/impl/SarVppsTreeServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/service/impl/SarVppsTreeServiceImpl.java new file mode 100644 index 00000000..1a7b51d4 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/service/impl/SarVppsTreeServiceImpl.java @@ -0,0 +1,53 @@ +package com.adc.da.slrs.sarVppsTree.service.impl; + +import com.adc.da.slrs.sarVppsTree.entity.SarVppsTree; +import com.adc.da.slrs.sarVppsTree.dao.SarVppsTreeDao; +import com.adc.da.slrs.sarVppsTree.service.ISarVppsTreeService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + *

+ * 服务实现类 + *

+ * + * @author super_liu + * @since 2021-07-15 + */ +@Service +public class SarVppsTreeServiceImpl extends ServiceImpl implements ISarVppsTreeService { + + /** + * 查询所有菜单 + * @param sarVppsTree + */ + @Override + public List getAll(SarVppsTree sarVppsTree) { + QueryWrapper tsResourceQueryWrapper=new QueryWrapper<>(); + tsResourceQueryWrapper.isNull("PID"); + List list = this.baseMapper.selectList(tsResourceQueryWrapper); + for(SarVppsTree tree:list){ + tree.setChildren(recursionGetChildren((tree))); + } + return list; + } + + /** + * 递归调用获取子节点 + * @param parent：父节点 + * @return List + */ + private List recursionGetChildren(SarVppsTree parent){ + QueryWrapper sarMenuQueryWrapper=new QueryWrapper<>(); + sarMenuQueryWrapper.orderByAsc("SORT"); + sarMenuQueryWrapper.eq("PID",parent.getId()); + List children=this.baseMapper.selectList(sarMenuQueryWrapper); + for(SarVppsTree sarMenu:children){ + sarMenu.setChildren(recursionGetChildren((sarMenu))); + } + return children; + } +} diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarModelTree/SarModelTreeMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarModelTree/SarModelTreeMapper.xml new file mode 100644 index 00000000..9541c60b --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarModelTree/SarModelTreeMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarVppsTree/SarVppsTreeMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarVppsTree/SarVppsTreeMapper.xml new file mode 100644 index 00000000..8e2bb000 --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarVppsTree/SarVppsTreeMapper.xml @@ -0,0 +1,5 @@ + + + + + From 59b8ee7e19d96587726f5bf3001bdc5394926821 Mon Sep 17 00:00:00 2001 From: zxy-lbj <15192043237@163.com> Date: Fri, 16 Jul 2021 03:10:09 +0000 Subject: [PATCH 10/16] Update application-dev.properties --- adc-da-main/src/main/resources/application-dev.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index d10482d6..23fac18c 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -18,7 +18,7 @@ application.center=1 #Eruept eureka.client.allow-redirects=true eureka.client.register-with-eureka=true -eureka.client.service-url.defaultZone=http://101.36.227.25:8761/eureka/ +eureka.client.service-url.defaultZone=http://192.168.10.47:8761/eureka/ #============================================== # 邮箱配置1 From ee7358191220b6873943a779b3e0a6489989fe8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A4=8F=E6=99=96?= Date: Fri, 16 Jul 2021 08:27:45 +0000 Subject: [PATCH 11/16] Update application.properties --- adc-da-main/src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-main/src/main/resources/application.properties b/adc-da-main/src/main/resources/application.properties index 6b97ffad..5b30f553 100644 --- a/adc-da-main/src/main/resources/application.properties +++ b/adc-da-main/src/main/resources/application.properties @@ -39,7 +39,7 @@ eureka.client.fetch-registry=true #eureka.client.service-url.defaultZone=http://127.0.0.1:8671/eureka/ #eureka.client.service-url.defaultZone=http://10.5.116.172:8672/eureka/ -eureka.client.service-url.defaultZone=http://192.168.10.47:8761/eureka/ +eureka.client.service-url.defaultZone=http://101.36.227.25:8761/eureka/ # 请求连接的超时时间 默认的时间为 1 秒 ribbon.ConnectTimeout=500000 From eca5c9ae331a2c72dcc9dee2d26f98ec02bf6b4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A4=8F=E6=99=96?= Date: Fri, 16 Jul 2021 08:50:12 +0000 Subject: [PATCH 12/16] Update application-dev.properties --- adc-da-main/src/main/resources/application-dev.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index 23fac18c..d10482d6 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -18,7 +18,7 @@ application.center=1 #Eruept eureka.client.allow-redirects=true eureka.client.register-with-eureka=true -eureka.client.service-url.defaultZone=http://192.168.10.47:8761/eureka/ +eureka.client.service-url.defaultZone=http://101.36.227.25:8761/eureka/ #============================================== # 邮箱配置1 From 63181803aa3024423a2efcedd13c2233827226e7 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Sun, 18 Jul 2021 17:10:35 +0800 Subject: [PATCH 13/16] =?UTF-8?q?feat:=20=E6=A0=87=E5=87=86=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarStandardsInfoServiceImpl.java | 27 ++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java index 277fdd53..0b2d01bf 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java @@ -316,6 +316,31 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl sarlist) throws Exception { + for (SarStandardsInfo row : sarlist) { + attrInfoDetails(row); + Map getAttrMap = row.getAttrInfoMap(); + if (getAttrMap != null && getAttrMap.size() > 0) { + for (Map.Entry entry : getAttrMap.entrySet()) { + String name = entry.getKey(); + String value = ""; + if (entry.getValue() != null && InitStandAttrUtil.fileFieldList != null && InitStandAttrUtil.fileFieldList.size() > 0 && InitStandAttrUtil.fileFieldList.contains(name)) { + value = entry.getValue().toString(); + if (StringUtils.isNotBlank(value)) { + List fileObj = attFileEOService.getMultiFileInfos(value); + entry.setValue(fileObj); + } + }else if (entry.getValue() != null && InitStandAttrUtil.selectionFieldList != null && InitStandAttrUtil.selectionFieldList.size() > 0 && InitStandAttrUtil.selectionFieldList.contains(name)) { + value = entry.getValue().toString(); + List valArr = Arrays.asList(value.split(",")); + value = dicTypeEODao.getDicNamesByCodes(valArr); + entry.setValue(value); + } + } + } + } + } + public void attrInfoShow(List sarlist) throws Exception { for (SarStandardsInfo row : sarlist) { attrInfoDetails(row); @@ -1826,7 +1851,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl 0) { List sarStandardsInfoEOList = new ArrayList<>(); sarStandardsInfoEOList.add(resultlist.get(0)); - attrInfoShow(sarStandardsInfoEOList); + attrInfoShowDetails(sarStandardsInfoEOList); sarStandardsInfoEO = sarStandardsInfoEOList.get(0); } // 查询纳入清单的国家地区 From a2be968da5c056e097b616c12ba7371c61ef2c46 Mon Sep 17 00:00:00 2001 From: duanwenbin <12345678> Date: Mon, 19 Jul 2021 09:32:23 +0800 Subject: [PATCH 14/16] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=88=86=E8=A7=A3?= =?UTF-8?q?=E5=8D=95=E5=88=97=E8=A1=A8=EF=BC=8C=E5=A2=9E=E5=8A=A0=E7=AD=9B?= =?UTF-8?q?=E9=80=89=E6=9D=A1=E4=BB=B6-=E6=A0=B9=E6=8D=AE=E5=9B=BD?= =?UTF-8?q?=E5=86=85=E5=A4=96=E6=A0=87=E5=87=86=E7=AD=9B=E9=80=89=20=20=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E4=B8=AAbug=EF=BC=8C=E6=8B=86?= =?UTF-8?q?=E5=88=86=E8=A7=A3=E5=8D=95=E6=8F=90=E4=BA=A4=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=EF=BC=8C=E6=8A=A5=E9=94=99=E5=90=8E=E4=B8=8D=E8=AE=A9=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/ActSarItemsEOService.java | 34 ++++++++++++++++++- .../controller/SarStandFileEOController.java | 4 +++ .../standardSplit/entity/SarStandFileEO.java | 10 ++++++ .../impl/SarFileSplitInfoEOServiceImpl.java | 7 ++-- .../SarFileSplitInfoEOMapper.xml | 3 ++ .../standardSplit/SarStandFileEOMapper.xml | 3 +- 6 files changed, 57 insertions(+), 4 deletions(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java index a724e332..8d9ef5de 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java @@ -88,8 +88,40 @@ public class ActSarItemsEOService { @Value("${elas.flag}") private boolean elasflag; + /** + * 标准解读流程入库" + * @param standJson + * @throws Exception + */ + public void createStandardRead(String standJson) throws Exception{ + JSONObject object = JSONObject.parseObject(standJson); + String fileName = object.getString("fileName"); + String fileType = object.getString("fileType"); + String creationTime = object.getString("creationTime"); + String creationUser = object.getString("creationUser"); + String standId = object.getString("standId"); + //数组去重 + JSONArray responUserList1 = object.getJSONArray("itemList"); + for (Object obj:responUserList1) { + JSONObject object1 = (JSONObject) obj; + JSONArray preResponUserList = object1.getJSONArray("zxUserId"); + String oldNumber = object1.getString("oldNumber"); + String itemsNum = object1.getString("itemsNum"); + String itemsName = object1.getString("itemsName"); + String itemsTitle = object1.getString("itemsTitle"); + String applyArcticId = object1.getString("applyArcticId"); + String applyArctic = object1.getString("applyArctic"); + String changePoint = object1.getString("changePoint"); + String technicalRequir = object1.getString("technicalRequir"); + String onlineData = object1.getString("onlineData"); + String newData = object1.getString("newData"); + String complianceRequir = object1.getString("complianceRequir"); + String complianceState = object1.getString("complianceState"); + } + } + /*** - * @Description: 标准入库流程数据保存 + * @Description: 标准解读流程入库" * @Author: yangxuenan * @Date: 2020/12/7 13:48 * @Param: [standJson] diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarStandFileEOController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarStandFileEOController.java index c671b63c..825a91d6 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarStandFileEOController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarStandFileEOController.java @@ -3,6 +3,7 @@ package com.adc.da.slrs.standardSplit.controller; import com.adc.da.att.service.IAttFileEOService; import com.adc.da.base.web.BaseController; import com.adc.da.http.PageInfo; +import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsEO; import com.adc.da.slrs.standardSplit.entity.SarStandFileEO; import com.adc.da.slrs.standardSplit.entity.SarStandFileEOPage; import com.adc.da.slrs.standardSplit.service.SarStandAttrDetailsEOService; @@ -118,6 +119,9 @@ public class SarStandFileEOController extends BaseController { page.setFileSuffixList(suffix.split(",")); } List rows = sarStandFileEOService.getStandFileListByPage(page); + for (SarStandFileEO one:rows) { + one.setAttId(one.getAttId1()); + } if (rows != null && !rows.isEmpty()) { for (SarStandFileEO sarStandFileEO : rows) { List getField = sarStandAttrDetailsEOService.selectFileFieldForSel(sarStandFileEO.getStandFileClassify()); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandFileEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandFileEO.java index b45d23b3..6e8ef33a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandFileEO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandFileEO.java @@ -21,6 +21,16 @@ public class SarStandFileEO extends BaseEntity { private String validFlag; private String useModel; private String attId; + + public String getAttId1() { + return attId1; + } + + public void setAttId1(String attId1) { + this.attId1 = attId1; + } + + private String attId1; private String resId; private String standId; private String id; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java index d49d5d84..ad78a58f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java @@ -37,9 +37,9 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import com.adc.da.person.dao.PersonShareEODao; import com.adc.da.person.dao.PersonCollectEODao; +import org.springframework.transaction.interceptor.TransactionAspectSupport; @Service -@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService { private static final Logger logger = LoggerFactory.getLogger(SarFileSplitInfoEOServiceImpl.class); @@ -104,6 +104,7 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService } @Override + @Transactional public int fileAplit(SarFileSplitInfoEO sarFileSplitInfoEO){ // 拆分文件主表中插入数据 sarFileSplitInfoEO.setId(UUIDUtils.randomUUID20()); @@ -135,7 +136,8 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService } try { AttFileEO attFileEO = attFileEOService.getFileInfo(sarFileSplitInfoEO.getAttId()); - String readFilePath = filePath + "/" + attFileEO.getFilePath() + attFileEO.getFileName(); + //String readFilePath = filePath + "/" + attFileEO.getFilePath() + attFileEO.getFileName(); + String readFilePath = filePath + attFileEO.getFilePath() + attFileEO.getFileName(); InputStream is = new FileInputStream(readFilePath); //需要将文件路更改为word文档所在路径。 XWPFDocument doc = new XWPFDocument(is); @@ -317,6 +319,7 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService } catch (Exception e) { e.printStackTrace(); + TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); return -1; } if(treeList.size()>0 && messageList.size() > 0){ diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitInfoEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitInfoEOMapper.xml index 5f560a34..491246ff 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitInfoEOMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitInfoEOMapper.xml @@ -263,6 +263,9 @@ and SAR_FILE_SPLIT_INFO.stand_id = #{standId} + + and SAR_TYPE = #{sarType} + and SAR_FILE_SPLIT_INFO.id = #{id} diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandFileEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandFileEOMapper.xml index 471e17c1..8a7744c1 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandFileEOMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandFileEOMapper.xml @@ -20,6 +20,7 @@ + @@ -278,7 +279,7 @@ CONCAT(SAR_STANDARDS_INFO.stand_sort,' ',SAR_STANDARDS_INFO.stand_number,'-',SAR_STANDARDS_INFO.stand_year) ) ) AS standNumber, SAR_STANDARDS_INFO.stand_name as standName, - SAR_STAND_FILE.att_id AS attId, + SAR_STAND_FILE.att_id AS attId1, SAR_STANDARDS_INFO.STAND_TYPE as sarType FROM SAR_STAND_FILE From 21931a9455e478edca4ab170124ff96a5299e898 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Mon, 19 Jul 2021 12:02:56 +0800 Subject: [PATCH 15/16] =?UTF-8?q?feat:=20=E6=A0=87=E5=87=86=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adc/da/slrs/sarStandAttrInfo/entity/SarStandAttrInfo.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/entity/SarStandAttrInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/entity/SarStandAttrInfo.java index 7ef6ef5f..8985ecd5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/entity/SarStandAttrInfo.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/entity/SarStandAttrInfo.java @@ -187,8 +187,8 @@ public class SarStandAttrInfo extends BaseEntity { private String sycpx; @ApiModelProperty(value = "适用认证") - @TableField("SYZD") - private String syzd; + @TableField("SYRZ") + private String syrz; @ApiModelProperty(value = "责任工程师") @TableField("ZRGCS") From 7db2b79b637518e13c24eaa791a5b68217a557b8 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Mon, 19 Jul 2021 16:29:52 +0800 Subject: [PATCH 16/16] =?UTF-8?q?feat:=20=E9=A6=96=E9=A1=B5=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=8F=91=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SarStandardsInfoController.java | 9 +++++++++ .../slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java | 2 ++ .../service/ISarStandardsInfoService.java | 2 ++ .../service/impl/SarStandardsInfoServiceImpl.java | 5 +++++ .../mapper/sarStandardsInfo/SarStandardsInfoMapper.xml | 10 ++++++++++ 5 files changed, 28 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java index 8c3a3177..c35efe84 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java @@ -419,6 +419,15 @@ public class SarStandardsInfoController extends BaseController } } + + @ApiOperation(value = "标准发布查询") + @GetMapping("/getStandInfoByList") + //@RequiresPermissions("lawss:sarStandardsInfo:get") + public ResponseMessage> getStandInfoByList(String limit) throws Exception { + List result = sarStandardsInfoEOService.getStandInfoByList(limit); + return Result.success(result); + } + @ApiOperation(value = "|SarStandardsInfoEO|详情") @GetMapping("/getStandInfoById") //@RequiresPermissions("lawss:sarStandardsInfo:get") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java index 98bc1851..5fa8089c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java @@ -29,6 +29,8 @@ public interface SarStandardsInfoDao extends BaseMapper { List selectStandardsByStandnumber(SarStandardsInfo sarStandardsInfoEO); + List queryStandInfoByList(@Param("limit") Integer limit); + Integer selectStandColumn(@Param("columnName") String columnName); Integer selectCounterStandardsCount(SarStandardsInfo sarStandardsInfoEO); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java index 3d021796..b3fc3d01 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java @@ -31,6 +31,8 @@ public interface ISarStandardsInfoService extends IService { List selectStandardsByStandnumber(String replaceStandNum, String standType); + List getStandInfoByList(String limit); + SarStandardsInfo selectStandardsInfoByKey(String id) throws Exception; public void attrInfoDetails (SarStandardsInfo row) throws Exception; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java index 0b2d01bf..c3e1a681 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java @@ -1829,6 +1829,11 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl getStandInfoByList(String limit){ + return dao.queryStandInfoByList(Integer.valueOf(limit)); + } + /** * 新增过程中验证标准号 * diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml index 253602d1..2bc31a08 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml @@ -626,6 +626,16 @@ + +