From 905296d89c10d770cb613fd93f1ca4aa687754ce Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期一, 12 六月 2023 09:44:41 +0800
Subject: [PATCH] bug修改

---
 ycl-platform/src/main/resources/application-dev.yml                                    |    8 ++--
 ycl-common/src/main/java/com/ycl/aspect/LogAspect.java                                 |   23 ++++++-----
 ycl-platform/src/main/java/com/ycl/entity/caseHandler/BaseCase.java                    |    6 +++
 ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/ViolationsServiceImpl.java |   19 +++++++++
 ycl-platform/src/main/java/com/ycl/dto/casePool/ViolationParam.java                    |    8 ++++
 ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java        |    8 ++-
 ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java            |    2 
 /dev/null                                                                              |    0 
 document/副本丽水市遂昌县智慧执法应用-资源开通表 -0228.xlsx                                               |    0 
 ycl-platform/src/main/resources/application-prod.yml                                   |    8 ++--
 document/驾驶舱数据接口文档(ai物联和综合决策).docx                                                     |    0 
 ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java      |   28 ++++++++++++-
 ycl-platform/src/main/java/com/ycl/controller/platformApi/AlarmController.java         |    3 +
 13 files changed, 87 insertions(+), 26 deletions(-)

diff --git "a/document/\344\272\221mas/~$TPS\347\237\255\344\277\241\346\216\245\345\217\243\346\226\207\346\241\243.docx" "b/document/\344\272\221mas/~$TPS\347\237\255\344\277\241\346\216\245\345\217\243\346\226\207\346\241\243.docx"
deleted file mode 100644
index 2fc0b2e..0000000
--- "a/document/\344\272\221mas/~$TPS\347\237\255\344\277\241\346\216\245\345\217\243\346\226\207\346\241\243.docx"
+++ /dev/null
Binary files differ
diff --git "a/document/\345\211\257\346\234\254\344\270\275\346\260\264\345\270\202\351\201\202\346\230\214\345\216\277\346\231\272\346\205\247\346\211\247\346\263\225\345\272\224\347\224\250-\350\265\204\346\272\220\345\274\200\351\200\232\350\241\250 -0228.xlsx" "b/document/\345\211\257\346\234\254\344\270\275\346\260\264\345\270\202\351\201\202\346\230\214\345\216\277\346\231\272\346\205\247\346\211\247\346\263\225\345\272\224\347\224\250-\350\265\204\346\272\220\345\274\200\351\200\232\350\241\250 -0228.xlsx"
index 1b07cbb..204dfb6 100644
--- "a/document/\345\211\257\346\234\254\344\270\275\346\260\264\345\270\202\351\201\202\346\230\214\345\216\277\346\231\272\346\205\247\346\211\247\346\263\225\345\272\224\347\224\250-\350\265\204\346\272\220\345\274\200\351\200\232\350\241\250 -0228.xlsx"
+++ "b/document/\345\211\257\346\234\254\344\270\275\346\260\264\345\270\202\351\201\202\346\230\214\345\216\277\346\231\272\346\205\247\346\211\247\346\263\225\345\272\224\347\224\250-\350\265\204\346\272\220\345\274\200\351\200\232\350\241\250 -0228.xlsx"
Binary files differ
diff --git "a/document/\351\251\276\351\251\266\350\210\261\346\225\260\346\215\256\346\216\245\345\217\243\346\226\207\346\241\243\357\274\210ai\347\211\251\350\201\224\345\222\214\347\273\274\345\220\210\345\206\263\347\255\226\357\274\211.docx" "b/document/\351\251\276\351\251\266\350\210\261\346\225\260\346\215\256\346\216\245\345\217\243\346\226\207\346\241\243\357\274\210ai\347\211\251\350\201\224\345\222\214\347\273\274\345\220\210\345\206\263\347\255\226\357\274\211.docx"
index 3732dce..186a476 100644
--- "a/document/\351\251\276\351\251\266\350\210\261\346\225\260\346\215\256\346\216\245\345\217\243\346\226\207\346\241\243\357\274\210ai\347\211\251\350\201\224\345\222\214\347\273\274\345\220\210\345\206\263\347\255\226\357\274\211.docx"
+++ "b/document/\351\251\276\351\251\266\350\210\261\346\225\260\346\215\256\346\216\245\345\217\243\346\226\207\346\241\243\357\274\210ai\347\211\251\350\201\224\345\222\214\347\273\274\345\220\210\345\206\263\347\255\226\357\274\211.docx"
Binary files differ
diff --git a/ycl-common/src/main/java/com/ycl/aspect/LogAspect.java b/ycl-common/src/main/java/com/ycl/aspect/LogAspect.java
index 8db5b2a..9d342d9 100644
--- a/ycl-common/src/main/java/com/ycl/aspect/LogAspect.java
+++ b/ycl-common/src/main/java/com/ycl/aspect/LogAspect.java
@@ -35,9 +35,13 @@
         MethodSignature signature = (MethodSignature) joinPoint.getSignature();
         Method method = signature.getMethod();
         LogSave annotation = method.getAnnotation(LogSave.class);
