From 9c5ace83564592854966ffd99cca5f329ac6ff20 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Tue, 17 May 2022 17:52:18 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20TDM?= =?UTF-8?q?=20=E5=88=86=E9=A1=B5=E5=A4=96=E9=83=A8=E8=AE=BF=E9=97=AE?= =?UTF-8?q?=E6=A0=87=E5=87=86=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/StandDataController.java | 64 ++++++++++++++ .../slrs/regulationsTDM/dao/StandDataDao.java | 26 ++++++ .../entity/SearchStandContext.java | 24 +++++ .../entity/SearchStandResult.java | 46 ++++++++++ .../slrs/regulationsTDM/entity/StandData.java | 54 ++++++++++++ .../entity/StandMessageCodeEnum.java | 23 +++++ .../regulationsTDM/entity/StandResult.java | 34 ++++++++ .../service/IStandDataService.java | 21 +++++ .../service/impl/StandDataServiceImpl.java | 87 +++++++++++++++++++ .../regulationsTDM/RegulationsTDMMapper.xml | 75 ++++++++++++++++ 10 files changed, 454 insertions(+) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/controller/StandDataController.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/dao/StandDataDao.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/entity/SearchStandContext.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/entity/SearchStandResult.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/entity/StandData.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/entity/StandMessageCodeEnum.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/entity/StandResult.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/service/IStandDataService.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/service/impl/StandDataServiceImpl.java create mode 100644 adc-da-slrs/src/main/resources/mybatis/mapper/regulationsTDM/RegulationsTDMMapper.xml diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/controller/StandDataController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/controller/StandDataController.java new file mode 100644 index 00000000..d4abcc6d --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/controller/StandDataController.java @@ -0,0 +1,64 @@ +package com.adc.da.slrs.regulationsTDM.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.regulationsTDM.entity.SearchStandContext; +import com.adc.da.slrs.regulationsTDM.entity.StandData; +import com.adc.da.slrs.regulationsTDM.entity.StandMessageCodeEnum; +import com.adc.da.slrs.regulationsTDM.service.IStandDataService; +import com.adc.da.util.utils.StringUtils; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + *

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

