From f879ddd80a2bd267a0a575ef03f76d3ec2ae1504 Mon Sep 17 00:00:00 2001 From: ludc Date: 星期四, 04 一月 2024 11:42:22 +0800 Subject: [PATCH] bug列表269:集成日志查询bug修改。 270:关键属性校验,去掉多线程之后请求响应非常慢(之前报错线程阻塞的bug改成单线程导致非常慢,现在又改回ForJoinPool方式限制线程生成数量实现多线程并行,提升执行效率)。 --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java index 82d9c86..9ea8b4d 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java @@ -456,8 +456,14 @@ throw new VciBaseException("鏇存柊鏁版嵁鍑洪敊锛岄噸璇曪紒"+r.getMsg()); } } + // 鍒氬ソ椤哄簭鏄竴鑷寸殑锛屾墍浠ョ洿鎺ユ寜鐓odeallcode鐨勯『搴忔潵鎷夸笟鍔℃暟鎹� + int i = -1; for (CodeAllCode codeCbo : codeCbos) { codeCbo.setLcStatus(baseModelDTO.getLcStatus()); + // 濡傛灉鏄洖鏀讹紝灏遍渶瑕佸皢涓氬姟鏁版嵁瀛樺偍鍒扮爜鍊艰〃涓� + if(baseModelDTO.getLcStatus().equals(FrameWorkDefaultValueConstant.FRAMEWORK_RELEASE_TAKEBACK)){ + codeCbo.setBusinessData(JSON.toJSONString(baseModels.get(++i))); + } } codeAllCodeService.updateBatchById(codeCbos); @@ -1168,10 +1174,7 @@ "order by to_char(CREATETIME, 'mm')"; //鏌ヨ鍑洪渶瑕佸鐞嗙殑鏁版嵁 List<Map> maps = commonsMapper.selectBySql(sql); - if(maps.size() == 0){ - throw new ServiceException("浼犲叆绫诲瀷["+ datum.getName() + ":" + - datum.getId() +"]鏈煡鍒扮浉鍏崇粺璁℃暟鎹紝璇风‘璁�!!!!"); - } + //褰撳勾姣忔湀鏈堜唤涔嬪墠涔嬪拰 List<Integer> monthCount = new ArrayList<>(12); //褰撳勾姣忔湀鐨勬湀浠芥暟鎹� @@ -1179,12 +1182,16 @@ //鑾峰彇褰撳墠鏈堢殑鏁板瓧 Calendar instance = Calendar.getInstance(); int nowmonth = instance.get(Calendar.MONTH) + 1; + if(maps.size() == 0){ + nowmonth = 0; + } //浠�1鍒�12鏈堣繘琛屽鐞� for (Integer i = 1; i <= 12; i++) { //褰撳墠鏈堝悗鎵�鏈夋暟鎹缃负0 if(i>nowmonth){ monthCount.add(0); month.add(0); + continue; } //褰撳墠鏈堜唤涔嬪墠涔嬪拰 Integer count = 0; -- Gitblit v1.9.3