bonus
/
SafetyAlertSystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

数据推送接口服务

This commit is contained in:
haozq 2024-09-23 10:56:24 +08:00
parent 409dd5c966
commit c293523952
7 changed files with 74 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bonus-modules/bonus-base/pom.xml
View File

@ -42,6 +42,13 @@
</dependency> </dependency>
<!-- JSON 解析器和生成器 -->
<dependency>
<groupId>com.alibaba.fastjson2</groupId>
<artifactId>fastjson2</artifactId>
<version>${fastjson.version}</version>
</dependency>
<!-- Mysql Connector --> <!-- Mysql Connector -->
<dependency> <dependency>

26
bonus-modules/bonus-base/src/main/java/com/bonus/data/controller/DataCenterController.java
View File

@ -1,9 +1,12 @@
package com.bonus.data.controller; package com.bonus.data.controller;
import com.alibaba.fastjson2.JSONObject;
import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.controller.BaseController;
import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.core.web.domain.AjaxResult;
import com.bonus.data.entity.*; import com.bonus.data.entity.*;
import com.bonus.data.service.DataCenterService; import com.bonus.data.service.DataCenterService;
import lombok.extern.slf4j.Slf4j;
import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
@ -20,6 +23,7 @@ import java.util.List;
*/ */
@RestController @RestController
@RequestMapping("/data") @RequestMapping("/data")
@Slf4j
public class DataCenterController extends BaseController { public class DataCenterController extends BaseController {
@Autowired @Autowired
@ -30,8 +34,16 @@ public class DataCenterController extends BaseController {
* @return * @return
*/ */
@PostMapping("/uploadDevStatus") @PostMapping("/uploadDevStatus")
public AjaxResult uploadDevStatus(@RequestBody List<DevInfoVo> list){ public AjaxResult uploadDevStatus(@RequestBody String obj){
return service.uploadDevStatus(list); try{
JSONObject jsonObject = JSONObject.parseObject(obj);
log.info("数据-->{}",obj);
List<DevInfoVo> list = jsonObject.getList("list",DevInfoVo.class);
return service.uploadDevStatus(list);
}catch (Exception e){
log.error(e.toString(),e);
}
return AjaxResult.error("数据解析异常");
} }
@ -40,7 +52,10 @@ public class DataCenterController extends BaseController {
* @return * @return
*/ */
@PostMapping("/uploadCgqData") @PostMapping("/uploadCgqData")
public AjaxResult uploadCgqData(@RequestBody List<CgqInfoDataVo> list){ public AjaxResult uploadCgqData(@RequestBody String obj){
JSONObject jsonObject = JSONObject.parseObject(obj);
log.info("数据-->{}",obj);
List<CgqInfoDataVo> list = jsonObject.getList("list",CgqInfoDataVo.class);
return service.uploadCgqData(list); return service.uploadCgqData(list);
} }
@ -49,7 +64,10 @@ public class DataCenterController extends BaseController {
* @return * @return
*/ */
@PostMapping("/uploadCjData") @PostMapping("/uploadCjData")
public AjaxResult uploadCjData(@RequestBody List<CjDataVo> list){ public AjaxResult uploadCjData(@RequestBody String obj){
JSONObject jsonObject = JSONObject.parseObject(obj);
log.info("数据-->{}",obj);
List<CjDataVo> list = jsonObject.getList("list",CjDataVo.class);
return service.uploadCjData(list); return service.uploadCjData(list);
} }
/** /**

30
bonus-modules/bonus-base/src/main/java/com/bonus/data/entity/DevInfoVo.java
View File

@ -2,12 +2,14 @@ package com.bonus.data.entity;
import lombok.Data; import lombok.Data;
import java.io.Serializable;
/** /**
* 设备基础信息 * 设备基础信息
* @author 黑子 * @author 黑子
*/ */
@Data @Data
public class DevInfoVo { public class DevInfoVo implements Serializable {
/** /**
* 设备id * 设备id
@ -16,60 +18,60 @@ public class DevInfoVo {
/** /**
* 设备编码 * 设备编码
*/ */
private String device_code; private String deviceCode;
/** /**
* 设备名称 * 设备名称
*/ */
private String device_name; private String deviceName;
/** /**
* 设备类型 * 设备类型
*/ */
private String device_type; private String deviceType;
/** /**
* 工程名称 * 工程名称
*/ */
private String device_project_name; private String deviceProjectName;
/** /**
* 设备工程编码 * 设备工程编码
*/ */
private String device_project_code; private String deviceProjectCode;
/** /**
* 设备负责人 * 设备负责人
*/ */
private String device_fuzeren; private String deviceFuzeren;
/** /**
* 设备绑定状态1 绑定0 未绑定 * 设备绑定状态1 绑定0 未绑定
*/ */
private String bangding_state; private String bangdingState;
/** /**
* 设备在线状态1：在线，0：离线 * 设备在线状态1：在线，0：离线
*/ */
private String device_online_state; private String deviceOnlineState;
/** /**
* 设备故障状态1：故障，0：正常 * 设备故障状态1：故障，0：正常
*/ */
private String device_failure_state; private String deviceFailureState;
/** /**
* 设备告警状态1：告警，0：正常 * 设备告警状态1：告警，0：正常
*/ */
private String device_alarm_state; private String deviceAlarmState;
/** /**
* 设备出场日期 * 设备出场日期
*/ */
private String device_manu_date; private String deviceManuDate;
/** /**
* 设备厂商 * 设备厂商
*/ */
private String device_factory; private String deviceFactory;
/** /**
* 更新时间 * 更新时间
*/ */
private String update_time; private String updateTime;
/** /**
* 备注 * 备注
*/ */

2
bonus-modules/bonus-base/src/main/java/com/bonus/data/service/DataCenterServiceImpl.java
View File

@ -54,7 +54,7 @@ public class DataCenterServiceImpl implements DataCenterService{
}catch (Exception e){ }catch (Exception e){
log.error(e.toString(),e); log.error(e.toString(),e);
} }
return AjaxResult.error(msg.get()); return AjaxResult.success(msg.get());
} }
/** /**

2
bonus-modules/bonus-base/src/main/resources/bootstrap.yml
View File

@ -1,6 +1,6 @@
# Tomcat # Tomcat
server: server:
port: 18088 port: 21994
# Spring # Spring
spring: spring:
application: application:

20
bonus-modules/bonus-base/src/main/resources/mapper/data/DataCenterMapper.xml
View File

@ -10,10 +10,10 @@
dev_err, dev_factory, remark, pro_name, dev_err, dev_factory, remark, pro_name,
pro_code, rel_id pro_code, rel_id
)values )values
(#{device_type},#{device_code},#{device_name}, (#{deviceType},#{deviceCode},#{deviceName},
#{device_online_state},#{device_alarm_state},0, #{deviceOnlineState},#{deviceAlarmState},0,
#{device_failure_state},#{device_factory},#{remark},#{device_project_name} #{deviceFailureState},#{deviceFactory},#{remark},#{deviceProjectName},
#{device_project_code},#{id} #{deviceProjectCode},#{id}
) )
</insert> </insert>
<insert id="insertAttribute" keyProperty="attributeId" useGeneratedKeys="true"> <insert id="insertAttribute" keyProperty="attributeId" useGeneratedKeys="true">
@ -39,12 +39,12 @@
<!--更新设备信息--> <!--更新设备信息-->
<update id="updateDevInfo"> <update id="updateDevInfo">
update tb_device set update tb_device set
dev_type=#{device_type}, dev_code=#{device_code},dev_name=#{device_name}, dev_type=#{deviceType}, dev_code=#{deviceCode},dev_name=#{deviceName},
dev_status= #{device_online_state},dev_warn=#{device_alarm_state}, dev_status= #{deviceOnlineState},dev_warn=#{deviceAlarmState},
dev_err= #{device_failure_state}, dev_factory=#{device_factory}, remark=#{remark}, dev_err= #{deviceFailureState}, dev_factory=#{deviceFactory}, remark=#{remark},
pro_name=#{device_project_name}, pro_name=#{deviceProjectCode},
pro_code=#{device_project_code} pro_code=#{deviceProjectCode}
where rel_id=#{id} where rel_id=#{id}
</update> </update>
<!--数据采集同步--> <!--数据采集同步-->
<update id="updateAttribute"> <update id="updateAttribute">

31
bonus-modules/bonus-datacenter/src/main/java/com/bonus/data/entity/DevInfoVo.java
View File

@ -2,12 +2,15 @@ package com.bonus.data.entity;
import lombok.Data; import lombok.Data;
import java.awt.*;
import java.io.Serializable;
/** /**
* 设备基础信息 * 设备基础信息
* @author 黑子 * @author 黑子
*/ */
@Data @Data
public class DevInfoVo { public class DevInfoVo implements Serializable {
/** /**
* 设备id * 设备id
@ -16,60 +19,60 @@ public class DevInfoVo {
/** /**
* 设备编码 * 设备编码
*/ */
private String device_code; private String deviceCode;
/** /**
* 设备名称 * 设备名称
*/ */
private String device_name; private String deviceName;
/** /**
* 设备类型 * 设备类型
*/ */
private String device_type; private String deviceType;
/** /**
* 工程名称 * 工程名称
*/ */
private String device_project_name; private String deviceProjectName;
/** /**
* 设备工程编码 * 设备工程编码
*/ */
private String device_project_code; private String deviceProjectCode;
/** /**
* 设备负责人 * 设备负责人
*/ */
private String device_fuzeren; private String deviceFuzeren;
/** /**
* 设备绑定状态1 绑定0 未绑定 * 设备绑定状态1 绑定0 未绑定
*/ */
private String bangding_state; private String bangdingState;
/** /**
* 设备在线状态1：在线，0：离线 * 设备在线状态1：在线，0：离线
*/ */
private String device_online_state; private String deviceOnlineState;
/** /**
* 设备故障状态1：故障，0：正常 * 设备故障状态1：故障，0：正常
*/ */
private String device_failure_state; private String deviceFailureState;
/** /**
* 设备告警状态1：告警，0：正常 * 设备告警状态1：告警，0：正常
*/ */
private String device_alarm_state; private String deviceAlarmState;
/** /**
* 设备出场日期 * 设备出场日期
*/ */
private String device_manu_date; private String deviceManuDate;
/** /**
* 设备厂商 * 设备厂商
*/ */
private String device_factory; private String deviceFactory;
/** /**
* 更新时间 * 更新时间
*/ */
private String update_time; private String updateTime;
/** /**
* 备注 * 备注
*/ */