-        AdminUserDetails adminUserDetails = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
         UmsAdminLoginLog loginLog = new UmsAdminLoginLog();
-        loginLog.setAdminId(adminUserDetails.getUserId());
+        try {
+            AdminUserDetails adminUserDetails = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+
+            loginLog.setAdminId(adminUserDetails.getUserId());
+        } catch (Exception ex) {
+        }
         loginLog.setCreateTime(new Date());
         ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
         HttpServletRequest request = attributes.getRequest();
@@ -45,21 +49,18 @@
         String header = request.getHeader("user-agent");
         if (header.contains("Windows NT")) {
             loginLog.setUserAgent("Web绔�");
-        }
-        else if(header.contains("Android")) {
+        } else if (header.contains("Android")) {
             loginLog.setUserAgent("Android绔�");
-        }
-        else if(header.contains("iPhone")) {
+        } else if (header.contains("iPhone")) {
             loginLog.setUserAgent("ios绔�");
-        }
-        else if(header.contains("iPad")) {
+        } else if (header.contains("iPad")) {
             loginLog.setUserAgent("iPad绔�");
-        }else {
+        } else {
             loginLog.setUserAgent("Web绔�");
         }
-        if (annotation.operationType().equals("")){
+        if (annotation.operationType().equals("")) {
             loginLog.setOperationType("鍏朵粬鎿嶄綔");
-        }else {
+        } else {
             loginLog.setOperationType(annotation.operationType());
         }
         loginLog.setContain(annotation.contain());
diff --git a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
index 3b459dd..868fadd 100644
--- a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
+++ b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
@@ -141,7 +141,7 @@
             date = calendar.getTime();
             umsAdmin.setExpirationDate(date);
         } else {
-            umsAdmin.setExpirationDate(new Date("2200-01-01"));
+            umsAdmin.setExpirationDate(new Date(2090,1,1));
         }
         if (umsAdmin.getId() != null) {
             baseMapper.updateById(umsAdmin);
diff --git a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java
index ec42868..cc301dc 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java
@@ -1,11 +1,14 @@
 package com.ycl.controller.caseHandler;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ycl.annotation.LogSave;
 import com.ycl.api.CommonResult;
+import com.ycl.bo.AdminUserDetails;
 import com.ycl.controller.BaseController;
 import com.ycl.common.constant.BaseCaseStatus;
 import com.ycl.common.util.UtilNumber;
@@ -16,10 +19,12 @@
 import com.ycl.entity.caseHandler.BaseCase;
 import com.ycl.entity.caseHandler.BaseCaseDetail;
 import com.ycl.entity.caseHandler.DisposeRecord;
+import com.ycl.entity.resources.ImageResources;
 import com.ycl.service.caseHandler.IBaseCaseService;
 import com.ycl.service.caseHandler.IDisposeRecordService;
 import com.ycl.service.caseHandler.IIllegalBuildingService;
 import com.ycl.service.caseHandler.IViolationsService;
+import com.ycl.service.resources.IImageResourcesService;
 import com.ycl.utils.EasyExcelUtils;
 import com.ycl.vo.casePool.QueryForViolationVO;
 import io.swagger.annotations.Api;
@@ -28,6 +33,7 @@
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -63,6 +69,9 @@
 
     @Autowired
     UtilNumber utilNumber;
+
+    @Autowired
+    IImageResourcesService iImageResourcesService;
 
 
     @Autowired
@@ -211,7 +220,7 @@
      **/
     @ApiOperation(value = "娣诲姞杩濊妗堜欢")
     @PostMapping("/addition_violation")
-    @LogSave(operationType = "浜嬮」澶勭疆绠$悊", contain = "鏂板杩濆缓妗堜欢")
+    @LogSave(operationType = "浜嬮」澶勭疆绠$悊", contain = "鏂板杩濊妗堜欢")
     public CommonResult addViolationCase(@RequestBody @Validated ViolationParam violationParam) {
         Integer violation = 1;
         Integer resource = 2;
@@ -224,6 +233,19 @@
         baseCase.setAlarmTime(LocalDateTime.parse(violationParam.getAlarmTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
         baseCase.setCreateTime(LocalDateTime.now());
         baseCaseService.save(baseCase);
+        JSONArray arr = JSON.parseArray(baseCase.getPic());
+        AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+
+        for (int i = 0; i < arr.size(); i++) {
+            ImageResources imageResources = new ImageResources();
+            imageResources.setType("01");
+            imageResources.setBelongToId(baseCase.getId());
+            imageResources.setUrl(arr.getString(i));
+            imageResources.setCreateTime(LocalDateTime.now());
+            imageResources.setCreateUser(user.getUserId());
+            iImageResourcesService.save(imageResources);
+        }
+
         return CommonResult.success(baseCaseService.saveViolationCase(violationParam, baseCase.getId()));
     }
 
@@ -234,7 +256,7 @@
      **/
     @ApiOperation(value = "娣诲姞杩濆缓妗堜欢")
     @PostMapping("/addition_illegal_building")
-    @LogSave(operationType = "浜嬮」澶勭疆绠$悊", contain = "鏂板杩濊妗堜欢")
+    @LogSave(operationType = "浜嬮」澶勭疆绠$悊", contain = "鏂板杩濆缓妗堜欢")
     public CommonResult addIllegalBuildingCase(@RequestBody @Validated IllegalBuildingParam illegalBuildingParam) {
         Integer illegalBuilding = 2;
         Integer resource = 2;
@@ -341,7 +363,7 @@
         Integer state = iDisposeRecordService
                 .list(new LambdaQueryWrapper<DisposeRecord>()
                         .eq(DisposeRecord::getBaseCaseId, caseId).
-                                orderByDesc(DisposeRecord::getCreateTime)).get(firstNum).getState();
+                        orderByDesc(DisposeRecord::getCreateTime)).get(firstNum).getState();
         return CommonResult.success(baseCaseService
                 .update(new LambdaUpdateWrapper<BaseCase>()
                         .eq(BaseCase::getId, caseId)
diff --git a/ycl-platform/src/main/java/com/ycl/controller/platformApi/AlarmController.java b/ycl-platform/src/main/java/com/ycl/controller/platformApi/AlarmController.java
index 70ba109..257e41b 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/platformApi/AlarmController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/platformApi/AlarmController.java
@@ -1,5 +1,7 @@
 package com.ycl.controller.platformApi;
 
+import cn.hutool.json.JSONConverter;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.ycl.annotation.LogSave;
 import com.ycl.api.CommonResult;
@@ -49,6 +51,7 @@
     @PostMapping("/AlarmReport")
     @LogSave(operationType = "鎶ヨ绠$悊", contain = "瑙嗛鎶ヨ鎺ㄩ��")
     public CommonResult alarmReport(@RequestBody @Validated AlarmParam alarmParam) {
+//        System.out.println("淇濆瓨鎶ヨ鏁版嵁锛�" + JSONObject.toJSONString(alarmParam));
         videoAlarmReportService.save(alarmParam);
         return new CommonResult(ResultCode.SUCCESS.getCode(), ResultCode.SUCCESS.getMessage());
     }
diff --git a/ycl-platform/src/main/java/com/ycl/dto/casePool/ViolationParam.java b/ycl-platform/src/main/java/com/ycl/dto/casePool/ViolationParam.java
index 6a98d88..db538f0 100644
--- a/ycl-platform/src/main/java/com/ycl/dto/casePool/ViolationParam.java
+++ b/ycl-platform/src/main/java/com/ycl/dto/casePool/ViolationParam.java
@@ -122,4 +122,12 @@
      */
     @ApiModelProperty(value = "韬唤璇佸彿鐮�")
     private String informantIdCard;
+
+
+    @ApiModelProperty(value = "鍥剧墖")
+    private String pic;
+
+
+    @ApiModelProperty(value = "瑙嗛")
+    private String media;
 }
diff --git a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/BaseCase.java b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/BaseCase.java
index 439057f..18a22b4 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/BaseCase.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/BaseCase.java
@@ -216,6 +216,12 @@
     @ApiModelProperty(value = "璋冨害淇℃伅")
     private DispatchInfo dispatchInfo;
 
+    @TableField("pic")
+    @ApiModelProperty(value = "鍥剧墖")
+    private String pic;
 
+    @TableField("media")
+    @ApiModelProperty(value = "瑙嗛")
+    private String media;
 
 }
\ No newline at end of file
diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/ViolationsServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/ViolationsServiceImpl.java
index 5f0476c..eea6be4 100644
--- a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/ViolationsServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/ViolationsServiceImpl.java
@@ -8,6 +8,7 @@
 import com.ycl.entity.caseHandler.QuestionCategory;
 import com.ycl.entity.caseHandler.Violations;
 import com.ycl.entity.dict.DataDictionary;
+import com.ycl.entity.resources.ImageResources;
 import com.ycl.entity.video.VideoAlarmReport;
 import com.ycl.entity.video.VideoPoint;
 import com.ycl.enums.common.DictTypeEnum;
@@ -16,6 +17,7 @@
 import com.ycl.service.caseHandler.IBaseCaseService;
 import com.ycl.service.caseHandler.IViolationsService;
 import com.ycl.service.dict.IDataDictionaryService;
+import com.ycl.service.resources.IImageResourcesService;
 import com.ycl.service.video.impl.IVideoPointService;
 import com.ycl.vo.cockpit.enforcementEvents.VideoAndAreaVO;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -39,6 +41,7 @@
     private IVideoPointService videoPointService;
     private IBaseCaseService baseCaseService;
     private IDataDictionaryService dataDictionaryService;
+    private IImageResourcesService imageResourcesService;
 
     @Resource
     BaseCaseMapper baseCaseMapper;
@@ -59,6 +62,11 @@
     @Autowired
     public void setDataDictionaryService(IDataDictionaryService dataDictionaryService) {
         this.dataDictionaryService = dataDictionaryService;
+    }
+
+    @Autowired
+    public void setImageResourcesService(IImageResourcesService imageResourcesService) {
+        this.imageResourcesService = imageResourcesService;
     }
 
     @Override
@@ -96,6 +104,17 @@
                 }
 
                 baseMapper.insert(violations);
+
+                try {
+                    ImageResources imageResources = new ImageResources();
+                    imageResources.setType("01");
+                    imageResources.setBelongToId(baseCase.getId());
+                    imageResources.setUrl(videoAlarmReport.getPicData());
+                    imageResources.setCreateTime(LocalDateTime.now());
+                    imageResourcesService.save(imageResources);
+                } catch (Exception ex) {
+
+                }
             }
         }
     }
