UDI
/
udiwms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

基础信息导入导出，优化

Browse Source
master
anthonyywj2 3 years ago
parent 8e7fc2d784
commit 8e27780b04
7 changed files with 179 additions and 119 deletions
Show Stats Download Patch File Download Diff File

16
api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderDetailController.java
Unescape Escape View File

@ -430,17 +430,13 @@ public class StockOrderDetailController {
CompanyProductRelevanceRequest companyProductRelevanceRequest = new CompanyProductRelevanceRequest(); CompanyProductRelevanceRequest companyProductRelevanceRequest = new CompanyProductRelevanceRequest();
BeanUtils.copyProperties(filterUdiInfoRequest, companyProductRelevanceRequest); BeanUtils.copyProperties(filterUdiInfoRequest, companyProductRelevanceRequest);
List<CompanyProductRelevanceResponse> basicInstrumentMaintainRelevanceResponses = null; List<CompanyProductRelevanceResponse> basicInstrumentMaintainRelevanceResponses = null;
if (filterUdiInfoRequest.getCustomerId().equals(Constant.SYSTEM_CUSTOMER_ID)) { BussinessLocalTypeEntity bussinessTypeEntity = bussinessLocalTypeService.findBTByAction(filterUdiInfoRequest.getBillType());
BussinessLocalTypeEntity bussinessTypeEntity = bussinessLocalTypeService.findBTByAction(filterUdiInfoRequest.getBillType()); if (bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_OUT) {
if (bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_OUT) { companyProductRelevanceRequest.setCustomerId(null);
companyProductRelevanceRequest.setCustomerId(null); companyProductRelevanceRequest.setUnitFk(companyProductRelevanceRequest.getCorpId());
companyProductRelevanceRequest.setUnitFk(companyProductRelevanceRequest.getCorpId());
basicInstrumentMaintainRelevanceResponses = companyProductRelevanceService.filterUdiGp(companyProductRelevanceRequest);
} else {
basicInstrumentMaintainRelevanceResponses = getHosDatas(filterUdiInfoRequest);
}
} else {
basicInstrumentMaintainRelevanceResponses = companyProductRelevanceService.filterUdiGp(companyProductRelevanceRequest); basicInstrumentMaintainRelevanceResponses = companyProductRelevanceService.filterUdiGp(companyProductRelevanceRequest);
} else {
basicInstrumentMaintainRelevanceResponses = getHosDatas(filterUdiInfoRequest);
} }
PageInfo<CompanyProductRelevanceResponse> pageInfo; PageInfo<CompanyProductRelevanceResponse> pageInfo;
pageInfo = new PageInfo<>(basicInstrumentMaintainRelevanceResponses); pageInfo = new PageInfo<>(basicInstrumentMaintainRelevanceResponses);

54
api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiInfoImportDetailServiceImpl.java
Unescape Escape View File

@ -2,14 +2,23 @@ package com.glxp.api.admin.service.basic.impl;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.glxp.api.admin.dao.basic.BasicUnitMaintainDao;
import com.glxp.api.admin.dao.basic.UdiInfoDao; import com.glxp.api.admin.dao.basic.UdiInfoDao;
import com.glxp.api.admin.dao.basic.UdiInfoImportDetailDao; import com.glxp.api.admin.dao.basic.UdiInfoImportDetailDao;
import com.glxp.api.admin.dao.basic.UdiRelevanceDao; import com.glxp.api.admin.dao.basic.UdiRelevanceDao;
import com.glxp.api.admin.dao.thrsys.ThrProductsDao; import com.glxp.api.admin.dao.thrsys.ThrProductsDao;
import com.glxp.api.admin.entity.basic.BasicUnitMaintainEntity;
import com.glxp.api.admin.entity.basic.UdiInfoEntity;
import com.glxp.api.admin.entity.basic.UdiInfoImportDetailEntity; import com.glxp.api.admin.entity.basic.UdiInfoImportDetailEntity;
import com.glxp.api.admin.entity.basic.UdiRelevanceEntity;
import com.glxp.api.admin.entity.thrsys.ThrProductsEntity;
import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest;
import com.glxp.api.admin.res.basic.UdiRelevanceExportJsonResponse; import com.glxp.api.admin.res.basic.UdiRelevanceExportJsonResponse;
import com.glxp.api.admin.service.basic.UdiInfoImportDetailService; import com.glxp.api.admin.service.basic.UdiInfoImportDetailService;
import org.apache.ibatis.session.ExecutorType;
import org.apache.ibatis.session.SqlSession;
import org.apache.ibatis.session.SqlSessionFactory;
import org.apache.ibatis.session.TransactionIsolationLevel;
import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -28,6 +37,8 @@ public class UdiInfoImportDetailServiceImpl implements UdiInfoImportDetailServic
UdiRelevanceDao udiRelevanceDao; UdiRelevanceDao udiRelevanceDao;
@Resource @Resource
ThrProductsDao thrProductsDao; ThrProductsDao thrProductsDao;
@Resource
SqlSessionFactory sqlSessionFactory;
@Override @Override
public List<UdiInfoImportDetailEntity> filterUdiInfoImport(FilterUdiIpLogRequest filterInCodeLogRequest) { public List<UdiInfoImportDetailEntity> filterUdiInfoImport(FilterUdiIpLogRequest filterInCodeLogRequest) {
@ -73,15 +84,52 @@ public class UdiInfoImportDetailServiceImpl implements UdiInfoImportDetailServic
@Async @Async
public void importJsonData(UdiRelevanceExportJsonResponse udiRelevanceExportJsonResponse) { public void importJsonData(UdiRelevanceExportJsonResponse udiRelevanceExportJsonResponse) {
if (CollUtil.isNotEmpty(udiRelevanceExportJsonResponse.getUdiInfoEntities())) { if (CollUtil.isNotEmpty(udiRelevanceExportJsonResponse.getUdiInfoEntities())) {
udiInfoDao.importUdiInfo(udiRelevanceExportJsonResponse.getUdiInfoEntities());
SqlSession batchSession = sqlSessionFactory.openSession(ExecutorType.BATCH, TransactionIsolationLevel.READ_COMMITTED);
if (CollUtil.isNotEmpty(udiRelevanceExportJsonResponse.getUdiInfoEntities())) {
try {
List<UdiInfoEntity> corpList = udiRelevanceExportJsonResponse.getUdiInfoEntities();
UdiInfoDao mapper = batchSession.getMapper(UdiInfoDao.class);
for (UdiInfoEntity basicUnitMaintainEntity : corpList) {
mapper.insertUdiInfo(basicUnitMaintainEntity);
}
batchSession.commit();
} catch (Exception e) {
}
}
// udiInfoDao.importUdiInfo(udiRelevanceExportJsonResponse.getUdiInfoEntities());
} }
if (CollUtil.isNotEmpty(udiRelevanceExportJsonResponse.getUdiRelevanceEntities())) { if (CollUtil.isNotEmpty(udiRelevanceExportJsonResponse.getUdiRelevanceEntities())) {
udiRelevanceDao.importUdiRelevance(udiRelevanceExportJsonResponse.getUdiRelevanceEntities()); SqlSession batchSession = sqlSessionFactory.openSession(ExecutorType.BATCH, TransactionIsolationLevel.READ_COMMITTED);
try {
List<UdiRelevanceEntity> corpList = udiRelevanceExportJsonResponse.getUdiRelevanceEntities();
UdiRelevanceDao mapper = batchSession.getMapper(UdiRelevanceDao.class);
for (UdiRelevanceEntity basicUnitMaintainEntity : corpList) {
mapper.insertUdiRelevance(basicUnitMaintainEntity);
}
batchSession.commit();
} catch (Exception e) {
}
// udiRelevanceDao.importUdiRelevance(udiRelevanceExportJsonResponse.getUdiRelevanceEntities());
} }
if (CollUtil.isNotEmpty(udiRelevanceExportJsonResponse.getThrProductsEntities())) { if (CollUtil.isNotEmpty(udiRelevanceExportJsonResponse.getThrProductsEntities())) {
thrProductsDao.importThrProductss(udiRelevanceExportJsonResponse.getThrProductsEntities());
SqlSession batchSession = sqlSessionFactory.openSession(ExecutorType.BATCH, TransactionIsolationLevel.READ_COMMITTED);
try {
List<ThrProductsEntity> corpList = udiRelevanceExportJsonResponse.getThrProductsEntities();
ThrProductsDao mapper = batchSession.getMapper(ThrProductsDao.class);
for (ThrProductsEntity basicUnitMaintainEntity : corpList) {
mapper.insertThrProducts(basicUnitMaintainEntity);
}
batchSession.commit();
} catch (Exception e) {
}
// thrProductsDao.importThrProductss(udiRelevanceExportJsonResponse.getThrProductsEntities());
} }
} }
} }

49
api-admin/src/main/resources/mybatis/mapper/basic/BasicUnitMaintainDao.xml
Unescape Escape View File

@ -167,31 +167,32 @@
<insert id="importBasicUnitMaintain" keyProperty="id"> <insert id="importBasicUnitMaintain" keyProperty="id">
REPLACE REPLACE
INTO basic_corp INTO basic_corp
(id, thirdId, erpId, name, spell, ( thirdId, erpId, name, spell,
addr, status, type, creditNo, contact, mobile, thirdId1, thirdId2, thirdId3, thirdId4, addr, status, type, creditNo, contact, mobile, thirdId1, thirdId2, thirdId3, thirdId4,
thirdName, thirdName1, thirdName2, thirdName3, thirdName4, updateTime, corpType) thirdName, thirdName1, thirdName2, thirdName3, thirdName4, updateTime, corpType)
values (#{id}, values (
#{thirdId}, #{thirdId},
#{erpId}, #{erpId},
#{name}, #{name},
#{spell}, #{spell},
#{addr}, #{addr},
#{status}, #{status},
#{type}, #{type},
#{creditNo}, #{creditNo},
#{contact}, #{contact},
#{mobile}, #{mobile},
#{thirdId1}, #{thirdId1},
#{thirdId2}, #{thirdId2},
#{thirdId3}, #{thirdId3},
#{thirdId4}, #{thirdId4},
#{thirdName}, #{thirdName},
#{thirdName1}, #{thirdName1},
#{thirdName2}, #{thirdName2},
#{thirdName3}, #{thirdName3},
#{thirdName4}, #{thirdName4},
#{updateTime}, #{updateTime},
#{corpType}) #{corpType}
)
</insert> </insert>
</mapper> </mapper>

4
api-admin/src/main/resources/mybatis/mapper/basic/CompanyProductRelevanceDao.xml
Unescape Escape View File

@ -42,13 +42,13 @@
basic_products.tyshxydm,basic_products.ylqxzcrbarmc,basic_products.zczbhhzbapzbh, basic_products.tyshxydm,basic_products.ylqxzcrbarmc,basic_products.zczbhhzbapzbh,
basic_products.ylqxzcrbarywmc,basic_products.sydycpbs,basic_products.uuid, basic_products.ylqxzcrbarywmc,basic_products.sydycpbs,basic_products.uuid,
basic_products.sjcpbm,basic_products.versionNumber,basic_products.diType, basic_products.sjcpbm,basic_products.versionNumber,basic_products.diType,
customer_info.companyName, basic_udirel.mainId,basic_udirel.mainName,basic_udirel.isAdavence basic_udirel.mainId,basic_udirel.mainName,basic_udirel.isAdavence
FROM company_product_relevance FROM company_product_relevance
inner JOIN basic_udirel inner JOIN basic_udirel
ON company_product_relevance.udiRlIdFk = basic_udirel.id ON company_product_relevance.udiRlIdFk = basic_udirel.id
inner JOIN basic_products inner JOIN basic_products
ON basic_udirel.uuid = basic_products.uuid ON basic_udirel.uuid = basic_products.uuid
inner JOIN customer_info on customer_info.customerId = company_product_relevance.customerId
<where> <where>
<if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null"> <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
AND ylqxzcrbarmc LIKE concat(#{ylqxzcrbarmc},'%') AND ylqxzcrbarmc LIKE concat(#{ylqxzcrbarmc},'%')

148
api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml
Unescape Escape View File

@ -25,56 +25,64 @@
<select id="findByUuid" parameterType="java.lang.String" <select id="findByUuid" parameterType="java.lang.String"
resultType="com.glxp.api.admin.entity.basic.UdiInfoEntity"> resultType="com.glxp.api.admin.entity.basic.UdiInfoEntity">
SELECT * FROM basic_products WHERE ( SELECT *
uuid = #{uuid} ) limit 1 FROM basic_products
WHERE (
uuid = #{uuid}) limit 1
</select> </select>
<select id="findByUuids" parameterType="java.lang.String" <select id="findByUuids" parameterType="java.lang.String"
resultType="com.glxp.api.admin.entity.basic.UdiInfoEntity"> resultType="com.glxp.api.admin.entity.basic.UdiInfoEntity">
SELECT * FROM basic_products WHERE ( SELECT *
uuid = #{uuid} ) FROM basic_products
WHERE (
uuid = #{uuid})
</select> </select>
<select id="findByNameCode" parameterType="java.lang.String" <select id="findByNameCode" parameterType="java.lang.String"
resultType="com.glxp.api.admin.entity.basic.UdiInfoEntity"> resultType="com.glxp.api.admin.entity.basic.UdiInfoEntity">
SELECT * FROM basic_products WHERE ( SELECT *
nameCode = #{nameCode} ) limit 1 FROM basic_products
WHERE (
nameCode = #{nameCode}) limit 1
</select> </select>
<insert id="insertUdiInfo" keyProperty="id" parameterType="com.glxp.api.admin.entity.basic.UdiInfoEntity"> <insert id="insertUdiInfo" keyProperty="id" parameterType="com.glxp.api.admin.entity.basic.UdiInfoEntity">
replace INTO basic_products replace
INTO basic_products
( (
nameCode,packRatio,packLevel,bhxjsl, id,nameCode,packRatio,packLevel,bhxjsl,
bhzxxsbzsl,zxxsbzbhsydysl,bhxjcpbm,bzcj,addType,deviceRecordKey, bhzxxsbzsl,zxxsbzbhsydysl,bhxjcpbm,bzcj,addType,deviceRecordKey,
cpmctymc,cplb,flbm,ggxh,qxlb,tyshxydm,ylqxzcrbarmc,zczbhhzbapzbh,ylqxzcrbarywmc,uuid,sjcpbm,versionNumber cpmctymc,cplb,flbm,ggxh,qxlb,tyshxydm,ylqxzcrbarmc,zczbhhzbapzbh,ylqxzcrbarywmc,uuid,sjcpbm,versionNumber
,diType,productType ,diType,productType
) )
values values
( (
#{nameCode}, #{id},
#{packRatio}, #{nameCode},
#{packLevel}, #{packRatio},
#{bhxjsl}, #{packLevel},
#{bhzxxsbzsl}, #{bhxjsl},
#{zxxsbzbhsydysl}, #{bhzxxsbzsl},
#{bhxjcpbm}, #{zxxsbzbhsydysl},
#{bzcj}, #{bhxjcpbm},
#{addType}, #{bzcj},
#{deviceRecordKey}, #{addType},
#{cpmctymc}, #{deviceRecordKey},
#{cplb}, #{cpmctymc},
#{flbm}, #{cplb},
#{ggxh}, #{flbm},
#{qxlb}, #{ggxh},
#{tyshxydm}, #{qxlb},
#{ylqxzcrbarmc}, #{tyshxydm},
#{zczbhhzbapzbh}, #{ylqxzcrbarmc},
#{ylqxzcrbarywmc}, #{zczbhhzbapzbh},
#{uuid}, #{ylqxzcrbarywmc},
#{sjcpbm}, #{uuid},
#{versionNumber}, #{sjcpbm},
#{diType}, #{versionNumber},
#{productType} #{diType},
) #{productType}
)
</insert> </insert>
<insert id="insertUdiInfos" keyProperty="id" parameterType="java.util.List"> <insert id="insertUdiInfos" keyProperty="id" parameterType="java.util.List">
@ -119,11 +127,15 @@
</insert> </insert>
<delete id="deleteById" parameterType="Map"> <delete id="deleteById" parameterType="Map">
DELETE FROM basic_products WHERE id = #{id} DELETE
FROM basic_products
WHERE id = #{id}
</delete> </delete>
<delete id="deleteByUuid" parameterType="Map"> <delete id="deleteByUuid" parameterType="Map">
DELETE FROM basic_products WHERE uuid = #{uuid} DELETE
FROM basic_products
WHERE uuid = #{uuid}
</delete> </delete>
<update id="updateUdiInfo" parameterType="com.glxp.api.admin.entity.basic.UdiInfoEntity"> <update id="updateUdiInfo" parameterType="com.glxp.api.admin.entity.basic.UdiInfoEntity">
@ -170,41 +182,41 @@
<insert id="importUdiInfo" parameterType="java.util.List"> <insert id="importUdiInfo" parameterType="java.util.List">
replace into basic_products replace into basic_products
(id, nameCode, packRatio, packLevel, bhxjsl, bhzxxsbzsl, zxxsbzbhsydysl, bhxjcpbm, bzcj, addType, (id, nameCode, packRatio, packLevel, bhxjsl, bhzxxsbzsl, zxxsbzbhsydysl, bhxjcpbm, bzcj, addType,
deviceRecordKey, cpmctymc, cplb, flbm, ggxh, qxlb, tyshxydm, ylqxzcrbarmc, zczbhhzbapzbh, deviceRecordKey, cpmctymc, cplb, flbm, ggxh, qxlb, tyshxydm, ylqxzcrbarmc, zczbhhzbapzbh,
ylqxzcrbarywmc, sydycpbs, uuid, sjcpbm, versionNumber, diType, ybbm, sptm, manufactory, measname, ylqxzcrbarywmc, sydycpbs, uuid, sjcpbm, versionNumber, diType, ybbm, sptm, manufactory, measname,
productType) values productType) values
<foreach collection="udiInfoEntities" item="item" index="index" separator=","> <foreach collection="udiInfoEntities" item="item" index="index" separator=",">
(#{item.id}, (#{item.id},
#{item.nameCode}, #{item.nameCode},
#{item.packRatio}, #{item.packRatio},
#{item.packLevel}, #{item.packLevel},
#{item.bhxjsl}, #{item.bhxjsl},
#{item.bhzxxsbzsl}, #{item.bhzxxsbzsl},
#{item.zxxsbzbhsydysl}, #{item.zxxsbzbhsydysl},
#{item.bhxjcpbm}, #{item.bhxjcpbm},
#{item.bzcj}, #{item.bzcj},
#{item.addType}, #{item.addType},
#{item.deviceRecordKey}, #{item.deviceRecordKey},
#{item.cpmctymc}, #{item.cpmctymc},
#{item.cplb}, #{item.cplb},
#{item.flbm}, #{item.flbm},
#{item.ggxh}, #{item.ggxh},
#{item.qxlb}, #{item.qxlb},
#{item.tyshxydm}, #{item.tyshxydm},
#{item.ylqxzcrbarmc}, #{item.ylqxzcrbarmc},
#{item.zczbhhzbapzbh}, #{item.zczbhhzbapzbh},
#{item.ylqxzcrbarywmc}, #{item.ylqxzcrbarywmc},
#{item.sydycpbs}, #{item.sydycpbs},
#{item.uuid}, #{item.uuid},
#{item.sjcpbm}, #{item.sjcpbm},
#{item.versionNumber}, #{item.versionNumber},
#{item.diType}, #{item.diType},
#{item.ybbm}, #{item.ybbm},
#{item.sptm}, #{item.sptm},
#{item.manufactory}, #{item.manufactory},
#{item.measname}, #{item.measname},
#{item.productType}) #{item.productType})
</foreach> </foreach>
</insert> </insert>
</mapper> </mapper>

3
api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
Unescape Escape View File

@ -257,12 +257,13 @@
replace replace
INTO basic_udirel INTO basic_udirel
( (
thirdId,thirdName,uuid,isUseDy,updateTime, id,thirdId,thirdName,uuid,isUseDy,updateTime,
thirdId1,thirdId2,thirdId3,thirdId4,thirdName1,thirdName2,thirdName3,thirdName4,manufactory,measname,ybbm,sptm,isDisable,isLock thirdId1,thirdId2,thirdId3,thirdId4,thirdName1,thirdName2,thirdName3,thirdName4,manufactory,measname,ybbm,sptm,isDisable,isLock
,mainId,mainName,lockStatus,udplatCode,isAdavence ,mainId,mainName,lockStatus,udplatCode,isAdavence
) )
values values
( (
#{id},
#{thirdId}, #{thirdId},
#{thirdName}, #{thirdName},
#{uuid}, #{uuid},

24
api-admin/src/main/resources/mybatis/mapper/thrsys/ThrCorpDao.xml
Unescape Escape View File

@ -99,16 +99,18 @@
</update> </update>
<insert id="importThrCorp" parameterType="com.glxp.api.admin.entity.thrsys.ThrCorpEntity"> <insert id="importThrCorp" parameterType="com.glxp.api.admin.entity.thrsys.ThrCorpEntity">
replace into thr_corp (id, unitId, spell, addr, creditNo, contact, mobile, thirdSysFk, name, updateTime) replace
values (#{id}, into thr_corp (unitId, spell, addr, creditNo, contact, mobile, thirdSysFk, name, updateTime)
#{unitId}, values (
#{spell}, #{unitId},
#{addr}, #{spell},
#{creditNo}, #{addr},
#{contact}, #{creditNo},
#{mobile}, #{contact},
#{thirdSysFk}, #{mobile},
#{name}, #{thirdSysFk},
#{updateTime}) #{name},
#{updateTime}
)
</insert> </insert>
</mapper> </mapper>
Write Preview
Loading…
Cancel
Save