From d71c4a81e1ec1ae648a09674efa95f0708b90513 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Fri, 30 Jul 2021 16:25:23 +0800 Subject: [PATCH 1/4] =?UTF-8?q?Revert=20"=E4=BF=AE=E5=A4=8D=E4=BA=86?= =?UTF-8?q?=E6=94=B6=E8=97=8F=E5=90=8E=E9=87=8D=E6=96=B0=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E6=95=B0=E6=8D=AE,=E6=94=B6=E8=97=8F=E7=9A=84=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=B2=A1=E6=9C=89=E6=9B=B4=E6=96=B0=E9=97=AE=E9=A2=98?= =?UTF-8?q?"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 3154533fb81cb884cb632f3d9216144b45c0b55b. # Conflicts: # adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java --- .../controller/SarStandardsInfoController.java | 15 ++++++--------- .../controller/PersonCollectEOController.java | 2 +- 2 files changed, 7 insertions(+), 10 deletions(-) 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 5e5a1324..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 @@ -1,7 +1,10 @@ package com.adc.da.slrs.sarStandardsInfo.controller; +import cn.afterturn.easypoi.excel.ExcelExportUtil; +import cn.afterturn.easypoi.excel.entity.ExportParams; import cn.hutool.core.util.ZipUtil; +import com.adc.da.att.entity.AttFileEO; import com.adc.da.common.FileUnZip; import com.adc.da.common.ReadExcel; import com.adc.da.exception.AdcDaBaseException; @@ -17,6 +20,7 @@ import com.adc.da.util.LoginUserUtil; import com.adc.da.util.UUIDUtils; import com.adc.da.utils.util.*; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import io.swagger.annotations.ApiOperation; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; @@ -38,6 +42,7 @@ import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.*; +import java.net.URLEncoder; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.*; @@ -77,12 +82,6 @@ public class SarStandardsInfoController extends BaseController @Autowired ISarLawsInfoService sarLawsInfoEOService; - @ApiOperation(value="SarStandardsInfoEO|反向标准操作") - @GetMapping(value = "/reverseQueryStand") - public void reverseQueryStand(@RequestParam(name="ids",required=true) String ids, String standName, String type) { - this.sarStandardsInfoEOService.reverseQueryStand(Arrays.asList(ids.split(",")),standName,type); - } - @ApiOperation(value = "|SarStandardsInfoEO|自定义分页查询") @GetMapping("/getSarStandardsInfoPage") //@RequiresPermissions("lawss:sarStandardsInfo:getSarStandardsInfoPage") @@ -152,9 +151,7 @@ public class SarStandardsInfoController extends BaseController page.setAdvanceSearchStr(null); } } - if(page.getUserId() == null || page.getUserId().equals("")){ - page.setUserId(LoginUserUtil.getUserId()); - } + page.setUserId(LoginUserUtil.getUserId()); List rows = sarStandardsInfoEOService.getSarStandardsInfoPage(page); return Result.success(getPageInfo(page.getPager(), rows)); } diff --git a/adc-da-sys/src/main/java/com/adc/da/person/controller/PersonCollectEOController.java b/adc-da-sys/src/main/java/com/adc/da/person/controller/PersonCollectEOController.java index 5ffdf75d..600d4d9b 100644 --- a/adc-da-sys/src/main/java/com/adc/da/person/controller/PersonCollectEOController.java +++ b/adc-da-sys/src/main/java/com/adc/da/person/controller/PersonCollectEOController.java @@ -93,7 +93,7 @@ public class PersonCollectEOController extends BaseController { @ApiOperation(value = "|PersonCollectEO|修改") - @PutMapping(consumes = APPLICATION_JSON_UTF8_VALUE,value = "/updatePersonCollect") + @PutMapping(consumes = APPLICATION_JSON_UTF8_VALUE) // @RequiresPermissions("person:personCollect:update") public ResponseMessage update(@RequestBody TsPersonCollect tsPersonCollect) throws Exception { tsPersonCollect.setModifyTime(new Date()); From d7a2285d752a29252c83b98284879a8007a0c90f Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Fri, 30 Jul 2021 16:26:27 +0800 Subject: [PATCH 2/4] =?UTF-8?q?Revert=20"=E6=9C=80=E6=96=B0"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 9f82519e --- .../com/adc/da/slrs/sarResource/dao/TsResourceDao.java | 3 --- .../com/adc/da/att/controller/AttFileEOController.java | 9 ++++----- .../da/person/controller/PersonCollectEOController.java | 2 +- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/dao/TsResourceDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/dao/TsResourceDao.java index de959ae0..335a7986 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/dao/TsResourceDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/dao/TsResourceDao.java @@ -3,7 +3,6 @@ package com.adc.da.slrs.sarResource.dao; import com.adc.da.slrs.sarResource.entity.TsResource; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import java.util.HashMap; import java.util.List; /** @@ -20,6 +19,4 @@ public interface TsResourceDao extends BaseMapper { List selectMenuByRole(TsResource sarMenuEO); - int insertTsRoleResource(HashMap map); - } diff --git a/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java b/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java index ef5fb044..cc34cb29 100644 --- a/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java +++ b/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java @@ -276,14 +276,13 @@ public class AttFileEOController { TsUser tsUser = userDao.selectById(userId); if (tsUser != null) { userMsg = tsUser.getUname() + ","; - //2021/7/28水印内容取消工号 -// if (StringUtils.isNotEmpty(tsUser.getWorkNum())) { -// userMsg += tsUser.getWorkNum() + ","; -// } + if (StringUtils.isNotEmpty(tsUser.getWorkNum())) { + userMsg += tsUser.getWorkNum() + ","; + } } SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm");//设置日期格式 String date = df.format(new Date()); - String waterContent = userMsg+date ; + String waterContent = userMsg + date; //2020年9月5日 去掉水印处理 //2021年7月25日要求下载生成水印 WaterMarkUtil.waterMark(oldFilePath,waterFilePath,waterContent); diff --git a/adc-da-sys/src/main/java/com/adc/da/person/controller/PersonCollectEOController.java b/adc-da-sys/src/main/java/com/adc/da/person/controller/PersonCollectEOController.java index 600d4d9b..5ffdf75d 100644 --- a/adc-da-sys/src/main/java/com/adc/da/person/controller/PersonCollectEOController.java +++ b/adc-da-sys/src/main/java/com/adc/da/person/controller/PersonCollectEOController.java @@ -93,7 +93,7 @@ public class PersonCollectEOController extends BaseController { @ApiOperation(value = "|PersonCollectEO|修改") - @PutMapping(consumes = APPLICATION_JSON_UTF8_VALUE) + @PutMapping(consumes = APPLICATION_JSON_UTF8_VALUE,value = "/updatePersonCollect") // @RequiresPermissions("person:personCollect:update") public ResponseMessage update(@RequestBody TsPersonCollect tsPersonCollect) throws Exception { tsPersonCollect.setModifyTime(new Date()); From faef2cdf591190c3f774bc7583f9dfed9299b376 Mon Sep 17 00:00:00 2001 From: zzy <2041873787@qq.com> Date: Fri, 30 Jul 2021 16:45:23 +0800 Subject: [PATCH 3/4] =?UTF-8?q?Update=EF=BC=9A=E6=A0=87=E5=87=86=E8=A7=A3?= =?UTF-8?q?=E8=AF=BB=E6=B5=81=E7=A8=8B=E6=A3=80=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../standardSplit/entity/SarFileSplitInfoEO.java | 10 ++++++++++ .../standardSplit/entity/SarFileSplitInfoEOPage.java | 12 ++++++++++++ .../standardSplit/SarFileSplitInfoEOMapper.xml | 4 ++++ 3 files changed, 26 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitInfoEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitInfoEO.java index e77326e2..367f311a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitInfoEO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitInfoEO.java @@ -13,6 +13,8 @@ import java.util.Date; */ public class SarFileSplitInfoEO extends BaseEntity { + + private String standType; private String sarType; private String fileName; private String id; @@ -321,4 +323,12 @@ public class SarFileSplitInfoEO extends BaseEntity { public void setInfoId(String infoId) { this.infoId = infoId; } + + public String getStandType() { + return standType; + } + + public void setStandType(String standType) { + this.standType = standType; + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitInfoEOPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitInfoEOPage.java index 68158eff..cda70bf7 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitInfoEOPage.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitInfoEOPage.java @@ -10,6 +10,7 @@ import com.adc.da.base.page.BasePage; */ public class SarFileSplitInfoEOPage extends BasePage { + private String standType; private String sarType; private String sarTypeOperator = "="; private String fileName; @@ -49,6 +50,17 @@ public class SarFileSplitInfoEOPage extends BasePage { private String shunxu; + public SarFileSplitInfoEOPage() { + } + + public String getStandType() { + return standType; + } + + public void setStandType(String standType) { + this.standType = standType; + } + public String getResult() { return result; } 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 491246ff..62a2d1d9 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 @@ -238,6 +238,7 @@ select * from (select tmp_tb.* from (SELECT + SAR_STANDARDS_INFO.STAND_TYPE AS standType, SAR_FILE_SPLIT_INFO.*, if( SAR_STANDARDS_INFO.STAND_YEAR='', @@ -266,6 +267,9 @@ and SAR_TYPE = #{sarType} + + and SAR_STANDARDS_INFO.STAND_TYPE = #{standType} + and SAR_FILE_SPLIT_INFO.id = #{id} From 30859dd3afaab4a8943a1a37341e984a4afe9e53 Mon Sep 17 00:00:00 2001 From: zzy <2041873787@qq.com> Date: Fri, 30 Jul 2021 17:08:17 +0800 Subject: [PATCH 4/4] =?UTF-8?q?update=EF=BC=9Adevelop3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TsResourceController.java | 7 ++ .../slrs/sarResource/dao/TsResourceDao.java | 3 + .../service/ITsResourceService.java | 2 + .../service/impl/TsResourceServiceImpl.java | 13 +++ .../sarRole/controller/TsRoleController.java | 2 + .../adc/da/slrs/sarRole/dao/TsRoleDao.java | 5 +- .../service/impl/TsRoleServiceImpl.java | 8 ++ .../service/ISarStandardsInfoService.java | 2 +- .../impl/SarStandardsInfoServiceImpl.java | 106 +++++++++--------- 9 files changed, 92 insertions(+), 56 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/controller/TsResourceController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/controller/TsResourceController.java index 3079dc44..7ab32bdc 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/controller/TsResourceController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/controller/TsResourceController.java @@ -53,6 +53,13 @@ public class TsResourceController extends BaseController { return Result.success(tsResources); } +// @ApiOperation("查询所有资源") +// @GetMapping("/getDefault") +// public ResponseMessage> getDefault(){ +// List tsResources=tsResourceService.getDefaultByName(); +// return Result.success(tsResources); +// } + @ApiOperation("添加资源") @PostMapping("/add") public ResponseMessage addResource(@RequestBody TsResource tsResource){ diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/dao/TsResourceDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/dao/TsResourceDao.java index 335a7986..de959ae0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/dao/TsResourceDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/dao/TsResourceDao.java @@ -3,6 +3,7 @@ package com.adc.da.slrs.sarResource.dao; import com.adc.da.slrs.sarResource.entity.TsResource; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import java.util.HashMap; import java.util.List; /** @@ -19,4 +20,6 @@ public interface TsResourceDao extends BaseMapper { List selectMenuByRole(TsResource sarMenuEO); + int insertTsRoleResource(HashMap map); + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/ITsResourceService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/ITsResourceService.java index e66ec54c..2335e30e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/ITsResourceService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/ITsResourceService.java @@ -34,6 +34,8 @@ public interface ITsResourceService extends IService { List getAll(TsResource tsResource); + List getDefaultByName(); + ResponseMessage addResource(TsResource tsResource); ResponseMessage updateResource(TsResource tsResource); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java index c3f3a777..5da4ba92 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java @@ -155,6 +155,19 @@ public class TsResourceServiceImpl extends ServiceImpl getDefaultByName() { + List menusNames=new ArrayList<>(); + menusNames.add("海外标准法规"); + menusNames.add("国内标准法规"); + QueryWrapper tsResourceQueryWrapper=new QueryWrapper<>(); + tsResourceQueryWrapper.in("MENU_NAME",menusNames); + List TsResources=dao.selectList(tsResourceQueryWrapper); + List res=new ArrayList<>(); + TsResources.forEach(tsResource -> res.add(tsResource.getId())); + return res; + } + /** * 添加菜单 * @param TsResource：菜单信息 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/controller/TsRoleController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/controller/TsRoleController.java index eba62f9b..afcda9b0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/controller/TsRoleController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/controller/TsRoleController.java @@ -6,6 +6,8 @@ import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.login.util.UserUtils; import com.adc.da.slrs.sarMenu.entity.SarMenu; +import com.adc.da.slrs.sarResource.entity.TsResource; +import com.adc.da.slrs.sarResource.service.ITsResourceService; import com.adc.da.slrs.sarRole.entity.TsRoleMenuVO; import com.adc.da.slrs.sarRole.entity.TsRoleResourceVO; import com.adc.da.slrs.sarRole.service.ITsRoleService; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/dao/TsRoleDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/dao/TsRoleDao.java index e4536ea8..545ff443 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/dao/TsRoleDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/dao/TsRoleDao.java @@ -4,6 +4,7 @@ import com.adc.da.slrs.sarRole.entity.TsRole; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Insert; +import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import java.util.List; @@ -75,7 +76,7 @@ public interface TsRoleDao extends BaseMapper { * @param resourceId：权限ID */ @Insert("insert into ts_role_resource (role_id,resource_id) values (#{roleId},#{resourceId})") - void addResource(String roleId, String resourceId); + void addResource(@Param("roleId") String roleId, @Param("resourceId") String resourceId); /** * 删除权限 @@ -83,7 +84,7 @@ public interface TsRoleDao extends BaseMapper { * @param resourceId：权限ID */ @Delete("delete from ts_role_resource where role_id=#{roleId} and resource_id=#{resourceId}") - void delResource(String roleId, String resourceId); + void delResource(@Param("roleId") String roleId,@Param("resourceId") String resourceId); /** * 通过角色Id列表查询资源Id列表 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/impl/TsRoleServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/impl/TsRoleServiceImpl.java index d8ed1875..e4ee3dac 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/impl/TsRoleServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/impl/TsRoleServiceImpl.java @@ -6,6 +6,7 @@ import com.adc.da.slrs.sarMenu.dao.SarMenuDao; import com.adc.da.slrs.sarMenu.entity.SarMenu; import com.adc.da.slrs.sarMenu.service.ISarMenuService; import com.adc.da.slrs.sarPersonalCenter.service.ISarUserPersonalMenuService; +import com.adc.da.slrs.sarResource.service.ITsResourceService; import com.adc.da.slrs.sarRole.entity.TsRole; import com.adc.da.slrs.sarRole.dao.TsRoleDao; import com.adc.da.slrs.sarRole.entity.TsRoleMenuVO; @@ -42,6 +43,9 @@ public class TsRoleServiceImpl extends ServiceImpl implements @Autowired @Lazy private ISarUserPersonalMenuService sarUserPersonalMenuService; + + @Autowired + private ITsResourceService tsResourceService; /** * 查询所有角色 * @return List @@ -105,6 +109,10 @@ public class TsRoleServiceImpl extends ServiceImpl implements tsRole.setRoleHierarchy(parentRole.getRoleHierarchy()+1); } tsRoleDao.insert(tsRole); + List as=tsResourceService.getDefaultByName(); + as.forEach(s -> { + tsRoleDao.addResource(tsRole.getId(),s); + }); return Result.success(); } 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 93aa8d45..290c2343 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 @@ -17,7 +17,7 @@ import java.util.Map; */ public interface ISarStandardsInfoService extends IService { - void reverseQueryStand(List ids, String standName,String type); +// void reverseQueryStand(List ids, String standName,String type); List getSarStandardsInfoPage(SarStandardsInfoEOPage page) 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 63b78fb7..500854cf 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 @@ -194,59 +194,59 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl ids, String standName,String type){ - String fieldInfo = InitStandAttrUtil.queryField; - if (StringUtils.isNotBlank(fieldInfo) && StringUtils.isNotBlank(type)) { - List> getAttrListMap = sarStandAttrInfoEODao.selectStandFieldAndDataListMap(fieldInfo, ids); - getAttrListMap.forEach(attrMap -> { - List list = Collections.singletonList(attrMap.get(type).toString()); - list.add(standName); - String reverseStandName = list.stream().map(String::toString).collect(Collectors.joining(",")); - attrMap.put(type,reverseStandName); - SarStandAttrInfo sarStandAttrInfo = map2Object(attrMap,SarStandAttrInfo.class); - sarStandAttrInfoEODao.updateById(sarStandAttrInfo); - }); - } - } - - public static T map2Object(Map map, Class clazz) { - - T obj = null; - try { - BeanInfo bean = Introspector.getBeanInfo(clazz); - PropertyDescriptor[] propertyDescriptorArr = bean.getPropertyDescriptors(); - for (int i = 0; i < propertyDescriptorArr.length; i++) { - PropertyDescriptor propertyDescriptor = propertyDescriptorArr[i]; - String name = propertyDescriptor.getName(); - if(map.containsKey(name)) { - Object value = map.get(name); - if("null".equals(value)) { - value = null; - } - Object[] objArr = new Object[0]; - objArr[0] = value; - try { - propertyDescriptor.getWriteMethod().invoke(obj, objArr); - } catch (IllegalAccessException e) { - e.printStackTrace(); - } catch (IllegalArgumentException e) { - e.printStackTrace(); - } catch (InvocationTargetException e) { - e.printStackTrace(); - } - } - - } - } catch (IntrospectionException e) { - e.printStackTrace(); - } - return obj; - } +// /** +// * 反向操作标准 +// */ +// @Override +// @Async +// public void reverseQueryStand(List ids, String standName,String type){ +// String fieldInfo = InitStandAttrUtil.queryField; +// if (StringUtils.isNotBlank(fieldInfo) && StringUtils.isNotBlank(type)) { +// List> getAttrListMap = sarStandAttrInfoEODao.selectStandFieldAndDataListMap(fieldInfo, ids); +// getAttrListMap.forEach(attrMap -> { +// List list = Collections.singletonList(attrMap.get(type).toString()); +// list.add(standName); +// String reverseStandName = list.stream().map(String::toString).collect(Collectors.joining(",")); +// attrMap.put(type,reverseStandName); +// SarStandAttrInfo sarStandAttrInfo = map2Object(attrMap,SarStandAttrInfo.class); +// sarStandAttrInfoEODao.updateById(sarStandAttrInfo); +// }); +// } +// } +// +// public static T map2Object(Map map, Class clazz) { +// +// T obj = null; +// try { +// BeanInfo bean = Introspector.getBeanInfo(clazz); +// PropertyDescriptor[] propertyDescriptorArr = bean.getPropertyDescriptors(); +// for (int i = 0; i < propertyDescriptorArr.length; i++) { +// PropertyDescriptor propertyDescriptor = propertyDescriptorArr[i]; +// String name = propertyDescriptor.getName(); +// if(map.containsKey(name)) { +// Object value = map.get(name); +// if("null".equals(value)) { +// value = null; +// } +// Object[] objArr = new Object[0]; +// objArr[0] = value; +// try { +// propertyDescriptor.getWriteMethod().invoke(obj, objArr); +// } catch (IllegalAccessException e) { +// e.printStackTrace(); +// } catch (IllegalArgumentException e) { +// e.printStackTrace(); +// } catch (InvocationTargetException e) { +// e.printStackTrace(); +// } +// } +// +// } +// } catch (IntrospectionException e) { +// e.printStackTrace(); +// } +// return obj; +// } /***