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-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/dao/SarStandAttrInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/dao/SarStandAttrInfoDao.java index bda32502..2eced4cf 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/dao/SarStandAttrInfoDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/dao/SarStandAttrInfoDao.java @@ -28,6 +28,8 @@ public interface SarStandAttrInfoDao extends BaseMapper { Map selectStandFieldAndData(@Param("fieldInfo") String fieldInfo, @Param("standId") String standId); + List> selectStandFieldAndDataListMap(@Param("fieldInfo") String fieldInfo, @Param("ids") List ids); + int insertStandAttr(@Param("fieldInfo") String fieldInfo, @Param("fieldValue") String fieldValue); int deleteStandAttrByStandId(@Param("standId") String standId); 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 8cbf6ece..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 @@ -151,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-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 62c545e5..d9b5d1c2 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 @@ -94,6 +94,14 @@ public class SarStandardsInfo extends BaseEntity { @TableField("REPLACED_STAND_NUM") private String replacedStandNum; + @ApiModelProperty(value = "代替部分标准号") + @TableField("REPLACE_PART_STAND_NUM") + private String replacePartStandNum; + + @ApiModelProperty(value = "被代替部分标准号") + @TableField("REPLACED_PART_STAND_NUM") + private String replacedPartStandNum; + @TableField("CREATION_USER") private String creationUser; 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 b3fc3d01..93aa8d45 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,6 +17,8 @@ import java.util.Map; */ public interface ISarStandardsInfoService extends IService { + void reverseQueryStand(List ids, String standName,String type); + List getSarStandardsInfoPage(SarStandardsInfoEOPage page) throws Exception; void createSarStandardsInfo(SarStandardsInfo sarStandardsInfoEO) 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 b58cda14..63b78fb7 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 @@ -9,7 +9,6 @@ import com.adc.da.http.Result; import com.adc.da.mq.service.CreateStandMQService; import com.adc.da.person.dao.PersonCollectEODao; import com.adc.da.person.dao.PersonShareEODao; -import com.adc.da.person.entity.PersonMsgEO; import com.adc.da.person.service.IPersonCollectEOService; import com.adc.da.search.service.StandLawsSearchService; import com.adc.da.slrs.sarLawsInfo.entity.SarLawsInfo; @@ -40,7 +39,6 @@ import com.adc.da.slrs.sarStandPutTime.entity.SarStandPutTime; import com.adc.da.slrs.sarStandVal.dao.SarStandValDao; import com.adc.da.slrs.sarStandVal.entity.SarStandVal; import com.adc.da.slrs.sarStandardsInfo.entity.*; -import com.adc.da.slrs.sarMenu.service.ISarMenuService; import com.adc.da.slrs.sarStandardsInfo.dao.SarStandardsInfoDao; import com.adc.da.slrs.sarStandardsInfo.service.ISarStandardsInfoService; import com.adc.da.slrs.sarUpdLog.service.ISarUpdLogService; @@ -73,15 +71,24 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; +import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; +import java.beans.BeanInfo; +import java.beans.IntrospectionException; +import java.beans.Introspector; +import java.beans.PropertyDescriptor; import java.io.File; import java.io.FileInputStream; +import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Modifier; import java.sql.Clob; import java.text.SimpleDateFormat; import java.util.*; +import java.util.concurrent.atomic.AtomicInteger; import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; @@ -187,6 +194,60 @@ 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; + } + /*** * @Description: 分页查询 @@ -448,8 +509,8 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl 0) { // 主要逻辑处理新增的 @@ -1016,8 +1081,8 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl + + + insert into SAR_STAND_ATTR_INFO(${fieldInfo}) values (${fieldValue}) 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 2bc31a08..4b56f28b 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 @@ -395,7 +395,7 @@ and country = #{country} - + and ( (concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-', 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/resources/mybatis/mapper/sys/DicTypeEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/DicTypeEOMapper.xml index cd17691a..288146c0 100644 --- a/adc-da-sys/src/main/resources/mybatis/mapper/sys/DicTypeEOMapper.xml +++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/DicTypeEOMapper.xml @@ -26,7 +26,14 @@ TS_DICTYPE.id,TS_DICTYPE.parent_id, TS_DICTYPE.dic_type_code, TS_DICTYPE.dic_type_name, TS_DICTYPE.dic_id, - TS_DICTYPE.valid_flag,TS_DICTYPE.creation_time,TS_DICTYPE.modify_time,TS_DICTYPE.describes,TS_DICTYPE.show_index,tree_pid + TS_DICTYPE.valid_flag,TS_DICTYPE.creation_time,TS_DICTYPE.modify_time,TS_DICTYPE.describes,TS_DICTYPE.show_index, + tree_pid + + + + + TS_DICTYPE.id,TS_DICTYPE.parent_id, TS_DICTYPE.dic_type_code, TS_DICTYPE.dic_type_name, TS_DICTYPE.dic_id, + TS_DICTYPE.valid_flag,TS_DICTYPE.creation_time,TS_DICTYPE.modify_time,TS_DICTYPE.describes,(@rownum :=@rownum + 1) AS rownum,TS_DICTYPE.show_index,tree_pid @@ -34,6 +41,11 @@ a.id,a.parent_id, a.dic_type_code, a.dic_type_name, a.dic_id,a.valid_flag,a.creation_time,a.modify_time,a.describes,a.show_index + + + a.id,a.parent_id, a.dic_type_code, a.dic_type_name, a.dic_id,a.valid_flag,a.creation_time,a.modify_time,a.rownum,a.describes,a.show_index + + u.*, ur.id as type_id, ur.dic_type_code as dic_type_code, @@ -294,19 +306,20 @@