From cc511acb919f842e95c2f6027f4fc4429c7b7b1a Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 04 九月 2024 01:36:28 +0800
Subject: [PATCH] 权限配置、图像安全资源管理查询

---
 ycl-server/src/main/java/com/ycl/platform/service/impl/YwThresholdServiceImpl.java        |    8 ++--
 ycl-pojo/src/main/java/com/ycl/platform/domain/entity/ImageResourceSecurity.java          |    1 
 ycl-server/src/main/java/com/ycl/platform/controller/YwUnitController.java                |    2 
 ycl-server/src/main/java/com/ycl/platform/controller/ContractResultController.java        |   16 ++++----
 ycl-server/src/main/java/com/ycl/platform/controller/ImageResourceSecurityController.java |    8 ++--
 ycl-server/src/main/java/com/ycl/platform/controller/CheckScoreController.java            |    6 +-
 ycl-server/src/main/java/com/ycl/task/MonitorTask.java                                    |    2 
 ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java         |    3 -
 ycl-server/src/main/java/com/ycl/platform/controller/ContractScoreController.java         |   14 +++---
 ycl-server/src/main/java/com/ycl/platform/mapper/ImageResourceSecurityDetailMapper.java   |    3 +
 ycl-server/src/main/resources/mapper/zgyw/ImageResourceSecurityDetailMapper.xml           |   23 +++++++----
 11 files changed, 46 insertions(+), 40 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
index 2c5a08a..2f447de 100644
--- 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
@@ -50,4 +50,5 @@
     @TableField(exist = false)
     private BigDecimal imageResourceSecurity;
 
+
 }
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/CheckScoreController.java b/ycl-server/src/main/java/com/ycl/platform/controller/CheckScoreController.java
index e4b1a7a..5b13ba3 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/CheckScoreController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/CheckScoreController.java
@@ -34,7 +34,7 @@
     /**
      * 鏌ヨ鑰冩牳绉垎鍗$墖鍒楄〃
      */
