From 08c19dd1f472a80ddab2b8a77c1652a67bd39c7e Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Fri, 3 Sep 2021 10:47:37 +0800 Subject: [PATCH 01/10] =?UTF-8?q?/api/sarStandProjectLibrary/save=20?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarStandProjectLibraryController.java | 73 ++-------------- .../entity/Company.java | 10 +++ .../entity/ResponseDto.java | 7 +- .../entity/SarStandProjectLibrary.java | 8 +- .../SarStandProjectLibraryService.java | 1 + .../SarStandProjectLibraryServiceImpl.java | 84 ++++++++++++++++++- .../SarStandProjectTeamController.java | 11 ++- 7 files changed, 119 insertions(+), 75 deletions(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/Company.java diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java index e098b0b8..26d1d7d5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java @@ -227,72 +227,13 @@ public class SarStandProjectLibraryController extends BaseController queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("project_number",sarStandProjectLibrary.getProjectNumber()); - - sarStandProjectLibraryService.saveOrUpdate(sarStandProjectLibrary,queryWrapper); - - } -// }catch (Exception e){ -// head.setERRORCODE("2"); -// head.setRESULT("业务失败需要重做"); -// return responseDto(head); -// } - head.setERRORCODE("0"); - head.setRESULT("成功"); - responseDto.setHEAD(head); + Head head = sarStandProjectLibraryService.AnalysisJsonAndStorage(jsonStr); + ArrayList companies = new ArrayList<>(); + ResponseDto responseDto = new ResponseDto(head,companies); + Company company = new Company(); + company.setCOMPANY_CODE(""); + company.setFISCAL_YEAR(""); + companies.add(company); return responseDto; } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/Company.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/Company.java new file mode 100644 index 00000000..05e5c48a --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/Company.java @@ -0,0 +1,10 @@ +package com.adc.da.slrs.sarStandProjectLibrary.entity; + +import lombok.Data; + +@Data +public class Company { + private String COMPANY_CODE; + + private String FISCAL_YEAR; +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/ResponseDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/ResponseDto.java index d8a99c92..074c12db 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/ResponseDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/ResponseDto.java @@ -17,8 +17,11 @@ public class ResponseDto { // } - public ResponseDto(Head head) { - this.HEAD = head; + List LIST; + + public ResponseDto(Head HEAD, List LIST) { + this.HEAD = HEAD; + this.LIST = LIST; } public ResponseDto() { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/SarStandProjectLibrary.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/SarStandProjectLibrary.java index ac2a411e..06c6a716 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/SarStandProjectLibrary.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/SarStandProjectLibrary.java @@ -5,15 +5,17 @@ import java.util.Date; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; +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; +import org.springframework.format.annotation.DateTimeFormat; /** *

- * + * *

