diff --git a/bonus-modules/bonus-base/pom.xml b/bonus-modules/bonus-base/pom.xml index 21855ae..884876a 100644 --- a/bonus-modules/bonus-base/pom.xml +++ b/bonus-modules/bonus-base/pom.xml @@ -42,6 +42,13 @@ + + + com.alibaba.fastjson2 + fastjson2 + ${fastjson.version} + + diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/data/controller/DataCenterController.java b/bonus-modules/bonus-base/src/main/java/com/bonus/data/controller/DataCenterController.java index 1a685f0..1bdfd34 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/data/controller/DataCenterController.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/data/controller/DataCenterController.java @@ -1,9 +1,12 @@ package com.bonus.data.controller; +import com.alibaba.fastjson2.JSONObject; import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.data.entity.*; 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.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -20,6 +23,7 @@ import java.util.List; */ @RestController @RequestMapping("/data") +@Slf4j public class DataCenterController extends BaseController { @Autowired @@ -30,8 +34,16 @@ public class DataCenterController extends BaseController { * @return */ @PostMapping("/uploadDevStatus") - public AjaxResult uploadDevStatus(@RequestBody List list){ - return service.uploadDevStatus(list); + public AjaxResult uploadDevStatus(@RequestBody String obj){ + try{ + JSONObject jsonObject = JSONObject.parseObject(obj); + log.info("数据-->{}",obj); + List 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 */ @PostMapping("/uploadCgqData") - public AjaxResult uploadCgqData(@RequestBody List list){ + public AjaxResult uploadCgqData(@RequestBody String obj){ + JSONObject jsonObject = JSONObject.parseObject(obj); + log.info("数据-->{}",obj); + List list = jsonObject.getList("list",CgqInfoDataVo.class); return service.uploadCgqData(list); } @@ -49,7 +64,10 @@ public class DataCenterController extends BaseController { * @return */ @PostMapping("/uploadCjData") - public AjaxResult uploadCjData(@RequestBody List list){ + public AjaxResult uploadCjData(@RequestBody String obj){ + JSONObject jsonObject = JSONObject.parseObject(obj); + log.info("数据-->{}",obj); + List list = jsonObject.getList("list",CjDataVo.class); return service.uploadCjData(list); } /** diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/data/entity/DevInfoVo.java b/bonus-modules/bonus-base/src/main/java/com/bonus/data/entity/DevInfoVo.java index 11b2f2d..a197aba 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/data/entity/DevInfoVo.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/data/entity/DevInfoVo.java @@ -2,12 +2,14 @@ package com.bonus.data.entity; import lombok.Data; +import java.io.Serializable; + /** * 设备基础信息 * @author 黑子 */ @Data -public class DevInfoVo { +public class DevInfoVo implements Serializable { /** * 设备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 未绑定 */ - private String bangding_state; + private String bangdingState; /** * 设备在线状态1:在线,0:离线 */ - private String device_online_state; + private String deviceOnlineState; /** * 设备故障状态1:故障,0:正常 */ - private String device_failure_state; + private String deviceFailureState; /** * 设备告警状态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; /** * 备注 */ diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/data/service/DataCenterServiceImpl.java b/bonus-modules/bonus-base/src/main/java/com/bonus/data/service/DataCenterServiceImpl.java index 4b5c273..ab1d77a 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/data/service/DataCenterServiceImpl.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/data/service/DataCenterServiceImpl.java @@ -54,7 +54,7 @@ public class DataCenterServiceImpl implements DataCenterService{ }catch (Exception e){ log.error(e.toString(),e); } - return AjaxResult.error(msg.get()); + return AjaxResult.success(msg.get()); } /** diff --git a/bonus-modules/bonus-base/src/main/resources/bootstrap.yml b/bonus-modules/bonus-base/src/main/resources/bootstrap.yml index 0661fe7..11e6834 100644 --- a/bonus-modules/bonus-base/src/main/resources/bootstrap.yml +++ b/bonus-modules/bonus-base/src/main/resources/bootstrap.yml @@ -1,6 +1,6 @@ # Tomcat server: - port: 18088 + port: 21994 # Spring spring: application: diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/data/DataCenterMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/data/DataCenterMapper.xml index 5aad96f..dc1fa9c 100644 --- a/bonus-modules/bonus-base/src/main/resources/mapper/data/DataCenterMapper.xml +++ b/bonus-modules/bonus-base/src/main/resources/mapper/data/DataCenterMapper.xml @@ -10,10 +10,10 @@ dev_err, dev_factory, remark, pro_name, pro_code, rel_id )values - (#{device_type},#{device_code},#{device_name}, - #{device_online_state},#{device_alarm_state},0, - #{device_failure_state},#{device_factory},#{remark},#{device_project_name} - #{device_project_code},#{id} + (#{deviceType},#{deviceCode},#{deviceName}, + #{deviceOnlineState},#{deviceAlarmState},0, + #{deviceFailureState},#{deviceFactory},#{remark},#{deviceProjectName}, + #{deviceProjectCode},#{id} ) @@ -39,12 +39,12 @@ update tb_device set - dev_type=#{device_type}, dev_code=#{device_code},dev_name=#{device_name}, - dev_status= #{device_online_state},dev_warn=#{device_alarm_state}, - dev_err= #{device_failure_state}, dev_factory=#{device_factory}, remark=#{remark}, - pro_name=#{device_project_name}, - pro_code=#{device_project_code} - where rel_id=#{id} + dev_type=#{deviceType}, dev_code=#{deviceCode},dev_name=#{deviceName}, + dev_status= #{deviceOnlineState},dev_warn=#{deviceAlarmState}, + dev_err= #{deviceFailureState}, dev_factory=#{deviceFactory}, remark=#{remark}, + pro_name=#{deviceProjectCode}, + pro_code=#{deviceProjectCode} + where rel_id=#{id} diff --git a/bonus-modules/bonus-datacenter/src/main/java/com/bonus/data/entity/DevInfoVo.java b/bonus-modules/bonus-datacenter/src/main/java/com/bonus/data/entity/DevInfoVo.java index 11b2f2d..3c33837 100644 --- a/bonus-modules/bonus-datacenter/src/main/java/com/bonus/data/entity/DevInfoVo.java +++ b/bonus-modules/bonus-datacenter/src/main/java/com/bonus/data/entity/DevInfoVo.java @@ -2,12 +2,15 @@ package com.bonus.data.entity; import lombok.Data; +import java.awt.*; +import java.io.Serializable; + /** * 设备基础信息 * @author 黑子 */ @Data -public class DevInfoVo { +public class DevInfoVo implements Serializable { /** * 设备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 未绑定 */ - private String bangding_state; + private String bangdingState; /** * 设备在线状态1:在线,0:离线 */ - private String device_online_state; + private String deviceOnlineState; /** * 设备故障状态1:故障,0:正常 */ - private String device_failure_state; + private String deviceFailureState; /** * 设备告警状态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; /** * 备注 */