From d3b9773726fda802bc4ef5971af3d76b90ed208e Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 16 八月 2024 16:41:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/dataListener/CurrencyDataListener.java | 2 +-
ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml | 10 +++++++---
ycl-server/src/main/java/com/ycl/platform/mapper/TMonitorMapper.java | 5 ++++-
ycl-server/src/main/java/com/ycl/platform/mapper/YwPointMapper.java | 2 ++
ycl-server/src/main/java/com/ycl/task/MonitorTask.java | 15 +++++++++++----
ycl-server/src/main/resources/application-dev.yml | 2 +-
ycl-pojo/src/main/java/com/ycl/platform/domain/excel/PointExport.java | 1 +
ycl-server/src/main/java/com/ycl/platform/controller/YwPointController.java | 10 ++++++++--
ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java | 7 +++----
ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml | 4 ++++
ycl-server/src/main/java/com/ycl/platform/service/YwPointService.java | 2 +-
11 files changed, 43 insertions(+), 17 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/excel/PointExport.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/excel/PointExport.java
index d9b1ac5..df9e471 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/excel/PointExport.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/excel/PointExport.java
@@ -58,6 +58,7 @@
@ExcelIgnore
private Boolean importantCommandImageTag;
+ @ColumnWidth(16)
@ExcelProperty("鏄惁閲嶇偣鎸囨尌鍥惧儚")
private String importantCommandImageTagString;
}
diff --git a/ycl-server/src/main/java/com/ycl/dataListener/CurrencyDataListener.java b/ycl-server/src/main/java/com/ycl/dataListener/CurrencyDataListener.java
index 50ef882..b343155 100644
--- a/ycl-server/src/main/java/com/ycl/dataListener/CurrencyDataListener.java
+++ b/ycl-server/src/main/java/com/ycl/dataListener/CurrencyDataListener.java
@@ -24,7 +24,7 @@
/**
* 姣忛殧100鏉″瓨鍌ㄦ暟鎹簱锛岀劧鍚庢竻鐞唋ist 锛屾柟渚垮唴瀛樺洖鏀�
*/
- private static final int BATCH_COUNT = 100;
+ private static final int BATCH_COUNT = 500;
/**
* 缂撳瓨鐨勬暟鎹�
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/YwPointController.java b/ycl-server/src/main/java/com/ycl/platform/controller/YwPointController.java
index 506e616..b85ddb5 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/YwPointController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/YwPointController.java
@@ -5,6 +5,7 @@
import com.ycl.system.domain.group.Add;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.NotBlank;
+import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import lombok.RequiredArgsConstructor;
@@ -116,8 +117,13 @@
@PostMapping("/import/{unitId}")
@ApiOperation(value = "瀵煎叆鏁版嵁", notes = "瀵煎叆鏁版嵁")
- public Result importData(MultipartFile file, @PathVariable("unitId") Integer unitId, Date startTime, Date endTime, Boolean provinceTag, Boolean importantTag, Boolean importantCommandImageTag) throws IOException {
- return ywPointService.importData(file, unitId, startTime, endTime, provinceTag, importantTag, importantCommandImageTag);
+ public Result importData(MultipartFile file,
+ @PathVariable("unitId") Integer unitId,
+ @DateTimeFormat(pattern = "yyyy-MM-dd") Date startTime,
+ @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime,
+ Boolean provinceTag,
+ Boolean importantCommandImageTag) throws IOException {
+ return ywPointService.importData(file, unitId, startTime, endTime, provinceTag, importantCommandImageTag);
}
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/TMonitorMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/TMonitorMapper.java
index 266214c..15fe311 100644
--- a/ycl-server/src/main/java/com/ycl/platform/mapper/TMonitorMapper.java
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/TMonitorMapper.java
@@ -125,5 +125,8 @@
* @param page
* @param query
*/
- IPage assetManagement(IPage<TMonitorVO> page, @Param("query") DataCenterQuery query);
+ void assetManagement(IPage<TMonitorVO> page, @Param("query") DataCenterQuery query);
+
+ void deleteAll();
+
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/YwPointMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/YwPointMapper.java
index 4a15433..a7eafd9 100644
--- a/ycl-server/src/main/java/com/ycl/platform/mapper/YwPointMapper.java
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/YwPointMapper.java
@@ -49,4 +49,6 @@
* @return
*/
List<PointExport> export(@Param("query") YwPointQuery query);
+
+ void deleteAll();
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/YwPointService.java b/ycl-server/src/main/java/com/ycl/platform/service/YwPointService.java
index 0af0f0a..61e329d 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/YwPointService.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/YwPointService.java
@@ -121,5 +121,5 @@
* @param unitId 杩愮淮鍗曚綅id
* @return
*/
- Result importData(MultipartFile file, Integer unitId, Date startTime, Date endTime, Boolean provinceTag, Boolean importantTag, Boolean importantCommandImageTag) throws IOException;
+ Result importData(MultipartFile file, Integer unitId, Date startTime, Date endTime, Boolean provinceTag, Boolean importantCommandImageTag) throws IOException;
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java
index 52af163..e41a9c8 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java
@@ -245,9 +245,9 @@
}
@Override
- public Result importData(MultipartFile file, Integer unitId, Date startTime, Date endTime, Boolean provinceTag, Boolean importantTag, Boolean importantCommandImageTag) throws IOException {
+ public Result importData(MultipartFile file, Integer unitId, Date startTime, Date endTime, Boolean provinceTag, Boolean importantCommandImageTag) throws IOException {
Consumer<List<PointExport>> consumer = (dataList) -> {
- this.updatePoint(dataList, unitId, startTime, endTime, provinceTag, importantTag, importantCommandImageTag);
+ this.updatePoint(dataList, unitId, startTime, endTime, provinceTag, importantCommandImageTag);
};
EasyExcel.read(file.getInputStream(), PointExport.class , new CurrencyDataListener(consumer)).headRowNumber(1).doReadAll();
return Result.ok();
@@ -259,7 +259,7 @@
* @param dataList
* @param unitId
*/
- private void updatePoint(List<PointExport> dataList, Integer unitId, Date startTime, Date endTime, Boolean provinceTag, Boolean importantTag, Boolean importantCommandImageTag) {
+ private void updatePoint(List<PointExport> dataList, Integer unitId, Date startTime, Date endTime, Boolean provinceTag, Boolean importantCommandImageTag) {
if (CollectionUtils.isEmpty(dataList)) {
throw new RuntimeException("瀵煎叆鏁版嵁涓嶈兘涓虹┖");
}
@@ -270,7 +270,6 @@
.set(YwPoint::getStartTime, startTime)
.set(YwPoint::getEndTime, endTime)
.set(YwPoint::getProvinceTag, provinceTag)
- .set(YwPoint::getImportantTag, importantTag)
.set(YwPoint::getImportantCommandImageTag, importantCommandImageTag)
.update();
}
diff --git a/ycl-server/src/main/java/com/ycl/task/MonitorTask.java b/ycl-server/src/main/java/com/ycl/task/MonitorTask.java
index 9dc6986..5676db1 100644
--- a/ycl-server/src/main/java/com/ycl/task/MonitorTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/MonitorTask.java
@@ -10,6 +10,7 @@
import com.ycl.platform.domain.result.UY.OneMachineFileResult;
import com.ycl.platform.domain.vo.TMonitorVO;
import com.ycl.platform.mapper.TMonitorMapper;
+import com.ycl.platform.mapper.YwPointMapper;
import com.ycl.platform.service.ITMonitorService;
import com.ycl.platform.service.YwPointService;
import com.ycl.system.entity.SysDictData;
@@ -50,10 +51,12 @@
@Autowired
private YwPointService ywPointService;
@Autowired
+ private YwPointMapper ywPointMapper;
+ @Autowired
private RedisTemplate redisTemplate;
//鍚屾mongodb涓�鏈轰竴妗ｅ埌鏁版嵁搴�
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
public void synchronize() {
// 鑾峰彇Calendar瀹炰緥锛岄粯璁や娇鐢ㄥ綋鍓嶆椂鍖哄拰璇█鐜
Calendar calendar = Calendar.getInstance();
@@ -82,6 +85,7 @@
SysDictData sysDictData = new SysDictData();
sysDictData.setDictType("platform_important_site");
List<SysDictData> DictDataList = dictDataService.selectDictDataList(sysDictData);
+ //閲囬泦鍖哄煙涓洪噸鐐圭偣浣嶇殑闆嗗悎
List<String> importantSite = DictDataList.stream().map(SysDictData::getDictValue).collect(Collectors.toList());
//鍏ㄥ勾鐣欏瓨
@@ -98,10 +102,12 @@
log.info("result闆嗗悎{},璁惧闆嗗悎{},鐐逛綅闆嗗悎{}", oneMachineFileResults.size(), monitorList.size(), ywPointList.size());
//鎻掑叆鏁版嵁搴�
if (!CollectionUtils.isEmpty(monitorList)) {
- monitorService.saveOrUpdateBatch(monitorList);
+ monitorMapper.deleteAll();
+ monitorService.saveBatch(monitorList);
}
if (!CollectionUtils.isEmpty(ywPointList)) {
- ywPointService.saveOrUpdateBatch(ywPointList);
+ ywPointMapper.deleteAll();
+ ywPointService.saveBatch(ywPointList);
}
//鏂扮殑鏁版嵁鏀惧叆Redis涓瓑寰呰�冩牳鎸囨爣浠诲姟浣跨敤
redisTemplate.opsForValue().set(RedisConstant.New_Monitor_Set, JSONArray.toJSONString(newMonitorList));
@@ -117,11 +123,12 @@
ywPoint.setSerialNumber(result.getSerialNumber().getValue());
ywPoint.setImportantTag(Boolean.FALSE);
ywPoint.setProvinceTag(Boolean.FALSE);
+ ywPoint.setImportantCommandImageTag(Boolean.FALSE);
ywPoint.setCreateTime(new Date());
ywPoint.setUpdateTime(new Date());
}
//姣斿鏄惁鏄噸鐐圭偣浣�
- if (importantSite.contains(result.getSerialNumber().getValue())) {
+ if (importantSite.contains(result.getSxjcjqy().getValue())) {
ywPoint.setImportantTag(Boolean.TRUE);
}
//瑙ｆ瀽deptId
diff --git a/ycl-server/src/main/resources/application-dev.yml b/ycl-server/src/main/resources/application-dev.yml
index 5eabbef..ab4cea3 100644
--- a/ycl-server/src/main/resources/application-dev.yml
+++ b/ycl-server/src/main/resources/application-dev.yml
@@ -36,7 +36,7 @@
spring:
# 鏁版嵁婧愰厤缃�
datasource:
- url: jdbc:mysql://101.35.247.188/zgyw?useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8
+ url: jdbc:mysql://101.35.247.188/zgyw?useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&rewriteBatchedStatements=true
username: root
password: ycl@202466
type: com.alibaba.druid.pool.DruidDataSource
diff --git a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
index 1b1f3f3..8c11119 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
@@ -502,6 +502,10 @@
</where>
</select>
+ <delete id="deleteAll">
+ delete from t_monitor
+ </delete>
+
<resultMap id="dyMap" type="com.ycl.platform.domain.vo.TMonitorVO">
<id column="id" property="id"/>
<result column="serial_number" property="serialNumber"/>
diff --git a/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
index 850ac2e..572000a 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
@@ -89,9 +89,9 @@
yu.unit_name,
yp.start_time,
yp.end_time,
- yp.province_tag,
- yp.important_tag,
- yp.important_command_image_tag
+ CASE WHEN yp.province_tag = 0 THEN '' ELSE '鐪佸巺鐐逛綅' END AS provinceTagString,
+ CASE WHEN yp.important_tag = 0 THEN '' ELSE '閲嶇偣鐐逛綅' END AS importantTagString,
+ CASE WHEN yp.important_command_image_tag = 0 THEN '' ELSE '閲嶇偣鎸囨尌鍥惧儚' END AS importantCommandImageTagString
FROM
t_yw_point yp
INNER JOIN t_monitor m ON yp.serial_number = m.serial_number
@@ -102,4 +102,8 @@
</if>
</where>
</select>
+
+ <delete id="deleteAll">
+ delete from t_yw_point
+ </delete>
</mapper>
--
Gitblit v1.8.0