* * @author ZhangJin @@ -49,10 +51,14 @@ public class SarStandProjectLibrary extends BaseEntity { @ApiModelProperty(value = "项目群") private String projectGroup; + @ApiModelProperty(value = "项目开始日期") + @DateTimeFormat(pattern="yyyy-MM-dd") private Date projectStartDate; + @ApiModelProperty(value = "项目完成日期") + @DateTimeFormat(pattern="yyyy-MM-dd") private Date projectEndDate; @ApiModelProperty(value = "当前节点") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java index aaf079e1..d0dc5452 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java @@ -19,5 +19,6 @@ public interface SarStandProjectLibraryService { void deleteByIds(List ids); void batchInsert(@Param("ids") List list); List exportStandAttrInfoExcel(StandAttrInfoExcelDto standAttrInfoExcelDto,String standId); + public Head AnalysisJsonAndStorage(String jsonStr); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java index ed2f5dd3..09d94452 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java @@ -1,4 +1,5 @@ package com.adc.da.slrs.sarStandProjectLibrary.service.impl; +import com.adc.da.ocr.util.UUIDUtils; import com.adc.da.slrs.sarStandAttrInfo.dao.SarStandAttrInfoDao; import com.adc.da.slrs.sarStandAttrInfo.entity.SarStandAttrInfo; import com.adc.da.slrs.sarStandProjectLibrary.entity.*; @@ -12,16 +13,16 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.google.gson.JsonArray; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; import org.springframework.stereotype.Service; import redis.clients.jedis.ScanResult; import javax.annotation.Resource; import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Map; +import java.util.*; /** *

@@ -44,6 +45,81 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl updateCondition = new QueryWrapper(); + updateCondition.eq("project_number",projectInfo.getProjectNumber()); +// .eq("project_start_date",targetBeginOn); + + + this.saveOrUpdate(projectInfo,updateCondition); + + } + }catch (Exception e){ + head.setERRORCODE("2"); + head.setRESULT("业务失败需要重做"); + return head; + } + head.setERRORCODE("0"); + head.setRESULT("成功"); + + return head; + } + @Override public IPage queryMaintenanceProject(int current, int pageSize, SarStandProjectLibraryDto sarDto) { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectTeam/controller/SarStandProjectTeamController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectTeam/controller/SarStandProjectTeamController.java index 8fc7b55f..ed115833 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectTeam/controller/SarStandProjectTeamController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectTeam/controller/SarStandProjectTeamController.java @@ -3,6 +3,7 @@ package com.adc.da.slrs.sarStandProjectTeam.controller; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; +import com.adc.da.slrs.sarStandProjectLibrary.entity.Company; import com.adc.da.slrs.sarStandProjectLibrary.entity.Head; import com.adc.da.slrs.sarStandProjectLibrary.entity.ResponseDto; import com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibrary; @@ -16,6 +17,8 @@ import com.adc.da.slrs.sarStandProjectTeam.entity.SarStandProjectTeam; import io.swagger.annotations.Api; import com.adc.da.base.web.BaseController; +import java.util.ArrayList; + /** *

@@ -37,8 +40,12 @@ public class SarStandProjectTeamController extends BaseController companies = new ArrayList<>(); + Company company = new Company(); + company.setCOMPANY_CODE(""); + company.setFISCAL_YEAR(""); + companies.add(company); + ResponseDto responseDto = new ResponseDto(head,companies); return responseDto; } From 1f2d738ee38f4826e4bc13fa56fa2d1bc15a1027 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Fri, 3 Sep 2021 17:24:59 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E6=9C=BA=E6=9E=84=E7=AE=A1=E7=90=86--?= =?UTF-8?q?=E5=8A=A0=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6=EF=BC=9A=E5=A7=93?= =?UTF-8?q?=E5=90=8D=E5=92=8C=E9=82=AE=E7=AE=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TsInstitutionController.java | 9 +++++---- .../java/com/adc/da/slrs/sarUser/dao/TsUserDao.java | 5 +++-- .../adc/da/slrs/sarUser/service/ITsUserService.java | 2 +- .../slrs/sarUser/service/impl/TsUserServiceImpl.java | 5 +++-- .../resources/mybatis/mapper/sarUser/TsUserMapper.xml | 10 ++++++++-- 5 files changed, 20 insertions(+), 11 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java index beaa8d70..1518b0b5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java @@ -63,10 +63,11 @@ public class TsInstitutionController extends BaseController { * @return ResponseMessage> */ @ApiOperation("查询机构的人员") - @GetMapping("/user") - public ResponseMessage> getUserByInstitutionId(@RequestParam String institutionId){ - List tsUsers=tsUserService.getUserByInstitutionId(institutionId); - return Result.success(tsUsers); + @PostMapping("/user") + public ResponseMessage getUserByInstitutionId(TsUser tsUser){ +// List tsUsers=tsUserService.getUserByInstitutionId(institutionId); + List tsUserList = tsUserService.getUserByInstitutionId(tsUser); + return Result.success(tsUserList); } @ApiOperation("导入机构数据") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/dao/TsUserDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/dao/TsUserDao.java index 260e3afd..25c9ee05 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/dao/TsUserDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/dao/TsUserDao.java @@ -1,9 +1,11 @@ package com.adc.da.slrs.sarUser.dao; +import com.adc.da.http.ResponseMessage; import com.adc.da.slrs.sarUser.entity.TsUser; 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; @@ -45,8 +47,7 @@ public interface TsUserDao extends BaseMapper { * @param institutionId：岗位ID * @return List */ - List getUserAndPosition(String institutionId); - + List getUserAndPosition(@Param("TsUser") TsUser tsUser); /** * 通过岗位Id列表查询用户ID列表 * @param positionIds：岗位ID列表 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java index 2be89ea5..e7560a06 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java @@ -25,7 +25,7 @@ public interface ITsUserService extends IService { * @param institutionId：机构ID * @return List */ - List getUserByInstitutionId(String institutionId); + List getUserByInstitutionId(TsUser tsUser); /** * 封禁、解禁用户 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java index 12d7b452..447dbff0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java @@ -64,8 +64,9 @@ public class TsUserServiceImpl extends ServiceImpl implements * @return List */ @Override - public List getUserByInstitutionId(String institutionId) { - return tsUserDao.getUserAndPosition(institutionId); + public List getUserByInstitutionId(TsUser tsUser) { +// return tsUserDao.getUserAndPosition(institutionId); + return tsUserDao.getUserAndPosition(tsUser); } /** diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml index 158d3b20..fea6f6ed 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml @@ -28,13 +28,19 @@ - select u.*,p.id p_id,p.name p_name from ts_user u left join ts_user_position up on u.usid=up.user_id left join ts_position p on up.position_id=p.id - where u.institution_id=#{institutionId} + where u.institution_id=#{TsUser.institutionId} + + and u.uname like concat('%',#{TsUser.uname},'%') + + + and u.email like concat('%',#{TsUser.email},'%') + + + + + + + + delete from TS_ORG + From 84190c9ddc690019f85235a6181d49c2be86db33 Mon Sep 17 00:00:00 2001 From: "Mr.Z" <709235321@qq.com> Date: Tue, 7 Sep 2021 16:55:28 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=90=88=E8=A7=84?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B-=E9=A1=B9=E7=9B=AE=20?= =?UTF-8?q?=E5=85=A5=E5=88=B0=E6=A0=87=E5=87=86=E5=90=88=E8=A7=84=E8=AF=84?= =?UTF-8?q?=E4=BC=B0=E7=BB=93=E6=9E=9C=20=E9=87=8C=E9=9D=A2=20=E4=BA=A7?= =?UTF-8?q?=E5=93=81=E7=BA=BF=E3=80=81=E9=A1=B9=E7=9B=AE=E7=BC=96=E5=8F=B7?= =?UTF-8?q?=E3=80=81=E9=A1=B9=E7=9B=AE=E5=90=8D=E7=A7=B0=E6=B2=A1=E4=BC=A0?= =?UTF-8?q?=E5=80=BC~~?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sarStandItems/service/impl/SarStandItemsServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java index cc48b8d5..056c111f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java @@ -162,7 +162,7 @@ public class SarStandItemsServiceImpl extends ServiceImpl standId = new ArrayList<>(); for (SarStandardsInfo standardsInfo : pageInfo){ - if (standardsInfo.getAttrInfoCaseMap().get("fbgbjbd")!=null){ + if (standardsInfo.getAttrInfoCaseMap().get("FBGBJBD")!=null || standardsInfo.getAttrInfoCaseMap().get("fbgbjbd")!=null){ standId.add(standardsInfo.getId()); } } From f7497d48bc931873f288402d833529e45dd29152 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Tue, 7 Sep 2021 17:04:53 +0800 Subject: [PATCH 09/10] feat: There is no way the #47672 --- .../da/search/service/impl/SearchCenterServiceImpl.java | 2 +- .../search/service/impl/StandLawsSearchServiceImpl.java | 3 ++- .../src/main/java/com/adc/da/mq/SendBussMQService.java | 9 +++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java b/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java index 66c976c8..eb6116bc 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java +++ b/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java @@ -156,7 +156,7 @@ public class SearchCenterServiceImpl implements SearchCenterService { boolQueryShould.should(QueryBuilders.wildcardQuery("standSort.keyword", "*"+searchInfoEO.getSelectValue()+"*")) .should(QueryBuilders.wildcardQuery("stand_code.keyword", "*"+searchInfoEO.getSelectValue()+"*")) .should(QueryBuilders.wildcardQuery("standYear.keyword", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("standName.keyword", "*"+searchInfoEO.getSelectValue()+"*")) + .should(QueryBuilders.wildcardQuery("stand_name.keyword", "*"+searchInfoEO.getSelectValue()+"*")) .should(QueryBuilders.wildcardQuery("standEnName.keyword", "*"+searchInfoEO.getSelectValue()+"*")) .should(QueryBuilders.wildcardQuery("textStatusBuss.keyword", "*"+searchInfoEO.getSelectValue()+"*")); if (isRqFormat(searchInfoEO.getSelectValue())) { diff --git a/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java b/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java index b45fe99e..21240490 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java +++ b/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java @@ -302,9 +302,10 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService { contentBuilder.append("企标类别:").append(attrInfoMap.get("standSort")).append(" "); contentBuilder.append("标准年份:").append(attrInfoMap.get("standYear")).append(" "); contentBuilder.append("企标名称:").append(attrInfoMap.get("standName")).append(" "); - contentBuilder.append("企标英文名称:").append(attrInfoMap.get("standName")).append(" "); + contentBuilder.append("企标英文名称:").append(attrInfoMap.get("stand_en_name")).append(" "); contentBuilder.append("文本状态:").append(attrInfoMap.get("textStatusBussName")).append(" "); contentBuilder.append("企标实施日期:").append(attrInfoMap.get("putTime")).append(" "); + contentBuilder.append("企标发布日期:").append(attrInfoMap.get("issueTime")).append(" "); contentBuilder.append("废止日期:").append(attrInfoMap.get("FZRQBUSSName")).append(" "); contentBuilder.append("复审日期:").append(attrInfoMap.get("FSRQBUSSName")).append(" "); contentBuilder.append("起草部门:").append(attrInfoMap.get("QCDWName")).append(" "); diff --git a/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java b/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java index 0c0cf95d..f8b1108c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java @@ -171,17 +171,18 @@ public class SendBussMQService { saveMap.put("validFlag","0"); saveMap.put("content",infoEO.getFileIds()); - String fieldInfo = InitStandAttrUtil.queryField; + String fieldInfo = InitStandAttrUtil.queryFieldBuss; List fieldInfoList = Arrays.asList(fieldInfo .split(",")).stream().map(s -> (s.trim())).collect(Collectors.toList()); // 动态存储属性字段 for (String field : fieldInfoList) { saveMap.put(field,attrInfoMap.getOrDefault(field,"")); String fieldValue = ""; - if(infoMap.get(field) != null && StringUtils.isNotBlank(infoMap.get(field).toString())){ - Object json= new JSONTokener(infoMap.get(field).toString()).nextValue(); + String fieldFilter = field.toLowerCase(); + if(infoMap.get(fieldFilter) != null && StringUtils.isNotBlank(infoMap.get(fieldFilter).toString())){ + Object json= new JSONTokener(infoMap.get(fieldFilter).toString()).nextValue(); if(!json.toString().equals("null")){ - fieldValue = infoMap.get(field).toString(); + fieldValue = infoMap.get(fieldFilter).toString(); } } saveMap.put(field+"Name",fieldValue); From 5d8e14befe1ec7be7069db2394c5c4bb7a5a89ee Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 8 Sep 2021 10:09:05 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E6=B8=85=E5=8D=95=20=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E5=9B=9E=E9=80=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/adc/da/slrs/DataSync/DataSyncController.java | 4 +++- .../resources/mybatis/mapper/sarPosition/TsPositionMapper.xml | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/DataSync/DataSyncController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/DataSync/DataSyncController.java index b7cefcd3..4ca8c427 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/DataSync/DataSyncController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/DataSync/DataSyncController.java @@ -17,6 +17,7 @@ import com.adc.da.sys.service.IOrgEOService; import com.adc.da.sys.service.impl.OrgEOServiceImpl; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -49,7 +50,8 @@ public class DataSyncController { Map positionMap = new HashMap<>(); Map useDistinct = new HashMap<>(); - List positions = tsPositionService.getPosition(new TsPosition()); + IPage iPage = tsPositionService.getPosition(new TsPosition()); + List positions=iPage.getRecords(); if (!positions.isEmpty()) { positions.forEach(tsPosition -> { positionMap.put(tsPosition.getName(), tsPosition.getId()); diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarPosition/TsPositionMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarPosition/TsPositionMapper.xml index 2c1b947f..59141adc 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarPosition/TsPositionMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarPosition/TsPositionMapper.xml @@ -32,7 +32,9 @@ p.name like concat(concat('%',#{name}),'%') + limit ${(current-1) * pageSize},${pageSize} +