From 23fc81dcde45cc9f719b86ab6130cd520c65140c Mon Sep 17 00:00:00 2001 From: yewj Date: Fri, 22 Nov 2024 10:57:12 +0800 Subject: [PATCH] =?UTF-8?q?=E9=95=BF=E6=B3=B0=E8=8D=AF=E5=93=81=E4=B8=8B?= =?UTF-8?q?=E8=BD=BD=E6=94=B6=E8=B4=B9=E9=A1=B9=E7=9B=AE=E4=B8=8E=E7=89=A9?= =?UTF-8?q?=E8=B5=84=E5=AD=97=E5=85=B8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/mipsdl/client/ctqyy/CtqyyClient.java | 27 +++- .../mipsdl/dao/thrsys/ThrProductsDao.java | 5 + .../mapper/master/thrsys/ThrProductsDao.xml | 142 ++++++++++++------ 3 files changed, 126 insertions(+), 48 deletions(-) diff --git a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java index c1a5689..539d0ad 100644 --- a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java @@ -286,8 +286,24 @@ public class CtqyyClient extends CommonHttpClient { products.setPrepnSpec(dict.getPHYSIC_SPEC()); products.setPrepnUnit(dict.getPHYSIC_UNIT()); products.setProductType(2); + products.setId(IdUtil.getSnowflakeNextId()); + products.setThirdSysFk("thirdId1"); return products; }).collect(Collectors.toList()); + thrProductsDao.batchInsert(thrProductsEntityList); + thrProductsEntityList = thrProductsEntityList.stream() + .collect(Collectors.groupingBy(ThrProductsEntity::getYbbm, + LinkedHashMap::new, + Collectors.collectingAndThen(Collectors.toList(), list -> list.get(0)))) + .values() + .stream() + .collect(Collectors.toList()); + } + + for (ThrProductsEntity entity : thrProductsEntityList) { + entity.setId(null); + entity.setRemark(entity.getCode()); + entity.setCode(entity.getYbbm()); } PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(page.getTotal()); @@ -2263,6 +2279,7 @@ public class CtqyyClient extends CommonHttpClient { JSONObject dataJson = JSONObject.parseObject(jsonStr); ybClient.ybPost("3506A", dataJson); } + /** * 获取交易类型集合 * @@ -2270,11 +2287,11 @@ public class CtqyyClient extends CommonHttpClient { */ @Override public BaseResponse getBuyType() { - Map buyTypeMap= new HashMap<>(); - buyTypeMap.put("buyType_3501",buyType_3501); - buyTypeMap.put("buyType_3502",buyType_3502); - buyTypeMap.put("buyType_3505",buyType_3505); - buyTypeMap.put("buyType_3506",buyType_3506); + Map buyTypeMap = new HashMap<>(); + buyTypeMap.put("buyType_3501", buyType_3501); + buyTypeMap.put("buyType_3502", buyType_3502); + buyTypeMap.put("buyType_3505", buyType_3505); + buyTypeMap.put("buyType_3506", buyType_3506); return ResultVOUtils.success(buyTypeMap); } } diff --git a/src/main/java/com/glxp/mipsdl/dao/thrsys/ThrProductsDao.java b/src/main/java/com/glxp/mipsdl/dao/thrsys/ThrProductsDao.java index 2f9bd80..5e3538d 100644 --- a/src/main/java/com/glxp/mipsdl/dao/thrsys/ThrProductsDao.java +++ b/src/main/java/com/glxp/mipsdl/dao/thrsys/ThrProductsDao.java @@ -4,6 +4,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.mipsdl.entity.thrsys.ThrProductsEntity; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + @Mapper public interface ThrProductsDao extends BaseMapper { + + + boolean batchInsert(List thrProducts); } diff --git a/src/main/resources/mybatis/mapper/master/thrsys/ThrProductsDao.xml b/src/main/resources/mybatis/mapper/master/thrsys/ThrProductsDao.xml index 87f53b2..1a3a87c 100644 --- a/src/main/resources/mybatis/mapper/master/thrsys/ThrProductsDao.xml +++ b/src/main/resources/mybatis/mapper/master/thrsys/ThrProductsDao.xml @@ -1,47 +1,103 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - id, code, `name`, measname, spec, registerNo, manufactory, thirdSysFk, cplb, flbm, - qxlb, ybbm, sptm, tyshxydm, zczbhhzbapzbh, ylqxzcrbarmc, ylqxzcrbarywmc, cpms, updateTime, - supName, model, `standard`, qtbm, zczyxqz, remark, remark1, remark2, remark3, price, - `createUser`, createTime, updateUser - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, + code, + `name`, + measname, + spec, + registerNo, + manufactory, + thirdSysFk, + cplb, + flbm, + qxlb, + ybbm, + sptm, + tyshxydm, + zczbhhzbapzbh, + ylqxzcrbarmc, + ylqxzcrbarywmc, + cpms, + updateTime, + supName, + model, + `standard`, + qtbm, + zczyxqz, + remark, + remark1, + remark2, + remark3, + price, + `createUser`, + createTime, + updateUser + + + + insert ignore into thr_products + (id, code, `name`, measname, spec, registerNo, manufactory, thirdSysFk, cplb, flbm, + qxlb, ybbm, sptm, tyshxydm, zczbhhzbapzbh, ylqxzcrbarmc, ylqxzcrbarywmc, cpms, + updateTime, supName, model, `standard`, qtbm, zczyxqz, remark, remark1, remark2, + remark3, price, `createUser`, createTime, updateUser, manufactoryCode, supCode, + `type`, prcitmcode, productType, prepnSpec, prepnUnit) + values + + (#{item.id,jdbcType=BIGINT}, #{item.code,jdbcType=VARCHAR}, #{item.name,jdbcType=VARCHAR}, + #{item.measname,jdbcType=VARCHAR}, #{item.spec,jdbcType=VARCHAR}, #{item.registerNo,jdbcType=VARCHAR}, + #{item.manufactory,jdbcType=VARCHAR}, #{item.thirdSysFk,jdbcType=VARCHAR}, #{item.cplb,jdbcType=VARCHAR}, + #{item.flbm,jdbcType=VARCHAR}, #{item.qxlb,jdbcType=VARCHAR}, #{item.ybbm,jdbcType=VARCHAR}, + #{item.sptm,jdbcType=VARCHAR}, #{item.tyshxydm,jdbcType=VARCHAR}, #{item.zczbhhzbapzbh,jdbcType=VARCHAR}, + #{item.ylqxzcrbarmc,jdbcType=VARCHAR}, #{item.ylqxzcrbarywmc,jdbcType=VARCHAR}, + #{item.cpms,jdbcType=LONGVARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP}, #{item.supName,jdbcType=VARCHAR}, + #{item.model,jdbcType=VARCHAR}, #{item.standard,jdbcType=VARCHAR}, #{item.qtbm,jdbcType=VARCHAR}, + #{item.zczyxqz,jdbcType=VARCHAR}, #{item.remark,jdbcType=VARCHAR}, #{item.remark1,jdbcType=VARCHAR}, + #{item.remark2,jdbcType=VARCHAR}, #{item.remark3,jdbcType=VARCHAR}, #{item.price,jdbcType=VARCHAR}, + #{item.createUser,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP}, + #{item.updateUser,jdbcType=VARCHAR}, + #{item.manufactoryCode,jdbcType=VARCHAR}, #{item.supCode,jdbcType=VARCHAR}, #{item.type,jdbcType=TINYINT}, + #{item.prcitmcode,jdbcType=VARCHAR}, #{item.productType,jdbcType=TINYINT}, + #{item.prepnSpec,jdbcType=VARCHAR}, + #{item.prepnUnit,jdbcType=VARCHAR}) + +