From 439139cf650de7ccb0c91b2ffbda08e2273bc7b5 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期六, 24 八月 2024 18:45:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/task/ContractTask.java | 6
ycl-server/src/main/java/com/ycl/handler/CommentWriteHandler.java | 7
ycl-server/src/main/java/com/ycl/platform/controller/ImageResourceSecurityController.java | 63 +++++
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/ImageResourceSecurityDetail.java | 50 ++++
ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java | 26 ++
ycl-server/src/main/java/com/ycl/platform/mapper/ImageResourceSecurityDetailMapper.java | 62 +++++
ycl-server/src/main/resources/mapper/zgyw/ImageResourceSecurityDetailMapper.xml | 96 ++++++++
ycl-server/src/main/java/com/ycl/platform/mapper/ImageResourceSecurityMapper.java | 62 +++++
ycl-server/src/main/java/com/ycl/platform/service/impl/ImageResourceSecurityServiceImpl.java | 96 ++++++++
ycl-server/src/main/resources/mapper/zgyw/ImageResourceSecurityMapper.xml | 85 +++++++
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/ImageResourceSecurity.java | 47 +++
ycl-server/src/main/java/com/ycl/platform/service/IImageResourceSecurityService.java | 62 +++++
ycl-server/src/main/java/com/ycl/platform/controller/DataCenterController.java | 11
ycl-server/src/main/java/com/ycl/platform/service/DataCenterService.java | 2
14 files changed, 667 insertions(+), 8 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/ImageResourceSecurity.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/ImageResourceSecurity.java
new file mode 100644
index 0000000..4c905f8
--- /dev/null
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/ImageResourceSecurity.java
@@ -0,0 +1,47 @@
+package com.ycl.platform.domain.entity;
+
+import annotation.Excel;
+import com.ycl.system.entity.BaseEntity;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * platform瀵硅薄 t_image_resource_security
+ *
+ * @author flq
+ * @date 2024-08-24
+ */
+@Data
+public class ImageResourceSecurity extends BaseEntity
+{
+ private static final long serialVersionUID = 1L;
+
+ /** $column.columnComment */
+ private Long id;
+
+ /** 閮ㄩ棬id */
+ @Excel(name = "閮ㄩ棬id")
+ private Long deptId;
+
+ /** 骞冲彴杩愯鐜� */
+ @Excel(name = "骞冲彴杩愯鐜�")
+ private BigDecimal platformOnline;
+
+ /** 瑙嗛浼犺緭缃戣祫浜у噯纭巼 */
+ @Excel(name = "瑙嗛浼犺緭缃戣祫浜у噯纭巼")
+ private BigDecimal propertyAccuracy;
+
+ /** 寮卞彛浠ゅ緱鍒� */
+ @Excel(name = "寮卞彛浠ゅ緱鍒�")
+ private BigDecimal weakPassword;
+
+ /** 瑙嗛浼犺緭缃戝嵄闄╄祫浜ф瘮渚� */
+ @Excel(name = "瑙嗛浼犺緭缃戝嵄闄╄祫浜ф瘮渚�")
+ private BigDecimal riskProperty;
+
+ /** 瑙嗛浼犺緭缃戣竟鐣屽畬鏁存�ф娴嬫墸鍒嗛」 */
+ @Excel(name = "瑙嗛浼犺緭缃戣竟鐣屽畬鏁存�ф娴嬫墸鍒嗛」")
+ private BigDecimal boundaryIntegrity;
+
+}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/ImageResourceSecurityDetail.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/ImageResourceSecurityDetail.java
new file mode 100644
index 0000000..3684114
--- /dev/null
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/ImageResourceSecurityDetail.java
@@ -0,0 +1,50 @@
+package com.ycl.platform.domain.entity;
+
+import annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ycl.system.entity.BaseEntity;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 瀹夊叏妫�娴嬬粨鏋滃璞� t_image_resource_security_detail
+ *
+ * @author ruoyi
+ * @date 2024-08-24
+ */
+@Data
+public class ImageResourceSecurityDetail extends BaseEntity
+{
+ private static final long serialVersionUID = 1L;
+
+ /** $column.columnComment */
+ private Long id;
+
+ /** $column.columnComment */
+ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ private String ip;
+
+ /** 閮ㄩ棬id */
+ @Excel(name = "閮ㄩ棬id")
+ private Long deptId;
+
+ /** 鎶ヨ绫诲瀷 */
+ @Excel(name = "鎶ヨ绫诲瀷")
+ private String alarmCategory;
+
+ /** 鎶ヨ绾у埆 */
+ @Excel(name = "鎶ヨ绾у埆")
+ private Long alarmLevel;
+
+ /** 鎶ヨ娆℃暟 */
+ @Excel(name = "鎶ヨ娆℃暟")
+ private Long num;
+
+ /** 鎶ヨ鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "鎶ヨ鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
+ private Date alarmTime;
+
+
+}
diff --git a/ycl-server/src/main/java/com/ycl/handler/CommentWriteHandler.java b/ycl-server/src/main/java/com/ycl/handler/CommentWriteHandler.java
index f57b1c6..a9e8989 100644
--- a/ycl-server/src/main/java/com/ycl/handler/CommentWriteHandler.java
+++ b/ycl-server/src/main/java/com/ycl/handler/CommentWriteHandler.java
@@ -28,9 +28,10 @@
comment1.setString(new XSSFRichTextString("鎵ｉ櫎鐩稿叧闀滃ご鏁伴噺*0.1鍒�"));
sheet.getRow(0).getCell(1).setCellComment(comment1);
- Comment comment2 = drawingPatriarch.createCellComment(new XSSFClientAnchor(0, 0, 0, 0, 5, 8, 7, 9));
- comment2.setString(new XSSFRichTextString("鎵�2鍒�/12灏忔椂"));
- sheet.getRow(0).getCell(1).setCellComment(comment2);
+// Comment comment2 = drawingPatriarch.createCellComment(new XSSFClientAnchor(0, 0, 0, 0, 5, 8, 7, 9));
+// comment2.setString(new XSSFRichTextString("鎵�2鍒�/12灏忔椂"));
+// sheet.getRow(0).getCell(1).setCellComment(comment2);
+
}
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/DataCenterController.java b/ycl-server/src/main/java/com/ycl/platform/controller/DataCenterController.java
index 2dc0b40..4758d4d 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/DataCenterController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/DataCenterController.java
@@ -184,7 +184,16 @@
public Result videoImportantPointImageOnlineRate(DataCenterQuery query) {
return dataCenterService.videoImportantPointImageOnlineRate(query);
}
-
+ /**
+ * 瑙嗛锛氬浘鍍忚祫婧愬畨鍏ㄧ鐞�
+ *
+ * @param query
+ * @return
+ */
+ @GetMapping("/videoImageResourceSecurity")
+ public Result videoImageResourceSecurity(DataCenterQuery query) {
+ return dataCenterService.videoImageResourceSecurity(query);
+ }
/**
* 杞﹁締锛氳鍥惧簱瀵规帴绋冲畾鎬�
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/ImageResourceSecurityController.java b/ycl-server/src/main/java/com/ycl/platform/controller/ImageResourceSecurityController.java
new file mode 100644
index 0000000..8edd3dd
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/ImageResourceSecurityController.java
@@ -0,0 +1,63 @@
+package com.ycl.platform.controller;
+
+import annotation.Log;
+import com.ycl.platform.domain.entity.ImageResourceSecurity;
+import com.ycl.platform.service.IImageResourceSecurityService;
+import com.ycl.system.AjaxResult;
+import com.ycl.system.controller.BaseController;
+import com.ycl.system.page.TableDataInfo;
+import com.ycl.utils.poi.ExcelUtil;
+import enumeration.BusinessType;
+import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * platformController
+ *
+ * @author flq
+ * @date 2024-08-24
+ */
+@RestController
+@RequestMapping("/platform/resourceSecurity")
+public class ImageResourceSecurityController extends BaseController
+{
+ @Autowired
+ private IImageResourceSecurityService imageResourceSecurityService;
+
+ /**
+ * 鏌ヨplatform鍒楄〃
+ */
+ @PreAuthorize("@ss.hasPermi('platform:security:list')")
+ @GetMapping("/list")
+ public TableDataInfo list(ImageResourceSecurity imageResourceSecurity)
+ {
+ startPage();
+ List<ImageResourceSecurity> list = imageResourceSecurityService.selectImageResourceSecurityList(imageResourceSecurity);
+ return getDataTable(list);
+ }
+
+ /**
+ * 鑾峰彇platform璇︾粏淇℃伅
+ */
+ @PreAuthorize("@ss.hasPermi('platform:security:query')")
+ @GetMapping(value = "/{id}")
+ public AjaxResult getInfo(@PathVariable("id") Long id)
+ {
+ return success(imageResourceSecurityService.selectImageResourceSecurityById(id));
+ }
+
+ /**
+ * 淇敼platform
+ */
+ @PreAuthorize("@ss.hasPermi('platform:security:edit')")
+ @Log(title = "platform", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@RequestBody ImageResourceSecurity imageResourceSecurity)
+ {
+ return toAjax(imageResourceSecurityService.updateImageResourceSecurity(imageResourceSecurity));
+ }
+}
diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/ImageResourceSecurityDetailMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/ImageResourceSecurityDetailMapper.java
new file mode 100644
index 0000000..45e1889
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/ImageResourceSecurityDetailMapper.java
@@ -0,0 +1,62 @@
+package com.ycl.platform.mapper;
+
+import com.ycl.platform.domain.entity.ImageResourceSecurityDetail;
+
+import java.util.List;
+
+/**
+ * 瀹夊叏妫�娴嬬粨鏋淢apper鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2024-08-24
+ */
+public interface ImageResourceSecurityDetailMapper
+{
+ /**
+ * 鏌ヨ瀹夊叏妫�娴嬬粨鏋�
+ *
+ * @param id 瀹夊叏妫�娴嬬粨鏋滀富閿�
+ * @return 瀹夊叏妫�娴嬬粨鏋�
+ */
+ public ImageResourceSecurityDetail selectImageResourceSecurityDetailById(Long id);
+
+ /**
+ * 鏌ヨ瀹夊叏妫�娴嬬粨鏋滃垪琛�
+ *
+ * @param imageResourceSecurityDetail 瀹夊叏妫�娴嬬粨鏋�
+ * @return 瀹夊叏妫�娴嬬粨鏋滈泦鍚�
+ */
+ public List<ImageResourceSecurityDetail> selectImageResourceSecurityDetailList(ImageResourceSecurityDetail imageResourceSecurityDetail);
+
+ /**
+ * 鏂板瀹夊叏妫�娴嬬粨鏋�
+ *
+ * @param imageResourceSecurityDetail 瀹夊叏妫�娴嬬粨鏋�
+ * @return 缁撴灉
+ */
+ public int insertImageResourceSecurityDetail(ImageResourceSecurityDetail imageResourceSecurityDetail);
+
+ /**
+ * 淇敼瀹夊叏妫�娴嬬粨鏋�
+ *
+ * @param imageResourceSecurityDetail 瀹夊叏妫�娴嬬粨鏋�
+ * @return 缁撴灉
+ */
+ public int updateImageResourceSecurityDetail(ImageResourceSecurityDetail imageResourceSecurityDetail);
+
+ /**
+ * 鍒犻櫎瀹夊叏妫�娴嬬粨鏋�
+ *
+ * @param id 瀹夊叏妫�娴嬬粨鏋滀富閿�
+ * @return 缁撴灉
+ */
+ public int deleteImageResourceSecurityDetailById(Long id);
+
+ /**
+ * 鎵归噺鍒犻櫎瀹夊叏妫�娴嬬粨鏋�
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deleteImageResourceSecurityDetailByIds(Long[] ids);
+}
diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/ImageResourceSecurityMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/ImageResourceSecurityMapper.java
new file mode 100644
index 0000000..4958662
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/ImageResourceSecurityMapper.java
@@ -0,0 +1,62 @@
+package com.ycl.platform.mapper;
+
+import com.ycl.platform.domain.entity.ImageResourceSecurity;
+
+import java.util.List;
+
+/**
+ * platformMapper鎺ュ彛
+ *
+ * @author flq
+ * @date 2024-08-24
+ */
+public interface ImageResourceSecurityMapper
+{
+ /**
+ * 鏌ヨplatform
+ *
+ * @param id platform涓婚敭
+ * @return platform
+ */
+ public ImageResourceSecurity selectImageResourceSecurityById(Long id);
+
+ /**
+ * 鏌ヨplatform鍒楄〃
+ *
+ * @param imageResourceSecurity platform
+ * @return platform闆嗗悎
+ */
+ public List<ImageResourceSecurity> selectImageResourceSecurityList(ImageResourceSecurity imageResourceSecurity);
+
+ /**
+ * 鏂板platform
+ *
+ * @param imageResourceSecurity platform
+ * @return 缁撴灉
+ */
+ public int insertImageResourceSecurity(ImageResourceSecurity imageResourceSecurity);
+
+ /**
+ * 淇敼platform
+ *
+ * @param imageResourceSecurity platform
+ * @return 缁撴灉
+ */
+ public int updateImageResourceSecurity(ImageResourceSecurity imageResourceSecurity);
+
+ /**
+ * 鍒犻櫎platform
+ *
+ * @param id platform涓婚敭
+ * @return 缁撴灉
+ */
+ public int deleteImageResourceSecurityById(Long id);
+
+ /**
+ * 鎵归噺鍒犻櫎platform
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deleteImageResourceSecurityByIds(Long[] ids);
+}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/DataCenterService.java b/ycl-server/src/main/java/com/ycl/platform/service/DataCenterService.java
index d06696f..732fef8 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/DataCenterService.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/DataCenterService.java
@@ -268,4 +268,6 @@
* @return
*/
Result faceAvailabilityOfLargeImg(DataCenterQuery query);
+
+ Result videoImageResourceSecurity(DataCenterQuery query);
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/IImageResourceSecurityService.java b/ycl-server/src/main/java/com/ycl/platform/service/IImageResourceSecurityService.java
new file mode 100644
index 0000000..090586b
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/service/IImageResourceSecurityService.java
@@ -0,0 +1,62 @@
+package com.ycl.platform.service;
+
+import com.ycl.platform.domain.entity.ImageResourceSecurity;
+
+import java.util.List;
+
+/**
+ * platformService鎺ュ彛
+ *
+ * @author flq
+ * @date 2024-08-24
+ */
+public interface IImageResourceSecurityService
+{
+ /**
+ * 鏌ヨplatform
+ *
+ * @param id platform涓婚敭
+ * @return platform
+ */
+ public ImageResourceSecurity selectImageResourceSecurityById(Long id);
+
+ /**
+ * 鏌ヨplatform鍒楄〃
+ *
+ * @param imageResourceSecurity platform
+ * @return platform闆嗗悎
+ */
+ public List<ImageResourceSecurity> selectImageResourceSecurityList(ImageResourceSecurity imageResourceSecurity);
+
+ /**
+ * 鏂板platform
+ *
+ * @param imageResourceSecurity platform
+ * @return 缁撴灉
+ */
+ public int insertImageResourceSecurity(ImageResourceSecurity imageResourceSecurity);
+
+ /**
+ * 淇敼platform
+ *
+ * @param imageResourceSecurity platform
+ * @return 缁撴灉
+ */
+ public int updateImageResourceSecurity(ImageResourceSecurity imageResourceSecurity);
+
+ /**
+ * 鎵归噺鍒犻櫎platform
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑platform涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deleteImageResourceSecurityByIds(Long[] ids);
+
+ /**
+ * 鍒犻櫎platform淇℃伅
+ *
+ * @param id platform涓婚敭
+ * @return 缁撴灉
+ */
+ public int deleteImageResourceSecurityById(Long id);
+}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java
index f779f18..394332d 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java
@@ -1,14 +1,22 @@
package com.ycl.platform.service.impl;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.ycl.platform.domain.entity.ImageResourceSecurityDetail;
import com.ycl.platform.domain.query.DataCenterQuery;
import com.ycl.platform.domain.result.HK.*;
import com.ycl.platform.domain.result.UY.MonitorQualifyResult;
import com.ycl.platform.domain.result.UY.OneMachineFileResult;
import com.ycl.platform.domain.result.UY.RecordMetaDSumResult;
import com.ycl.platform.domain.result.UY.VideoOnlineResult;
+import com.ycl.platform.mapper.ImageResourceSecurityDetailMapper;
+import com.ycl.platform.mapper.ImageResourceSecurityMapper;
import com.ycl.platform.service.DataCenterService;
import com.ycl.system.Result;
+import com.ycl.system.page.TableDataInfo;
import com.ycl.utils.MongoUtil;
+import constant.HttpStatus;
import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.Sort;
import org.springframework.data.mongodb.core.MongoTemplate;
@@ -30,7 +38,8 @@
public class DataCenterServiceImpl implements DataCenterService {
private final MongoTemplate mongoTemplate;
-
+ private final ImageResourceSecurityMapper securityMapper;
+ private final ImageResourceSecurityDetailMapper securityDetailMapper;
private final static String TIME_FIELD = "mongoCreateTime";
/**
@@ -785,4 +794,19 @@
List<FaceDeviceSamplingResult> resultList = mongoTemplate.find(query, FaceDeviceSamplingResult.class);
return Result.ok().data(resultList).total(total);
}
+ /**
+ * 瑙嗛锛氳棰戝浘鍍忚祫婧愬畨鍏ㄧ鐞�
+ *
+ * @param query
+ * @return
+ */
+ @Override
+ public Result videoImageResourceSecurity(DataCenterQuery query) {
+ ImageResourceSecurityDetail imageResourceSecurityDetail = new ImageResourceSecurityDetail();
+ Page<ImageResourceSecurityDetail> page = PageHelper.startPage(query.getPageNum(), query.getPageSize());
+ securityDetailMapper.selectImageResourceSecurityDetailList(imageResourceSecurityDetail);
+
+ return Result.ok().data(page.getResult()).total(page.getTotal());
+
+ }
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/ImageResourceSecurityServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/ImageResourceSecurityServiceImpl.java
new file mode 100644
index 0000000..d2fc697
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/ImageResourceSecurityServiceImpl.java
@@ -0,0 +1,96 @@
+package com.ycl.platform.service.impl;
+
+import com.ycl.platform.domain.entity.ImageResourceSecurity;
+import com.ycl.platform.mapper.ImageResourceSecurityMapper;
+import com.ycl.platform.service.IImageResourceSecurityService;
+import com.ycl.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * platformService涓氬姟灞傚鐞�
+ *
+ * @author flq
+ * @date 2024-08-24
+ */
+@Service
+public class ImageResourceSecurityServiceImpl implements IImageResourceSecurityService
+{
+ @Autowired
+ private ImageResourceSecurityMapper imageResourceSecurityMapper;
+
+ /**
+ * 鏌ヨplatform
+ *
+ * @param id platform涓婚敭
+ * @return platform
+ */
+ @Override
+ public ImageResourceSecurity selectImageResourceSecurityById(Long id)
+ {
+ return imageResourceSecurityMapper.selectImageResourceSecurityById(id);
+ }
+
+ /**
+ * 鏌ヨplatform鍒楄〃
+ *
+ * @param imageResourceSecurity platform
+ * @return platform
+ */
+ @Override
+ public List<ImageResourceSecurity> selectImageResourceSecurityList(ImageResourceSecurity imageResourceSecurity)
+ {
+ return imageResourceSecurityMapper.selectImageResourceSecurityList(imageResourceSecurity);
+ }
+
+ /**
+ * 鏂板platform
+ *
+ * @param imageResourceSecurity platform
+ * @return 缁撴灉
+ */
+ @Override
+ public int insertImageResourceSecurity(ImageResourceSecurity imageResourceSecurity)
+ {
+ imageResourceSecurity.setCreateTime(DateUtils.getNowDate());
+ return imageResourceSecurityMapper.insertImageResourceSecurity(imageResourceSecurity);
+ }
+
+ /**
+ * 淇敼platform
+ *
+ * @param imageResourceSecurity platform
+ * @return 缁撴灉
+ */
+ @Override
+ public int updateImageResourceSecurity(ImageResourceSecurity imageResourceSecurity)
+ {
+ return imageResourceSecurityMapper.updateImageResourceSecurity(imageResourceSecurity);
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎platform
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑platform涓婚敭
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteImageResourceSecurityByIds(Long[] ids)
+ {
+ return imageResourceSecurityMapper.deleteImageResourceSecurityByIds(ids);
+ }
+
+ /**
+ * 鍒犻櫎platform淇℃伅
+ *
+ * @param id platform涓婚敭
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteImageResourceSecurityById(Long id)
+ {
+ return imageResourceSecurityMapper.deleteImageResourceSecurityById(id);
+ }
+}
diff --git a/ycl-server/src/main/java/com/ycl/task/ContractTask.java b/ycl-server/src/main/java/com/ycl/task/ContractTask.java
index aa9b899..1753fb6 100644
--- a/ycl-server/src/main/java/com/ycl/task/ContractTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/ContractTask.java
@@ -67,7 +67,7 @@
private static final Integer Offline = -1;
private static final String AuditStatus_Pass = "1";
private static final String Remark = "绯荤粺鐢熸垚";
- private static final Integer randomSize = 50;
+ private static final Integer randomSize = 1;
/**
* 鍚堝悓鑰冩牳 鍦ㄧ嚎鐜囨瘡鏃ヤ换鍔℃娴�
@@ -445,7 +445,7 @@
for (CalculateRuleVO calculateRuleVO : ruleList) {
Double max = calculateRuleVO.getMax();
Double min = calculateRuleVO.getMin();
- //鍒ゆ柇鑼冨洿鍦ㄥ摢涓尯闂�
+ //鍒ゆ柇鑼冨洿鍦ㄥ摢涓尯闂� //TODO:鍒ゆ柇鍗曚綅
if (checkRange(min, max, BigDecimal.valueOf(result.getMissDuration()))) {
if (calculateRuleVO.getNum() == null) {
calculateRuleVO.setNum(1);
@@ -458,7 +458,7 @@
}
}
for (CalculateRuleVO calculateRuleVO : ruleList) {
- if (calculateRuleVO.getNum() > 0) {
+ if (calculateRuleVO.getNum()!=null && calculateRuleVO.getNum() > 0) {
//闇�瑕佹墸闄ょ殑鍒嗘暟锛屾瑙勫垯鍙湁涓�鏉′笉闇�瑕佸垽鏂寖鍥�
double deductScore = calculateRuleVO.getCalcFraction() * calculateRuleVO.getNum();
ContractScore contractScore = getContractScore(calculateRuleVO, deductScore, calculateRuleVO.getNum() + "", Remark + calculateRuleVO.getNum() + "璺澶囪繚鍙嶈鍒�");
diff --git a/ycl-server/src/main/resources/mapper/zgyw/ImageResourceSecurityDetailMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/ImageResourceSecurityDetailMapper.xml
new file mode 100644
index 0000000..7cf6eed
--- /dev/null
+++ b/ycl-server/src/main/resources/mapper/zgyw/ImageResourceSecurityDetailMapper.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ycl.platform.mapper.ImageResourceSecurityDetailMapper">
+
+ <resultMap type="com.ycl.platform.domain.entity.ImageResourceSecurityDetail" id="ImageResourceSecurityDetailResult">
+ <result property="id" column="id"/>
+ <result property="ip" column="ip"/>
+ <result property="deptId" column="dept_id"/>
+ <result property="alarmCategory" column="alarm_category"/>
+ <result property="alarmLevel" column="alarm_level"/>
+ <result property="num" column="num"/>
+ <result property="alarmTime" column="alarm_time"/>
+ <result property="createTime" column="create_time"/>
+ </resultMap>
+
+ <sql id="selectImageResourceSecurityDetailVo">
+ select id,
+ ip,
+ dept_id,
+ alarm_category,
+ alarm_level,
+ num,
+ alarm_time,
+ create_time
+ from t_image_resource_security_detail
+ </sql>
+
+ <select id="selectImageResourceSecurityDetailList" resultMap="ImageResourceSecurityDetailResult">
+ <include refid="selectImageResourceSecurityDetailVo"/>
+ <where>
+ <if test="ip != null and ip != ''">and ip = #{ip}</if>
+ <if test="deptId != null ">and dept_id = #{deptId}</if>
+ <if test="alarmCategory != null and alarmCategory != ''">and alarm_category = #{alarmCategory}</if>
+ <if test="alarmLevel != null ">and alarm_level = #{alarmLevel}</if>
+ <if test="num != null ">and num = #{num}</if>
+ <if test="alarmTime != null ">and alarm_time = #{alarmTime}</if>
+ </where>
+ </select>
+
+ <select id="selectImageResourceSecurityDetailById">
+ resultMap="ImageResourceSecurityDetailResult">
+ <include refid="selectImageResourceSecurityDetailVo"/>
+ where id = #{id}
+ </select>
+
+ <insert id="insertImageResourceSecurityDetail" useGeneratedKeys="true" keyProperty="id">
+ insert into t_image_resource_security_detail
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="ip != null">ip,</if>
+ <if test="deptId != null">dept_id,</if>
+ <if test="alarmCategory != null">alarm_category,</if>
+ <if test="alarmLevel != null">alarm_level,</if>
+ <if test="num != null">num,</if>
+ <if test="alarmTime != null">alarm_time,</if>
+ <if test="createTime != null">create_time,</if>
+ </trim>
+ <trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="ip != null">#{ip},</if>
+ <if test="deptId != null">#{deptId},</if>
+ <if test="alarmCategory != null">#{alarmCategory},</if>
+ <if test="alarmLevel != null">#{alarmLevel},</if>
+ <if test="num != null">#{num},</if>
+ <if test="alarmTime != null">#{alarmTime},</if>
+ <if test="createTime != null">#{createTime},</if>
+ </trim>
+ </insert>
+
+ <update id="updateImageResourceSecurityDetail">
+ update t_image_resource_security_detail
+ <trim prefix="SET" suffixOverrides=",">
+ <if test="ip != null">ip = #{ip},</if>
+ <if test="deptId != null">dept_id = #{deptId},</if>
+ <if test="alarmCategory != null">alarm_category = #{alarmCategory},</if>
+ <if test="alarmLevel != null">alarm_level = #{alarmLevel},</if>
+ <if test="num != null">num = #{num},</if>
+ <if test="alarmTime != null">alarm_time = #{alarmTime},</if>
+ <if test="createTime != null">create_time = #{createTime},</if>
+ </trim>
+ where id = #{id}
+ </update>
+
+ <delete id="deleteImageResourceSecurityDetailById">
+ delete
+ from t_image_resource_security_detail
+ where id = #{id}
+ </delete>
+
+ <delete id="deleteImageResourceSecurityDetailByIds">
+ delete from t_image_resource_security_detail where id in
+ <foreach item="id" collection="array" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </delete>
+</mapper>
diff --git a/ycl-server/src/main/resources/mapper/zgyw/ImageResourceSecurityMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/ImageResourceSecurityMapper.xml
new file mode 100644
index 0000000..74b5a0e
--- /dev/null
+++ b/ycl-server/src/main/resources/mapper/zgyw/ImageResourceSecurityMapper.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ycl.platform.mapper.ImageResourceSecurityMapper">
+
+ <resultMap type="com.ycl.platform.domain.entity.ImageResourceSecurity" id="ImageResourceSecurityResult">
+ <result property="id" column="id" />
+ <result property="deptId" column="dept_id" />
+ <result property="platformOnline" column="platform_online" />
+ <result property="propertyAccuracy" column="property_accuracy" />
+ <result property="weakPassword" column="weak_password" />
+ <result property="riskProperty" column="risk_property" />
+ <result property="boundaryIntegrity" column="boundary_integrity" />
+ <result property="createTime" column="create_time" />
+ </resultMap>
+
+ <sql id="selectImageResourceSecurityVo">
+ select id, dept_id, platform_online, property_accuracy, weak_password, risk_property, boundary_integrity, create_time from t_image_resource_security
+ </sql>
+
+ <select id="selectImageResourceSecurityList" resultMap="ImageResourceSecurityResult">
+ <include refid="selectImageResourceSecurityVo"/>
+ <where>
+ <if test="deptId != null "> and dept_id = #{deptId}</if>
+ <if test="platformOnline != null "> and platform_online = #{platformOnline}</if>
+ <if test="propertyAccuracy != null "> and property_accuracy = #{propertyAccuracy}</if>
+ <if test="weakPassword != null "> and weak_password = #{weakPassword}</if>
+ <if test="riskProperty != null "> and risk_property = #{riskProperty}</if>
+ <if test="boundaryIntegrity != null "> and boundary_integrity = #{boundaryIntegrity}</if>
+ </where>
+ </select>
+
+ <select id="selectImageResourceSecurityById" resultMap="ImageResourceSecurityResult">
+ <include refid="selectImageResourceSecurityVo"/>
+ where id = #{id}
+ </select>
+
+ <insert id="insertImageResourceSecurity" useGeneratedKeys="true" keyProperty="id">
+ insert into t_image_resource_security
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="deptId != null">dept_id,</if>
+ <if test="platformOnline != null">platform_online,</if>
+ <if test="propertyAccuracy != null">property_accuracy,</if>
+ <if test="weakPassword != null">weak_password,</if>
+ <if test="riskProperty != null">risk_property,</if>
+ <if test="boundaryIntegrity != null">boundary_integrity,</if>
+ <if test="createTime != null">create_time,</if>
+ </trim>
+ <trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="deptId != null">#{deptId},</if>
+ <if test="platformOnline != null">#{platformOnline},</if>
+ <if test="propertyAccuracy != null">#{propertyAccuracy},</if>
+ <if test="weakPassword != null">#{weakPassword},</if>
+ <if test="riskProperty != null">#{riskProperty},</if>
+ <if test="boundaryIntegrity != null">#{boundaryIntegrity},</if>
+ <if test="createTime != null">#{createTime},</if>
+ </trim>
+ </insert>
+
+ <update id="updateImageResourceSecurity">
+ update t_image_resource_security
+ <trim prefix="SET" suffixOverrides=",">
+ <if test="deptId != null">dept_id = #{deptId},</if>
+ <if test="platformOnline != null">platform_online = #{platformOnline},</if>
+ <if test="propertyAccuracy != null">property_accuracy = #{propertyAccuracy},</if>
+ <if test="weakPassword != null">weak_password = #{weakPassword},</if>
+ <if test="riskProperty != null">risk_property = #{riskProperty},</if>
+ <if test="boundaryIntegrity != null">boundary_integrity = #{boundaryIntegrity},</if>
+ <if test="createTime != null">create_time = #{createTime},</if>
+ </trim>
+ where id = #{id}
+ </update>
+
+ <delete id="deleteImageResourceSecurityById">
+ delete from t_image_resource_security where id = #{id}
+ </delete>
+
+ <delete id="deleteImageResourceSecurityByIds">
+ delete from t_image_resource_security where id in
+ <foreach item="id" collection="array" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </delete>
+</mapper>
--
Gitblit v1.8.0