From bc2da7908a227c09e5cc7b6d8dab3e9c94b784a1 Mon Sep 17 00:00:00 2001 From: zhanghua <314079846@qq.com> Date: 星期二, 12 十二月 2023 22:18:18 +0800 Subject: [PATCH] 图片压缩及bug修改 --- ycl-platform/src/main/java/com/ycl/controller/platformApi/TranspondDHController.java | 4 ycl-platform/src/main/java/com/ycl/service/message/impl/MessageScheduleServiceImpl.java | 2 ycl-platform/src/main/java/com/ycl/service/caseHandler/IDisposeRecordService.java | 2 ycl-platform/src/main/java/com/ycl/task/SynchronizeHKVideo.java | 2 ycl-platform/src/main/java/com/ycl/util/VideoUtil.java | 12 ++-- ycl-smoke/src/main/java/com/ycl/smoke/task/CityUploadTask.java | 2 ycl-common/src/main/java/com/ycl/service/oss/impl/OssServiceImpl.java | 78 ++++++++++++++++++++++++- ycl-platform/src/main/java/com/ycl/controller/dict/DatabaseDictionaryController.java | 2 ycl-platform/src/main/java/com/ycl/controller/platformApi/AlarmController.java | 6 +- ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java | 21 ++++++ ycl-platform/src/main/resources/mapper/caseHandler/DisposeRecordMapper.xml | 7 +- ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java | 2 ycl-platform/src/main/java/com/ycl/controller/caseHandler/DisposeRecordController.java | 15 ++++ ycl-platform/src/test/java/com/ycl/sccgplatform/SccgPlatformApplicationTests.java | 6 +- 14 files changed, 130 insertions(+), 31 deletions(-) diff --git a/ycl-common/src/main/java/com/ycl/service/oss/impl/OssServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/oss/impl/OssServiceImpl.java index 0ec8e5a..3a24a08 100644 --- a/ycl-common/src/main/java/com/ycl/service/oss/impl/OssServiceImpl.java +++ b/ycl-common/src/main/java/com/ycl/service/oss/impl/OssServiceImpl.java @@ -9,12 +9,18 @@ import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.InputStream; +import javax.imageio.IIOImage; +import javax.imageio.ImageIO; +import javax.imageio.ImageWriteParam; +import javax.imageio.ImageWriter; +import javax.imageio.stream.ImageOutputStream; +import java.awt.*; +import java.awt.image.BufferedImage; +import java.io.*; import java.time.LocalDate; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; +import java.util.Arrays; import java.util.Date; @Service @@ -38,12 +44,20 @@ try { // 鑾峰彇鏂囦欢鐨勫悕绉� String fileName = "sczf/" + file.getOriginalFilename(); + byte[] newImg = file.getBytes(); + String originalFilename = file.getOriginalFilename(); + String fileType = originalFilename.substring(originalFilename.lastIndexOf(".")); + if (".png".equalsIgnoreCase(fileType) || ".jpg".equalsIgnoreCase(fileType) || ".jpeg".equalsIgnoreCase(fileType)) { + if (file.getSize() > 2097152) { + newImg = compressUnderSize(file.getBytes(), 2097152); + } + } ObjectMetadata objectMetadata = new ObjectMetadata(); objectMetadata.setContentType(getcontentType(fileName.substring(fileName.lastIndexOf(".")))); // 璋冪敤oss鐨勬柟娉曞疄鐜伴暱浼� // 绗竴涓弬鏁� bucketName // 绗簩涓弬鏁� 涓婁紶鍒皁ss鐨勬枃浠惰矾寰勫拰鏂囦欢鍚嶇О - ossClient.putObject(bucketName, fileName, new ByteArrayInputStream(file.getBytes()), objectMetadata); + ossClient.putObject(bucketName, fileName, new ByteArrayInputStream(newImg), objectMetadata); // 鍏抽棴OSSClient銆� ossClient.shutdown(); // 鎶婁笂浼犵殑鏂囦欢璺緞杩斿洖 锛堟墜鍔ㄦ嫾鎺ワ級 @@ -58,6 +72,60 @@ // e.printStackTrace(); return null; } + } + + /** + * 鎸夌収 瀹介珮 姣斾緥鍘嬬缉 + * + * @param imgIs 寰呭帇缂╁浘鐗囪緭鍏ユ祦 + * @param scale 鍘嬬缉鍒诲害 + * @param out 杈撳嚭 + * @return 鍘嬬缉鍚庡浘鐗囨暟鎹� + * @throws IOException 鍘嬬缉鍥剧墖杩囩▼涓嚭閿� + */ + public byte[] compress(byte[] srcImgData, double scale) throws IOException { + BufferedImage bi = ImageIO.read(new ByteArrayInputStream(srcImgData)); + int width = (int) (bi.getWidth() * scale); // 婧愬浘瀹藉害 + int height = (int) (bi.getHeight() * scale); // 婧愬浘楂樺害 + + Image image = bi.getScaledInstance(width, height, Image.SCALE_SMOOTH); + BufferedImage tag = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); + + Graphics g = tag.getGraphics(); + g.setColor(Color.RED); + g.drawImage(image, 0, 0, null); // 缁樺埗澶勭悊鍚庣殑鍥� + g.dispose(); + + ByteArrayOutputStream bOut = new ByteArrayOutputStream(); + ImageIO.write(tag, "JPEG", bOut); + + return bOut.toByteArray(); + } + + /** + * 灏嗗浘鐗囧帇缂╁埌鎸囧畾澶у皬浠ュ唴 + * + * @param srcImgData 婧愬浘鐗囨暟鎹� + * @param maxSize 鐩殑鍥剧墖澶у皬 + * @return 鍘嬬缉鍚庣殑鍥剧墖鏁版嵁 + */ + public byte[] compressUnderSize(byte[] srcImgData, long maxSize) { + double scale = 0.9; + byte[] imgData = Arrays.copyOf(srcImgData, srcImgData.length); + + if (imgData.length > maxSize) { + do { + try { + imgData = compress(imgData, scale); + + } catch (IOException e) { + throw new IllegalStateException("鍘嬬缉鍥剧墖杩囩▼涓嚭閿欙紝璇峰強鏃惰仈绯荤鐞嗗憳锛�", e); + } + + } while (imgData.length > maxSize); + } + + return imgData; } private byte[] readInputStream(InputStream inStream) throws Exception { @@ -173,7 +241,7 @@ public static String getcontentType(String FilenameExtension) { - if (FilenameExtension.equalsIgnoreCase(".mp4")||FilenameExtension.equalsIgnoreCase(".mov")) { + if (FilenameExtension.equalsIgnoreCase(".mp4") || FilenameExtension.equalsIgnoreCase(".mov")) { return "video/mp4"; } if (FilenameExtension.equalsIgnoreCase(".bmp")) { diff --git a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/DisposeRecordController.java b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/DisposeRecordController.java index e7872df..b19625c 100644 --- a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/DisposeRecordController.java +++ b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/DisposeRecordController.java @@ -52,9 +52,20 @@ @RequestParam(required = false) Short source, @RequestParam(required = false) Short type, @RequestParam(required = false) Short time - ) { + ) { AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal(); - return CommonResult.success(iDisposeRecordService.listMyTask(num, user.getUserId(),type,source,time,current,pageSize)); + return CommonResult.success(iDisposeRecordService.listMyTask(num, user.getUserId(), type, source, time, current, pageSize)); } + @ApiOperation(value = "鏌ヨ", response = MyBacklogVO.class) + @GetMapping("/query/count") + @LogSave(operationType = "鎴戠殑寰呭姙-鎬绘暟", contain = "鏌ヨ鎬绘暟") + public CommonResult searchMyTaskCount(@RequestParam(required = false) String num, + @RequestParam(required = false) Short source, + @RequestParam(required = false) Short type, + @RequestParam(required = false) Short time + ) { + AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal(); + return CommonResult.success(iDisposeRecordService.listMyTaskCount(num, user.getUserId(), type, source, time)); + } } diff --git a/ycl-platform/src/main/java/com/ycl/controller/dict/DatabaseDictionaryController.java b/ycl-platform/src/main/java/com/ycl/controller/dict/DatabaseDictionaryController.java index cea3bbb..0e7b4eb 100644 --- a/ycl-platform/src/main/java/com/ycl/controller/dict/DatabaseDictionaryController.java +++ b/ycl-platform/src/main/java/com/ycl/controller/dict/DatabaseDictionaryController.java @@ -44,7 +44,7 @@ private CommonResult<List<DataDictionary>> listAll() { try { PageResult<Camera> pageResult = videoUtil.callPostCameras(1, 20, "0"); - System.out.println("娴峰悍瑙嗛鎴愬姛锛�" + pageResult.getTotal()); +// System.out.println("娴峰悍瑙嗛鎴愬姛锛�" + pageResult.getTotal()); } catch (Exception ex) { System.out.println("娴峰悍瑙嗛锛�" + ex.getMessage()); } 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 02babf2..d58060a 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 @@ -72,7 +72,7 @@ @PostMapping("/HK/alarmReport") @LogSave(operationType = "鎶ヨ绠$悊", contain = "娴峰悍瑙嗛鎶ヨ鎺ㄩ��") public CommonResult hkAlarmReport(@RequestBody @Validated HKAlarmParam alarmParam) { - System.out.println("娴峰悍瑙嗛鎶ヨ鎺ㄩ�丄PI锛�" + JSONObject.toJSONString(alarmParam)); +// System.out.println("娴峰悍瑙嗛鎶ヨ鎺ㄩ�丄PI锛�" + JSONObject.toJSONString(alarmParam)); videoAlarmReportService.saveFromHK(alarmParam); return new CommonResult(ResultCode.SUCCESS.getCode(), ResultCode.SUCCESS.getMessage()); } @@ -157,7 +157,7 @@ if (sessionDic.get(sessionId) < 10) { sessionDic.remove(sessionId); fileUrl = fileUrl.replace("Expires", "v"); - System.out.println("getImages鑾峰彇鍥剧墖鍦板潃锛�" + fileUrl + "&OSSAccessKeyId=" + OSSAccessKeyId + "&Signature=" + Signature); +// System.out.println("getImages鑾峰彇鍥剧墖鍦板潃锛�" + fileUrl + "&OSSAccessKeyId=" + OSSAccessKeyId + "&Signature=" + Signature); URL url = null; if (StringUtils.isNotBlank(OSSAccessKeyId) && StringUtils.isNotBlank(Signature)) { url = new URL(fileUrl + "&OSSAccessKeyId=" + OSSAccessKeyId + "&Signature=" + Signature); @@ -172,7 +172,7 @@ InputStream inputStream = conn.getInputStream();// 閫氳繃杈撳叆娴佽幏鍙栧浘鐗囨暟鎹� byte[] data = readInputStream(inputStream); - System.out.println("getImages鑾峰彇鍥剧墖鎴愬姛"); +// System.out.println("getImages鑾峰彇鍥剧墖鎴愬姛"); return data; } diff --git a/ycl-platform/src/main/java/com/ycl/controller/platformApi/TranspondDHController.java b/ycl-platform/src/main/java/com/ycl/controller/platformApi/TranspondDHController.java index 35d099e..b75e8cc 100644 --- a/ycl-platform/src/main/java/com/ycl/controller/platformApi/TranspondDHController.java +++ b/ycl-platform/src/main/java/com/ycl/controller/platformApi/TranspondDHController.java @@ -88,7 +88,7 @@ private CommonResult<?> getResult(String reqUrl, String param) { try { String token = getToken(); - System.out.println("瀹氫綅鎺ュ彛url:" + url + reqUrl + param); +// System.out.println("瀹氫綅鎺ュ彛url:" + url + reqUrl + param); HttpHeaders deviceHeaders = new HttpHeaders(); ObjectMapper objectMapper = new ObjectMapper(); deviceHeaders.add("X-Subject-Token", token); @@ -107,7 +107,7 @@ private void postResult(String reqUrl, GpsSubscribe subscribe) { try { String token = getToken(); - System.out.println("瀹氫綅鎺ュ彛url:" + url + reqUrl + subscribe.toString()); +// System.out.println("瀹氫綅鎺ュ彛url:" + url + reqUrl + subscribe.toString()); HttpHeaders deviceHeaders = new HttpHeaders(); ObjectMapper objectMapper = new ObjectMapper(); deviceHeaders.add("X-Subject-Token", token); diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/IDisposeRecordService.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/IDisposeRecordService.java index f81cc37..92dbd02 100644 --- a/ycl-platform/src/main/java/com/ycl/service/caseHandler/IDisposeRecordService.java +++ b/ycl-platform/src/main/java/com/ycl/service/caseHandler/IDisposeRecordService.java @@ -22,5 +22,7 @@ Page<MyBacklogVO> listMyTask(String num, Long userId, Short type, Short source, Short time, Integer current, Integer pageSize); + Long listMyTaskCount(String num, Long userId, Short type, Short source, Short time); + CommonResult saveOrUpdateUpload(UploadDisposingResultParam uploadDisposingResultParam); } diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java index b2c5762..c731f80 100644 --- a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java +++ b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java @@ -648,7 +648,7 @@ registerState.add(BaseCaseStatus.REPORT); Long registerLastMonthCount = baseCaseMapper.selectLastMonthCount(registerState); Long registerRecentlyMonthCount = baseCaseMapper.selectRecentlyMonthCount(registerState); - System.out.println(disposeRecentlyMonthCount); +// System.out.println(disposeRecentlyMonthCount); Double v3 = (registerRecentlyMonthCount - registerLastMonthCount) * 1.0 / registerLastMonthCount; if (disposeLastMonthCount == 0) { register.setRatio(null); diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java index 5f11d68..9f9bc7a 100644 --- a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java +++ b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java @@ -102,9 +102,26 @@ } @Override + public Long listMyTaskCount(String num, Long userId, Short type, Short source, Short time) { + LocalDateTime alarmTimeStart = null; + LocalDateTime alarmTimeEnd = null; + if (Objects.equals(time, LAST_WEEK)) { + alarmTimeStart = LocalDateTime.now().minusDays(7); + alarmTimeEnd = LocalDateTime.now(); + } else if (Objects.equals(time, LAST_MONTH)) { + alarmTimeStart = LocalDateTime.now().minusMonths(1); + alarmTimeEnd = LocalDateTime.now(); + } else if (Objects.equals(time, LAST_THREEMONTH)) { + alarmTimeStart = LocalDateTime.now().minusMonths(3); + alarmTimeEnd = LocalDateTime.now(); + } + return disposeRecordMapper.selectMyBackListTotal(userId, num, alarmTimeStart, alarmTimeEnd, source, type); + } + + @Override @Transactional(rollbackFor = Exception.class) public CommonResult saveOrUpdateUpload(UploadDisposingResultParam uploadDisposingResultParam) { - log.info("鍙傛暟------------------>{}",uploadDisposingResultParam); + log.info("鍙傛暟------------------>{}", uploadDisposingResultParam); if (uploadDisposingResultParam.getArrivalTime() != null) { uploadDisposingResultParam.setArrivalTime(uploadDisposingResultParam.getArrivalTime().replace("/", "-")); } @@ -267,7 +284,7 @@ disposeRecord.setWorkflowConfigStepId(workflowConfigStep.getId()); disposeRecord.setHandlerRoleId(workflowConfigStep.getRoleId()); boolean result = baseMapper.insert(disposeRecord) == 1 ? true : false; - if(!result){ + if (!result) { CommonResult.failed("宸叉彁浜�,璇峰嬁閲嶅鎻愪氦"); } return CommonResult.success("add success"); diff --git a/ycl-platform/src/main/java/com/ycl/service/message/impl/MessageScheduleServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/message/impl/MessageScheduleServiceImpl.java index f52d9df..0181eef 100644 --- a/ycl-platform/src/main/java/com/ycl/service/message/impl/MessageScheduleServiceImpl.java +++ b/ycl-platform/src/main/java/com/ycl/service/message/impl/MessageScheduleServiceImpl.java @@ -35,7 +35,7 @@ QueryWrapper<Message> wrapper = new QueryWrapper<>(); wrapper.lambda().eq(Message::getIsScan, 0).le(Message::getSendTime,new Date()); //List<Message> messages = messageMapper.selectList(wrapper); - System.out.println("--------------------寮�濮嬫壂鎻忕煭淇′俊鎭�-------------------澶у皬涓�"); +// System.out.println("--------------------寮�濮嬫壂鎻忕煭淇′俊鎭�-------------------澶у皬涓�"); List<Long> ids = new ArrayList<>(); ids.add(3L); ids.add(4L); diff --git a/ycl-platform/src/main/java/com/ycl/task/SynchronizeHKVideo.java b/ycl-platform/src/main/java/com/ycl/task/SynchronizeHKVideo.java index 5e7244a..823256f 100644 --- a/ycl-platform/src/main/java/com/ycl/task/SynchronizeHKVideo.java +++ b/ycl-platform/src/main/java/com/ycl/task/SynchronizeHKVideo.java @@ -29,7 +29,7 @@ @Scheduled(cron = "0 0 1 * * ?") @Transactional(rollbackFor = Exception.class) public void scheduledTask() { - System.out.println("娴峰悍锛氬紑濮嬫墽琛�"); +// System.out.println("娴峰悍锛氬紑濮嬫墽琛�"); findVideoList(1, 5); diff --git a/ycl-platform/src/main/java/com/ycl/util/VideoUtil.java b/ycl-platform/src/main/java/com/ycl/util/VideoUtil.java index 48bde5e..bfee0ef 100644 --- a/ycl-platform/src/main/java/com/ycl/util/VideoUtil.java +++ b/ycl-platform/src/main/java/com/ycl/util/VideoUtil.java @@ -157,13 +157,13 @@ jsonBody.put("pageSize", pageSize); jsonBody.put("treeCode", treeCode); String body = jsonBody.toString(); - System.out.println("娴峰悍瑙嗛寮�濮嬭姹傦細"); +// System.out.println("娴峰悍瑙嗛寮�濮嬭姹傦細"); //鍙傛暟鏍规嵁鎺ュ彛瀹為檯鎯呭喌璁剧疆 HttpResponse result = ArtemisHttpUtil.doPostStringImgArtemis(config, path, body, null, null, "application/json", head); try { String strResult = EntityUtils.toString(result.getEntity()); HttpResponseResult responseResult = com.alibaba.fastjson.JSONObject.parseObject(strResult, HttpResponseResult.class); - System.out.println("娴峰悍瑙嗛缁撴灉锛�" + responseResult.toString()); +// System.out.println("娴峰悍瑙嗛缁撴灉锛�" + responseResult.toString()); if ("0".equals(responseResult.getCode())) { com.alibaba.fastjson.JSONObject jsonObject = responseResult.getData(); String strList = jsonObject.getString("list"); @@ -211,10 +211,10 @@ String body = jsonBody.toString(); //鍙傛暟鏍规嵁鎺ュ彛瀹為檯鎯呭喌璁剧疆 HttpResponse result = ArtemisHttpUtil.doPostStringImgArtemis(config, path, body, null, null, "application/json", null); - System.out.println("娴峰悍瀹屾垚璇锋眰"); +// System.out.println("娴峰悍瀹屾垚璇锋眰"); try { String strResult = EntityUtils.toString(result.getEntity()); - System.out.println("娴峰悍杩斿洖缁撴灉锛�" + strResult); +// System.out.println("娴峰悍杩斿洖缁撴灉锛�" + strResult); HttpResponseResult responseResult = com.alibaba.fastjson.JSONObject.parseObject(strResult, HttpResponseResult.class); if ("0".equals(responseResult.getCode())) { com.alibaba.fastjson.JSONObject jsonObject = responseResult.getData(); @@ -254,10 +254,10 @@ String body = jsonBody.toString(); //鍙傛暟鏍规嵁鎺ュ彛瀹為檯鎯呭喌璁剧疆 HttpResponse result = ArtemisHttpUtil.doPostStringImgArtemis(config, path, body, query, null, "application/json", head); - System.out.println("娴峰悍瀹屾垚璇锋眰-getKHPresets"); +// System.out.println("娴峰悍瀹屾垚璇锋眰-getKHPresets"); try { String strResult = EntityUtils.toString(result.getEntity()); - System.out.println("娴峰悍杩斿洖缁撴灉-getKHPresets锛�" + strResult); +// System.out.println("娴峰悍杩斿洖缁撴灉-getKHPresets锛�" + strResult); HttpResponseResult responseResult = com.alibaba.fastjson.JSONObject.parseObject(strResult, HttpResponseResult.class); if ("0".equals(responseResult.getCode())) { com.alibaba.fastjson.JSONObject jsonObject = responseResult.getData(); diff --git a/ycl-platform/src/main/resources/mapper/caseHandler/DisposeRecordMapper.xml b/ycl-platform/src/main/resources/mapper/caseHandler/DisposeRecordMapper.xml index 9edff58..0ede22c 100644 --- a/ycl-platform/src/main/resources/mapper/caseHandler/DisposeRecordMapper.xml +++ b/ycl-platform/src/main/resources/mapper/caseHandler/DisposeRecordMapper.xml @@ -53,7 +53,7 @@ ums_admin_role_relation t1 left JOIN ums_dispose_record t2 ON t1.role_id = t2.handler_role_id left JOIN ums_base_case t3 ON t2.base_case_id=t3.id - inner join ums_sccg_region t5 on t5.id = t3.community_id + left join ums_sccg_region t5 on t5.id = t3.community_id <where> t1.admin_id = #{id} and t3.`code` is not null AND t2.state = 0 @@ -104,6 +104,7 @@ order by create_time desc LIMIT #{pageIndex},#{pageSize}) nt left JOIN ums_image_resources t4 ON nt.caseId=t4.belong_to_id + order by create_time desc </select> <select id="selectMyBackListTotal" resultType="java.lang.Long"> select count( distinct id) from ( @@ -113,7 +114,7 @@ ums_admin_role_relation t1 left JOIN ums_dispose_record t2 ON t1.role_id = t2.handler_role_id left JOIN ums_base_case t3 ON t2.base_case_id=t3.id - inner join ums_sccg_region t5 on t5.id = t3.community_id + left join ums_sccg_region t5 on t5.id = t3.community_id <where> t1.admin_id = #{id} and t3.`code` is not null AND t2.state = 0 @@ -136,7 +137,7 @@ FROM ums_dispose_record t2 LEFT JOIN ums_base_case t3 ON t2.base_case_id = t3.id - inner join ums_sccg_region t5 on t5.id = t3.community_id + left join ums_sccg_region t5 on t5.id = t3.community_id <where> t2.handler_id = #{id} AND t2.state = 0 diff --git a/ycl-platform/src/test/java/com/ycl/sccgplatform/SccgPlatformApplicationTests.java b/ycl-platform/src/test/java/com/ycl/sccgplatform/SccgPlatformApplicationTests.java index 10ff185..1c74dd7 100644 --- a/ycl-platform/src/test/java/com/ycl/sccgplatform/SccgPlatformApplicationTests.java +++ b/ycl-platform/src/test/java/com/ycl/sccgplatform/SccgPlatformApplicationTests.java @@ -51,7 +51,7 @@ signature = MD5Util.md5Encrypt(signature); signature = MD5Util.md5Encrypt(userName + ":" + realm + ":" + signature); signature = MD5Util.md5Encrypt(signature + ":" + randomKey); - System.out.println(signature); +// System.out.println(signature); } @Test @@ -75,7 +75,7 @@ LoginParamDto loginParamDto = LoginParamDto.builder().username("connect_test2").password("test@234").noCode(true).build(); SmokeResultResponseDto<LoginResponseDto> responseDto = smokeDetectionService.loginAction(loginParamDto); if (responseDto.getStatus() == 200) { - System.out.println(responseDto.getData().getToken()); +// System.out.println(responseDto.getData().getToken()); redisService.set(RedisKey.SMOKE_TOKEN, responseDto.getData().getToken()); } } @@ -88,7 +88,7 @@ if (responseDto.getStatus() == 200) { AlarmMsgResponseDto dto = responseDto.getData(); List<AlarmMsgDataVo> list = dto.getContent(); - System.out.println(list.size()); +// System.out.println(list.size()); } else if (responseDto.getStatus() == 114) { login(); smokeAlarmMsgTest(); diff --git a/ycl-smoke/src/main/java/com/ycl/smoke/task/CityUploadTask.java b/ycl-smoke/src/main/java/com/ycl/smoke/task/CityUploadTask.java index 9e08aaa..17da2e9 100644 --- a/ycl-smoke/src/main/java/com/ycl/smoke/task/CityUploadTask.java +++ b/ycl-smoke/src/main/java/com/ycl/smoke/task/CityUploadTask.java @@ -70,7 +70,7 @@ o.setTaskCode(result.getResult()); o.setState(2); baseCaseMapper.updateById(o); - System.out.println("--鏇存柊鎴愬姛"); +// System.out.println("--鏇存柊鎴愬姛"); } catch (Exception ex) { -- Gitblit v1.8.0