Merge remote-tracking branch 'origin/master'

ws

2024-10-31 5408346178dd12b7ab78fb51c76f59c300a7e153

 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1023.java

@@ -117,8 +117,8 @@
                GD2022Api1023.setYjlx(data.getDrugType());
                GD2022Api1023.setLqrq(data.getLqsj());
                GD2022Api1023.setZhgxsj(data.getUpdateTime());
                if(data.getLqr().contains("、")){
                    GD2022Api1023.setLqr(data.getLqr().replace("、", "|"));
                if (data.getLqr().contains("、")) {
                    GD2022Api1023.setLqr(data.getLqr().replace('、', '|'));
                }

                //储粮粮情明细表
@@ -132,7 +132,7 @@
                }

                //粮食品种
                String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, data.getFoodVariety().substring(0, 3));
                String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, data.getFoodVariety());
                gd2022Api1023Dtl.setLspzdm(mappingCode);
                gd2022Api1023Dtl.setLsxzdm(data.getFoodType());
                gd2022Api1023Dtl.setLsdjdm(data.getFoodLevel());
@@ -185,10 +185,9 @@
                        gd2022Api1023People = new Gd2022Api1023People();
                        BeanUtils.copyProperties(people, gd2022Api1023People);
                        gd2022Api1023People.setXm(people.getMx());
                        if(StringUtils.isEmpty(gd2022Api1023People.getZyzg())){
                            gd2022Api1023People.setZyzg("高级");
                        if (StringUtils.isEmpty(people.getZyzg())) {
                            gd2022Api1023People.setZyzg("中级");
                        }

                        peopleList.add(gd2022Api1023People);
                    }
                    GD2022Api1023.setPeoples(peopleList);
@@ -202,15 +201,16 @@
                infoData.setBizType(PushProtocol.SB_GD_2022.getCode());
                infoData.setUpdateTime(new Date());
                infoData.setDataId(data.getXzbm());
                infoData.setId(data.getXzbm());
                apiInfoList = apiInfoDataRep.getDataByInteAndData(ApiCodeConstant.API_1023, data.getXzbm(), kqdm);

                if (null == apiInfoList || apiInfoList.isEmpty()) {
                    GD2022Api1023.setCzbz(Constant.CZBZ_I);
                    infoData.setCzbz(Constant.CZBZ_I);
                    infoData.setId(ContextUtil.getUUID());
                } else {
                    GD2022Api1023.setCzbz(apiInfoList.get(0).getCzbz());
                    infoData.setCzbz(apiInfoList.get(0).getCzbz());
                    infoData.setId(apiInfoList.get(0).getId());
                }

                infoData.setData(JSON.toJSONString(GD2022Api1023));