From d96e64b1d87ebc02d76cef301d52f1a5f91ec5fe Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Fri, 13 Dec 2024 18:51:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SuperStatisticsController.java | 11 ++++++++--- .../dutyTask/controller/TodayTaskController.java | 3 ++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/SuperStatisticsController.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/SuperStatisticsController.java index df4539c..fcb817f 100644 --- a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/SuperStatisticsController.java +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/SuperStatisticsController.java @@ -6,8 +6,10 @@ import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; import com.alibaba.fastjson2.JSONObject; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.securityControl.common.core.utils.SensitizedUtil; import com.securityControl.common.core.utils.StringUtils; import com.securityControl.common.core.utils.aes.DateTimeHelper; +import com.securityControl.common.core.utils.aes.SM4Utils; import com.securityControl.common.core.web.domain.AjaxResult; import com.securityControl.common.log.annotation.Log; import com.securityControl.common.log.enums.BusinessType; @@ -206,7 +208,8 @@ public class SuperStatisticsController extends BaseController { CommonsMultipartResolver multipartResolver = new CommonsMultipartResolver(); MultipartHttpServletRequest multiReq = multipartResolver.resolveMultipart(request); String params = multiReq.getParameter("params"); - NoticeVioEntity entity = com.alibaba.fastjson2.JSON.parseObject(params, NoticeVioEntity.class); + String decryptStr = SM4Utils.decryptData_CBC(params); + NoticeVioEntity entity = com.alibaba.fastjson2.JSON.parseObject(decryptStr, NoticeVioEntity.class); if (StringUtils.isEmpty(entity.getVoiStatus())) { entity.setVoiStatus("1"); } @@ -768,12 +771,13 @@ public class SuperStatisticsController extends BaseController { List> listMap = service.getBasicInfo(list.get(i).getClassId()); if (CollectionUtils.isNotEmpty(listMap)) { String contactPhone = listMap.get(0).get("contactPhone"); + String[] splitArr = contactPhone.split(" "); String jlUnit = listMap.get(0).get("jlUnit"); String sgdw = listMap.get(0).get("sgdw"); String jl = listMap.get(0).get("jl"); String sg = listMap.get(0).get("sg"); String yz = listMap.get(0).get("yz"); - list.get(i).setContactPhone(StringUtils.isEmpty(contactPhone) ? null : contactPhone); + list.get(i).setContactPhone(splitArr[0] + " " + SensitizedUtil.mobilePhone(splitArr[1])); list.get(i).setJlUnit(StringUtils.isEmpty(jlUnit) ? null : jlUnit); list.get(i).setSgUnit(StringUtils.isEmpty(sgdw) ? null : sgdw); list.get(i).setJl(StringUtils.isEmpty(jl) ? null : jl); @@ -832,13 +836,14 @@ public class SuperStatisticsController extends BaseController { CommonsMultipartResolver multipartResolver = new CommonsMultipartResolver(); MultipartHttpServletRequest multiReq = multipartResolver.resolveMultipart(request); String params = multiReq.getParameter("params"); + String decryptStr = SM4Utils.decryptData_CBC(params); String isAppeal = multiReq.getParameter("isAppeal"); String imgType = "2", status = "2"; if (Objects.equals("1", isAppeal)) { imgType = "3"; status = "4"; } - NoticeVoiRectEntity entity = com.alibaba.fastjson2.JSON.parseObject(params, NoticeVoiRectEntity.class); + NoticeVoiRectEntity entity = com.alibaba.fastjson2.JSON.parseObject(decryptStr, NoticeVoiRectEntity.class); entity.setCreateDate(DateTimeHelper.getNowDate()); entity.setCreateTime(DateTimeHelper.getNowTime()); entity.setRectUser(SecurityUtils.getUserId() + ""); diff --git a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/TodayTaskController.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/TodayTaskController.java index 83acb30..d861a01 100644 --- a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/TodayTaskController.java +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/TodayTaskController.java @@ -8,6 +8,7 @@ import com.alibaba.fastjson2.JSONObject; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.google.common.collect.Maps; +import com.securityControl.common.core.utils.SensitizedUtil; import com.securityControl.common.core.utils.StringUtils; import com.securityControl.common.core.utils.aes.DateTimeHelper; import com.securityControl.common.core.utils.aes.SM4Utils; @@ -154,7 +155,7 @@ public class TodayTaskController { } list.get(i).setEarlyWarningStatus(status); list.get(i).setEvaluationStatus(Objects.equals("0", list.get(i).getEvaluationStatus()) ? "未评价" : "已评价"); - list.get(i).setForemanAndPhone(list.get(i).getForeman() + "\r\n" + list.get(i).getForemanPhone()); + list.get(i).setForemanAndPhone(list.get(i).getForeman() + "\r\n" + SensitizedUtil.mobilePhone(list.get(i).getForemanPhone())); list.get(i).setDuty("业主：" + list.get(i).getYzDuty() + "\r\n" + "监理：" + list.get(i).getJlDuty() + "\r\n" + "施工：" + list.get(i).getSgDuty()); String inspector = list.get(i).getInspector(); list.get(i).setInspector(Objects.equals("3", todayTaskDto.getIsSup()) ? "建设部安全管控" : inspector);