diff --git a/pom.xml b/pom.xml index 8abde237..878c07da 100644 --- a/pom.xml +++ b/pom.xml @@ -3,12 +3,6 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - - org.springframework.boot - spring-boot-starter-parent - 2.7.5 - - com.imdroid security-monitor @@ -19,13 +13,61 @@ sec-beidou sec-beidou-rtcm sec-api + sec-beidou-rtcm-api + 1.0-SNAPSHOT 1.0.0 + 2.7.5 + 2021.0.5 UTF-8 UTF-8 - 8 + 1.8 + + + + + + org.springframework.cloud + spring-cloud-dependencies + ${spring-cloud.version} + pom + import + + + + + org.springframework.boot + spring-boot-dependencies + ${spring-boot.version} + pom + import + + + + + com.imdroid + sec-beidou-rtcm-api + ${sec.version} + + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + ${java.version} + ${java.version} + + + + + \ No newline at end of file diff --git a/sec-beidou-rtcm-api/pom.xml b/sec-beidou-rtcm-api/pom.xml new file mode 100644 index 00000000..b9d02604 --- /dev/null +++ b/sec-beidou-rtcm-api/pom.xml @@ -0,0 +1,32 @@ + + + + security-monitor + com.imdroid + 1.0-SNAPSHOT + + 4.0.0 + + sec-beidou-rtcm-api + 1.0-SNAPSHOT + + + + + + org.springframework.cloud + spring-cloud-starter-openfeign + + + com.google.code.findbugs + jsr305 + + + + + + + + \ No newline at end of file diff --git a/sec-beidou-rtcm-api/src/main/java/com/imdroid/sideslope/api/BeidouRtcmApi.java b/sec-beidou-rtcm-api/src/main/java/com/imdroid/sideslope/api/BeidouRtcmApi.java new file mode 100644 index 00000000..b4eb61cb --- /dev/null +++ b/sec-beidou-rtcm-api/src/main/java/com/imdroid/sideslope/api/BeidouRtcmApi.java @@ -0,0 +1,16 @@ +package com.imdroid.sideslope.api; + +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; + +/** + * @author LiGang + * @date 2023/10/22 19:40 + */ +@FeignClient(name = "rtcm-server", url = "http://localhost:9904/gnss") +public interface BeidouRtcmApi { + + @GetMapping("/clean-tilt") + String cleanTilt(@RequestParam(name = "deviceId") String deviceId); +} diff --git a/sec-beidou-rtcm/pom.xml b/sec-beidou-rtcm/pom.xml index 5db4d508..22b4258d 100644 --- a/sec-beidou-rtcm/pom.xml +++ b/sec-beidou-rtcm/pom.xml @@ -18,22 +18,9 @@ 1.2.3 1.0-SNAPSHOT 1.0-SNAPSHOT - 8 - - - - org.springframework.cloud - spring-cloud-dependencies - Greenwich.SR2 - pom - import - - - - org.springframework.boot @@ -59,11 +46,6 @@ spring-boot-starter-amqp - - - - - mysql mysql-connector-java diff --git a/sec-beidou/pom.xml b/sec-beidou/pom.xml index 39b7ac37..31b1d2c0 100644 --- a/sec-beidou/pom.xml +++ b/sec-beidou/pom.xml @@ -16,14 +16,10 @@ beidou - 8 - - - - + org.springframework.boot spring-boot-starter-thymeleaf @@ -43,6 +39,11 @@ 1.4.3 + + org.springframework.boot + spring-boot-starter-validation + + com.baomidou mybatis-plus-boot-starter @@ -83,11 +84,7 @@ fastjson 1.2.76 - - com.github.pagehelper - pagehelper - 4.1.6 - + io.jsonwebtoken jjwt @@ -126,6 +123,12 @@ 1.0-SNAPSHOT + + + com.imdroid + sec-beidou-rtcm-api + + 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 883e04c1..537b390d 100644 --- a/sec-beidou/src/main/java/com/imdroid/beidou/BeidouApplication.java +++ b/sec-beidou/src/main/java/com/imdroid/beidou/BeidouApplication.java @@ -3,10 +3,14 @@ package com.imdroid.beidou; import org.mybatis.spring.annotation.MapperScan; 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.*"}) @MapperScan({"com.imdroid.secapi","com.imdroid.beidou.entity"}) +@EnableFeignClients(basePackages = "com.imdroid.*") public class BeidouApplication { public static void main(String[] args) { diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/auth/AuthInterceptor.java b/sec-beidou/src/main/java/com/imdroid/beidou/auth/AuthInterceptor.java index 1c8a6e3d..10e9d1dd 100644 --- a/sec-beidou/src/main/java/com/imdroid/beidou/auth/AuthInterceptor.java +++ b/sec-beidou/src/main/java/com/imdroid/beidou/auth/AuthInterceptor.java @@ -23,7 +23,12 @@ public class AuthInterceptor implements HandlerInterceptor { if (!StringUtils.isEmpty(username)) { return true; } - response.sendRedirect("/login"); + String clientType = request.getHeader("x-imdroid-type"); + if ("mini".equals(clientType)) { + response.setStatus(404); + } else { + response.sendRedirect("/login"); + } return false; } diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/auth/WebMvcConfig.java b/sec-beidou/src/main/java/com/imdroid/beidou/auth/WebMvcConfig.java index bf198ea5..000515aa 100644 --- a/sec-beidou/src/main/java/com/imdroid/beidou/auth/WebMvcConfig.java +++ b/sec-beidou/src/main/java/com/imdroid/beidou/auth/WebMvcConfig.java @@ -21,6 +21,6 @@ public class WebMvcConfig implements WebMvcConfigurer { public void addInterceptors(InterceptorRegistry registry) { registry.addInterceptor(authInterceptor) .addPathPatterns("/**") - .excludePathPatterns("/**/*.js","/**/*.css","/**/*.jpg","/**/*.png", "/do_login", "/mini-register", "/login"); + .excludePathPatterns("/**/*.js","/**/*.css","/**/*.jpg","/**/*.png", "/do_login", "/mini-register", "/login", "/test/**"); } } diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/config/MybatisPlusConfig.java b/sec-beidou/src/main/java/com/imdroid/beidou/config/MybatisPlusConfig.java new file mode 100644 index 00000000..c5cdb026 --- /dev/null +++ b/sec-beidou/src/main/java/com/imdroid/beidou/config/MybatisPlusConfig.java @@ -0,0 +1,22 @@ +package com.imdroid.beidou.config; + +import com.baomidou.mybatisplus.annotation.DbType; +import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; +import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +/** + * @author LiGang + * @date 2023/10/19 19:42 + */ +@Configuration +public class MybatisPlusConfig { + + @Bean + public MybatisPlusInterceptor mybatisPlusInterceptor() { + MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); + interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL)); + return interceptor; + } +} 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 824bef31..b258430e 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,23 +1,25 @@ package com.imdroid.beidou.controller; import com.alibaba.fastjson.JSONObject; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.github.pagehelper.StringUtil; +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.data.vo.device.DeviceInstallVO; +import com.imdroid.beidou.data.vo.device.DeviceListVO; import com.imdroid.beidou.data.vo.device.DeviceStatusVO; import com.imdroid.beidou.entity.*; 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.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import javax.servlet.http.HttpSession; import java.sql.Timestamp; +import java.util.ArrayList; import java.util.List; @Controller @@ -63,7 +65,7 @@ public class GnssDeviceController extends BasicController{ @RequestMapping("/gnss/device/list") @ResponseBody public JSONObject list(HttpSession session, int page, int limit, String searchParams) { - PageHelper.startPage(page, limit); + Page pageable = new Page<>(page, limit); QueryWrapper queryWrapper = new QueryWrapper<>(); // 条件查询 @@ -71,12 +73,12 @@ public class GnssDeviceController extends BasicController{ JSONObject search = (JSONObject) JSONObject.parse(searchParams); //设备号 String deviceid = search.getString("deviceid"); - if (StringUtil.isNotEmpty(deviceid)) { + if (!StringUtils.isEmpty(deviceid)) { queryWrapper.like("deviceid", deviceid); } //父设备号 String parentid = search.getString("parentid"); - if (StringUtil.isNotEmpty(parentid)) { + if (!StringUtils.isEmpty(parentid)) { queryWrapper.like("parentid", parentid); } //设备类型 @@ -86,14 +88,13 @@ public class GnssDeviceController extends BasicController{ } } - List cs = gnssDeviceMapper.selectList(queryWrapper); - PageInfo pageInfo = new PageInfo<>(cs); + IPage cs = gnssDeviceMapper.selectPage(pageable, queryWrapper); JSONObject jsonObject = new JSONObject(); jsonObject.put("code", 0); jsonObject.put("msg", ""); - jsonObject.put("count", pageInfo.getTotal()); - jsonObject.put("data", pageInfo.getList()); + jsonObject.put("count", cs.getTotal()); + jsonObject.put("data", cs.getRecords()); return jsonObject; } @@ -157,16 +158,15 @@ public class GnssDeviceController extends BasicController{ wrapper.eq("deviceid",deviceInstallVO.getDeviceId()); GnssDevice gnssDevice = gnssDeviceMapper.selectOne(wrapper); if (gnssDevice == null) { - return HttpResult.fail(""); + return HttpResult.fail("设备不存在"); } GnssDevice tempDevice = new GnssDevice(); tempDevice.setId(gnssDevice.getId()); //安装位置通过GNSS坐标自动获取 - //tempDevice.setLocation(deviceInstallVO.getLocation()); tempDevice.setPictures(deviceInstallVO.getPictures()); gnssDeviceMapper.updateById(tempDevice); - return HttpResult.success(null); + return HttpResult.success(new DeviceListVO(gnssDevice.getId(), gnssDevice.getDeviceid(), gnssDevice.getName())); } /** @@ -175,15 +175,66 @@ public class GnssDeviceController extends BasicController{ * @param id 主键id * @return 设备信息 DeviceStatusVO */ - @PostMapping("/gnss/device/status") + @GetMapping("/gnss/device/status") @ResponseBody public HttpResult findById(Long id) { GnssDevice gnssDevice = gnssDeviceMapper.selectById(id); if (gnssDevice == null) { - return HttpResult.fail(""); + return HttpResult.fail("设备不存在"); } - GnssStatusJoin gnssStatus = gnssStatusMapper.queryByDeviceId(gnssDevice.getDeviceid()); + GnssStatus gnssStatus = gnssStatusMapper.getByDeviceId(gnssDevice.getDeviceid()); DeviceStatusVO deviceStatusVO = new DeviceStatusVO(gnssDevice, gnssStatus); return HttpResult.success(deviceStatusVO); } + + /** + * 获取设备列表 + * + * @param session HttpSession + * @param page page + * @param limit limit + * @param searchParams searchParams + * @return JSONObject + */ + @GetMapping("/gnss/device/simple-list") + @ResponseBody + public JSONObject simpleList(HttpSession session, Integer page, Integer limit, String searchParams) { + System.out.println(page + "," + limit); + Page pageable = new Page<>(page, limit); + QueryWrapper queryWrapper = new QueryWrapper<>(); + System.out.println("searchParams:" + searchParams); + // 条件查询 + if(searchParams != null) { + JSONObject search = (JSONObject) JSONObject.parse(searchParams); + //设备号 + String deviceid = search.getString("deviceid"); + if (!StringUtils.isEmpty(deviceid)) { + queryWrapper.like("deviceid", deviceid); + } + //父设备号 + String parentid = search.getString("parentid"); + if (!StringUtils.isEmpty(parentid)) { + queryWrapper.like("parentid", parentid); + } + //设备类型 + Integer devicetype = search.getInteger("devicetype"); + if (devicetype != null && devicetype != QUERY_ALL) { + queryWrapper.eq("devicetype", devicetype); + } + } + + IPage cs = gnssDeviceMapper.selectPage(pageable, queryWrapper); + List deviceListVOList = new ArrayList<>(cs.getRecords().size()); + for (GnssDevice device : cs.getRecords()) { + DeviceListVO deviceListVO = new DeviceListVO(device.getId(), device.getDeviceid(), device.getName()); + deviceListVOList.add(deviceListVO); + } + + JSONObject jsonObject = new JSONObject(); + jsonObject.put("code", 0); + jsonObject.put("msg", ""); + jsonObject.put("count", cs.getTotal()); + jsonObject.put("data", deviceListVOList); + return jsonObject; + } } 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 ae4e48a3..65781625 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 @@ -1,8 +1,8 @@ package com.imdroid.beidou.controller; import com.alibaba.fastjson.JSONObject; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; +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.entity.*; import com.imdroid.secapi.dto.GnssGroup; @@ -47,15 +47,14 @@ public class GnssGroupController { @RequestMapping("/gnss/group/list") @ResponseBody public JSONObject list(int page, int limit) { - PageHelper.startPage(page, limit); - List cs = gnssGroupMapper.selectList(null); - PageInfo pageInfo = new PageInfo<>(cs); + Page pageable = new Page<>(page, limit); + IPage cs = gnssGroupMapper.selectPage(pageable, null); JSONObject jsonObject = new JSONObject(); jsonObject.put("code", 0); jsonObject.put("msg", ""); - jsonObject.put("count", pageInfo.getTotal()); - jsonObject.put("data", pageInfo.getList()); + jsonObject.put("count", cs.getTotal()); + jsonObject.put("data", cs.getRecords()); return jsonObject; } @@ -88,15 +87,14 @@ public class GnssGroupController { @RequestMapping("/gnss/group/list_calc") @ResponseBody public JSONObject listCalc(int page, int limit) { - PageHelper.startPage(page, limit); - List cs = gnssGroupCalcMapper.selectList(null); - PageInfo pageInfo = new PageInfo<>(cs); + Page pageable = new Page<>(page, limit); + IPage cs = gnssGroupCalcMapper.selectPage(pageable, null); JSONObject jsonObject = new JSONObject(); jsonObject.put("code", 0); jsonObject.put("msg", ""); - jsonObject.put("count", pageInfo.getTotal()); - jsonObject.put("data", pageInfo.getList()); + jsonObject.put("count", cs.getTotal()); + jsonObject.put("data", cs.getRecords()); return jsonObject; } @@ -129,15 +127,14 @@ public class GnssGroupController { @RequestMapping("/gnss/group/list_fwd") @ResponseBody public JSONObject listFwd(int page, int limit) { - PageHelper.startPage(page, limit); - List cs = gnssGroupFwdMapper.selectList(null); - PageInfo pageInfo = new PageInfo<>(cs); + Page pageable = new Page<>(page, limit); + IPage cs = gnssGroupFwdMapper.selectPage(pageable, null); JSONObject jsonObject = new JSONObject(); jsonObject.put("code", 0); jsonObject.put("msg", ""); - jsonObject.put("count", pageInfo.getTotal()); - jsonObject.put("data", pageInfo.getList()); + jsonObject.put("count", cs.getTotal()); + jsonObject.put("data", cs.getRecords()); return jsonObject; } 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 b6f80ee0..a2a37a7c 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 @@ -1,16 +1,15 @@ package com.imdroid.beidou.controller; 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.github.pagehelper.PageHelper; -import com.github.pagehelper.StringUtil; -import com.github.yulichang.query.MPJQueryWrapper; 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.ui.Model; +import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpSession; @@ -33,41 +32,36 @@ public class GnssStatusController extends BasicController{ @RequestMapping("/gnss/status/list") @ResponseBody public JSONObject list(HttpSession session, int page, int limit, String searchParams) { - PageHelper.startPage(page, limit); - - MPJQueryWrapper wrapper = new MPJQueryWrapper() - .selectAll(GnssStatus.class) - .select("d.devicetype as devicetype","d.tenantid as tenantid") - .leftJoin("gnssdevices d on t.deviceid = d.deviceid"); + Page pageable = new Page<>(page, limit); + QueryWrapper queryWrapper = new QueryWrapper<>(); // 条件查询 if(searchParams != null) { JSONObject search = (JSONObject) JSONObject.parse(searchParams); //设备号 String deviceid = search.getString("deviceid"); - if (StringUtil.isNotEmpty(deviceid)) { - wrapper.like("deviceid", deviceid); + if (!StringUtils.isEmpty(deviceid)) { + queryWrapper.like("deviceid", deviceid); } //状态 Integer state = search.getInteger("state"); if(state!=null && state != QUERY_ALL){ - wrapper.eq("state", state); + queryWrapper.eq("state", state); } //告警 Integer warning = search.getInteger("warning"); if(warning!=null && warning != QUERY_ALL){ - wrapper.eq("warning", warning); + queryWrapper.eq("warning", warning); } } - //分页查询 （需要启用 mybatis plus 分页插件） - Page listPage = gnssStatusMapper.selectJoinPage(new Page<>(page, limit), GnssStatusJoin.class, wrapper); + IPage cs = gnssStatusMapper.selectPage(pageable, queryWrapper); JSONObject jsonObject = new JSONObject(); jsonObject.put("code", 0); jsonObject.put("msg", ""); - jsonObject.put("count", listPage.getTotal()); - jsonObject.put("data", listPage.getRecords()); + jsonObject.put("count", cs.getTotal()); + jsonObject.put("data", cs.getRecords()); return jsonObject; } diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/controller/OssFileController.java b/sec-beidou/src/main/java/com/imdroid/beidou/controller/OssFileController.java index e42c3079..91ec4a11 100644 --- a/sec-beidou/src/main/java/com/imdroid/beidou/controller/OssFileController.java +++ b/sec-beidou/src/main/java/com/imdroid/beidou/controller/OssFileController.java @@ -3,6 +3,7 @@ package com.imdroid.beidou.controller; import com.imdroid.beidou.common.HttpResult; import com.imdroid.beidou.utils.AliyunOssUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; @@ -47,6 +48,11 @@ public class OssFileController { */ @RequestMapping("/upload-device-image") public HttpResult upload(@RequestParam("file") MultipartFile multipartFile, String deviceId) throws Exception { + System.out.println("upload device image:" + multipartFile.getOriginalFilename()); + if (StringUtils.isEmpty(deviceId)) { + HttpResult.fail("设备编号不能为空"); + } + String filename = deviceId + "_" + UUID.randomUUID().toString().replace("-", "") + ".jpg"; String url = aliyunOssUtils.uploadFile(multipartFile, filename, "device-img"); return HttpResult.success(url); diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/controller/TestController.java b/sec-beidou/src/main/java/com/imdroid/beidou/controller/TestController.java new file mode 100644 index 00000000..03fa3508 --- /dev/null +++ b/sec-beidou/src/main/java/com/imdroid/beidou/controller/TestController.java @@ -0,0 +1,25 @@ +package com.imdroid.beidou.controller; + +import com.imdroid.sideslope.api.BeidouRtcmApi; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +/** + * @author LiGang + * @date 2023/10/22 21:26 + */ +@RestController +@RequestMapping("/test") +public class TestController { + + @Autowired + private BeidouRtcmApi beidouRtcmApi; + + @GetMapping("/clean-tilt") + public String cleanTilt(@RequestParam(name = "deviceId") String deviceId) { + return beidouRtcmApi.cleanTilt(deviceId); + } +} diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/data/vo/device/DeviceInstallVO.java b/sec-beidou/src/main/java/com/imdroid/beidou/data/vo/device/DeviceInstallVO.java index cc8d441c..5371b625 100644 --- a/sec-beidou/src/main/java/com/imdroid/beidou/data/vo/device/DeviceInstallVO.java +++ b/sec-beidou/src/main/java/com/imdroid/beidou/data/vo/device/DeviceInstallVO.java @@ -17,9 +17,6 @@ public class DeviceInstallVO { @NotBlank(message = "设备编号不能为空") private String deviceId; - @NotBlank(message = "设备安装位置的经纬度不能为空") - private String location; - @NotBlank(message = "现场图片不能为空") private String pictures; diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/data/vo/device/DeviceListVO.java b/sec-beidou/src/main/java/com/imdroid/beidou/data/vo/device/DeviceListVO.java new file mode 100644 index 00000000..ea4a39d9 --- /dev/null +++ b/sec-beidou/src/main/java/com/imdroid/beidou/data/vo/device/DeviceListVO.java @@ -0,0 +1,26 @@ +package com.imdroid.beidou.data.vo.device; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +/** + * 设备列表VO + * + * @author LiGang + * @date 2023/10/17 21:37 + */ +@Setter +@Getter +@AllArgsConstructor +@NoArgsConstructor +public class DeviceListVO { + + private Long id; + + private String deviceId; + + private String name; + +} diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/data/vo/device/DeviceStatusVO.java b/sec-beidou/src/main/java/com/imdroid/beidou/data/vo/device/DeviceStatusVO.java index ff4ccc95..d8e588fe 100644 --- a/sec-beidou/src/main/java/com/imdroid/beidou/data/vo/device/DeviceStatusVO.java +++ b/sec-beidou/src/main/java/com/imdroid/beidou/data/vo/device/DeviceStatusVO.java @@ -2,7 +2,7 @@ package com.imdroid.beidou.data.vo.device; import com.fasterxml.jackson.annotation.JsonFormat; import com.imdroid.secapi.dto.GnssDevice; -import com.imdroid.secapi.dto.GnssStatusJoin; +import com.imdroid.secapi.dto.GnssStatus; import lombok.Getter; import lombok.Setter; import org.springframework.format.annotation.DateTimeFormat; @@ -44,24 +44,22 @@ public class DeviceStatusVO { private Integer rxbytes; private Integer b562bytes; private Integer d3xxbytes; - private Integer satelliteinview; - private Integer satelliteinuse; + private Integer satelliteInView; + private Integer satelliteInUse; - private Short dtuState; + private Short dtuState; public DeviceStatusVO() { } - public DeviceStatusVO(GnssDevice gnssDevice, GnssStatusJoin gnssStatus) { + public DeviceStatusVO(GnssDevice gnssDevice, GnssStatus gnssStatus) { this.id = gnssDevice.getId(); this.deviceId = gnssDevice.getDeviceid(); this.name = gnssDevice.getName(); - //this.location = gnssDevice.getLocation(); this.pictures = gnssDevice.getPictures(); this.tenantName = gnssDevice.getTenantname(); - //this.latestDataTime = gnssDevice.getLatest_data_time(); if (gnssStatus != null) { this.latestDataTime = gnssStatus.getUpdatetime(); @@ -77,8 +75,8 @@ public class DeviceStatusVO { this.rxbytes = gnssStatus.getRxbytes(); this.d3xxbytes = gnssStatus.getD3xxbytes(); this.b562bytes = gnssStatus.getB562bytes(); - this.satelliteinview = gnssStatus.getSatelliteinview(); - this.satelliteinuse = gnssStatus.getSatelliteinuse(); + this.satelliteInView = gnssStatus.getSatelliteinview(); + this.satelliteInUse = gnssStatus.getSatelliteinuse(); this.dtuState = gnssStatus.getState(); } } diff --git a/sec-beidou/src/main/resources/application.properties b/sec-beidou/src/main/resources/application.properties index cd708a8b..42e90f54 100644 --- a/sec-beidou/src/main/resources/application.properties +++ b/sec-beidou/src/main/resources/application.properties @@ -1,7 +1,7 @@ # Attention: serverTimezone=Asia/Shanghai !!! -spring.datasource.url=jdbc:mysql://127.0.0.1:3306/beidou?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&useSSL=true -spring.datasource.username=admin -spring.datasource.password=DBMgr_2022 +spring.datasource.url=jdbc:mysql://127.0.0.1:3306/bis-device?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&useSSL=true +spring.datasource.username=root +spring.datasource.password= spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver spring.jpa.properties.hibernate.hbm2ddl.auto=update spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MYSQL5InnoDBDialect diff --git a/sec-beidou/src/main/resources/db/schema.sql b/sec-beidou/src/main/resources/db/schema.sql index 71e30a82..7eb0d011 100644 --- a/sec-beidou/src/main/resources/db/schema.sql +++ b/sec-beidou/src/main/resources/db/schema.sql @@ -135,8 +135,8 @@ CREATE TABLE IF NOT EXISTS `gnsssinglecalcdata` ( `pitch` double DEFAULT NULL, `yaw` double DEFAULT NULL, `shock` double DEFAULT NULL, - PRIMARY KEY (`id`), - ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; CREATE TABLE IF NOT EXISTS `gnssstatusmsg` ( `id` bigint AUTO_INCREMENT,