+ * + * @author super_liu + * @since 2021-07-13 + */ +@RestController +@Api(tags = "福田标准法规--TDM查询标准") +@RequestMapping("/api/regulationsTDM") +public class StandDataController extends BaseController { + + private static final Logger logger = LoggerFactory.getLogger(StandDataController.class); + + @Autowired + private IStandDataService iStandDataService; + /** + * 标准查询列表接口 + * + * @param + * @return + */ + @ApiOperation(value = "|regulationsTDM|标准查询列表接口") + @PostMapping("/standData") + public ResponseMessage searchStandData(@RequestBody SearchStandContext searchStandContext){ + String resultJson = ""; + if(searchStandContext.getPage() == 0 + || StringUtils.isEmpty(searchStandContext.getType())){ + return Result.error(StandMessageCodeEnum.ERROR_PARAM.getCode(), + "page/type 为必填项 且page不可为0"); + } + List rows = iStandDataService.searchStandData(searchStandContext); + return Result.success(getPageInfo(searchStandContext.getPager(), rows)); + } + + private String verifyObj(String str){ + return (str == null || str.equals("")) ? "" : str; + } +} + diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/dao/StandDataDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/dao/StandDataDao.java new file mode 100644 index 00000000..f15e27b1 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/dao/StandDataDao.java @@ -0,0 +1,26 @@ +package com.adc.da.slrs.regulationsTDM.dao; + +import com.adc.da.slrs.regulationsTDM.entity.SearchStandContext; +import com.adc.da.slrs.regulationsTDM.entity.StandData; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springframework.stereotype.Repository; + +import java.util.List; + +/** + *

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

+ * + * @author super_liu + */ +@Repository +public interface StandDataDao extends BaseMapper { + + List searchStandData(SearchStandContext searchStandContext); + List searchBussData(SearchStandContext searchStandContext); + + List searchStandDataThree(SearchStandContext searchStandContext); + +} + diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/entity/SearchStandContext.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/entity/SearchStandContext.java new file mode 100644 index 00000000..099b1097 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/entity/SearchStandContext.java @@ -0,0 +1,24 @@ +package com.adc.da.slrs.regulationsTDM.entity; + +import com.adc.da.base.page.BasePage; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description: TODO + * @author: super_liu + * @date: 2022年04月25日 12:05 + */ +@Data +public class SearchStandContext extends BasePage { + + // 标准查询条件 + @ApiModelProperty(value = "页数") + private int page; + + @ApiModelProperty(value = "区分类别（GB：国内外标准 QB：企业标准）") + private String type; + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/entity/SearchStandResult.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/entity/SearchStandResult.java new file mode 100644 index 00000000..192dba9f --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/entity/SearchStandResult.java @@ -0,0 +1,46 @@ +package com.adc.da.slrs.regulationsTDM.entity; + +import com.alibaba.fastjson.annotation.JSONField; +import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.apache.poi.ss.formula.functions.T; + +import java.util.List; + +/** + * @Description: TODO + * @author: super_liu + * @date: 2022年04月25日 12:05 + */ +@Data +public class SearchStandResult { + + @ApiModelProperty(value = "返回状态 200 正常，-1 系统错误， -10 参数错误") + @JSONField(ordinal=1) + private String respCode; + + @ApiModelProperty(value = "true：成功 false：失败") + @JSONField(ordinal=2) + private Boolean ok; + + @ApiModelProperty(value = "正常返回空字符串，系统错误时返回系统异常信息及对应描述") + @JSONField(ordinal=3) + private String message; + + private T data; + + + public SearchStandResult(String respCode, String message, boolean ok, T data) { + this.respCode = respCode; + this.message = message; + this.ok = ok; + this.data = data; + } + + public SearchStandResult(String respCode, String message, boolean ok) { + this.respCode = respCode; + this.message = message; + this.ok = ok; + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/entity/StandData.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/entity/StandData.java new file mode 100644 index 00000000..a81db2dc --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/entity/StandData.java @@ -0,0 +1,54 @@ +package com.adc.da.slrs.regulationsTDM.entity; + +import com.alibaba.fastjson.annotation.JSONField; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: TODO + * @author: super_liu + * @date: 2022年04月25日 12:05 + */ +@Data +public class StandData { + + @ApiModelProperty(value = "标准ID") + @JSONField(ordinal=1) + private String id; + + @ApiModelProperty(value = "标准类型") + @JSONField(ordinal=2) + private String standType; + + @ApiModelProperty(value = "标准分类") + @JSONField(ordinal=3) + private String standSort; + + @ApiModelProperty(value = "标准号") + @JSONField(ordinal=4) + private String standNumber; + + @ApiModelProperty(value = "年代号") + @JSONField(ordinal=5) + private String standYear; + + @ApiModelProperty(value = "标准名称") + @JSONField(ordinal=6) + private String standName; + + @ApiModelProperty(value = "标准英文名称") + @JSONField(ordinal=7) + private String standEnName; + + @ApiModelProperty(value = "标准分类+空格+标准号+空格+标准名称") + @JSONField(ordinal=8) + private String documentName; + + @ApiModelProperty(value = "当前标准跳转到本系统内的链接地址") + @JSONField(ordinal=9) + private String documentUrl; + + @ApiModelProperty(value = "代替标准号") + @JSONField(ordinal=10) + private String dtbzh; +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/entity/StandMessageCodeEnum.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/entity/StandMessageCodeEnum.java new file mode 100644 index 00000000..e326a7d0 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/entity/StandMessageCodeEnum.java @@ -0,0 +1,23 @@ +package com.adc.da.slrs.regulationsTDM.entity; + +/** + * @Description: TODO + * @author: super_liu + * @date: 2022年04月25日 14:58 + */ +public enum StandMessageCodeEnum { + SUCCESS("200"), + ERROR_SYS("-1"), + ERROR_PARAM("-10"), + SOURCE("SRMS"); + + private String code; + + private StandMessageCodeEnum(String code) { + this.code = code; + } + + public String getCode() { + return this.code; + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/entity/StandResult.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/entity/StandResult.java new file mode 100644 index 00000000..821ca718 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/entity/StandResult.java @@ -0,0 +1,34 @@ +package com.adc.da.slrs.regulationsTDM.entity; + +import com.adc.da.http.ResponseMessageCodeEnum; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import org.apache.poi.ss.formula.functions.T; + +import java.util.List; + +/** + * @Description: TODO + * @author: super_liu + * @date: 2022年04月25日 14:56 + */ +public class StandResult { + + public static SearchStandResult success(String code,String message,T t) { + return new SearchStandResult(code, message, true, t); + } + + public static SearchStandResult error(String code,String message) { + return new SearchStandResult(code, message, true); + } + + public static String toJson(SearchStandResult searchStandResult){ + GsonBuilder gsonBuilder = getGsonBuilder(); + Gson json = gsonBuilder.create(); + return json.toJson(searchStandResult); + } + + private static GsonBuilder getGsonBuilder() { + return new GsonBuilder().disableHtmlEscaping().serializeNulls().enableComplexMapKeySerialization().serializeSpecialFloatingPointValues().setLenient(); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/service/IStandDataService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/service/IStandDataService.java new file mode 100644 index 00000000..547fe895 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/service/IStandDataService.java @@ -0,0 +1,21 @@ +package com.adc.da.slrs.regulationsTDM.service; + +import com.adc.da.http.ResponseMessage; +import com.adc.da.slrs.regulationsTDM.entity.SearchStandContext; +import com.adc.da.slrs.regulationsTDM.entity.StandData; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +/** + *

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

+ * + * @author super_liu + */ +public interface IStandDataService extends IService { + + List searchStandData(SearchStandContext searchStandContext); +} + diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/service/impl/StandDataServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/service/impl/StandDataServiceImpl.java new file mode 100644 index 00000000..845f080a --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/service/impl/StandDataServiceImpl.java @@ -0,0 +1,87 @@ +package com.adc.da.slrs.regulationsTDM.service.impl; + +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.scheduled.dao.SarStandardInfoDao; +import com.adc.da.slrs.regulationsTDM.entity.*; +import com.adc.da.slrs.regulationsTDM.dao.StandDataDao; +import com.adc.da.slrs.regulationsTDM.service.IStandDataService; +import com.adc.da.slrs.sarBussionessStand.dao.SarBussionessStandDao; +import com.adc.da.slrs.sarStandardsInfo.dao.SarStandardsInfoDao; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import sun.misc.BASE64Encoder; + +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; + + +/** + *

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

+ * + * @author super_liu + * @date: 2022年04月25日 14:56 + */ +@Service +public class StandDataServiceImpl extends ServiceImpl implements IStandDataService { + + private static final Logger logger = LoggerFactory.getLogger(StandDataServiceImpl.class); + + private String webUrl = "https://srms.foton.com.cn/#/loginStandDetails"; + + @Autowired + private SarStandardsInfoDao sarStandardInfoDao; + + @Autowired + private SarBussionessStandDao sarBussionessStandDao; + + @Override + public List searchStandData(SearchStandContext searchStandContext){ + List standDataQuery = new ArrayList<>(); + searchStandContext.setPageSize(100); + QueryWrapper queryCount = new QueryWrapper(); + queryCount.eq("VALID_FLAG","0"); + if("GB".equals(searchStandContext.getType().toUpperCase())){ + int count = sarStandardInfoDao.selectCount(queryCount); + searchStandContext.getPager().setRowCount(count); + standDataQuery = this.baseMapper.searchStandData(searchStandContext); + }else if("QB".equals(searchStandContext.getType().toUpperCase())){ + int count = sarBussionessStandDao.selectCount(queryCount); + searchStandContext.getPager().setRowCount(count); + standDataQuery = this.baseMapper.searchBussData(searchStandContext); + } + if(!standDataQuery.isEmpty()){ + // 重组数据集合 只需documentName 及 documentUrl + standDataQuery.stream().peek(standData -> { + standData.setDocumentName(verifyObj(standData.getStandSort(),standData.getStandNumber(),standData.getStandName())); + standData.setDocumentUrl(webUrl+"?dataId="+standData.getId()+"&datatype="+standData.getStandType()); + }).collect(Collectors.toList()); + } + return standDataQuery; + } + + private String verifyObj(String str1,String str2,String str3){ + String res1 = (str1 == null || str1.equals("")) ? "" : (str1+" "); + String res2 = (str2 == null || str2.equals("")) ? "" : (str2+" "); + String res3 = (str3 == null || str3.equals("")) ? "" : str3; + return res1 + res2 + res3; + } + private String encode(String str){ + String encodeStr = new BASE64Encoder().encodeBuffer(str.getBytes()).replaceAll("[\r\n]", "");; + return encodeStr; + } + + private String errFilter(String str){ + if (str.contains("Cause")){ + str = str.split("Cause")[0].replaceAll("\\r\\n###",""); + } + return str; + } +} diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/regulationsTDM/RegulationsTDMMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/regulationsTDM/RegulationsTDMMapper.xml new file mode 100644 index 00000000..745fcded --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/regulationsTDM/RegulationsTDMMapper.xml @@ -0,0 +1,75 @@ + + + + + + + + + + + From fea5aab330a6328c823181024dbb9c714d4d174b Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Wed, 18 May 2022 11:20:54 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20TDM?= =?UTF-8?q?=20=E5=AF=B9=E5=A4=96=E5=88=86=E9=A1=B5100=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=A0=87=E5=87=86=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adc/da/login/security/WebMvcConfig.java | 1 + ...oller.java => StandDataTDMController.java} | 21 +++++++-------- ...StandDataDao.java => StandDataTDMDao.java} | 2 +- .../entity/SearchStandContext.java | 2 +- .../regulationsTDM/entity/StandResult.java | 5 ++-- ...Service.java => IStandDataTDMService.java} | 2 +- ...Impl.java => StandDataTDMServiceImpl.java} | 13 ++++----- .../regulationsTDM/RegulationsTDMMapper.xml | 27 +++++++++---------- 8 files changed, 34 insertions(+), 39 deletions(-) rename adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/controller/{StandDataController.java => StandDataTDMController.java} (68%) rename adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/dao/{StandDataDao.java => StandDataTDMDao.java} (90%) rename adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/service/{IStandDataService.java => IStandDataTDMService.java} (86%) rename adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/service/impl/{StandDataServiceImpl.java => StandDataTDMServiceImpl.java} (87%) diff --git a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java index 3b64ef82..d25ebf10 100644 --- a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java +++ b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java @@ -36,6 +36,7 @@ public class WebMvcConfig implements WebMvcConfigurer { * AWG 接口 */ addInterceptor.excludePathPatterns("/api/regulations/searchStandData"); + addInterceptor.excludePathPatterns("/api/regulationsTDM/standData"); /** * TODO 测试流程 开放 login 接口 正式环境 关闭 */ diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/controller/StandDataController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/controller/StandDataTDMController.java similarity index 68% rename from adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/controller/StandDataController.java rename to adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/controller/StandDataTDMController.java index d4abcc6d..261bd317 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/controller/StandDataController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/controller/StandDataTDMController.java @@ -2,12 +2,12 @@ package com.adc.da.slrs.regulationsTDM.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.regulationsTDM.entity.StandResult; import com.adc.da.slrs.regulationsTDM.entity.SearchStandContext; import com.adc.da.slrs.regulationsTDM.entity.StandData; import com.adc.da.slrs.regulationsTDM.entity.StandMessageCodeEnum; -import com.adc.da.slrs.regulationsTDM.service.IStandDataService; +import com.adc.da.slrs.regulationsTDM.service.IStandDataTDMService; import com.adc.da.util.utils.StringUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -32,12 +32,12 @@ import java.util.List; @RestController @Api(tags = "福田标准法规--TDM查询标准") @RequestMapping("/api/regulationsTDM") -public class StandDataController extends BaseController { +public class StandDataTDMController extends BaseController { - private static final Logger logger = LoggerFactory.getLogger(StandDataController.class); + private static final Logger logger = LoggerFactory.getLogger(StandDataTDMController.class); @Autowired - private IStandDataService iStandDataService; + private IStandDataTDMService iStandDataTDMService; /** * 标准查询列表接口 * @@ -46,15 +46,14 @@ public class StandDataController extends BaseController { */ @ApiOperation(value = "|regulationsTDM|标准查询列表接口") @PostMapping("/standData") - public ResponseMessage searchStandData(@RequestBody SearchStandContext searchStandContext){ - String resultJson = ""; + public String searchStandData(@RequestBody SearchStandContext searchStandContext){ if(searchStandContext.getPage() == 0 || StringUtils.isEmpty(searchStandContext.getType())){ - return Result.error(StandMessageCodeEnum.ERROR_PARAM.getCode(), - "page/type 为必填项 且page不可为0"); + return StandResult.toJson(Result.error(StandMessageCodeEnum.ERROR_PARAM.getCode(), + "page/type 为必填项 且page不可为0")); } - List rows = iStandDataService.searchStandData(searchStandContext); - return Result.success(getPageInfo(searchStandContext.getPager(), rows)); + List rows = iStandDataTDMService.searchStandData(searchStandContext); + return StandResult.toJson(Result.success(getPageInfo(searchStandContext.getPager(), rows))); } private String verifyObj(String str){ diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/dao/StandDataDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/dao/StandDataTDMDao.java similarity index 90% rename from adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/dao/StandDataDao.java rename to adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/dao/StandDataTDMDao.java index f15e27b1..aac0e3c7 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/dao/StandDataDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/dao/StandDataTDMDao.java @@ -15,7 +15,7 @@ import java.util.List; * @author super_liu */ @Repository -public interface StandDataDao extends BaseMapper { +public interface StandDataTDMDao extends BaseMapper { List searchStandData(SearchStandContext searchStandContext); List searchBussData(SearchStandContext searchStandContext); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/entity/SearchStandContext.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/entity/SearchStandContext.java index 099b1097..1b03e3f2 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/entity/SearchStandContext.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/entity/SearchStandContext.java @@ -16,7 +16,7 @@ public class SearchStandContext extends BasePage { // 标准查询条件 @ApiModelProperty(value = "页数") - private int page; + private Integer page; @ApiModelProperty(value = "区分类别（GB：国内外标准 QB：企业标准）") private String type; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/entity/StandResult.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/entity/StandResult.java index 821ca718..0d9b6bbe 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/entity/StandResult.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/entity/StandResult.java @@ -1,9 +1,8 @@ package com.adc.da.slrs.regulationsTDM.entity; -import com.adc.da.http.ResponseMessageCodeEnum; +import com.adc.da.http.ResponseMessage; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import org.apache.poi.ss.formula.functions.T; import java.util.List; @@ -22,7 +21,7 @@ public class StandResult { return new SearchStandResult(code, message, true); } - public static String toJson(SearchStandResult searchStandResult){ + public static String toJson(ResponseMessage searchStandResult){ GsonBuilder gsonBuilder = getGsonBuilder(); Gson json = gsonBuilder.create(); return json.toJson(searchStandResult); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/service/IStandDataService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/service/IStandDataTDMService.java similarity index 86% rename from adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/service/IStandDataService.java rename to adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/service/IStandDataTDMService.java index 547fe895..897f923e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/service/IStandDataService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/service/IStandDataTDMService.java @@ -14,7 +14,7 @@ import java.util.List; * * @author super_liu */ -public interface IStandDataService extends IService { +public interface IStandDataTDMService extends IService { List searchStandData(SearchStandContext searchStandContext); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/service/impl/StandDataServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/service/impl/StandDataTDMServiceImpl.java similarity index 87% rename from adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/service/impl/StandDataServiceImpl.java rename to adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/service/impl/StandDataTDMServiceImpl.java index 845f080a..0dc17de3 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/service/impl/StandDataServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/service/impl/StandDataTDMServiceImpl.java @@ -1,11 +1,8 @@ package com.adc.da.slrs.regulationsTDM.service.impl; -import com.adc.da.http.ResponseMessage; -import com.adc.da.http.Result; -import com.adc.da.scheduled.dao.SarStandardInfoDao; import com.adc.da.slrs.regulationsTDM.entity.*; -import com.adc.da.slrs.regulationsTDM.dao.StandDataDao; -import com.adc.da.slrs.regulationsTDM.service.IStandDataService; +import com.adc.da.slrs.regulationsTDM.dao.StandDataTDMDao; +import com.adc.da.slrs.regulationsTDM.service.IStandDataTDMService; import com.adc.da.slrs.sarBussionessStand.dao.SarBussionessStandDao; import com.adc.da.slrs.sarStandardsInfo.dao.SarStandardsInfoDao; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -30,9 +27,9 @@ import java.util.stream.Collectors; * @date: 2022年04月25日 14:56 */ @Service -public class StandDataServiceImpl extends ServiceImpl implements IStandDataService { +public class StandDataTDMServiceImpl extends ServiceImpl implements IStandDataTDMService { - private static final Logger logger = LoggerFactory.getLogger(StandDataServiceImpl.class); + private static final Logger logger = LoggerFactory.getLogger(StandDataTDMServiceImpl.class); private String webUrl = "https://srms.foton.com.cn/#/loginStandDetails"; @@ -74,7 +71,7 @@ public class StandDataServiceImpl extends ServiceImpl i return res1 + res2 + res3; } private String encode(String str){ - String encodeStr = new BASE64Encoder().encodeBuffer(str.getBytes()).replaceAll("[\r\n]", "");; + String encodeStr = new BASE64Encoder().encodeBuffer(str.getBytes()).replaceAll("[\r\n]", ""); return encodeStr; } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/regulationsTDM/RegulationsTDMMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/regulationsTDM/RegulationsTDMMapper.xml index 745fcded..7603b46d 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/regulationsTDM/RegulationsTDMMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/regulationsTDM/RegulationsTDMMapper.xml @@ -1,31 +1,31 @@ - +