修改

service-issue/service-issue-biz/src/main/java/com/usky/issue/controller/MybatisGeneratorUtils.java

@@ -43,10 +43,10 @@ public class MybatisGeneratorUtils {
         //2、数据源配置
         //修改数据源
         DataSourceConfig dsc = new DataSourceConfig();
-        dsc.setUrl("jdbc:mysql://47.98.201.187:3306/jdxf?useUnicode=true&serverTimezone=GMT&useSSL=false&characterEncoding=utf8");
+        dsc.setUrl("jdbc:mysql://172.16.120.165:3306/usky-website?useUnicode=true&serverTimezone=GMT&useSSL=false&characterEncoding=utf8");
         dsc.setDriverName("com.mysql.jdbc.Driver");
-        dsc.setUsername("fuYuChuan");
-        dsc.setPassword("fuYuChuan@123");
+        dsc.setUsername("usky");
+        dsc.setPassword("Yt#75Usky");
         mpg.setDataSource(dsc);
 
         // 3、包配置
@@ -71,7 +71,7 @@ public class MybatisGeneratorUtils {
         // strategy.setTablePrefix("t_"); // 表名前缀
         strategy.setEntityLombokModel(true); //使用lombok
         //修改自己想要生成的表
-        strategy.setInclude(new String[]{"sp_rtu2017", "sp_sj2017"});  // 逆向工程使用的表   如果要生成多个,这里可以传入String[]
+        strategy.setInclude(new String[]{"sp_device","sp_device_alarm","sp_device_data"});  // 逆向工程使用的表   如果要生成多个,这里可以传入String[]
         mpg.setStrategy(strategy);
 
         // 关闭默认 xml 生成，调整生成 至 根目录

service-issue/service-issue-biz/src/main/java/com/usky/issue/service/impl/SpDeviceServiceImpl.java

@@ -0,0 +1,55 @@
+package com.usky.issue.service.impl;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.usky.issue.domain.SpDevice;
+import com.usky.issue.domain.SpOwner;
+import com.usky.issue.mapper.SpDeviceMapper;
+import com.usky.issue.service.SpDeviceService;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import com.usky.issue.service.SpOwnerService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+
+import java.util.List;
+
+/**
+ * <p>
+ * 设备信息表 服务实现类
+ * </p>
+ *
+ * @author fu
+ * @since 2024-01-24
+ */
+@Service
+public class SpDeviceServiceImpl extends AbstractCrudService<SpDeviceMapper, SpDevice> implements SpDeviceService {
+    @Autowired
+    private SpOwnerService spOwnerService;
+
+    @Override
+    @DS("usky-website")
+    public void updateDevice() {
+        QueryWrapper<SpDevice> queryWrapper = new QueryWrapper<>();
+        queryWrapper.orderByDesc("id").last("LIMIT 1");
+        SpDevice lastDevice = baseMapper.selectOne(queryWrapper);
+        List<SpOwner> devicesToUpdate;
+        if (lastDevice == null) {
+            devicesToUpdate = spOwnerService.getOwners(spOwnerService.getDeviceCodes());
+        } else {
+            devicesToUpdate = spOwnerService.getOwnersAfter(lastDevice.getId());
+        }
+        for (SpOwner owner : devicesToUpdate) {
+            SpDevice spDevice = new SpDevice();
+            spDevice.setId(owner.getId());
+            spDevice.setDeviceCode(owner.getOwnerCode());
+            spDevice.setDeviceName(owner.getOwnerName());
+            spDevice.setInstallAddress(owner.getUnitinfo());
+            spDevice.setInstallationFloor(owner.getLouyu());
+            spDevice.setInstallationTime(owner.getInstallTime());
+            spDevice.setDeviceType(owner.getDwtype());
+            spDevice.setCampus(spOwnerService.getCampus(owner.getCompany()));
+            baseMapper.insert(spDevice);
+        }
+    }
+}

service-issue/service-issue-biz/src/main/java/com/usky/issue/service/impl/SpEf2017ServiceImpl.java

@@ -0,0 +1,79 @@
+package com.usky.issue.service.impl;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.usky.common.core.util.StringUtils;
+import com.usky.issue.domain.*;
+import com.usky.issue.mapper.SpEf2017Mapper;
+import com.usky.issue.service.SpEf2017Service;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import com.usky.issue.service.SpOwnerService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author fu
+ * @since 2024-01-24
+ */
+@Service
+@DS("jdxf")
+public class SpEf2017ServiceImpl extends AbstractCrudService<SpEf2017Mapper, SpEf2017> implements SpEf2017Service {
+    @Autowired
+    private SpOwnerService spOwnerService;
+
+
+    /**
+     * 告警信息更新
+     * @return
+     */
+    @Override
+    public List<SpEf2017> getOwners() {
+        List<String> codes = spOwnerService.getOwners(spOwnerService.getDeviceCodes())
+                .stream()
+                .filter(spOwner -> spOwner.getDwtype()==7)
+                .map(SpOwner::getOwnerCode)
+                .collect(Collectors.toList());
+        return baseMapper.selectList(Wrappers.<SpEf2017>query()
+                .select("device_code", "time", "data1","clr",
+                        "IF(clsj = '0000-00-00 00:00:00', '1997-01-01 00:00:00', clsj) AS clsj",
+                        "clnr", "clzt", "clwb")
+                .in("device_code", codes)
+        );
+    }
+
+
+
+
+    @Override
+    public String getAlarmName(String data1) {
+        switch (data1) {
+            case "EF1":
+                return "过压报警";
+            case "EF2":
+                return "低压报警";
+            case "EF3":
+                return "过流报警";
+            case "EF4":
+                return "漏电报警";
+            case "EF5":
+                return "1号线缆温度超高";
+            case "EF6":
+                return "2号线缆温度超高";
+            case "EF7":
+                return "3号线缆温度超高";
+            default:
+                return "";
+        }
+    }
+
+}

service-issue/service-issue-biz/src/main/java/com/usky/issue/service/impl/SpOwnerStatusServiceImpl.java

@@ -0,0 +1,57 @@
+package com.usky.issue.service.impl;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.usky.issue.domain.SpDeviceData;
+import com.usky.issue.domain.SpOwner;
+import com.usky.issue.domain.SpOwnerStatus;
+import com.usky.issue.mapper.SpOwnerStatusMapper;
+import com.usky.issue.service.SpOwnerService;
+import com.usky.issue.service.SpOwnerStatusService;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author fu
+ * @since 2024-01-24
+ */
+@Service
+@DS("jdxf")
+public class SpOwnerStatusServiceImpl extends AbstractCrudService<SpOwnerStatusMapper, SpOwnerStatus> implements SpOwnerStatusService {
+    @Autowired
+    private SpOwnerService spOwnerService;
+
+    /**
+     * 设备数据更新
+     *
+     * @return
+     */
+    @Override
+    public List<SpOwnerStatus> getOwners() {
+        LambdaQueryWrapper<SpOwnerStatus> device = Wrappers.lambdaQuery();
+        device.select(SpOwnerStatus::getId, SpOwnerStatus::getDeviceId, SpOwnerStatus::getDwtype, SpOwnerStatus::getPointName,
+                SpOwnerStatus::getPointCode, SpOwnerStatus::getPointData, SpOwnerStatus::getDataTime, SpOwnerStatus::getContent)
+                .in(SpOwnerStatus::getDeviceId, spOwnerService.getDeviceCodes());
+        return baseMapper.selectList(device);
+    }
+
+    @Override
+    public List<SpOwnerStatus> getOwnersAfter(Integer lastId) {
+        LambdaQueryWrapper<SpOwnerStatus> wrapper = Wrappers.lambdaQuery();
+        wrapper.select(SpOwnerStatus::getId, SpOwnerStatus::getDeviceId, SpOwnerStatus::getPointName, SpOwnerStatus::getPointCode,
+                SpOwnerStatus::getPointData, SpOwnerStatus::getDwtype, SpOwnerStatus::getDataTime, SpOwnerStatus::getContent)
+                .gt(SpOwnerStatus::getId, lastId)
+                .in(SpOwnerStatus::getDeviceId, spOwnerService.getDeviceCodes());
+        return baseMapper.selectList(wrapper);
+    }
+
+}

service-issue/service-issue-biz/src/main/resources/bootstrap.yml

@@ -14,10 +14,10 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: usky-cloud-nacos:8848
+        server-addr: 172.16.120.165:8848
       config:
         # 配置中心地址
-        server-addr: usky-cloud-nacos:8848
+        server-addr: 172.16.120.165:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

service-issue/service-issue-biz/src/main/resources/mapper/issue/SpDeviceAlarmMapper.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.usky.issue.mapper.SpDeviceAlarmMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.issue.domain.SpDeviceAlarm">
+        <id column="id" property="id" />
+        <result column="device_code" property="deviceCode" />
+        <result column="alarm_time" property="alarmTime" />
+        <result column="device_type" property="deviceType" />
+        <result column="alarm_type" property="alarmType" />
+        <result column="alarm_name" property="alarmName" />
+        <result column="alarm_address" property="alarmAddress" />
+        <result column="handler" property="handler" />
+        <result column="handling_time" property="handlingTime" />
+        <result column="handling_content" property="handlingContent" />
+        <result column="handling_status" property="handlingStatus" />
+        <result column="false_alarm" property="falseAlarm" />
+    </resultMap>
+
+</mapper>

service-issue/service-issue-biz/src/main/resources/mapper/issue/SpDeviceDataMapper.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.usky.issue.mapper.SpDeviceDataMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.issue.domain.SpDeviceData">
+        <id column="id" property="id" />
+        <result column="device_code" property="deviceCode" />
+        <result column="device_type" property="deviceType" />
+        <result column="point_name" property="pointName" />
+        <result column="point_code" property="pointCode" />
+        <result column="point_data" property="pointData" />
+        <result column="data_time" property="dataTime" />
+        <result column="data_content" property="dataContent" />
+    </resultMap>
+
+</mapper>

service-issue/service-issue-biz/src/main/resources/mapper/issue/SpDeviceMapper.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.usky.issue.mapper.SpDeviceMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.issue.domain.SpDevice">
+        <id column="id" property="id" />
+        <result column="device_code" property="deviceCode" />
+        <result column="device_name" property="deviceName" />
+        <result column="install_address" property="installAddress" />
+        <result column="installation_floor" property="installationFloor" />
+        <result column="installation_time" property="installationTime" />
+        <result column="device_type" property="deviceType" />
+        <result column="campus" property="campus" />
+    </resultMap>
+
+</mapper>

service-issue/service-issue-biz/src/main/resources/mapper/issue/SpEf2017Mapper.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.usky.issue.mapper.SpEf2017Mapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.issue.domain.SpEf2017">
+        <id column="id" property="id" />
+        <result column="port" property="port" />
+        <result column="device_code" property="deviceCode" />
+        <result column="time" property="time" />
+        <result column="status" property="status" />
+        <result column="address" property="address" />
+        <result column="ncmd" property="ncmd" />
+        <result column="data1" property="data1" />
+        <result column="data2" property="data2" />
+        <result column="data3" property="data3" />
+        <result column="data4" property="data4" />
+        <result column="data5" property="data5" />
+        <result column="cllx" property="cllx" />
+        <result column="clsj" property="clsj" />
+        <result column="clr" property="clr" />
+        <result column="clnr" property="clnr" />
+        <result column="clwb" property="clwb" />
+        <result column="cllxr" property="cllxr" />
+        <result column="cldh" property="cldh" />
+        <result column="clzt" property="clzt" />
+        <result column="video" property="video" />
+    </resultMap>
+
+</mapper>

service-issue/service-issue-biz/src/main/resources/mapper/issue/SpOwnerStatusMapper.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.usky.issue.mapper.SpOwnerStatusMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.issue.domain.SpOwnerStatus">
+        <id column="id" property="id" />
+        <result column="device_id" property="deviceId" />
+        <result column="dwtype" property="dwtype" />
+        <result column="point_name" property="pointName" />
+        <result column="point_code" property="pointCode" />
+        <result column="point_data" property="pointData" />
+        <result column="data_time" property="dataTime" />
+        <result column="content" property="content" />
+    </resultMap>
+
+</mapper>