提交

src/main/java/org/springblade/modules/zbTable/controller/ZbTableController.java

@@ -34,6 +34,7 @@ import org.springblade.core.tool.utils.Func;
 import org.springblade.modules.system.entity.Dept;
 import org.springblade.modules.system.service.IDeptService;
 import org.springblade.modules.system.service.IDictBizService;
+import org.springblade.modules.zbTable.vo.TQDevBaseVO;
 import org.springblade.modules.zbdsTable.entity.ZbdsTableEntity;
 import org.springblade.modules.zbdsTable.service.IZbdsTableService;
 import org.springblade.modules.zblsTable.entity.ZblsTableEntity;
@@ -101,6 +102,21 @@ public class ZbTableController extends BladeController {
 	@ApiOperation(value = "分页", notes = "传入table")
 	public R<IPage<ZbTableEntity>> page(ZbTableEntity table, Query query) {
 		IPage<ZbTableEntity> pages = zbTableService.selectTablePage(Condition.getPage(query), table);
+		for (ZbTableEntity zb:pages.getRecords()) {
+			TQDevBaseVO tqDevBaseVO = zbTableService.getZbzxdw(zb.getZbbh());
+			if (tqDevBaseVO != null) {
+				String lon = String.valueOf(tqDevBaseVO.getLon());
+				String lat = String.valueOf(tqDevBaseVO.getLat());
+				String lon1 = lon.substring(0, 3);
+				String lon2 = lon.substring(3);
+				String lat1 = lat.substring(0, 2);
+				String lat2 = lat.substring(2);
+				String jd = lon1 + "." + lon2;
+				String wd = lat1 + "." + lat2;
+				zb.setJd(jd);
+				zb.setWd(wd);
+			}
+		}
 		/*for (ZbTableEntity zbTableVO:pages.getRecords()) {
 			String codeyt = "zbyt";
 			String codezt = "zbzt";
@@ -271,6 +287,13 @@ public class ZbTableController extends BladeController {
 				list.add(lsjl);
 			}
 		}
+		for (ZblsTableEntity zblsTable:list) {
+			TQDevBaseVO tqDevBaseVO = zbTableService.getZbzxdw(zblsTable.getZbbh());
+			if (tqDevBaseVO != null) {
+				zblsTable.setBAT(tqDevBaseVO.getBat());
+				zblsTable.setCSQ(tqDevBaseVO.getCsq());
+			}
+		}
 		return R.data(list);
 	}
 
@@ -295,6 +318,22 @@ public class ZbTableController extends BladeController {
 	 */
 	@GetMapping("selectDt")
 	public R selectDt(ZbTableEntity zbTable) {
+		List<ZbTableEntity> list = zbTableService.selectDt(zbTable);
+		for (ZbTableEntity zb:list) {
+			TQDevBaseVO tqDevBaseVO = zbTableService.getZbzxdw(zb.getZbbh());
+			if (tqDevBaseVO != null) {
+				String lon = String.valueOf(tqDevBaseVO.getLon());
+				String lat = String.valueOf(tqDevBaseVO.getLat());
+				String lon1 = lon.substring(0, 3);
+				String lon2 = lon.substring(3);
+				String lat1 = lat.substring(0, 2);
+				String lat2 = lat.substring(2);
+				String jd = lon1 + "." + lon2;
+				String wd = lat1 + "." + lat2;
+				zb.setJd(jd);
+				zb.setWd(wd);
+			}
+		}
 		return R.data(zbTableService.selectDt(zbTable));
 	}
 
@@ -320,8 +359,19 @@ public class ZbTableController extends BladeController {
 	 * 获取当前装备的最新点位
 	 */
 	@GetMapping("getZbzxdw")
-	public R getZbzxdw(String zbbh) {
-		return R.data(zbTableService.getZbzxdw(zbbh));
+	public R getZbzxdw(TQDevBaseVO tqDevBaseVO) {
+		TQDevBaseVO zbzxdw = zbTableService.getZbzxdw(tqDevBaseVO.getQid());
+		String lon = String.valueOf(zbzxdw.getLon());
+		String lat = String.valueOf(zbzxdw.getLat());
+		String lon1 = lon.substring(0, 3);
+		String lon2 = lon.substring(3);
+		String lat1 = lat.substring(0, 2);
+		String lat2 = lat.substring(2);
+		String jd = lon1 + "." + lon2;
+		String wd = lat1 + "." + lat2;
+		zbzxdw.setJd(jd);
+		zbzxdw.setWd(wd);
+		return R.data(zbzxdw);
 	}
 
 	/**

src/main/java/org/springblade/modules/zbTable/mapper/ZbTableMapper.java

@@ -16,7 +16,9 @@
  */
 package org.springblade.modules.zbTable.mapper;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import org.springblade.modules.zbTable.entity.ZbTableEntity;
+import org.springblade.modules.zbTable.vo.TQDevBaseVO;
 import org.springblade.modules.zbTable.vo.ZbTableVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -51,7 +53,7 @@ public interface ZbTableMapper extends BaseMapper<ZbTableEntity> {
 
 	List<ZbTableEntity> getZbByDw(String[] id);
 
-	ZbTableEntity getZbzxdw(String zbbh);
+	TQDevBaseVO getZbzxdw(String zbbh);
 
 	List<ZbTableEntity> selectZbByPcs(ZbTableEntity zbTable);
 

src/main/java/org/springblade/modules/zbTable/mapper/ZbTableMapper.xml

@@ -163,8 +163,8 @@
         </foreach>
     </select>
 
-    <select id="getZbzxdw" resultMap="tableResultMap">
-        select jd,wd from zbjwd_table where zbbh = #{zbbh} order by create_time desc
+    <select id="getZbzxdw" resultType="org.springblade.modules.zbTable.vo.TQDevBaseVO">
+        select * from t_q_dev_base where qid = #{zbbh}
     </select>
 
     <select id="selectZbByPcs" resultMap="tableResultMap">

src/main/java/org/springblade/modules/zbTable/service/IZbTableService.java

@@ -17,6 +17,7 @@
 package org.springblade.modules.zbTable.service;
 
 import org.springblade.modules.zbTable.entity.ZbTableEntity;
+import org.springblade.modules.zbTable.vo.TQDevBaseVO;
 import org.springblade.modules.zbTable.vo.ZbTableVO;
 import org.springblade.core.mp.base.BaseService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -51,7 +52,7 @@ public interface IZbTableService extends BaseService<ZbTableEntity> {
 
 	List<ZbTableEntity> getZbByDw(String[] id);
 
-	ZbTableEntity getZbzxdw(String zbbh);
+	TQDevBaseVO getZbzxdw(String zbbh);
 
 	List<ZbTableEntity> selectZbByPcs(ZbTableEntity zbTable);
 

src/main/java/org/springblade/modules/zbTable/service/impl/ZbTableServiceImpl.java

@@ -17,6 +17,7 @@
 package org.springblade.modules.zbTable.service.impl;
 
 import org.springblade.modules.zbTable.entity.ZbTableEntity;
+import org.springblade.modules.zbTable.vo.TQDevBaseVO;
 import org.springblade.modules.zbTable.vo.ZbTableVO;
 import org.springblade.modules.zbTable.mapper.ZbTableMapper;
 import org.springblade.modules.zbTable.service.IZbTableService;
@@ -67,7 +68,7 @@ public class ZbTableServiceImpl extends BaseServiceImpl<ZbTableMapper, ZbTableEn
 	}
 
 	@Override
-	public ZbTableEntity getZbzxdw(String zbbh) {
+	public TQDevBaseVO getZbzxdw(String zbbh) {
 		return baseMapper.getZbzxdw(zbbh);
 	}
 

src/main/java/org/springblade/modules/zbTable/vo/TQDevBaseVO.java

@@ -0,0 +1,35 @@
+package org.springblade.modules.zbTable.vo;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class TQDevBaseVO {
+	// 唯一编号
+	private String qid;
+	// 最后一次定位数据  经度
+	private int lon;
+	// 最后一次定位数据  纬度
+	private int lat;
+	// 位置
+	private String addr;
+	// 最后一次定位类型 0-复合定位  1-北斗
+	private int ltype;
+	// 电池电量百分比
+	private int bat;
+	// 网络信号强度
+	private int csq;
+	// iccid
+	private String iccid;
+	// 数据有效位
+	private int datav;
+	// 设备注册时间
+	private Date regTime;
+	// 设备心跳时间
+	private Date aliveTime;
+	// 设备定位时间
+	private Date locateTime;
+	private String jd;
+	private String wd;
+}

src/main/java/org/springblade/modules/zbTable/vo/TQDevLocateVO.java

@@ -0,0 +1,33 @@
+package org.springblade.modules.zbTable.vo;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class TQDevLocateVO {
+	// 历史定位数据自增唯一
+	private Long hid;
+	// 唯一编号
+	private String qid;
+	// 经度
+	private int lon;
+	// 纬度
+	private int lat;
+	// 定位精度米
+	private int radius;
+	// 位置
+	private String addr;
+	// 最后一次定位类型 0-复合定位  1-北斗
+	private int ltype;
+	// 电池电量百分比
+	private int bat;
+	// 网络信号强度
+	private int csq;
+	// 数据有效位
+	private int datav;
+	// 其他数据
+	private String ojson;
+	// 设备定位时间
+	private Date locateTime;
+}

src/main/java/org/springblade/modules/zblsTable/entity/ZblsTableEntity.java

@@ -132,4 +132,8 @@ public class ZblsTableEntity extends BaseEntity {
 	private String zhdw;
 	@TableField(exist = false)
 	private String dsdd;
+	@TableField(exist = false)
+	private int BAT;
+	@TableField(exist = false)
+	private int CSQ;
 }

src/main/resources/application-prod.yml

@@ -2,9 +2,7 @@
 spring:
   redis:
     ##redis 单机环境配置
-    ##将docker脚本部署的redis服务映射为宿主机ip
-    ##生产环境推荐使用阿里云高可用redis服务并设置密码
-    host: 127.0.0.1
+    host: 135.48.15.214
     port: 6379
     password:
     database: 0
@@ -14,9 +12,26 @@ spring:
     #  nodes: 127.0.0.1:7001,127.0.0.1:7002,127.0.0.1:7003
     #  commandTimeout: 5000
   datasource:
-    url: jdbc:mysql://localhost:3306/bladex_boot?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
-    username: root
-    password: root
+    # MySql
+    #url: jdbc:mysql://localhost:3306/bladex_boot?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+    #username: root
+    #password: root
+    # PostgreSQL
+    url: jdbc:postgresql://135.48.15.214:5432/postgres?currentSchema=zdzb
+    username: postgres
+    password: xwkj2022@
+    # Oracle
+    #url: jdbc:oracle:thin:@127.0.0.1:1521:orcl
+    #username: BLADEX_BOOT
+    #password: BLADEX_BOOT
+    # SqlServer
+    #url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=bladex_boot
+    #username: bladex_boot
+    #password: bladex_boot
+    # DaMeng
+    #url: jdbc:dm://127.0.0.1:5236/BLADEX_BOOT?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8
+    #username: BLADEX_BOOT
+    #password: BLADEX_BOOT
 
 #第三方登陆
 social:
@@ -29,12 +44,11 @@ blade:
   lock:
     ##是否启用分布式锁
     enabled: false
-    ##将docker脚本部署的redis服务映射为宿主机ip
-    ##生产环境推荐使用阿里云高可用redis服务并设置密码
+    ##redis服务地址
     address: redis://127.0.0.1:6379
-    password: 123456
   #本地文件上传
   file:
     remote-mode: true
     upload-domain: http://localhost:8999
     remote-path: /usr/share/nginx/html
+