diff --git a/src/main/java/com/casic/config/task/TaskConfigurer.java b/src/main/java/com/casic/config/task/TaskConfigurer.java index 5a3a029..6a64d1c 100644 --- a/src/main/java/com/casic/config/task/TaskConfigurer.java +++ b/src/main/java/com/casic/config/task/TaskConfigurer.java @@ -4,6 +4,7 @@ import com.casic.service.IPartitionStrategyService; import com.casic.service.UserDataDelayReceiver; import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; @@ -18,6 +19,7 @@ */ @Configuration @EnableScheduling +@Slf4j @RequiredArgsConstructor public class TaskConfigurer implements SchedulingConfigurer { @@ -55,6 +57,7 @@ return new Runnable() { @Override public void run() { + log.info("定时查询在线离线运行了..."); deviceDataService.checkAndUpdateDeviceOnline(); } }; @@ -67,6 +70,7 @@ return new Runnable() { @Override public void run() { + log.info("同步数据的任运行..."); userDataDelayReceiver.saveNewUserData(); } }; @@ -79,6 +83,7 @@ return new Runnable() { @Override public void run() { + log.info("定时构建硫化氢数据分区表任务运行..."); partitionStrategyService.createPartition("DATA_H2S", "data_h2s_log"); } }; diff --git a/src/main/java/com/casic/config/task/TaskConfigurer.java b/src/main/java/com/casic/config/task/TaskConfigurer.java index 5a3a029..6a64d1c 100644 --- a/src/main/java/com/casic/config/task/TaskConfigurer.java +++ b/src/main/java/com/casic/config/task/TaskConfigurer.java @@ -4,6 +4,7 @@ import com.casic.service.IPartitionStrategyService; import com.casic.service.UserDataDelayReceiver; import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; @@ -18,6 +19,7 @@ */ @Configuration @EnableScheduling +@Slf4j @RequiredArgsConstructor public class TaskConfigurer implements SchedulingConfigurer { @@ -55,6 +57,7 @@ return new Runnable() { @Override public void run() { + log.info("定时查询在线离线运行了..."); deviceDataService.checkAndUpdateDeviceOnline(); } }; @@ -67,6 +70,7 @@ return new Runnable() { @Override public void run() { + log.info("同步数据的任运行..."); userDataDelayReceiver.saveNewUserData(); } }; @@ -79,6 +83,7 @@ return new Runnable() { @Override public void run() { + log.info("定时构建硫化氢数据分区表任务运行..."); partitionStrategyService.createPartition("DATA_H2S", "data_h2s_log"); } }; diff --git a/src/main/java/com/casic/controller/ThirdDataController.java b/src/main/java/com/casic/controller/ThirdDataController.java index 30c191c..e95a9b6 100644 --- a/src/main/java/com/casic/controller/ThirdDataController.java +++ b/src/main/java/com/casic/controller/ThirdDataController.java @@ -2,7 +2,6 @@ import com.alibaba.fastjson.JSON; import com.casic.service.ThirdDataService; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; @@ -31,13 +30,13 @@ */ @RequestMapping("/push/data") public Object h2sData(@RequestBody Map h2sDataMap) { - System.out.println(JSON.toJSON(h2sDataMap)); + log.info("硫化氢数据订阅接口!" + JSON.toJSON(h2sDataMap)); return thirdDataService.h2sData(h2sDataMap); } @RequestMapping("/config/confirm") public Object configConfirm(@RequestBody Map configConfirmMap) { - System.out.println(JSON.toJSON(configConfirmMap)); + log.info("数据下发确认!" + JSON.toJSON(configConfirmMap)); threadPoolExecutor.execute( () -> { thirdDataService.configConfirm(configConfirmMap); diff --git a/src/main/java/com/casic/config/task/TaskConfigurer.java b/src/main/java/com/casic/config/task/TaskConfigurer.java index 5a3a029..6a64d1c 100644 --- a/src/main/java/com/casic/config/task/TaskConfigurer.java +++ b/src/main/java/com/casic/config/task/TaskConfigurer.java @@ -4,6 +4,7 @@ import com.casic.service.IPartitionStrategyService; import com.casic.service.UserDataDelayReceiver; import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; @@ -18,6 +19,7 @@ */ @Configuration @EnableScheduling +@Slf4j @RequiredArgsConstructor public class TaskConfigurer implements SchedulingConfigurer { @@ -55,6 +57,7 @@ return new Runnable() { @Override public void run() { + log.info("定时查询在线离线运行了..."); deviceDataService.checkAndUpdateDeviceOnline(); } }; @@ -67,6 +70,7 @@ return new Runnable() { @Override public void run() { + log.info("同步数据的任运行..."); userDataDelayReceiver.saveNewUserData(); } }; @@ -79,6 +83,7 @@ return new Runnable() { @Override public void run() { + log.info("定时构建硫化氢数据分区表任务运行..."); partitionStrategyService.createPartition("DATA_H2S", "data_h2s_log"); } }; diff --git a/src/main/java/com/casic/controller/ThirdDataController.java b/src/main/java/com/casic/controller/ThirdDataController.java index 30c191c..e95a9b6 100644 --- a/src/main/java/com/casic/controller/ThirdDataController.java +++ b/src/main/java/com/casic/controller/ThirdDataController.java @@ -2,7 +2,6 @@ import com.alibaba.fastjson.JSON; import com.casic.service.ThirdDataService; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; @@ -31,13 +30,13 @@ */ @RequestMapping("/push/data") public Object h2sData(@RequestBody Map h2sDataMap) { - System.out.println(JSON.toJSON(h2sDataMap)); + log.info("硫化氢数据订阅接口!" + JSON.toJSON(h2sDataMap)); return thirdDataService.h2sData(h2sDataMap); } @RequestMapping("/config/confirm") public Object configConfirm(@RequestBody Map configConfirmMap) { - System.out.println(JSON.toJSON(configConfirmMap)); + log.info("数据下发确认!" + JSON.toJSON(configConfirmMap)); threadPoolExecutor.execute( () -> { thirdDataService.configConfirm(configConfirmMap); diff --git a/src/main/java/com/casic/dao/UsersMapper.java b/src/main/java/com/casic/dao/UsersMapper.java index d394db7..9e8aa53 100644 --- a/src/main/java/com/casic/dao/UsersMapper.java +++ b/src/main/java/com/casic/dao/UsersMapper.java @@ -23,7 +23,7 @@ @Select("SELECT ID " + "FROM SYS_DEPT " + - "WHERE SIMPLE_NAME LIKE '%达州%'" + + "WHERE SIMPLE_NAME LIKE '%普光%'" + "AND DEL_FLAG=0 " + "LIMIT 1 ") Long getDeptIdByName(); diff --git a/src/main/java/com/casic/config/task/TaskConfigurer.java b/src/main/java/com/casic/config/task/TaskConfigurer.java index 5a3a029..6a64d1c 100644 --- a/src/main/java/com/casic/config/task/TaskConfigurer.java +++ b/src/main/java/com/casic/config/task/TaskConfigurer.java @@ -4,6 +4,7 @@ import com.casic.service.IPartitionStrategyService; import com.casic.service.UserDataDelayReceiver; import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; @@ -18,6 +19,7 @@ */ @Configuration @EnableScheduling +@Slf4j @RequiredArgsConstructor public class TaskConfigurer implements SchedulingConfigurer { @@ -55,6 +57,7 @@ return new Runnable() { @Override public void run() { + log.info("定时查询在线离线运行了..."); deviceDataService.checkAndUpdateDeviceOnline(); } }; @@ -67,6 +70,7 @@ return new Runnable() { @Override public void run() { + log.info("同步数据的任运行..."); userDataDelayReceiver.saveNewUserData(); } }; @@ -79,6 +83,7 @@ return new Runnable() { @Override public void run() { + log.info("定时构建硫化氢数据分区表任务运行..."); partitionStrategyService.createPartition("DATA_H2S", "data_h2s_log"); } }; diff --git a/src/main/java/com/casic/controller/ThirdDataController.java b/src/main/java/com/casic/controller/ThirdDataController.java index 30c191c..e95a9b6 100644 --- a/src/main/java/com/casic/controller/ThirdDataController.java +++ b/src/main/java/com/casic/controller/ThirdDataController.java @@ -2,7 +2,6 @@ import com.alibaba.fastjson.JSON; import com.casic.service.ThirdDataService; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; @@ -31,13 +30,13 @@ */ @RequestMapping("/push/data") public Object h2sData(@RequestBody Map h2sDataMap) { - System.out.println(JSON.toJSON(h2sDataMap)); + log.info("硫化氢数据订阅接口!" + JSON.toJSON(h2sDataMap)); return thirdDataService.h2sData(h2sDataMap); } @RequestMapping("/config/confirm") public Object configConfirm(@RequestBody Map configConfirmMap) { - System.out.println(JSON.toJSON(configConfirmMap)); + log.info("数据下发确认!" + JSON.toJSON(configConfirmMap)); threadPoolExecutor.execute( () -> { thirdDataService.configConfirm(configConfirmMap); diff --git a/src/main/java/com/casic/dao/UsersMapper.java b/src/main/java/com/casic/dao/UsersMapper.java index d394db7..9e8aa53 100644 --- a/src/main/java/com/casic/dao/UsersMapper.java +++ b/src/main/java/com/casic/dao/UsersMapper.java @@ -23,7 +23,7 @@ @Select("SELECT ID " + "FROM SYS_DEPT " + - "WHERE SIMPLE_NAME LIKE '%达州%'" + + "WHERE SIMPLE_NAME LIKE '%普光%'" + "AND DEL_FLAG=0 " + "LIMIT 1 ") Long getDeptIdByName(); diff --git a/src/main/java/com/casic/model/DataH2s.java b/src/main/java/com/casic/model/DataH2s.java index b53b19e..cfac77c 100644 --- a/src/main/java/com/casic/model/DataH2s.java +++ b/src/main/java/com/casic/model/DataH2s.java @@ -20,13 +20,14 @@ private String devcode; + @TableField(value = "WELL_CODE") private String wellCode; private String cell; private String strength; - private String uptime; + private String uptime; private String logtime; diff --git a/src/main/java/com/casic/config/task/TaskConfigurer.java b/src/main/java/com/casic/config/task/TaskConfigurer.java index 5a3a029..6a64d1c 100644 --- a/src/main/java/com/casic/config/task/TaskConfigurer.java +++ b/src/main/java/com/casic/config/task/TaskConfigurer.java @@ -4,6 +4,7 @@ import com.casic.service.IPartitionStrategyService; import com.casic.service.UserDataDelayReceiver; import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; @@ -18,6 +19,7 @@ */ @Configuration @EnableScheduling +@Slf4j @RequiredArgsConstructor public class TaskConfigurer implements SchedulingConfigurer { @@ -55,6 +57,7 @@ return new Runnable() { @Override public void run() { + log.info("定时查询在线离线运行了..."); deviceDataService.checkAndUpdateDeviceOnline(); } }; @@ -67,6 +70,7 @@ return new Runnable() { @Override public void run() { + log.info("同步数据的任运行..."); userDataDelayReceiver.saveNewUserData(); } }; @@ -79,6 +83,7 @@ return new Runnable() { @Override public void run() { + log.info("定时构建硫化氢数据分区表任务运行..."); partitionStrategyService.createPartition("DATA_H2S", "data_h2s_log"); } }; diff --git a/src/main/java/com/casic/controller/ThirdDataController.java b/src/main/java/com/casic/controller/ThirdDataController.java index 30c191c..e95a9b6 100644 --- a/src/main/java/com/casic/controller/ThirdDataController.java +++ b/src/main/java/com/casic/controller/ThirdDataController.java @@ -2,7 +2,6 @@ import com.alibaba.fastjson.JSON; import com.casic.service.ThirdDataService; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; @@ -31,13 +30,13 @@ */ @RequestMapping("/push/data") public Object h2sData(@RequestBody Map h2sDataMap) { - System.out.println(JSON.toJSON(h2sDataMap)); + log.info("硫化氢数据订阅接口!" + JSON.toJSON(h2sDataMap)); return thirdDataService.h2sData(h2sDataMap); } @RequestMapping("/config/confirm") public Object configConfirm(@RequestBody Map configConfirmMap) { - System.out.println(JSON.toJSON(configConfirmMap)); + log.info("数据下发确认!" + JSON.toJSON(configConfirmMap)); threadPoolExecutor.execute( () -> { thirdDataService.configConfirm(configConfirmMap); diff --git a/src/main/java/com/casic/dao/UsersMapper.java b/src/main/java/com/casic/dao/UsersMapper.java index d394db7..9e8aa53 100644 --- a/src/main/java/com/casic/dao/UsersMapper.java +++ b/src/main/java/com/casic/dao/UsersMapper.java @@ -23,7 +23,7 @@ @Select("SELECT ID " + "FROM SYS_DEPT " + - "WHERE SIMPLE_NAME LIKE '%达州%'" + + "WHERE SIMPLE_NAME LIKE '%普光%'" + "AND DEL_FLAG=0 " + "LIMIT 1 ") Long getDeptIdByName(); diff --git a/src/main/java/com/casic/model/DataH2s.java b/src/main/java/com/casic/model/DataH2s.java index b53b19e..cfac77c 100644 --- a/src/main/java/com/casic/model/DataH2s.java +++ b/src/main/java/com/casic/model/DataH2s.java @@ -20,13 +20,14 @@ private String devcode; + @TableField(value = "WELL_CODE") private String wellCode; private String cell; private String strength; - private String uptime; + private String uptime; private String logtime; diff --git a/src/main/java/com/casic/service/impl/ThirdDataServiceImpl.java b/src/main/java/com/casic/service/impl/ThirdDataServiceImpl.java index 71d244c..e156160 100644 --- a/src/main/java/com/casic/service/impl/ThirdDataServiceImpl.java +++ b/src/main/java/com/casic/service/impl/ThirdDataServiceImpl.java @@ -173,8 +173,8 @@ AlarmRecord alarmRecord = AlarmRecord.builder() .devcode(dataH2s.getDevcode()) .wellCode(dataH2s.getWellCode()) - .alarmType(dataH2s.getStrength()) .alarmMessage("浓度超限") + .alarmValue(dataH2s.getStrength()) .deviceId(deviceId) .alarmType("1") .alarmContent("浓度超限") diff --git a/src/main/java/com/casic/config/task/TaskConfigurer.java b/src/main/java/com/casic/config/task/TaskConfigurer.java index 5a3a029..6a64d1c 100644 --- a/src/main/java/com/casic/config/task/TaskConfigurer.java +++ b/src/main/java/com/casic/config/task/TaskConfigurer.java @@ -4,6 +4,7 @@ import com.casic.service.IPartitionStrategyService; import com.casic.service.UserDataDelayReceiver; import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; @@ -18,6 +19,7 @@ */ @Configuration @EnableScheduling +@Slf4j @RequiredArgsConstructor public class TaskConfigurer implements SchedulingConfigurer { @@ -55,6 +57,7 @@ return new Runnable() { @Override public void run() { + log.info("定时查询在线离线运行了..."); deviceDataService.checkAndUpdateDeviceOnline(); } }; @@ -67,6 +70,7 @@ return new Runnable() { @Override public void run() { + log.info("同步数据的任运行..."); userDataDelayReceiver.saveNewUserData(); } }; @@ -79,6 +83,7 @@ return new Runnable() { @Override public void run() { + log.info("定时构建硫化氢数据分区表任务运行..."); partitionStrategyService.createPartition("DATA_H2S", "data_h2s_log"); } }; diff --git a/src/main/java/com/casic/controller/ThirdDataController.java b/src/main/java/com/casic/controller/ThirdDataController.java index 30c191c..e95a9b6 100644 --- a/src/main/java/com/casic/controller/ThirdDataController.java +++ b/src/main/java/com/casic/controller/ThirdDataController.java @@ -2,7 +2,6 @@ import com.alibaba.fastjson.JSON; import com.casic.service.ThirdDataService; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; @@ -31,13 +30,13 @@ */ @RequestMapping("/push/data") public Object h2sData(@RequestBody Map h2sDataMap) { - System.out.println(JSON.toJSON(h2sDataMap)); + log.info("硫化氢数据订阅接口!" + JSON.toJSON(h2sDataMap)); return thirdDataService.h2sData(h2sDataMap); } @RequestMapping("/config/confirm") public Object configConfirm(@RequestBody Map configConfirmMap) { - System.out.println(JSON.toJSON(configConfirmMap)); + log.info("数据下发确认!" + JSON.toJSON(configConfirmMap)); threadPoolExecutor.execute( () -> { thirdDataService.configConfirm(configConfirmMap); diff --git a/src/main/java/com/casic/dao/UsersMapper.java b/src/main/java/com/casic/dao/UsersMapper.java index d394db7..9e8aa53 100644 --- a/src/main/java/com/casic/dao/UsersMapper.java +++ b/src/main/java/com/casic/dao/UsersMapper.java @@ -23,7 +23,7 @@ @Select("SELECT ID " + "FROM SYS_DEPT " + - "WHERE SIMPLE_NAME LIKE '%达州%'" + + "WHERE SIMPLE_NAME LIKE '%普光%'" + "AND DEL_FLAG=0 " + "LIMIT 1 ") Long getDeptIdByName(); diff --git a/src/main/java/com/casic/model/DataH2s.java b/src/main/java/com/casic/model/DataH2s.java index b53b19e..cfac77c 100644 --- a/src/main/java/com/casic/model/DataH2s.java +++ b/src/main/java/com/casic/model/DataH2s.java @@ -20,13 +20,14 @@ private String devcode; + @TableField(value = "WELL_CODE") private String wellCode; private String cell; private String strength; - private String uptime; + private String uptime; private String logtime; diff --git a/src/main/java/com/casic/service/impl/ThirdDataServiceImpl.java b/src/main/java/com/casic/service/impl/ThirdDataServiceImpl.java index 71d244c..e156160 100644 --- a/src/main/java/com/casic/service/impl/ThirdDataServiceImpl.java +++ b/src/main/java/com/casic/service/impl/ThirdDataServiceImpl.java @@ -173,8 +173,8 @@ AlarmRecord alarmRecord = AlarmRecord.builder() .devcode(dataH2s.getDevcode()) .wellCode(dataH2s.getWellCode()) - .alarmType(dataH2s.getStrength()) .alarmMessage("浓度超限") + .alarmValue(dataH2s.getStrength()) .deviceId(deviceId) .alarmType("1") .alarmContent("浓度超限") diff --git a/src/main/java/com/casic/service/impl/UserDataDelayReceiverImpl.java b/src/main/java/com/casic/service/impl/UserDataDelayReceiverImpl.java index 1be4a99..e7aff82 100644 --- a/src/main/java/com/casic/service/impl/UserDataDelayReceiverImpl.java +++ b/src/main/java/com/casic/service/impl/UserDataDelayReceiverImpl.java @@ -118,9 +118,18 @@ roleId = entry.getKey(); } } - if (StringUtils.isEmpty(roleId) || ObjectUtils.isEmpty(deptId)) { + + if (StringUtils.isEmpty(roleId)) { return; } + if (ObjectUtils.isEmpty(deptId)) { + for (Map.Entry entry : userMap.entrySet()) { + if (ObjectUtils.isEmpty(deptId) && ObjectUtils.isNotEmpty(entry.getValue().getDeptId())) { + deptId = (entry.getValue()).getDeptId(); + break; + } + } + } //新增 doAddUser(newUserCodeList, sourceMap, String.valueOf(roleId), deptId); //更新 @@ -182,10 +191,11 @@ User user = userMap.get(editUser); if (ObjectUtils.isNotEmpty(user)) { user.setRoleId(roleId); + users.add(user); } } - this.saveBatch(users); + this.updateBatchById(users); } /** diff --git a/src/main/java/com/casic/config/task/TaskConfigurer.java b/src/main/java/com/casic/config/task/TaskConfigurer.java index 5a3a029..6a64d1c 100644 --- a/src/main/java/com/casic/config/task/TaskConfigurer.java +++ b/src/main/java/com/casic/config/task/TaskConfigurer.java @@ -4,6 +4,7 @@ import com.casic.service.IPartitionStrategyService; import com.casic.service.UserDataDelayReceiver; import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; @@ -18,6 +19,7 @@ */ @Configuration @EnableScheduling +@Slf4j @RequiredArgsConstructor public class TaskConfigurer implements SchedulingConfigurer { @@ -55,6 +57,7 @@ return new Runnable() { @Override public void run() { + log.info("定时查询在线离线运行了..."); deviceDataService.checkAndUpdateDeviceOnline(); } }; @@ -67,6 +70,7 @@ return new Runnable() { @Override public void run() { + log.info("同步数据的任运行..."); userDataDelayReceiver.saveNewUserData(); } }; @@ -79,6 +83,7 @@ return new Runnable() { @Override public void run() { + log.info("定时构建硫化氢数据分区表任务运行..."); partitionStrategyService.createPartition("DATA_H2S", "data_h2s_log"); } }; diff --git a/src/main/java/com/casic/controller/ThirdDataController.java b/src/main/java/com/casic/controller/ThirdDataController.java index 30c191c..e95a9b6 100644 --- a/src/main/java/com/casic/controller/ThirdDataController.java +++ b/src/main/java/com/casic/controller/ThirdDataController.java @@ -2,7 +2,6 @@ import com.alibaba.fastjson.JSON; import com.casic.service.ThirdDataService; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; @@ -31,13 +30,13 @@ */ @RequestMapping("/push/data") public Object h2sData(@RequestBody Map h2sDataMap) { - System.out.println(JSON.toJSON(h2sDataMap)); + log.info("硫化氢数据订阅接口!" + JSON.toJSON(h2sDataMap)); return thirdDataService.h2sData(h2sDataMap); } @RequestMapping("/config/confirm") public Object configConfirm(@RequestBody Map configConfirmMap) { - System.out.println(JSON.toJSON(configConfirmMap)); + log.info("数据下发确认!" + JSON.toJSON(configConfirmMap)); threadPoolExecutor.execute( () -> { thirdDataService.configConfirm(configConfirmMap); diff --git a/src/main/java/com/casic/dao/UsersMapper.java b/src/main/java/com/casic/dao/UsersMapper.java index d394db7..9e8aa53 100644 --- a/src/main/java/com/casic/dao/UsersMapper.java +++ b/src/main/java/com/casic/dao/UsersMapper.java @@ -23,7 +23,7 @@ @Select("SELECT ID " + "FROM SYS_DEPT " + - "WHERE SIMPLE_NAME LIKE '%达州%'" + + "WHERE SIMPLE_NAME LIKE '%普光%'" + "AND DEL_FLAG=0 " + "LIMIT 1 ") Long getDeptIdByName(); diff --git a/src/main/java/com/casic/model/DataH2s.java b/src/main/java/com/casic/model/DataH2s.java index b53b19e..cfac77c 100644 --- a/src/main/java/com/casic/model/DataH2s.java +++ b/src/main/java/com/casic/model/DataH2s.java @@ -20,13 +20,14 @@ private String devcode; + @TableField(value = "WELL_CODE") private String wellCode; private String cell; private String strength; - private String uptime; + private String uptime; private String logtime; diff --git a/src/main/java/com/casic/service/impl/ThirdDataServiceImpl.java b/src/main/java/com/casic/service/impl/ThirdDataServiceImpl.java index 71d244c..e156160 100644 --- a/src/main/java/com/casic/service/impl/ThirdDataServiceImpl.java +++ b/src/main/java/com/casic/service/impl/ThirdDataServiceImpl.java @@ -173,8 +173,8 @@ AlarmRecord alarmRecord = AlarmRecord.builder() .devcode(dataH2s.getDevcode()) .wellCode(dataH2s.getWellCode()) - .alarmType(dataH2s.getStrength()) .alarmMessage("浓度超限") + .alarmValue(dataH2s.getStrength()) .deviceId(deviceId) .alarmType("1") .alarmContent("浓度超限") diff --git a/src/main/java/com/casic/service/impl/UserDataDelayReceiverImpl.java b/src/main/java/com/casic/service/impl/UserDataDelayReceiverImpl.java index 1be4a99..e7aff82 100644 --- a/src/main/java/com/casic/service/impl/UserDataDelayReceiverImpl.java +++ b/src/main/java/com/casic/service/impl/UserDataDelayReceiverImpl.java @@ -118,9 +118,18 @@ roleId = entry.getKey(); } } - if (StringUtils.isEmpty(roleId) || ObjectUtils.isEmpty(deptId)) { + + if (StringUtils.isEmpty(roleId)) { return; } + if (ObjectUtils.isEmpty(deptId)) { + for (Map.Entry entry : userMap.entrySet()) { + if (ObjectUtils.isEmpty(deptId) && ObjectUtils.isNotEmpty(entry.getValue().getDeptId())) { + deptId = (entry.getValue()).getDeptId(); + break; + } + } + } //新增 doAddUser(newUserCodeList, sourceMap, String.valueOf(roleId), deptId); //更新 @@ -182,10 +191,11 @@ User user = userMap.get(editUser); if (ObjectUtils.isNotEmpty(user)) { user.setRoleId(roleId); + users.add(user); } } - this.saveBatch(users); + this.updateBatchById(users); } /** diff --git a/src/main/resources/config/application-dz.yml b/src/main/resources/config/application-dz.yml index ceabc64..d1474a4 100644 --- a/src/main/resources/config/application-dz.yml +++ b/src/main/resources/config/application-dz.yml @@ -1,5 +1,4 @@ -server: - port: 11314 + ################### spring配置 ################### spring: datasource: diff --git a/src/main/java/com/casic/config/task/TaskConfigurer.java b/src/main/java/com/casic/config/task/TaskConfigurer.java index 5a3a029..6a64d1c 100644 --- a/src/main/java/com/casic/config/task/TaskConfigurer.java +++ b/src/main/java/com/casic/config/task/TaskConfigurer.java @@ -4,6 +4,7 @@ import com.casic.service.IPartitionStrategyService; import com.casic.service.UserDataDelayReceiver; import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; @@ -18,6 +19,7 @@ */ @Configuration @EnableScheduling +@Slf4j @RequiredArgsConstructor public class TaskConfigurer implements SchedulingConfigurer { @@ -55,6 +57,7 @@ return new Runnable() { @Override public void run() { + log.info("定时查询在线离线运行了..."); deviceDataService.checkAndUpdateDeviceOnline(); } }; @@ -67,6 +70,7 @@ return new Runnable() { @Override public void run() { + log.info("同步数据的任运行..."); userDataDelayReceiver.saveNewUserData(); } }; @@ -79,6 +83,7 @@ return new Runnable() { @Override public void run() { + log.info("定时构建硫化氢数据分区表任务运行..."); partitionStrategyService.createPartition("DATA_H2S", "data_h2s_log"); } }; diff --git a/src/main/java/com/casic/controller/ThirdDataController.java b/src/main/java/com/casic/controller/ThirdDataController.java index 30c191c..e95a9b6 100644 --- a/src/main/java/com/casic/controller/ThirdDataController.java +++ b/src/main/java/com/casic/controller/ThirdDataController.java @@ -2,7 +2,6 @@ import com.alibaba.fastjson.JSON; import com.casic.service.ThirdDataService; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; @@ -31,13 +30,13 @@ */ @RequestMapping("/push/data") public Object h2sData(@RequestBody Map h2sDataMap) { - System.out.println(JSON.toJSON(h2sDataMap)); + log.info("硫化氢数据订阅接口!" + JSON.toJSON(h2sDataMap)); return thirdDataService.h2sData(h2sDataMap); } @RequestMapping("/config/confirm") public Object configConfirm(@RequestBody Map configConfirmMap) { - System.out.println(JSON.toJSON(configConfirmMap)); + log.info("数据下发确认!" + JSON.toJSON(configConfirmMap)); threadPoolExecutor.execute( () -> { thirdDataService.configConfirm(configConfirmMap); diff --git a/src/main/java/com/casic/dao/UsersMapper.java b/src/main/java/com/casic/dao/UsersMapper.java index d394db7..9e8aa53 100644 --- a/src/main/java/com/casic/dao/UsersMapper.java +++ b/src/main/java/com/casic/dao/UsersMapper.java @@ -23,7 +23,7 @@ @Select("SELECT ID " + "FROM SYS_DEPT " + - "WHERE SIMPLE_NAME LIKE '%达州%'" + + "WHERE SIMPLE_NAME LIKE '%普光%'" + "AND DEL_FLAG=0 " + "LIMIT 1 ") Long getDeptIdByName(); diff --git a/src/main/java/com/casic/model/DataH2s.java b/src/main/java/com/casic/model/DataH2s.java index b53b19e..cfac77c 100644 --- a/src/main/java/com/casic/model/DataH2s.java +++ b/src/main/java/com/casic/model/DataH2s.java @@ -20,13 +20,14 @@ private String devcode; + @TableField(value = "WELL_CODE") private String wellCode; private String cell; private String strength; - private String uptime; + private String uptime; private String logtime; diff --git a/src/main/java/com/casic/service/impl/ThirdDataServiceImpl.java b/src/main/java/com/casic/service/impl/ThirdDataServiceImpl.java index 71d244c..e156160 100644 --- a/src/main/java/com/casic/service/impl/ThirdDataServiceImpl.java +++ b/src/main/java/com/casic/service/impl/ThirdDataServiceImpl.java @@ -173,8 +173,8 @@ AlarmRecord alarmRecord = AlarmRecord.builder() .devcode(dataH2s.getDevcode()) .wellCode(dataH2s.getWellCode()) - .alarmType(dataH2s.getStrength()) .alarmMessage("浓度超限") + .alarmValue(dataH2s.getStrength()) .deviceId(deviceId) .alarmType("1") .alarmContent("浓度超限") diff --git a/src/main/java/com/casic/service/impl/UserDataDelayReceiverImpl.java b/src/main/java/com/casic/service/impl/UserDataDelayReceiverImpl.java index 1be4a99..e7aff82 100644 --- a/src/main/java/com/casic/service/impl/UserDataDelayReceiverImpl.java +++ b/src/main/java/com/casic/service/impl/UserDataDelayReceiverImpl.java @@ -118,9 +118,18 @@ roleId = entry.getKey(); } } - if (StringUtils.isEmpty(roleId) || ObjectUtils.isEmpty(deptId)) { + + if (StringUtils.isEmpty(roleId)) { return; } + if (ObjectUtils.isEmpty(deptId)) { + for (Map.Entry entry : userMap.entrySet()) { + if (ObjectUtils.isEmpty(deptId) && ObjectUtils.isNotEmpty(entry.getValue().getDeptId())) { + deptId = (entry.getValue()).getDeptId(); + break; + } + } + } //新增 doAddUser(newUserCodeList, sourceMap, String.valueOf(roleId), deptId); //更新 @@ -182,10 +191,11 @@ User user = userMap.get(editUser); if (ObjectUtils.isNotEmpty(user)) { user.setRoleId(roleId); + users.add(user); } } - this.saveBatch(users); + this.updateBatchById(users); } /** diff --git a/src/main/resources/config/application-dz.yml b/src/main/resources/config/application-dz.yml index ceabc64..d1474a4 100644 --- a/src/main/resources/config/application-dz.yml +++ b/src/main/resources/config/application-dz.yml @@ -1,5 +1,4 @@ -server: - port: 11314 + ################### spring配置 ################### spring: datasource: diff --git a/src/main/resources/config/application.yml b/src/main/resources/config/application.yml index ffa9d4c..f354d1d 100644 --- a/src/main/resources/config/application.yml +++ b/src/main/resources/config/application.yml @@ -9,6 +9,8 @@ mvc: pathmatch: matching-strategy: ant_path_matcher +server: + port: 11314 mybatis-plus: global-config: enable-sql-runner: true @@ -38,9 +40,9 @@ online: cron: 0 0 0/1 * * ? # 多长时间判断离线 transfer-user: - cron: 0 0 0,12 * * ? # 数据同步，每天凌晨0点、中午12点各进行同步一次 0 0 0,12 * * ? + cron: 0 0/1 * * * ? # 数据同步，每天凌晨0点、中午12点各进行同步一次 0 0 0,12 * * ? partition: - cron: 0 0/1 * * * ? + cron: 0 0 0 * * ? data-day: 3 #多少天为离线 type: 14 #硫化氢