From f6f7b7b76c1580b56d05aff342ef8ec5b5469777 Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Wed, 17 Apr 2024 10:58:13 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 6 ++++ .../java/com/zhgd/xmgl/async/AsyncWorker.java | 9 ++--- .../impl/ProjectUfaceConfigServiceImpl.java | 33 ++++++++++--------- .../WorkerAttendancePresenceServiceImpl.java | 1 - .../zhgd/xmgl/security/WebSecurityConfig.java | 7 ++-- src/main/resources/application.properties | 4 +++ 6 files changed, 34 insertions(+), 26 deletions(-) diff --git a/pom.xml b/pom.xml index 5e764e91c..546497ef4 100644 --- a/pom.xml +++ b/pom.xml @@ -58,6 +58,12 @@ + + + org.ssssssss + magic-api-spring-boot-starter + 2.1.1 + com.github.whvcse diff --git a/src/main/java/com/zhgd/xmgl/async/AsyncWorker.java b/src/main/java/com/zhgd/xmgl/async/AsyncWorker.java index e86d36b5b..a21a5f13f 100644 --- a/src/main/java/com/zhgd/xmgl/async/AsyncWorker.java +++ b/src/main/java/com/zhgd/xmgl/async/AsyncWorker.java @@ -75,8 +75,8 @@ public class AsyncWorker { info.setNoticeUserId(userId); projectUfaceConfigService.sendBatchWorkerInfo(info, projectUfaceConfig, devList); } catch (Exception e) { - log.error("下发人员异常，人员名称：{}", info.getWorkerName()); - noticeFail(info.getWorkerName(), userId); + log.error("下发人员异常，人员名称：{}", info.getWorkerName() + "," + e.getMessage()); + noticeFail(info.getWorkerName(), userId, e); log.error("error：", e); } } @@ -102,13 +102,14 @@ public class AsyncWorker { * * @param workerName * @param userId + * @param e */ - private void noticeFail(String workerName, Long userId) { + private void noticeFail(String workerName, Long userId, Exception e) { if (userId != null) { java.text.DateFormat format1 = new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); Notice notice = new Notice(); notice.setAccountId(userId); - notice.setMsg("下发人员异常，人员名称：" + workerName); + notice.setMsg("下发人员异常，人员名称：" + workerName + "," + e.getMessage()); notice.setTitle("人员批量下发设备提醒"); notice.setSendTime(format1.format(new Date())); notice.setType("1"); diff --git a/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectUfaceConfigServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectUfaceConfigServiceImpl.java index 47a14f92c..a1c4fcd4a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectUfaceConfigServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectUfaceConfigServiceImpl.java @@ -377,33 +377,34 @@ public class ProjectUfaceConfigServiceImpl extends ServiceImpl ufaceIds = ufaceDevToGroupMapper.selectList(new LambdaQueryWrapper() .in(UfaceDevToGroup::getUfaceDevGroupId, Arrays.asList(StringUtils.split(ufaceDevGroupId, ",")))).stream().map(UfaceDevToGroup::getUfaceDevId).collect(Collectors.toList()); if (CollUtil.isEmpty(ufaceIds)) { - ufaceIds.add(0L); + return; } ufaceIds.stream().distinct(); Map param = new HashMap<>(); param.put("projectSn", workerInfo.getProjectSn()); param.put("devIds", StringUtils.join(ufaceIds, ",")); List list1 = ufaceDevMapper.selectUserUfaceDevList(param); - if (list1 != null && list1.size() > 0) { - StringBuilder devBuilder1 = new StringBuilder(); - StringBuilder devIdBuilder1 = new StringBuilder(); - for (UfaceDev dev : list1) { - if (devBuilder1.length() > 0) { - devBuilder1.append(","); - } - if (devIdBuilder1.length() > 0) { - devIdBuilder1.append(","); - } - devBuilder1.append(dev.getDevSn()); - devIdBuilder1.append(dev.getDeviceId()); - } - sendDev(projectUfaceConfig, workerInfo, devBuilder1.toString(), devIdBuilder1.toString()); + if (CollUtil.isEmpty(list1)) { + return; } + StringBuilder devBuilder1 = new StringBuilder(); + StringBuilder devIdBuilder1 = new StringBuilder(); + for (UfaceDev dev : list1) { + if (devBuilder1.length() > 0) { + devBuilder1.append(","); + } + if (devIdBuilder1.length() > 0) { + devIdBuilder1.append(","); + } + devBuilder1.append(dev.getDevSn()); + devIdBuilder1.append(dev.getDeviceId()); + } + sendDev(projectUfaceConfig, workerInfo, devBuilder1.toString(), devIdBuilder1.toString()); } } diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendancePresenceServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendancePresenceServiceImpl.java index 6f896e8a6..19fb70d7f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendancePresenceServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendancePresenceServiceImpl.java @@ -64,7 +64,6 @@ public class WorkerAttendancePresenceServiceImpl extends ServiceImpl paramMap) { String projectSn1 = MapUtils.getString(paramMap, "projectSn"); List projects = projectMapper.selectList(new LambdaQueryWrapper() - .eq(Project::getEnableWorkerAttendanceZero, 1) .eq(Project::getProjectSn, projectSn1) ); for (Project project : projects) { diff --git a/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java b/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java index 2b6a14d17..d4a6b5778 100644 --- a/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java +++ b/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java @@ -90,6 +90,8 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter { http.authorizeRequests() //请求路径允许访问 + .antMatchers("/xmgl/magic/**").permitAll() + .antMatchers("/xmgl/magic/web/**").permitAll() .antMatchers("/xmgl/base/**").permitAll() .antMatchers("/zw/base/**").permitAll() .antMatchers("/zw/Index/**").permitAll() @@ -98,11 +100,6 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter { .antMatchers("/xmgl/videoItem/selectProjectVideoList").permitAll() .antMatchers("/xmgl/tower/list").permitAll() .antMatchers("/xmgl/workerSafeEducation/list").permitAll() - // .antMatchers("/").permitAll() - //.antMatchers("/xmgl/base/login").permitAll() - //.antMatchers("/xmgl/base/projectLogin").permitAll() - //.antMatchers("/xmgl/base/companyLogin").permitAll() - //.antMatchers("/api/**").permitAll() .antMatchers("/xmgl/callback/**").permitAll() .antMatchers("/xmgl/standardCurrentData/addCurrentData").permitAll() .antMatchers("/xmgl/ammeterData/**").permitAll() diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 287b6b4ee..1bb77cd0f 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -178,3 +178,7 @@ spring.datasource.db2.jdbc-url=jdbc:mysql://101.43.164.214:3306/wflow_pro?useUni spring.datasource.db2.driver-class-name=com.mysql.jdbc.Driver spring.datasource.db2.username=root spring.datasource.db2.password=JXJ@admin +#配置web页面入口 +magic-api.web=/xmgl/magic/web +#配置文件存储位置。当以classpath开头时，为只读模式 +magic-api.resource.location=${basePath}/data/magic-api