FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

数据同步接口 不走es

Browse Source
This commit is contained in:
yuezhihang
2022-04-29 14:42:32 +08:00
parent 540d1ba218
commit 14f67dda61
9 changed files with 461 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/regulations/entity/SearchStandContext.java
+2
View File
@@ -61,5 +61,7 @@ public class SearchStandContext implements Serializable {
private String standCode; private String standCode;
private String standId;
} }
adc-da-slrs/src/main/java/com/adc/da/slrs/regulations/entity/StandData.java
+3
View File
@@ -28,4 +28,7 @@ public class StandData {
@ApiModelProperty(value = "标准分类+空格+标准号+空格+标准名称") @ApiModelProperty(value = "标准分类+空格+标准号+空格+标准名称")
private String documentName; private String documentName;
@ApiModelProperty(value = "标准分类+空格+标准号+空格+标准名称")
private String standNum;
} }
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfo.java
+4
View File
@@ -61,6 +61,10 @@ public class SarBussStandAttrInfo extends BaseEntity {
@TableField("BDTQBBHBUSS") @TableField("BDTQBBHBUSS")
private String bdtqbbhbuss; private String bdtqbbhbuss;
@ApiModelProperty(value = "被代替企标编号")
@TableField("DTQBBHBUSS")
private String dtqbbhbuss;
@TableField(exist = false) @TableField(exist = false)
private String glwj; private String glwj;
// //
adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java
+10 -10
View File
@@ -951,10 +951,10 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
ExportEmptyModel model = map.get(sarStandardsInfo.getId()); ExportEmptyModel model = map.get(sarStandardsInfo.getId());
model.setStandName(sarStandardsInfo.getStandName()); model.setStandName(sarStandardsInfo.getStandName());
model.setStandEnName(sarStandardsInfo.getStandEnName()); model.setStandEnName(sarStandardsInfo.getStandEnName());
model.setNylx(null!=sarStandardsInfo.getAttrInfoCaseMap().get("nylx").toString() ?sarStandardsInfo.getAttrInfoCaseMap().get("nylx").toString():""); model.setNylx(null!=sarStandardsInfo.getAttrInfoCaseMap().get("nylx") ?sarStandardsInfo.getAttrInfoCaseMap().get("nylx").toString():"");
model.setSycpx(null!=sarStandardsInfo.getAttrInfoCaseMap().get("sycpx").toString() ?sarStandardsInfo.getAttrInfoCaseMap().get("sycpx").toString():""); model.setSycpx(null!=sarStandardsInfo.getAttrInfoCaseMap().get("sycpx") ?sarStandardsInfo.getAttrInfoCaseMap().get("sycpx").toString():"");
model.setZrbm(null!=sarStandardsInfo.getAttrInfoCaseMap().get("zrbm").toString() ?sarStandardsInfo.getAttrInfoCaseMap().get("zrbm").toString():""); model.setZrbm(null!=sarStandardsInfo.getAttrInfoCaseMap().get("zrbm") ?sarStandardsInfo.getAttrInfoCaseMap().get("zrbm").toString():"");
model.setSycx(null!=sarStandardsInfo.getAttrInfoCaseMap().get("cllx").toString() ?sarStandardsInfo.getAttrInfoCaseMap().get("cllx").toString():""); model.setSycx(null!=sarStandardsInfo.getAttrInfoCaseMap().get("cllx") ?sarStandardsInfo.getAttrInfoCaseMap().get("cllx").toString():"");
result.add(model); result.add(model);
}); });
} }
@@ -978,10 +978,10 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
ExportEmptyModel model = map.get(sarStandardsInfo.getId()); ExportEmptyModel model = map.get(sarStandardsInfo.getId());
model.setStandName(sarStandardsInfo.getStandName()); model.setStandName(sarStandardsInfo.getStandName());
model.setStandEnName(sarStandardsInfo.getStandEnName()); model.setStandEnName(sarStandardsInfo.getStandEnName());
model.setNylx(null!=sarStandardsInfo.getAttrInfoCaseMap().get("nylx").toString() ?sarStandardsInfo.getAttrInfoCaseMap().get("nylx").toString():""); model.setNylx(null!=sarStandardsInfo.getAttrInfoCaseMap().get("nylx") ?sarStandardsInfo.getAttrInfoCaseMap().get("nylx").toString():"");
model.setSycpx(null!=sarStandardsInfo.getAttrInfoCaseMap().get("sycpx").toString() ?sarStandardsInfo.getAttrInfoCaseMap().get("sycpx").toString():""); model.setSycpx(null!=sarStandardsInfo.getAttrInfoCaseMap().get("sycpx") ?sarStandardsInfo.getAttrInfoCaseMap().get("sycpx").toString():"");
model.setZrbm(null!=sarStandardsInfo.getAttrInfoCaseMap().get("zrbm").toString() ?sarStandardsInfo.getAttrInfoCaseMap().get("zrbm").toString():""); model.setZrbm(null!=sarStandardsInfo.getAttrInfoCaseMap().get("zrbm") ?sarStandardsInfo.getAttrInfoCaseMap().get("zrbm").toString():"");
model.setSycx(null!=sarStandardsInfo.getAttrInfoCaseMap().get("cllx").toString() ?sarStandardsInfo.getAttrInfoCaseMap().get("cllx").toString():""); model.setSycx(null!=sarStandardsInfo.getAttrInfoCaseMap().get("cllx") ?sarStandardsInfo.getAttrInfoCaseMap().get("cllx").toString():"");
result.add(model); result.add(model);
}); });
} }
@@ -1004,10 +1004,10 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
ExportEmptyModel model = map.get(sarStandardsInfo.getId()); ExportEmptyModel model = map.get(sarStandardsInfo.getId());
model.setStandName(sarStandardsInfo.getLawsName()); model.setStandName(sarStandardsInfo.getLawsName());
model.setStandEnName(sarStandardsInfo.getLawsEnName()); model.setStandEnName(sarStandardsInfo.getLawsEnName());
model.setNylx(null!=sarStandardsInfo.getAttrInfoCaseMap().get("nylxlaws").toString() ?sarStandardsInfo.getAttrInfoCaseMap().get("nylxlaws").toString():""); model.setNylx(null!=sarStandardsInfo.getAttrInfoCaseMap().get("nylxlaws") ?sarStandardsInfo.getAttrInfoCaseMap().get("nylxlaws").toString():"");
//没有使用产品线 //没有使用产品线
// model.setSycpx(null!=sarStandardsInfo.getLawsSycx() ?sarStandardsInfo.getLawsSycx():""); // model.setSycpx(null!=sarStandardsInfo.getLawsSycx() ?sarStandardsInfo.getLawsSycx():"");
model.setZrbm(null!=sarStandardsInfo.getAttrInfoCaseMap().get("zrbmlaws").toString() ?sarStandardsInfo.getAttrInfoCaseMap().get("zrbmlaws").toString():""); model.setZrbm(null!=sarStandardsInfo.getAttrInfoCaseMap().get("zrbmlaws") ?sarStandardsInfo.getAttrInfoCaseMap().get("zrbmlaws").toString():"");
model.setSycx(null!=sarStandardsInfo.getLawsSycx() ?sarStandardsInfo.getLawsSycx():""); model.setSycx(null!=sarStandardsInfo.getLawsSycx() ?sarStandardsInfo.getLawsSycx():"");
result.add(model); result.add(model);
}); });
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/entity/SarStandAttrInfo.java
+5 -1
View File
@@ -50,7 +50,7 @@ public class SarStandAttrInfo extends BaseEntity {
@ApiModelProperty(value = "修改时间") @ApiModelProperty(value = "修改时间")
@TableField("MODIFY_TIME") @TableField("MODIFY_TIME")
private LocalDateTime modifyTime; private Date modifyTime;
@ApiModelProperty(value = "归口管理部门") @ApiModelProperty(value = "归口管理部门")
@TableField("GKDW") @TableField("GKDW")
@@ -234,5 +234,9 @@ public class SarStandAttrInfo extends BaseEntity {
@TableField("TXLB") @TableField("TXLB")
private String txlb; private String txlb;
@ApiModelProperty(value = "体系类别")
@TableField("BDTBZH")
private String bdtbzh;
} }
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java
+15
View File
@@ -822,6 +822,21 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
return "1"; return "1";
} }
@ApiOperation(value = "国内海外数据处理接口")
@GetMapping("/replaceBdtbzhforDtbzh")
public String replaceBdtbzhforDtbzh(SarStandardsInfo sarStandardsInfo) {
sarStandardsInfoEOService.replaceBdtbzhforDtbzh();
return "1";
}
@ApiOperation(value = "企标数据处理接口")
@GetMapping("/replaceBdtbzhforDtbzhQb")
public String replaceBdtbzhforDtbzhQb(SarStandardsInfo sarStandardsInfo) {
sarStandardsInfoEOService.replaceBdtbzhforDtbzhQb();
return "1";
}
@ApiOperation(value = "|SarStandardsInfoEO|自定义分页查询") @ApiOperation(value = "|SarStandardsInfoEO|自定义分页查询")
@GetMapping("/checkIsOnly") @GetMapping("/checkIsOnly")
public ResponseMessage checkIsOnly (SarStandardsInfoEOPage page){ public ResponseMessage checkIsOnly (SarStandardsInfoEOPage page){
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java
+4
View File
@@ -60,4 +60,8 @@ public interface ISarStandardsInfoService extends IService<SarStandardsInfo> {
void insertIntoIndexForMap(Map<String,Object> attrInfoMap); void insertIntoIndexForMap(Map<String,Object> attrInfoMap);
void updateIntoIndexForMap(Map<String,Object> attrInfoMap); void updateIntoIndexForMap(Map<String,Object> attrInfoMap);
void replaceBdtbzhforDtbzh();
void replaceBdtbzhforDtbzhQb();
} }
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
+400 -167
View File
File diff suppressed because it is too large Load Diff
adc-da-slrs/src/main/resources/mybatis/mapper/regulations/RegulationsMapper.xml
+18 -5
View File
@@ -62,11 +62,14 @@
<select id="searchStandDataThree" resultMap="BaseResultMap"> <select id="searchStandDataThree" resultMap="BaseResultMap">
SELECT SELECT
t.standId, t.standId,
t.standType t.standType,
t.standNum
FROM ( FROM (
SELECT SELECT
sar_standards_info.id AS standId, sar_standards_info.id AS standId,
sar_standards_info.STAND_TYPE AS standType sar_standards_info.STAND_TYPE AS standType,
concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-',
SAR_STANDARDS_INFO.STAND_YEAR) as standNum
FROM FROM
sar_standards_info sar_standards_info
LEFT JOIN SAR_STAND_ATTR_INFO ON ( LEFT JOIN SAR_STAND_ATTR_INFO ON (
@@ -82,6 +85,9 @@
and (SAR_STAND_ATTR_INFO.KCCVPPSCN like concat('%',#{vppsName},'%') or SAR_STAND_ATTR_INFO.CYCVPPSCN like and (SAR_STAND_ATTR_INFO.KCCVPPSCN like concat('%',#{vppsName},'%') or SAR_STAND_ATTR_INFO.CYCVPPSCN like
concat('%',#{vppsName},'%')) concat('%',#{vppsName},'%'))
</if> </if>
<if test="standId != null and standId != ''">
and sar_standards_info.ID = #{standId}
</if>
<if test="standCode != null and standCode != ''"> <if test="standCode != null and standCode != ''">
and ( and (
(trim(replace(concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-', (trim(replace(concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-',
@@ -93,7 +99,8 @@
UNION UNION
SELECT SELECT
sar_bussioness_stand.id AS standId, sar_bussioness_stand.id AS standId,
'BUSINESS_STAND' AS standType 'BUSINESS_STAND' AS standType,
SAR_BUSSIONESS_STAND.STAND_CODE as standNum
FROM FROM
sar_bussioness_stand sar_bussioness_stand
LEFT JOIN sar_buss_stand_attr_info ON ( LEFT JOIN sar_buss_stand_attr_info ON (
@@ -113,11 +120,15 @@
and (SAR_BUSSIONESS_STAND.STAND_CODE = #{standCode} and (SAR_BUSSIONESS_STAND.STAND_CODE = #{standCode}
or REPLACE( SAR_BUSSIONESS_STAND.STAND_CODE,' ','') = REPLACE( #{standCode},' ','')) or REPLACE( SAR_BUSSIONESS_STAND.STAND_CODE,' ','') = REPLACE( #{standCode},' ',''))
</if> </if>
<if test="standId != null and standId != ''">
and sar_bussioness_stand.ID = #{standId}
</if>
UNION UNION
SELECT SELECT
SAR_LAWS_STAND_INFO.id AS standId, SAR_LAWS_STAND_INFO.id AS standId,
'LAWS_TYPE' AS standType 'LAWS_TYPE' AS standType,
SAR_LAWS_STAND_INFO.LAWS_NUMBER as standNum
FROM FROM
SAR_LAWS_STAND_INFO SAR_LAWS_STAND_INFO
LEFT JOIN sar_laws_attr_info ON ( LEFT JOIN sar_laws_attr_info ON (
@@ -129,7 +140,9 @@
<if test="standCode != null and standCode != ''"> <if test="standCode != null and standCode != ''">
and SAR_LAWS_STAND_INFO.LAWS_NUMBER = #{standCode} and SAR_LAWS_STAND_INFO.LAWS_NUMBER = #{standCode}
</if> </if>
<if test="standId != null and standId != ''">
and SAR_LAWS_STAND_INFO.ID = #{standId}
</if>
) t ) t
</select> </select>
</mapper> </mapper>