diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/BeidouApplication.java b/sec-beidou/src/main/java/com/imdroid/beidou/BeidouApplication.java index 537b390d..999c6c0c 100644 --- a/sec-beidou/src/main/java/com/imdroid/beidou/BeidouApplication.java +++ b/sec-beidou/src/main/java/com/imdroid/beidou/BeidouApplication.java @@ -5,7 +5,6 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.Configuration; @SpringBootApplication(scanBasePackages = {"com.imdroid"}) @ComponentScan({"com.imdroid.*"}) diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/config/WebSocketConfig.java b/sec-beidou/src/main/java/com/imdroid/beidou/config/WebSocketConfig.java index 4c20f13d..69c17235 100644 --- a/sec-beidou/src/main/java/com/imdroid/beidou/config/WebSocketConfig.java +++ b/sec-beidou/src/main/java/com/imdroid/beidou/config/WebSocketConfig.java @@ -4,7 +4,6 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.web.socket.server.standard.ServerEndpointExporter; - import javax.servlet.http.HttpSession; import javax.websocket.HandshakeResponse; import javax.websocket.server.HandshakeRequest; diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/controller/APIController.java b/sec-beidou/src/main/java/com/imdroid/beidou/controller/APIController.java index be2df35c..a7497786 100644 --- a/sec-beidou/src/main/java/com/imdroid/beidou/controller/APIController.java +++ b/sec-beidou/src/main/java/com/imdroid/beidou/controller/APIController.java @@ -1,9 +1,9 @@ package com.imdroid.beidou.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.imdroid.common.util.HexUtil; import com.imdroid.secapi.client.RtcmClient; import com.imdroid.secapi.dto.*; -import com.imdroid.common.util.HexUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.PostMapping; diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/controller/CmdLineController.java b/sec-beidou/src/main/java/com/imdroid/beidou/controller/CmdLineController.java index bf00c3ef..2ab43766 100644 --- a/sec-beidou/src/main/java/com/imdroid/beidou/controller/CmdLineController.java +++ b/sec-beidou/src/main/java/com/imdroid/beidou/controller/CmdLineController.java @@ -4,11 +4,10 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.imdroid.beidou.common.HttpResult; -import com.imdroid.secapi.dto.OpLogManager; +import com.imdroid.common.util.HexUtil; import com.imdroid.secapi.client.HttpResp; import com.imdroid.secapi.client.RtcmClient; import com.imdroid.secapi.dto.*; -import com.imdroid.common.util.HexUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/controller/DeviceSummaryController.java b/sec-beidou/src/main/java/com/imdroid/beidou/controller/DeviceSummaryController.java index d638e5d9..d0f87f34 100644 --- a/sec-beidou/src/main/java/com/imdroid/beidou/controller/DeviceSummaryController.java +++ b/sec-beidou/src/main/java/com/imdroid/beidou/controller/DeviceSummaryController.java @@ -2,10 +2,15 @@ package com.imdroid.beidou.controller; import com.alibaba.fastjson.JSONObject; import com.imdroid.common.util.NumberUtils; -import com.imdroid.secapi.dto.*; +import com.imdroid.secapi.dto.GnssDevice; +import com.imdroid.secapi.dto.GnssStatus; +import com.imdroid.secapi.dto.GnssStatusJoin; +import com.imdroid.secapi.dto.GnssStatusMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; import java.time.format.DateTimeFormatter; diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssCalcDataController.java b/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssCalcDataController.java index a3991e7b..24ebd8c2 100644 --- a/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssCalcDataController.java +++ b/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssCalcDataController.java @@ -5,16 +5,14 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.yulichang.query.MPJQueryWrapper; -import com.imdroid.secapi.dto.Tenant; -import com.imdroid.secapi.dto.TenantMapper; import com.imdroid.beidou.service.CommonExcelService; import com.imdroid.secapi.dto.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; +import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.util.StringUtils; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -69,7 +67,7 @@ public class GnssCalcDataController extends BasicController implements CommonExc String begin = search.getString("dgt_t.createtime"); String end = search.getString("dlt_t.createtime"); - if(deviceId != null && !deviceId.isBlank() && freqency!=0){ + if(deviceId != null && !deviceId.isEmpty() && freqency!=0){ Page pageable = new Page<>(page == null ? 1 : page, limit == null ? 10 : limit); // 缺省按1小时采样，如果时间跨度较大，则按最多300条记录的采样率采样 @@ -78,10 +76,10 @@ public class GnssCalcDataController extends BasicController implements CommonExc if(freqency == 2){ LocalDateTime endTime = LocalDateTime.now(); LocalDateTime beginTime = endTime.minusDays(30); - if(begin!=null && !begin.isBlank()){ + if(begin!=null && !begin.isEmpty()){ beginTime = LocalDateTime.parse(begin,df); } - if(end!=null && !end.isBlank()){ + if(end!=null && !end.isEmpty()){ endTime = LocalDateTime.parse(end,df); } Duration duration = Duration.between(beginTime, endTime); @@ -139,9 +137,17 @@ public class GnssCalcDataController extends BasicController implements CommonExc @Override public void checkSearchParams(JSONObject search){ if(search != null) { - String parentId = search.getString("sl_d.parentid"); - String projectId = search.getString("sl_d.project_id"); - isJoinQuery = StringUtils.hasText(parentId) || StringUtils.hasText(projectId); + String deviceId = search.getString("sl_t.deviceid"); + if(StringUtils.hasText(deviceId)){ + search.remove("sl_d.parentid"); + search.remove("sl_d.project_id"); + isJoinQuery=false; + } + else { + String parentId = search.getString("sl_d.parentid"); + String projectId = search.getString("sl_d.project_id"); + isJoinQuery = StringUtils.hasText(parentId) || StringUtils.hasText(projectId); + } } else isJoinQuery=false; } diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssDeviceController.java b/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssDeviceController.java index 78b68dd9..663b1e30 100644 --- a/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssDeviceController.java +++ b/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssDeviceController.java @@ -1,20 +1,17 @@ package com.imdroid.beidou.controller; -import com.imdroid.beidou.common.Role; -import com.imdroid.secapi.dto.TenantMapper; -import com.imdroid.secapi.dto.Tenant; -import com.imdroid.secapi.dto.OpLogManager; -import com.imdroid.common.util.NumberUtils; -import com.imdroid.common.util.ObjUtil; -import com.imdroid.secapi.client.RtcmClient; import com.alibaba.fastjson.JSONObject; 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.imdroid.beidou.common.HttpResult; +import com.imdroid.beidou.common.Role; import com.imdroid.beidou.data.vo.device.DeviceInstallVO; import com.imdroid.beidou.data.vo.device.DeviceListVO; import com.imdroid.beidou.data.vo.device.DeviceStatusVO; +import com.imdroid.common.util.NumberUtils; +import com.imdroid.common.util.ObjUtil; +import com.imdroid.secapi.client.RtcmClient; import com.imdroid.secapi.dto.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -172,7 +169,7 @@ public class GnssDeviceController extends BasicController{ device.setUpdatetime(old_device.getUpdatetime()); device.setSyn(old_device.getSyn()); String diff=ObjUtil.compare(old_device,device); - if(!diff.isBlank()) { + if(!diff.isEmpty()) { opLogManager.addLog(getLoginUser(session), getTenantId(session), OpLogManager.OP_TYPE_UPDATE, OpLogManager.OP_OBJ_DEVICE, diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssFwdController.java b/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssFwdController.java index fb122990..d52c8c24 100644 --- a/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssFwdController.java +++ b/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssFwdController.java @@ -5,11 +5,15 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.imdroid.beidou.service.CommonExcelService; -import com.imdroid.secapi.dto.*; +import com.imdroid.secapi.dto.FwdRecord; +import com.imdroid.secapi.dto.FwdRecordMapper; +import com.imdroid.secapi.dto.GnssGroupFwd; +import com.imdroid.secapi.dto.GnssGroupFwdMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; import javax.servlet.http.HttpSession; import java.util.List; diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssGroupController.java b/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssGroupController.java index 24dc73ae..4653325d 100644 --- a/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssGroupController.java +++ b/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssGroupController.java @@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.imdroid.beidou.common.HttpResult; -import com.imdroid.secapi.dto.OpLogManager; import com.imdroid.common.util.ObjUtil; import com.imdroid.secapi.client.RtcmClient; import com.imdroid.secapi.dto.*; @@ -75,7 +74,7 @@ public class GnssGroupController extends BasicController { if(null != oldGroup) { group.setDevice_num(oldGroup.getDevice_num()); String diff = ObjUtil.compare(oldGroup,group); - if(!diff.isBlank()) { + if(!diff.isEmpty()) { num = gnssGroupMapper.updateById(group); opLogManager.addLog(getLoginUser(session), getTenantId(session), OpLogManager.OP_TYPE_UPDATE, @@ -143,7 +142,7 @@ public class GnssGroupController extends BasicController { if(null != oldGroup) { group.setDevice_num(oldGroup.getDevice_num()); String diff = ObjUtil.compare(oldGroup,group); - if(!diff.isBlank()) { + if(!diff.isEmpty()) { num = gnssGroupCalcMapper.updateById(group); opLogManager.addLog(getLoginUser(session), getTenantId(session), OpLogManager.OP_TYPE_UPDATE, diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssMsgController.java b/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssMsgController.java index a5308253..6c3bd5fc 100644 --- a/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssMsgController.java +++ b/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssMsgController.java @@ -3,7 +3,8 @@ package com.imdroid.beidou.controller; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.imdroid.beidou.service.CommonExcelService; -import com.imdroid.secapi.dto.*; +import com.imdroid.secapi.dto.GnssMsg; +import com.imdroid.secapi.dto.GnssMsgMapper; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssResendController.java b/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssResendController.java index 7074cb9a..253566d4 100644 --- a/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssResendController.java +++ b/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssResendController.java @@ -3,7 +3,10 @@ package com.imdroid.beidou.controller; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.imdroid.beidou.service.CommonExcelService; -import com.imdroid.secapi.dto.*; +import com.imdroid.secapi.dto.GnssGroupFwd; +import com.imdroid.secapi.dto.GnssGroupFwdMapper; +import com.imdroid.secapi.dto.ResendRecord; +import com.imdroid.secapi.dto.ResendRecordMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssStatusController.java b/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssStatusController.java index 78d6d501..28cdd822 100644 --- a/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssStatusController.java +++ b/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssStatusController.java @@ -3,17 +3,14 @@ package com.imdroid.beidou.controller; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.github.yulichang.query.MPJQueryWrapper; -import com.imdroid.secapi.dto.Tenant; -import com.imdroid.secapi.dto.TenantMapper; import com.imdroid.beidou.service.CommonExcelService; -import com.imdroid.secapi.dto.GnssStatus; -import com.imdroid.secapi.dto.GnssStatusJoin; -import com.imdroid.secapi.dto.GnssStatusMapper; -import com.imdroid.secapi.dto.WarningCfg; +import com.imdroid.secapi.dto.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/controller/IndexController.java b/sec-beidou/src/main/java/com/imdroid/beidou/controller/IndexController.java index 0d9e5ef2..f5a25c74 100644 --- a/sec-beidou/src/main/java/com/imdroid/beidou/controller/IndexController.java +++ b/sec-beidou/src/main/java/com/imdroid/beidou/controller/IndexController.java @@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.yulichang.query.MPJQueryWrapper; -import com.imdroid.secapi.dto.Tenant; import com.imdroid.secapi.dto.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/controller/LoginController.java b/sec-beidou/src/main/java/com/imdroid/beidou/controller/LoginController.java index a69ef2eb..a0fcdfed 100644 --- a/sec-beidou/src/main/java/com/imdroid/beidou/controller/LoginController.java +++ b/sec-beidou/src/main/java/com/imdroid/beidou/controller/LoginController.java @@ -6,17 +6,15 @@ import com.imdroid.beidou.data.WxMiniUserSession; import com.imdroid.beidou.data.vo.MiniUserRegisterVO; import com.imdroid.beidou.data.vo.MiniUserVO; import com.imdroid.beidou.data.vo.UserLoginVO; -import com.imdroid.secapi.dto.Tenant; -import com.imdroid.secapi.dto.TenantMapper; -import com.imdroid.secapi.dto.User; -import com.imdroid.secapi.dto.UserMapper; -import com.imdroid.secapi.dto.OpLogManager; -import com.imdroid.common.util.BCryptPasswordEncoderUtil; import com.imdroid.beidou.utils.WXUtils; +import com.imdroid.common.util.BCryptPasswordEncoderUtil; +import com.imdroid.secapi.dto.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/controller/TenantController.java b/sec-beidou/src/main/java/com/imdroid/beidou/controller/TenantController.java index d0241d9f..c48e181c 100644 --- a/sec-beidou/src/main/java/com/imdroid/beidou/controller/TenantController.java +++ b/sec-beidou/src/main/java/com/imdroid/beidou/controller/TenantController.java @@ -5,10 +5,10 @@ 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.imdroid.beidou.common.HttpResult; +import com.imdroid.common.util.ObjUtil; +import com.imdroid.secapi.dto.OpLogManager; import com.imdroid.secapi.dto.Tenant; import com.imdroid.secapi.dto.TenantMapper; -import com.imdroid.secapi.dto.OpLogManager; -import com.imdroid.common.util.ObjUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; @@ -75,7 +75,7 @@ public class TenantController extends BasicController{ tenantNew.setCreate_time(tenantOld.getCreate_time()); tenantNew.setUpdate_time(tenantOld.getUpdate_time()); String diff = ObjUtil.compare(tenantOld,tenantNew); - if(!diff.isBlank()) { + if(!diff.isEmpty()) { opLogManager.addLog(getLoginUser(session), getTenantId(session), OpLogManager.OP_TYPE_UPDATE, OpLogManager.OP_OBJ_TENANT, diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/controller/UserController.java b/sec-beidou/src/main/java/com/imdroid/beidou/controller/UserController.java index aa72aa8f..d475ce4e 100644 --- a/sec-beidou/src/main/java/com/imdroid/beidou/controller/UserController.java +++ b/sec-beidou/src/main/java/com/imdroid/beidou/controller/UserController.java @@ -5,12 +5,8 @@ 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.imdroid.beidou.common.HttpResult; -import com.imdroid.secapi.dto.Tenant; -import com.imdroid.secapi.dto.TenantMapper; -import com.imdroid.secapi.dto.User; -import com.imdroid.secapi.dto.UserMapper; -import com.imdroid.secapi.dto.OpLogManager; import com.imdroid.common.util.ObjUtil; +import com.imdroid.secapi.dto.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; @@ -115,7 +111,7 @@ public class UserController extends BasicController { userNew.setPwd(userOld.getPwd()); userNew.setInit_pwd(userOld.getInit_pwd()); String diff = ObjUtil.compare(userOld,userNew); - if(!diff.isBlank()) { + if(!diff.isEmpty()) { num = userMapper.updateById(userNew); opLogManager.addLog(getLoginUser(session), getTenantId(session), OpLogManager.OP_TYPE_UPDATE, diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/controller/WarningController.java b/sec-beidou/src/main/java/com/imdroid/beidou/controller/WarningController.java index 1051a5fd..12dd6fcb 100644 --- a/sec-beidou/src/main/java/com/imdroid/beidou/controller/WarningController.java +++ b/sec-beidou/src/main/java/com/imdroid/beidou/controller/WarningController.java @@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.imdroid.beidou.common.HttpResult; import com.imdroid.beidou.service.CommonExcelService; -import com.imdroid.secapi.dto.OpLogManager; import com.imdroid.common.util.ObjUtil; import com.imdroid.secapi.client.RtcmClient; import com.imdroid.secapi.dto.*; @@ -126,7 +125,7 @@ public class WarningController extends BasicController implements CommonExcelSer cfg.getTypename()+" create new"); } else { String diff = ObjUtil.compare(oldCfg, cfg); - if(!diff.isBlank()) { + if(!diff.isEmpty()) { num = warningCfgMapper.update(cfg, queryWrapper); opLogManager.addLog(getLoginUser(session), getTenantId(session), OpLogManager.OP_TYPE_ADD, diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/service/ServiceEnvInit.java b/sec-beidou/src/main/java/com/imdroid/beidou/service/ServiceEnvInit.java index 389f8574..1ede2407 100644 --- a/sec-beidou/src/main/java/com/imdroid/beidou/service/ServiceEnvInit.java +++ b/sec-beidou/src/main/java/com/imdroid/beidou/service/ServiceEnvInit.java @@ -2,13 +2,8 @@ package com.imdroid.beidou.service; import com.imdroid.beidou.common.Role; -import com.imdroid.secapi.dto.Tenant; -import com.imdroid.secapi.dto.TenantMapper; -import com.imdroid.secapi.dto.User; -import com.imdroid.secapi.dto.UserMapper; import com.imdroid.common.util.BCryptPasswordEncoderUtil; -import com.imdroid.secapi.dto.WarningCfg; -import com.imdroid.secapi.dto.WarningCfgMapper; +import com.imdroid.secapi.dto.*; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/task/DeviceStatusChecker.java b/sec-beidou/src/main/java/com/imdroid/beidou/task/DeviceStatusChecker.java index 12b90962..773f15ee 100644 --- a/sec-beidou/src/main/java/com/imdroid/beidou/task/DeviceStatusChecker.java +++ b/sec-beidou/src/main/java/com/imdroid/beidou/task/DeviceStatusChecker.java @@ -2,7 +2,6 @@ package com.imdroid.beidou.task; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.yulichang.query.MPJQueryWrapper; -import com.imdroid.secapi.dto.Tenant; import com.imdroid.beidou.service.NotificationService; import com.imdroid.secapi.dto.*; import lombok.extern.slf4j.Slf4j; diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/utils/AliyunOssUtils.java b/sec-beidou/src/main/java/com/imdroid/beidou/utils/AliyunOssUtils.java index 032af71a..7c77e84f 100644 --- a/sec-beidou/src/main/java/com/imdroid/beidou/utils/AliyunOssUtils.java +++ b/sec-beidou/src/main/java/com/imdroid/beidou/utils/AliyunOssUtils.java @@ -1,6 +1,5 @@ package com.imdroid.beidou.utils; -import com.imdroid.beidou.config.AliyunOssProperties; import com.aliyun.oss.OSS; import com.aliyun.oss.OSSClientBuilder; import com.aliyun.oss.internal.OSSHeaders; @@ -8,6 +7,7 @@ import com.aliyun.oss.model.CannedAccessControlList; import com.aliyun.oss.model.ObjectMetadata; import com.aliyun.oss.model.PutObjectRequest; import com.aliyun.oss.model.StorageClass; +import com.imdroid.beidou.config.AliyunOssProperties; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; import org.springframework.web.multipart.MultipartFile; diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/utils/WXUtils.java b/sec-beidou/src/main/java/com/imdroid/beidou/utils/WXUtils.java index be222433..626f5c22 100644 --- a/sec-beidou/src/main/java/com/imdroid/beidou/utils/WXUtils.java +++ b/sec-beidou/src/main/java/com/imdroid/beidou/utils/WXUtils.java @@ -1,10 +1,10 @@ package com.imdroid.beidou.utils; -import com.imdroid.beidou.config.WxMiniProperties; -import com.imdroid.beidou.data.WxMiniUserSession; import com.google.gson.JsonObject; import com.google.gson.JsonParser; +import com.imdroid.beidou.config.WxMiniProperties; +import com.imdroid.beidou.data.WxMiniUserSession; import com.imdroid.beidou.data.dto.MiniHardwareDeviceMessageDTO; import com.imdroid.beidou.data.dto.MiniSnTicketBodyDTO; import com.imdroid.beidou.data.dto.MiniSubscribeMessageDTO;