admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug修改

Browse Source
This commit is contained in:
guoshengxiong 2024-04-17 10:58:13 +08:00
parent e289ae35ec
commit f6f7b7b76c
6 changed files with 34 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pom.xml
View File

@ -58,6 +58,12 @@
</repositories>
<dependencies>
<!-- 以spring-boot-starter的方式引用 -->
<dependency>
<groupId>org.ssssssss</groupId>
<artifactId>magic-api-spring-boot-starter</artifactId>
<version>2.1.1</version>
</dependency>
<!--验证码-->
<dependency>
<groupId>com.github.whvcse</groupId>

9
src/main/java/com/zhgd/xmgl/async/AsyncWorker.java
View File

@ -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");

33
src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectUfaceConfigServiceImpl.java
View File

@ -377,33 +377,34 @@ public class ProjectUfaceConfigServiceImpl extends ServiceImpl<ProjectUfaceConfi
//设备分组情况！
String ufaceDevGroupId = workerInfo.getUfaceDevGroupId();
if (StringUtils.isEmpty(ufaceDevGroupId)) {
ufaceDevGroupId = "0";
return;
}
List<Long> ufaceIds = ufaceDevToGroupMapper.selectList(new LambdaQueryWrapper<UfaceDevToGroup>()
.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<String, Object> param = new HashMap<>();
param.put("projectSn", workerInfo.getProjectSn());
param.put("devIds", StringUtils.join(ufaceIds, ","));
List<UfaceDev> 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());
}
}

1
src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendancePresenceServiceImpl.java
View File

@ -64,7 +64,6 @@ public class WorkerAttendancePresenceServiceImpl extends ServiceImpl<WorkerAtten
public void updateWorkerAttendanceZero(HashMap<String, Object> paramMap) {
String projectSn1 = MapUtils.getString(paramMap, "projectSn");
List<Project> projects = projectMapper.selectList(new LambdaQueryWrapper<Project>()
.eq(Project::getEnableWorkerAttendanceZero, 1)
.eq(Project::getProjectSn, projectSn1)
);
for (Project project : projects) {

7
src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java
View File

@ -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()

4
src/main/resources/application.properties
View File

@ -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