-    @PreAuthorize("@ss.hasPermi('check:score:list')")
+    @PreAuthorize("@ss.hasPermi('check:score:query')")
     @GetMapping("/list")
     public AjaxResult list(CheckScore checkScore)
     {
@@ -69,7 +69,7 @@
     /**
      * 鑾峰彇鑰冩牳鎸囨爣璇︾粏淇℃伅
      */
-    @PreAuthorize("@ss.hasPermi('check:score:query')")
+    @PreAuthorize("@ss.hasPermi('check:score:detail')")
     @GetMapping(value = "/detail/index")
     public AjaxResult getIndex(CheckScoreIndexDTO checkScoreIndexDTO)
     {
@@ -79,7 +79,7 @@
     /**
      * 鍙戝竷鑰冩牳绉垎
      */
-    @PreAuthorize("@ss.hasPermi('check:score:edit')")
+    @PreAuthorize("@ss.hasPermi('check:score:publish')")
     @Log(title = "鍙戝竷鑰冩牳绉垎", businessType = BusinessType.UPDATE)
     @PutMapping("/publish")
     public AjaxResult edit(@RequestBody CheckScoreDTO checkScoreDTO)
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/ContractResultController.java b/ycl-server/src/main/java/com/ycl/platform/controller/ContractResultController.java
index ce6af88..6bf94e2 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/ContractResultController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/ContractResultController.java
@@ -32,7 +32,7 @@
     /**
      * 鏌ヨ鑰冩牳缁撴灉鍒楄〃
      */
-    @PreAuthorize("@ss.hasPermi('system:result:list')")
+    @PreAuthorize("@ss.hasPermi('contract:result:list')")
     @PostMapping("/list")
     public TableDataInfo list(@RequestBody ContractResultVO contractResult) {
         startPage();
@@ -43,7 +43,7 @@
     /**
      * 鏌ヨ鑰冩牳缁撴灉鍒楄〃
      */
-    @PreAuthorize("@ss.hasPermi('system:result:query')")
+    @PreAuthorize("@ss.hasPermi('contract:result:query')")
     @GetMapping("/record/list")
     public TableDataInfo recordList(Long resultId, Long contractId) {
         List<ContractResultRecord> list = checkResultService.selectCheckResultRecordList(resultId, contractId);
@@ -53,7 +53,7 @@
     /**
      * 瀵煎嚭鑰冩牳缁撴灉鍒楄〃
      */
-    @PreAuthorize("@ss.hasPermi('system:result:export')")
+    @PreAuthorize("@ss.hasPermi('contract:result:export')")
     @Log(title = "鑰冩牳缁撴灉", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, ContractResultVO contractResult) {
@@ -65,7 +65,7 @@
     /**
      * 鑾峰彇鑰冩牳缁撴灉璇︾粏淇℃伅
      */
-    @PreAuthorize("@ss.hasPermi('system:result:query')")
+    @PreAuthorize("@ss.hasPermi('contract:result:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return success(checkResultService.selectCheckResultById(id));
@@ -74,7 +74,7 @@
     /**
      * 鏂板鑰冩牳缁撴灉
      */
-    @PreAuthorize("@ss.hasPermi('system:result:add')")
+    @PreAuthorize("@ss.hasPermi('contract:result:add')")
     @Log(title = "鑰冩牳缁撴灉", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody ContractResult contractResult) {
@@ -84,7 +84,7 @@
     /**
      * 淇敼鑰冩牳缁撴灉
      */
-    @PreAuthorize("@ss.hasPermi('system:result:edit')")
+    @PreAuthorize("@ss.hasPermi('contract:result:edit')")
     @Log(title = "鑰冩牳缁撴灉", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody ContractResult contractResult) {
@@ -94,7 +94,7 @@
     /**
      * 鍙戝竷鑰冩牳缁撴灉
      */
-    @PreAuthorize("@ss.hasPermi('system:result:publish')")
+    @PreAuthorize("@ss.hasPermi('contract:result:publish')")
     @PutMapping("/publish/{id}")
     public AjaxResult publish(@PathVariable("id") Long id) {
         return toAjax(checkResultService.publish(id));
@@ -103,7 +103,7 @@
     /**
      * 鍒犻櫎鑰冩牳缁撴灉
      */
-    @PreAuthorize("@ss.hasPermi('system:result:remove')")
+    @PreAuthorize("@ss.hasPermi('contract:result:remove')")
     @Log(title = "鑰冩牳缁撴灉", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids) {
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/ContractScoreController.java b/ycl-server/src/main/java/com/ycl/platform/controller/ContractScoreController.java
index 298cf96..5343d7e 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/ContractScoreController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/ContractScoreController.java
@@ -31,7 +31,7 @@
     /**
      * 鏌ヨ鍚堝悓鎵撳垎鍒楄〃
      */
-    @PreAuthorize("@ss.hasPermi('platform:score:list')")
+    @PreAuthorize("@ss.hasPermi('contract:score:list')")
     @PostMapping("/list")
     public TableDataInfo list(@RequestBody ContractScore contractScore) {
         startPage();
@@ -42,7 +42,7 @@
     /**
      * 瀵煎嚭鍚堝悓鎵撳垎鍒楄〃
      */
-    @PreAuthorize("@ss.hasPermi('platform:score:export')")
+    @PreAuthorize("@ss.hasPermi('contract:score:export')")
     @PostMapping("/export")
     public void export(HttpServletResponse response, ContractScore contractScore) {
         List<ContractScore> list = defaultScoreService.selectDefaultScoreList(contractScore);
@@ -53,7 +53,7 @@
     /**
      * 鑾峰彇鍚堝悓鎵撳垎璇︾粏淇℃伅
      */
-    @PreAuthorize("@ss.hasPermi('platform:score:query')")
+    @PreAuthorize("@ss.hasPermi('contract:score:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return success(defaultScoreService.getById(id));
@@ -62,7 +62,7 @@
     /**
      * 鏂板鍚堝悓鎵撳垎
      */
-    @PreAuthorize("@ss.hasPermi('platform:score:add')")
+    @PreAuthorize("@ss.hasPermi('contract:score:add')")
     @Log(title = "鍚堝悓鎵撳垎", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody ContractScore contractScore) {
@@ -72,7 +72,7 @@
     /**
      * 淇敼鍚堝悓鎵撳垎
      */
-    @PreAuthorize("@ss.hasPermi('platform:score:edit')")
+    @PreAuthorize("@ss.hasPermi('contract:score:edit')")
     @Log(title = "鍚堝悓鎵撳垎", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody ContractScore contractScore) {
@@ -82,7 +82,7 @@
     /**
      * 鍚堝悓鎵撳垎瀹℃牳
      */
-    @PreAuthorize("@ss.hasPermi('platform:score:audit')")
+    @PreAuthorize("@ss.hasPermi('contract:score:audit')")
     @Log(title = "鍚堝悓鎵撳垎瀹℃牳", businessType = BusinessType.UPDATE)
     @PostMapping("/auditing")
     public AjaxResult audit(@RequestBody ContractScore contractScore) {
@@ -92,7 +92,7 @@
     /**
      * 鍒犻櫎鍚堝悓鎵撳垎
      */
-    @PreAuthorize("@ss.hasPermi('platform:score:remove')")
+    @PreAuthorize("@ss.hasPermi('contract:score:remove')")
     @Log(title = "鍚堝悓鎵撳垎", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids) {
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
index 295fc53..850b3df 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/ImageResourceSecurityController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/ImageResourceSecurityController.java
@@ -31,7 +31,7 @@
     /**
      * 鏌ヨplatform鍒楄〃
      */
-    @PreAuthorize("@ss.hasPermi('platform:security:list')")
+    @PreAuthorize("@ss.hasPermi('imageResource:security:list')")
     @GetMapping("/list")
     public TableDataInfo list(ImageResourceSecurity imageResourceSecurity)
     {
@@ -42,7 +42,7 @@
     /**
      * 鑾峰彇platform璇︾粏淇℃伅
      */
-    @PreAuthorize("@ss.hasPermi('platform:security:query')")
+    @PreAuthorize("@ss.hasPermi('imageResource:security:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -63,7 +63,7 @@
     /**
      * 瀵煎叆妯℃澘
      */
-    @PreAuthorize("@ss.hasPermi('platform:security:list')")
+    @PreAuthorize("@ss.hasPermi('imageResource:security:template')")
     @Log(title = "瀵煎叆妯℃澘", businessType = BusinessType.IMPORT)
     @PostMapping("/importTemplate")
     public void importTemplate(HttpServletResponse response) {
@@ -73,7 +73,7 @@
     /**
      * 瀵煎叆鏁版嵁
      */
-    @PreAuthorize("@ss.hasPermi('platform:security:list')")
+    @PreAuthorize("@ss.hasPermi('imageResource:security:import')")
     @Log(title = "瀵煎叆", businessType = BusinessType.IMPORT)
     @PostMapping("/importData")
     public AjaxResult importData(MultipartFile file) {
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/YwUnitController.java b/ycl-server/src/main/java/com/ycl/platform/controller/YwUnitController.java
index 3d097f0..751ab03 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/YwUnitController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/YwUnitController.java
@@ -77,7 +77,7 @@
 
     @GetMapping("/list")
     @ApiOperation(value = "鍒楄〃", notes = "鍒楄〃")
-    @PreAuthorize("@ss.hasPermi('unit:list')")
+//    @PreAuthorize("@ss.hasPermi('unit:list')")
     public Result list() {
         return ywUnitService.all();
     }
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
index e35795b..91a47e3 100644
--- a/ycl-server/src/main/java/com/ycl/platform/mapper/ImageResourceSecurityDetailMapper.java
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/ImageResourceSecurityDetailMapper.java
@@ -1,6 +1,7 @@
 package com.ycl.platform.mapper;
 
 import com.ycl.platform.domain.entity.ImageResourceSecurityDetail;
+import com.ycl.platform.domain.query.DataCenterQuery;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.ArrayList;
@@ -28,7 +29,7 @@
      * @param imageResourceSecurityDetail 瀹夊叏妫�娴嬬粨鏋�
      * @return 瀹夊叏妫�娴嬬粨鏋滈泦鍚�
      */
-    public List<ImageResourceSecurityDetail> selectImageResourceSecurityDetailList(ImageResourceSecurityDetail imageResourceSecurityDetail);
+    public List<ImageResourceSecurityDetail> selectImageResourceSecurityDetailList(DataCenterQuery query);
 
     /**
      * 鏂板瀹夊叏妫�娴嬬粨鏋�
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 b983667..4dc66d0 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
@@ -1021,9 +1021,8 @@
      */
     @Override
     public Result videoImageResourceSecurity(DataCenterQuery query) {
-        ImageResourceSecurityDetail imageResourceSecurityDetail = new ImageResourceSecurityDetail();
         Page<ImageResourceSecurityDetail> page = PageHelper.startPage(query.getPageNum(), query.getPageSize());
-        securityDetailMapper.selectImageResourceSecurityDetailList(imageResourceSecurityDetail);
+        securityDetailMapper.selectImageResourceSecurityDetailList(query);
 
         // 缁熻鏁�
         HashMap<String, Object> map = new HashMap<>();
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwThresholdServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwThresholdServiceImpl.java
index c04c859..3dae6eb 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwThresholdServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwThresholdServiceImpl.java
@@ -179,10 +179,10 @@
             check(YwThreadConstants.Face_NouniqueCount, nouniqueCount, result.getExternalIndexCode(), thresholdMap, workOrder, CompareType.MORE_THAN_EQ, ErrorType.NOT_UNIQUE_DATA_VOLUME.getValue());
             //妫�鏌ヤ汉鑴镐綆璇勫垎鐜�
             Float lowScorePercent = result.getSnapValidity().getLowScorePercent();
-            check(YwThreadConstants.Face_LowScorePercent, lowScorePercent, result.getExternalIndexCode(), thresholdMap, workOrder, CompareType.LESS_THAN_EQ, ErrorType.FACE_LOW.getValue());
+            check(YwThreadConstants.Face_LowScorePercent, lowScorePercent, result.getExternalIndexCode(), thresholdMap, workOrder, CompareType.MORE_THAN_EQ, ErrorType.FACE_LOW.getValue());
             //妫�鏌ュ缓妯″け璐ョ巼
             Float failPercent = result.getSnapValidity().getFailPercent();
-            check(YwThreadConstants.Face_FailPercent, failPercent, result.getExternalIndexCode(), thresholdMap, workOrder, CompareType.LESS_THAN_EQ, ErrorType.MODELING_FAIL.getValue());
+            check(YwThreadConstants.Face_FailPercent, failPercent, result.getExternalIndexCode(), thresholdMap, workOrder, CompareType.MORE_THAN_EQ, ErrorType.MODELING_FAIL.getValue());
             // 鐐逛綅鍦ㄧ嚎鐜�
             if (2 == result.getSnapResult()) {
                 workOrder.setSerialNumber(result.getExternalIndexCode());
@@ -239,8 +239,8 @@
             //妫�鏌ョ櫧澶╂湭璇嗗埆閲�
             Integer dayNoNumberCountResult = result.getSnapPlate().getDayNoNumberCount();
             check(YwThreadConstants.Car_DayNoNumberCount, dayNoNumberCountResult, result.getExternalIndexCode(), thresholdMap, workOrder, CompareType.MORE_THAN_EQ, ErrorType.UNRECOGNIZED_DAY_VOLUME.getValue());
-            //杞﹁締鍏」灞炴�т笉瀹屾暣閲�
-            Integer noIntegrityCountResult = result.getIntegrity().getNoIntegrityCount();
+            //杞﹁締涓昏灞炴�т笉瀹屾暣鐜�
+            Integer noIntegrityCountResult = result.getIntegrity().getMainNoIntegrityCount();
             check(YwThreadConstants.Car_NoIntegrityCount, noIntegrityCountResult, result.getExternalIndexCode(), thresholdMap, workOrder, CompareType.MORE_THAN_EQ, ErrorType.CAR_SIX.getValue());
             // 鐐逛綅鍦ㄧ嚎鐜�
             if (2 == result.getSnapResult()) {
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 51ea36f..4262d99 100644
--- a/ycl-server/src/main/java/com/ycl/task/MonitorTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/MonitorTask.java
@@ -64,7 +64,7 @@
         Query query = new Query(Criteria.where("mongoCreateTime").gte(DateUtils.getDayStart(yesterday)).lt(DateUtils.getDayEnd(yesterday)));
         List<MonitorQualifyResult> oneMachineFileResults = mongoTemplate.find(query, MonitorQualifyResult.class);
         //mongo鍝佺墝鏁版嵁
-        Query OSDQuery = new Query(Criteria.where("mongoCreateTime").gte(DateUtils.getDayStart(yesterday)).lt(DateUtils.getDayEnd(yesterday))));
+        Query OSDQuery = new Query(Criteria.where("mongoCreateTime").gte(DateUtils.getDayStart(yesterday)).lt(DateUtils.getDayEnd(yesterday)));
         Map<String, OsdCheckResult> osdMap = mongoTemplate.find(query, OsdCheckResult.class).stream().collect(Collectors.toMap(OsdCheckResult::getDeviceNo, Function.identity()));
         //鏁版嵁搴搈onitor琛ㄦ暟鎹�
         Map<String, TMonitorVO> monitorVOMap = monitorMapper.selectMonitorVOList().stream().collect(Collectors.toMap(TMonitorVO::getSerialNumber, Function.identity()));
diff --git a/ycl-server/src/main/resources/mapper/zgyw/ImageResourceSecurityDetailMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/ImageResourceSecurityDetailMapper.xml
index 56f3aef..13c0c67 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/ImageResourceSecurityDetailMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/ImageResourceSecurityDetailMapper.xml
@@ -27,7 +27,8 @@
         FROM t_image_resource_security_detail
     </sql>
 
-    <select id="selectImageResourceSecurityDetailList" resultType="com.ycl.platform.domain.entity.ImageResourceSecurityDetail">
+    <select id="selectImageResourceSecurityDetailList"
+            resultType="com.ycl.platform.domain.entity.ImageResourceSecurityDetail">
         select id,
         ip,
         a.dept_id,
@@ -40,12 +41,14 @@
         from t_image_resource_security_detail a
         LEFT JOIN sys_dept b ON a.dept_id = b.dept_id AND b.del_flag = 0
         <where>
-            <if test="ip != null  and ip != ''">and ip = #{ip}</if>
-            <if test="deptId != null ">and a.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>
+            <if test="startTime!=null and endTime!=null">
+                and a.alarm_time between #{startTime} and #{endTime}
+            </if>
+            <if test="keyword!=null and keyword!=''">
+                and (b.dept_name like concat('%',#{keyword},'%') or
+                a.ip like concat('%',#{keyword},'%')
+                )
+            </if>
         </where>
     </select>
 
@@ -78,9 +81,11 @@
     </insert>
 
     <insert id="saveBatch">
-        INSERT INTO t_image_resource_security_detail (ip, dept_id, alarm_category, alarm_level, num, alarm_time, create_time) VALUES
+        INSERT INTO t_image_resource_security_detail (ip, dept_id, alarm_category, alarm_level, num, alarm_time,
+        create_time) VALUES
         <foreach collection="list" item="item" index="index" separator=",">
-            (#{item.ip}, #{item.deptId}, #{item.alarmCategory}, #{item.alarmLevel}, #{item.num}, #{item.alarmTime}, NOW())
+            (#{item.ip}, #{item.deptId}, #{item.alarmCategory}, #{item.alarmLevel}, #{item.num}, #{item.alarmTime},
+            NOW())
         </foreach>
     </insert>
 

--
Gitblit v1.8.0