diff --git a/ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java
index 015b95e..6c5e7e1 100644
--- a/ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java
@@ -23,6 +23,7 @@
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
 import org.springframework.mail.javamail.JavaMailSenderImpl;
 import org.springframework.mail.javamail.MimeMessageHelper;
 import org.springframework.stereotype.Service;
@@ -32,6 +33,7 @@
 
 import javax.annotation.Resource;
 import javax.mail.internet.MimeMessage;
+import javax.xml.ws.Response;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -103,7 +105,7 @@
                 sendMessage.setTargetTo(receive);
                 sendMessage.setSendTime(new Date());
                 sendMessage.setPhoneNumber(umsAdminMapper.selectById(receive).getMobile());
-                if (ChannelCode.INNER.equals(message.getChannelCode())){
+                if (ChannelCode.INNER.equals(message.getChannelCode())) {
                     sendMessage.setIsView(0);
                 }
                 this.save(sendMessage);
@@ -207,8 +209,8 @@
         ObjectMapper objectMapper = new ObjectMapper();
 
         HttpEntity<String> stringHttpEntity = new HttpEntity<>(Base64Utils.encodeToString(objectMapper.writeValueAsBytes(mac)), httpHeaders);
-
-        SendRes sendRes = objectMapper.readValue(restTemplate.postForEntity(url, stringHttpEntity, String.class).getBody(), SendRes.class);
+        ResponseEntity<String> response = restTemplate.postForEntity(url + "/sms/submit", sendReq, String.class);
+        SendRes sendRes = objectMapper.readValue(response.getBody(), SendRes.class);
         if (sendRes.getRspcod().equals("success")) {
             return 2;
         } else {
diff --git a/ycl-platform/src/main/resources/application-dev.yml b/ycl-platform/src/main/resources/application-dev.yml
index 7f25105..f3a1029 100644
--- a/ycl-platform/src/main/resources/application-dev.yml
+++ b/ycl-platform/src/main/resources/application-dev.yml
@@ -61,10 +61,10 @@
   password: qizcitupatzoeeij
 
 SMS:
-  ecName: ycl
-  apId: 1
-  sign: sign
-  url: http://localhost:8082/sccg/text/sms_res
+  ecName: 娴欐睙绉诲姩淇℃伅绯荤粺闆嗘垚鏈夐檺鍏徃锛堥亗鏄岋級
+  apId: sccg
+  sign: wg2AOpofE
+  url: https://mas.10086.cn
 
 videoPoint:
   url: http://183.245.159.161:8281
diff --git a/ycl-platform/src/main/resources/application-prod.yml b/ycl-platform/src/main/resources/application-prod.yml
index 25f75ee..6201f09 100644
--- a/ycl-platform/src/main/resources/application-prod.yml
+++ b/ycl-platform/src/main/resources/application-prod.yml
@@ -60,10 +60,10 @@
   password: qizcitupatzoeeij
 
 SMS:
-  ecName: ycl
-  apId: 1
-  sign: sign
-  url: http://localhost:8082/sccg/text/sms_res
+  ecName: 娴欐睙绉诲姩淇℃伅绯荤粺闆嗘垚鏈夐檺鍏徃锛堥亗鏄岋級
+  apId: sccg
+  sign: wg2AOpofE
+  url: https://mas.10086.cn
 
 videoPoint:
   url: http://172.28.194.180:7901

--
Gitblit v1.8.0