From 06f191ca4e40540f0d87a63fd3a5cb612bc117f3 Mon Sep 17 00:00:00 2001 From: guo Date: Tue, 19 Sep 2023 18:36:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E4=BD=8Dbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zhgd/xmgl/base/entity/vo/TrendVo.java | 10 +- .../impl/GantryCraneAlarmServiceImpl.java | 2 +- .../impl/GantryCraneWorkCycleServiceImpl.java | 4 +- .../controller/LocationApiController.java | 10 +- .../controller/LocationDataController.java | 67 +-------- .../LocationTagLowVoltageAlarmController.java | 132 +++--------------- .../modules/location/entity/LocationData.java | 9 +- .../entity/LocationTagLowVoltageAlarm.java | 5 +- .../LocationTagLowVoltageAlarmMapper.java | 5 + .../mapper/xml/LocationDataMapper.xml | 4 + .../xml/LocationTagLowVoltageAlarmMapper.xml | 9 ++ .../ILocationTagLowVoltageAlarmService.java | 5 +- .../service/impl/LocationDataServiceImpl.java | 17 ++- ...LocationTagLowVoltageAlarmServiceImpl.java | 23 ++- .../zhgd/xmgl/security/WebSecurityConfig.java | 4 +- .../java/com/zhgd/xmgl/util/TimeUtil.java | 6 + 16 files changed, 113 insertions(+), 199 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/base/entity/vo/TrendVo.java b/src/main/java/com/zhgd/xmgl/base/entity/vo/TrendVo.java index 43993e1ce..81205e4a6 100644 --- a/src/main/java/com/zhgd/xmgl/base/entity/vo/TrendVo.java +++ b/src/main/java/com/zhgd/xmgl/base/entity/vo/TrendVo.java @@ -17,7 +17,15 @@ public class TrendVo { private String x; private String y; - public static List getTrendVos(List list, List days, String format) { + /** + * 补充空的日期和初始值 + * + * @param list 数据的list + * @param days 日期的list + * @param format 需要转换的时间格式 + * @return + */ + public static List fillTrendVos(List list, List days, String format) { Map voMap = list.stream().collect(Collectors.toMap(TrendVo::getX, Function.identity())); List rtList = new ArrayList<>(); for (String day : days) { diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/GantryCraneAlarmServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/GantryCraneAlarmServiceImpl.java index d4a816666..e9c33bc98 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/GantryCraneAlarmServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/GantryCraneAlarmServiceImpl.java @@ -73,7 +73,7 @@ public class GantryCraneAlarmServiceImpl extends ServiceImpl days = DateUtil.getBetweenDays(startTime, endTime, "yyyy-MM-dd"); - return TrendVo.getTrendVos(list, days, "MM-dd"); + return TrendVo.fillTrendVos(list, days, "MM-dd"); } @Override diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/GantryCraneWorkCycleServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/GantryCraneWorkCycleServiceImpl.java index 428065790..2a11a1b55 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/GantryCraneWorkCycleServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/GantryCraneWorkCycleServiceImpl.java @@ -20,8 +20,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.*; -import java.util.function.Function; -import java.util.stream.Collectors; /** * @Description: 龙门吊工作循环 @@ -75,6 +73,6 @@ public class GantryCraneWorkCycleServiceImpl extends ServiceImpl paramMap) { - log.info("uploadSensorAlarm:{}", JSON.toJSONString(paramMap)); - return locationTagLowVoltageAlarmService.uploadSensorAlarm(paramMap); + @ApiOperation(value = "上传低电量报警数据", notes = "上传低电量报警数据", httpMethod = "POST") + @PostMapping(value = "/api/uploadTagLowVoltageAlarm") + public JiLianDaRt uploadTagLowVoltageAlarm(@ApiIgnore @RequestBody HashMap paramMap) { + log.info("uploadTagLowVoltageAlarm:{}", JSON.toJSONString(paramMap)); + return locationTagLowVoltageAlarmService.uploadTagLowVoltageAlarm(paramMap); } @ApiOperation(value = "上传全量人员定位实时数据", notes = "上传全量人员定位实时数据", httpMethod = "POST") diff --git a/src/main/java/com/zhgd/xmgl/modules/location/controller/LocationDataController.java b/src/main/java/com/zhgd/xmgl/modules/location/controller/LocationDataController.java index aaa6a3a87..32a91f7fd 100644 --- a/src/main/java/com/zhgd/xmgl/modules/location/controller/LocationDataController.java +++ b/src/main/java/com/zhgd/xmgl/modules/location/controller/LocationDataController.java @@ -65,72 +65,6 @@ public class LocationDataController { return result; } - /** - * 列表查询 - * - * @param locationData - * @param req - * @return - */ - @ApiOperation(value = "列表查询定位数据信息", notes = "列表查询定位数据信息", httpMethod = "GET") - @GetMapping(value = "/list") - public Result> queryList(LocationData locationData, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(locationData, req.getParameterMap()); - return Result.success(locationDataService.list(queryWrapper)); - } - - /** - * 添加 - * - * @param locationData - * @return - */ - @ApiOperation(value = "添加定位数据信息", notes = "添加定位数据信息", httpMethod = "POST") - @PostMapping(value = "/add") - public Result add(@RequestBody LocationData locationData) { - locationDataService.save(locationData); - return Result.ok(); - } - - /** - * 编辑 - * - * @param locationData - * @return - */ - @ApiOperation(value = "编辑定位数据信息", notes = "编辑定位数据信息", httpMethod = "POST") - @PostMapping(value = "/edit") - public Result edit(@RequestBody LocationData locationData) { - locationDataService.updateById(locationData); - return Result.ok(); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @ApiOperation(value = "删除定位数据信息", notes = "删除定位数据信息", httpMethod = "POST") - @ApiImplicitParam(name = "id", value = "定位数据ID", paramType = "body", required = true, dataType = "String", example = "{\"id\":\"1\"}") - @PostMapping(value = "/delete") - public Result delete(@ApiIgnore @RequestBody HashMap map) { - String id = MapUtils.getString(map, "id"); - Result result = new Result(); - LocationData locationData = locationDataService.getById(id); - if (locationData == null) { - result.error500("未找到对应实体"); - } else { - boolean ok = locationDataService.removeById(id); - if (ok) { - result.success("删除成功!"); - } - } - - return result; - } - /** * 通过id查询 * @@ -156,6 +90,7 @@ public class LocationDataController { @ApiImplicitParams({ @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "body", required = true, dataType = "String"), @ApiImplicitParam(name = "locationTunnelId", value = "定位隧道信息id", paramType = "body", required = true, dataType = "String"), + @ApiImplicitParam(name = "queryStr", value = "卡号或姓名", paramType = "body", required = false, dataType = "String"), }) @PostMapping(value = "/countRealTimeLocationWorker") public Result> countRealTimeLocationWorker(@ApiIgnore @RequestBody HashMap paramMap) { diff --git a/src/main/java/com/zhgd/xmgl/modules/location/controller/LocationTagLowVoltageAlarmController.java b/src/main/java/com/zhgd/xmgl/modules/location/controller/LocationTagLowVoltageAlarmController.java index 36a1119c7..2a1a28906 100644 --- a/src/main/java/com/zhgd/xmgl/modules/location/controller/LocationTagLowVoltageAlarmController.java +++ b/src/main/java/com/zhgd/xmgl/modules/location/controller/LocationTagLowVoltageAlarmController.java @@ -1,39 +1,26 @@ package com.zhgd.xmgl.modules.location.controller; -import com.zhgd.xmgl.modules.location.entity.LocationTagLowVoltageAlarm; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; - -import java.util.HashMap; -import java.util.List; -import java.io.UnsupportedEncodingException; -import java.net.URLDecoder; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import com.zhgd.jeecg.common.api.vo.Result; -import com.zhgd.jeecg.common.system.query.QueryGenerator; -import com.zhgd.jeecg.common.util.oConvertUtils; -import org.apache.commons.collections.MapUtils; -import com.zhgd.xmgl.modules.location.service.ILocationTagLowVoltageAlarmService; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.zhgd.jeecg.common.api.vo.Result; +import com.zhgd.jeecg.common.system.query.QueryGenerator; +import com.zhgd.xmgl.base.entity.vo.TrendVo; +import com.zhgd.xmgl.modules.location.entity.LocationTagLowVoltageAlarm; +import com.zhgd.xmgl.modules.location.service.ILocationTagLowVoltageAlarmService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; - -import org.jeecgframework.poi.excel.def.NormalExcelConstants; -import org.jeecgframework.poi.excel.entity.ExportParams; -import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import org.springframework.web.servlet.ModelAndView; -import com.alibaba.fastjson.JSON; import springfox.documentation.annotations.ApiIgnore; +import javax.servlet.http.HttpServletRequest; +import java.util.HashMap; +import java.util.List; + /** * @Title: Controller @@ -78,91 +65,14 @@ public class LocationTagLowVoltageAlarmController { return result; } - /** - * 列表查询 - * - * @param locationTagLowVoltageAlarm - * @param req - * @return - */ - @ApiOperation(value = "列表查询定位低电量报警信息", notes = "列表查询定位低电量报警信息", httpMethod = "GET") - @GetMapping(value = "/list") - public Result> queryList(LocationTagLowVoltageAlarm locationTagLowVoltageAlarm, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(locationTagLowVoltageAlarm, req.getParameterMap()); - return Result.success(locationTagLowVoltageAlarmService.list(queryWrapper)); - } - - /** - * 添加 - * - * @param locationTagLowVoltageAlarm - * @return - */ - @ApiOperation(value = "添加定位低电量报警信息", notes = "添加定位低电量报警信息", httpMethod = "POST") - @PostMapping(value = "/add") - public Result add(@RequestBody LocationTagLowVoltageAlarm locationTagLowVoltageAlarm) { - locationTagLowVoltageAlarmService.save(locationTagLowVoltageAlarm); - return Result.ok(); - } - - /** - * 编辑 - * - * @param locationTagLowVoltageAlarm - * @return - */ - @ApiOperation(value = "编辑定位低电量报警信息", notes = "编辑定位低电量报警信息", httpMethod = "POST") - @PostMapping(value = "/edit") - public Result edit(@RequestBody LocationTagLowVoltageAlarm locationTagLowVoltageAlarm) { - locationTagLowVoltageAlarmService.updateById(locationTagLowVoltageAlarm); - return Result.ok(); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @ApiOperation(value = "删除定位低电量报警信息", notes = "删除定位低电量报警信息", httpMethod = "POST") - @ApiImplicitParam(name = "id", value = "定位低电量报警ID", paramType = "body", required = true, dataType = "String", example = "{\"id\":\"1\"}") - @PostMapping(value = "/delete") - public Result delete(@ApiIgnore @RequestBody HashMap map) { - String id = MapUtils.getString(map, "id"); - Result result = new Result(); - LocationTagLowVoltageAlarm locationTagLowVoltageAlarm = locationTagLowVoltageAlarmService.getById(id); - if (locationTagLowVoltageAlarm == null) { - result.error500("未找到对应实体"); - } else { - boolean ok = locationTagLowVoltageAlarmService.removeById(id); - if (ok) { - result.success("删除成功!"); - } - } - - return result; - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - @ApiOperation(value = "通过id查询定位低电量报警信息", notes = "通过id查询定位低电量报警信息", httpMethod = "GET") - @ApiImplicitParam(name = "id", value = "定位低电量报警ID", paramType = "query", required = true, dataType = "Integer") - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name = "id", required = true) String id) { - Result result = new Result(); - LocationTagLowVoltageAlarm locationTagLowVoltageAlarm = locationTagLowVoltageAlarmService.getById(id); - if (locationTagLowVoltageAlarm == null) { - result.error500("未找到对应实体"); - } else { - result.setResult(locationTagLowVoltageAlarm); - result.setSuccess(true); - } - return result; + @ApiOperation(value = "统计每天低电量报警数量", notes = "统计每天低电量报警数量", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "locationTunnelId", value = "定位隧道信息id", paramType = "body", required = true, dataType = "String"), + @ApiImplicitParam(name = "type", value = "1一个星期", paramType = "body", required = true, dataType = "String"), + }) + @PostMapping(value = "/countLocationTagLowVoltageAlarmEveryDay") + public Result> countLocationTagLowVoltageAlarmEveryDay(@ApiIgnore @RequestBody HashMap paramMap) { + return Result.success(locationTagLowVoltageAlarmService.countLocationTagLowVoltageAlarmEveryDay(paramMap)); } diff --git a/src/main/java/com/zhgd/xmgl/modules/location/entity/LocationData.java b/src/main/java/com/zhgd/xmgl/modules/location/entity/LocationData.java index 2d63eda1f..686353d6f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/location/entity/LocationData.java +++ b/src/main/java/com/zhgd/xmgl/modules/location/entity/LocationData.java @@ -1,6 +1,5 @@ package com.zhgd.xmgl.modules.location.entity; -import cn.hutool.core.util.ReflectUtil; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -13,7 +12,6 @@ import org.jeecgframework.poi.excel.annotation.Excel; import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; -import java.lang.reflect.Field; import java.util.Date; /** @@ -249,8 +247,13 @@ public class LocationData implements Serializable { @ApiModelProperty(value = "实时数据id") private Long realtimeId; @ApiModelProperty(value = "隧道ID") - private String tunnel_id; + private String tunnelId; + @ApiModelProperty(value = "工作时长（秒）") + private Integer workingTime; + @ApiModelProperty(value = "工作时长中文显示") + @TableField(exist = false) + private String workingTimeName; @TableField(exist = false) private String projectId; @TableField(exist = false) diff --git a/src/main/java/com/zhgd/xmgl/modules/location/entity/LocationTagLowVoltageAlarm.java b/src/main/java/com/zhgd/xmgl/modules/location/entity/LocationTagLowVoltageAlarm.java index 3f85e1635..946f93668 100644 --- a/src/main/java/com/zhgd/xmgl/modules/location/entity/LocationTagLowVoltageAlarm.java +++ b/src/main/java/com/zhgd/xmgl/modules/location/entity/LocationTagLowVoltageAlarm.java @@ -12,6 +12,7 @@ import org.jeecgframework.poi.excel.annotation.Excel; import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; +import java.util.Date; /** * @Description: 定位低电量报警 @@ -96,7 +97,9 @@ public class LocationTagLowVoltageAlarm implements Serializable { */ @Excel(name = "报警时间", width = 15) @ApiModelProperty(value = "报警时间") - private java.lang.String updateTime; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date updateTime; /** * 项目sn */ diff --git a/src/main/java/com/zhgd/xmgl/modules/location/mapper/LocationTagLowVoltageAlarmMapper.java b/src/main/java/com/zhgd/xmgl/modules/location/mapper/LocationTagLowVoltageAlarmMapper.java index 21f01a220..5bea2f63c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/location/mapper/LocationTagLowVoltageAlarmMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/location/mapper/LocationTagLowVoltageAlarmMapper.java @@ -1,9 +1,13 @@ package com.zhgd.xmgl.modules.location.mapper; +import com.zhgd.xmgl.base.entity.vo.TrendVo; import org.apache.ibatis.annotations.Mapper; import com.zhgd.xmgl.modules.location.entity.LocationTagLowVoltageAlarm; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import java.util.HashMap; +import java.util.List; + /** * @Description: 定位低电量报警 * @author： pds @@ -13,4 +17,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; @Mapper public interface LocationTagLowVoltageAlarmMapper extends BaseMapper { + List countLocationTagLowVoltageAlarmEveryDay(HashMap paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/location/mapper/xml/LocationDataMapper.xml b/src/main/java/com/zhgd/xmgl/modules/location/mapper/xml/LocationDataMapper.xml index f1c14b844..5d84b4c36 100644 --- a/src/main/java/com/zhgd/xmgl/modules/location/mapper/xml/LocationDataMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/location/mapper/xml/LocationDataMapper.xml @@ -13,6 +13,10 @@ and d.project_sn = #{projectSn} + + and (wi.worker_name like concat('%', #{queryStr}, '%') or + wi.location_cardno like concat('%', #{queryStr}, '%')) + group by i.id diff --git a/src/main/java/com/zhgd/xmgl/modules/location/mapper/xml/LocationTagLowVoltageAlarmMapper.xml b/src/main/java/com/zhgd/xmgl/modules/location/mapper/xml/LocationTagLowVoltageAlarmMapper.xml index d3e6d1ca7..cfe408a9c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/location/mapper/xml/LocationTagLowVoltageAlarmMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/location/mapper/xml/LocationTagLowVoltageAlarmMapper.xml @@ -1,4 +1,13 @@ + diff --git a/src/main/java/com/zhgd/xmgl/modules/location/service/ILocationTagLowVoltageAlarmService.java b/src/main/java/com/zhgd/xmgl/modules/location/service/ILocationTagLowVoltageAlarmService.java index f84ae0052..2b44b5f2d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/location/service/ILocationTagLowVoltageAlarmService.java +++ b/src/main/java/com/zhgd/xmgl/modules/location/service/ILocationTagLowVoltageAlarmService.java @@ -1,10 +1,12 @@ package com.zhgd.xmgl.modules.location.service; +import com.zhgd.xmgl.base.entity.vo.TrendVo; import com.zhgd.xmgl.modules.location.entity.LocationTagLowVoltageAlarm; import com.baomidou.mybatisplus.extension.service.IService; import com.zhgd.xmgl.modules.location.entity.dto.JiLianDaRt; import java.util.HashMap; +import java.util.List; /** * @Description: 定位低电量报警 @@ -14,6 +16,7 @@ import java.util.HashMap; */ public interface ILocationTagLowVoltageAlarmService extends IService { - JiLianDaRt uploadSensorAlarm(HashMap paramMap); + JiLianDaRt uploadTagLowVoltageAlarm(HashMap paramMap); + List countLocationTagLowVoltageAlarmEveryDay(HashMap paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/location/service/impl/LocationDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/location/service/impl/LocationDataServiceImpl.java index df27aee19..6ed9cac77 100644 --- a/src/main/java/com/zhgd/xmgl/modules/location/service/impl/LocationDataServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/location/service/impl/LocationDataServiceImpl.java @@ -2,6 +2,7 @@ package com.zhgd.xmgl.modules.location.service.impl; import cn.hutool.core.codec.Base64; import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.RandomUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -19,6 +20,7 @@ import com.zhgd.xmgl.modules.location.mapper.LocationDataMapper; import com.zhgd.xmgl.modules.location.mapper.LocationTunnelMapper; import com.zhgd.xmgl.modules.location.service.ILocationDataService; import com.zhgd.xmgl.util.RefUtil; +import com.zhgd.xmgl.util.TimeUtil; import org.apache.commons.collections.MapUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -46,7 +48,13 @@ public class LocationDataServiceImpl extends ServiceImpl getRealTimeLocationWorker(HashMap paramMap) { - return baseMapper.getRealTimeLocationWorker(paramMap); + List locationDataList = baseMapper.getRealTimeLocationWorker(paramMap); + for (LocationData locationData : locationDataList) { + if (locationData.getWorkingTime() != null) { + locationData.setWorkingTimeName(TimeUtil.toHourMinSecond(locationData.getWorkingTime())); + } + } + return locationDataList; } @Override @@ -71,7 +79,12 @@ public class LocationDataServiceImpl extends ServiceImpl implements ILocationTagLowVoltageAlarmService { @Override - public JiLianDaRt uploadSensorAlarm(HashMap paramMap) { + public JiLianDaRt uploadTagLowVoltageAlarm(HashMap paramMap) { String data = MapUtils.getString(paramMap, "data"); - LocationTagLowVoltageAlarm alarm = JSON.parseObject(Base64.decodeStr(data), LocationTagLowVoltageAlarm.class); - alarm.setProjectSn(alarm.getProjectId()); - baseMapper.insert(alarm); + List alarms = JSON.parseObject(Base64.decodeStr(data), new TypeReference>() { + }); + for (LocationTagLowVoltageAlarm alarm : alarms) { + alarm.setProjectSn(alarm.getProjectId()); + baseMapper.insert(alarm); + } return JiLianDaRt.success(); } + @Override + public List countLocationTagLowVoltageAlarmEveryDay(HashMap paramMap) { + List list = baseMapper.countLocationTagLowVoltageAlarmEveryDay(paramMap); + List days = DateUtil.getDaysBetweenLastWeek(); + List trendVos = TrendVo.fillTrendVos(list, days, "MM-dd"); + return trendVos; + } + } diff --git a/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java b/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java index 33d2b3ac2..3a7d9dce8 100644 --- a/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java +++ b/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java @@ -239,8 +239,10 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter { .antMatchers("/xmgl/poisonousGasDevCurrentData/add").permitAll() .antMatchers("/xmgl/concreteMonitorAlarm/add").permitAll() .antMatchers("/api/uploadLocationDataList").permitAll() - .antMatchers("/api/uploadSensorAlarm").permitAll() + .antMatchers("/api/uploadTagLowVoltageAlarm").permitAll() .antMatchers("/xmgl/towerJackingRecord/add").permitAll() + .antMatchers("/xmgl/sjSafeEnvironmentFile/uploadfile").permitAll() + .antMatchers("/api/uploadTagLowVoltageAlarm").permitAll() .antMatchers(HttpMethod.OPTIONS, "/**").anonymous() .anyRequest().authenticated() // 剩下所有的验证都需要验证 .and() diff --git a/src/main/java/com/zhgd/xmgl/util/TimeUtil.java b/src/main/java/com/zhgd/xmgl/util/TimeUtil.java index a4626e32c..c837db284 100644 --- a/src/main/java/com/zhgd/xmgl/util/TimeUtil.java +++ b/src/main/java/com/zhgd/xmgl/util/TimeUtil.java @@ -1,6 +1,12 @@ package com.zhgd.xmgl.util; public class TimeUtil { + /** + * 获取时分秒中文显示 + * + * @param second + * @return + */ public static String toHourMinSecond(Integer second) { if (second == null) { return null;