diff --git a/pom.xml b/pom.xml index e01bd984..aa7d318d 100644 --- a/pom.xml +++ b/pom.xml @@ -89,12 +89,12 @@ prod prod - 53.16.17.13:8848 + 53.238.79.33:8848 DEFAULT_GROUP DEFAULT_GROUP nacos - nacos - 53.16.17.13:4560 + Ycgis!2509 + 53.238.79.33:4560 diff --git a/stwzhj-auth/src/main/resources/logback-plus.xml b/stwzhj-auth/src/main/resources/logback-plus.xml index a2e187f8..d97d7560 100644 --- a/stwzhj-auth/src/main/resources/logback-plus.xml +++ b/stwzhj-auth/src/main/resources/logback-plus.xml @@ -1,28 +1,49 @@ - + + + + - - - - + + + ${log.path}/info.${log.file}.log + + INFO + ACCEPT + DENY + + + ${log.path}/info/info.${log.file}.%d{yyyy-MM-dd}.%i.log.gz + ${MAX_FILE_SIZE} + ${MAX_HISTORY} + - ${console.log.pattern} - utf-8 + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - + + + ${log.path}/error.${log.file}.log + + ERROR + + + ${log.path}/error/error.${log.file}.%d{yyyy-MM-dd}.%i.log.gz + ${MAX_FILE_SIZE} + ${MAX_HISTORY} + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + - - - - - - - - + + + + + diff --git a/stwzhj-common/stwzhj-common-dubbo/src/main/resources/common-dubbo.yml b/stwzhj-common/stwzhj-common-dubbo/src/main/resources/common-dubbo.yml index 02638409..fae8884d 100644 --- a/stwzhj-common/stwzhj-common-dubbo/src/main/resources/common-dubbo.yml +++ b/stwzhj-common/stwzhj-common-dubbo/src/main/resources/common-dubbo.yml @@ -25,12 +25,12 @@ dubbo: username: dubbo password: ruoyi123 # 集群开关 - sentinel: false + sentinel: true parameters: namespace: ${spring.profiles.active} database: ${spring.data.redis.database} timeout: ${spring.data.redis.timeout} - backup: 10.129.128.116:26380,10.129.128.115:26380,10.129.128.114:26380 + backup: 53.238.79.33:26380,53.238.79.34:26380,53.238.79.35:26380 # metadata-report: # address: redis://${spring.data.redis.host}:${spring.data.redis.port} # group: DUBBO_GROUP diff --git a/stwzhj-modules/pom.xml b/stwzhj-modules/pom.xml index 74c11234..d1b71c21 100644 --- a/stwzhj-modules/pom.xml +++ b/stwzhj-modules/pom.xml @@ -19,7 +19,7 @@ wzhj-consumer wzhj-location stwzhj-dataToGas - wzhj-webscoket + wzhj-websocket wzhj-extract wzhj-udp diff --git a/stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/config/KafkaConfig.java b/stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/config/KafkaConfig.java index fedb34ec..464531b0 100644 --- a/stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/config/KafkaConfig.java +++ b/stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/config/KafkaConfig.java @@ -27,7 +27,7 @@ public class KafkaConfig { // private String kafkaServers = "140.168.2.31:21007,140.168.2.32:21007,140.168.2.33:21007"; // private String kafkaServers = "53.208.61.105:6667,53.208.61.106:6667,53.208.61.107:6667";//六安GA网 // private String kafkaServers = "34.72.62.93:9092";//六安视频网 - private String kafkaServers = "127.0.0.1:9092";//本地 + private String kafkaServers = "53.238.79.33:9092,53.238.79.34:9092,53.238.79.35:9092";//本地 // private String kafkaServers = "53.238.79.4:9092,53.238.79.5:9092,53.238.79.6:9092";//省厅 马伟提供 private String groupId = "ruansiProducer"; diff --git a/stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/config/RuansiConfiguration.java b/stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/config/RuansiConfiguration.java new file mode 100644 index 00000000..0e4b9afb --- /dev/null +++ b/stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/config/RuansiConfiguration.java @@ -0,0 +1,21 @@ +package org.dromara.data2es.config; + +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.cloud.context.config.annotation.RefreshScope; +import org.springframework.context.annotation.Configuration; + + +@Data +@Configuration +@RefreshScope +@ConfigurationProperties(prefix = "ruansi") +public class RuansiConfiguration { + + private boolean sendToThirdEnabled; + + private String startUpdateTime; + + private String dsPreurl; + +} diff --git a/stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/schedule/BaseDataSchedule.java b/stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/schedule/BaseDataSchedule.java index b98c0a9c..13ee0fd5 100644 --- a/stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/schedule/BaseDataSchedule.java +++ b/stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/schedule/BaseDataSchedule.java @@ -3,14 +3,17 @@ package org.dromara.data2es.schedule; import cn.hutool.core.date.DateUtil; import cn.hutool.http.HttpUtil; import cn.hutool.json.JSONUtil; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; +import org.dromara.data2es.config.RuansiConfiguration; import org.dromara.data2es.domain.DSQinwuEntity; import org.dromara.data2es.domain.vo.DSResponse; import org.dromara.data2es.service.DSQinwuService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; +import org.springframework.scheduling.annotation.Scheduled; import org.springframework.util.CollectionUtils; import java.util.*; @@ -23,28 +26,23 @@ import java.util.*; */ @Configuration @Slf4j +@RequiredArgsConstructor public class BaseDataSchedule { private String lastUpdateTime; - private String preUrl = "http://53.238.84.10:28080/ds-portal-web"; +// private String preUrl = "http://53.238.84.10:28080/ds-portal-web"; @Autowired DSQinwuService dsQinwuService; - @Value("${ruansi.ruansi-kafka.send-to-third-enabled}") - private boolean sendToThirdEnabled; + private final RuansiConfiguration ruansiConfiguration; - @Value("${ruansi.ruansi-kafka.start-update-time}") - private String startUpdateTime; - - @Value("${ruansi.ruansi-kafka.ds-preurl}") - private String dsPreurl; /** * 娱特单位抽取 */ -// @Scheduled(cron = "0/30 * * * * ?") + @Scheduled(cron = "0/30 * * * * ?") public void updateDsQw(){ if(StringUtils.isBlank(lastUpdateTime)){ DSQinwuEntity qinwu = dsQinwuService.lastOne(); @@ -152,7 +150,7 @@ public class BaseDataSchedule { private DSResponse requestList(String updateTime, String suffixUrl) { Map map = new HashMap<>(); map.put("updateTime",updateTime); - String content = HttpUtil.get(dsPreurl + suffixUrl, map); + String content = HttpUtil.get(ruansiConfiguration.getDsPreurl() + suffixUrl, map); DSResponse dsResponse = JSONUtil.toBean(content, DSResponse.class); return dsResponse; } diff --git a/stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/service/impl/DSQinwuServiceImpl.java b/stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/service/impl/DSQinwuServiceImpl.java index a5b1aa10..f907b5a7 100644 --- a/stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/service/impl/DSQinwuServiceImpl.java +++ b/stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/service/impl/DSQinwuServiceImpl.java @@ -30,7 +30,7 @@ public class DSQinwuServiceImpl implements DSQinwuService { public DSQinwuEntity checkExist(DSQinwuEntity dsQinwuEntity) { LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); lqw.eq(DSQinwuEntity::getImei, dsQinwuEntity.getImei()); - lqw.eq(DSQinwuEntity::getType, dsQinwuEntity.getType()); +// lqw.eq(DSQinwuEntity::getType, dsQinwuEntity.getType()); DSQinwuEntity entity = dsQinwuMapper.selectOne(lqw); return entity; } diff --git a/stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/service/impl/GpsServiceImpl.java b/stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/service/impl/GpsServiceImpl.java index 5abaaf96..472ce1bd 100644 --- a/stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/service/impl/GpsServiceImpl.java +++ b/stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/service/impl/GpsServiceImpl.java @@ -4,9 +4,8 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUnit; import cn.hutool.core.date.DateUtil; +import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import org.apache.commons.lang.StringUtils; import org.apache.dubbo.config.annotation.DubboReference; @@ -173,14 +172,12 @@ public class GpsServiceImpl implements IGpsService { String deviceCode = originEsGpsInfo.getDeviceCode(); String deviceType = originEsGpsInfo.getDeviceType(); // DeviceEntityV2 de = deviceService.checkDeviceExists(info); - Object o = RedisUtils.getBucket(RedisConstants.ONLINE_USERS + deviceType+":" + deviceCode); + JSONObject o = RedisUtils.getBucket(RedisConstants.ONLINE_USERS + deviceType+":" + deviceCode); if (Objects.isNull(o)) { logger.error("redis中的Object=null，deviceType={},deviceCode={}",deviceType,deviceCode); continue; } - JSONObject o1 = (JSONObject) o; - String json = o1.toJSONString(); - EsGpsInfoVO2 esGpsInfoVO2 = JSON.parseObject(json, EsGpsInfoVO2.class); + EsGpsInfoVO2 esGpsInfoVO2 = JSONUtil.toBean(o, EsGpsInfoVO2.class); //更新在线状态和时间，经纬度不变 esGpsInfoVO2.setOnline(originEsGpsInfo.getOnline()); @@ -219,14 +216,13 @@ public class GpsServiceImpl implements IGpsService { String deviceCode = gpsInfoVO2.getDeviceCode(); String deviceType = gpsInfoVO2.getDeviceType(); // DeviceEntityV2 de = deviceService.checkDeviceExists(info); - Object o = RedisUtils.getBucket(RedisConstants.ONLINE_USERS + deviceType + ":" + deviceCode); + JSONObject o = RedisUtils.getBucket(RedisConstants.ONLINE_USERS + deviceType + ":" + deviceCode); if (Objects.isNull(o)) { logger.error("redis中的Object=null，deviceType={},deviceCode={}", deviceType, deviceCode); return null; } - JSONObject o1 = (JSONObject) o; - String json = o1.toJSONString(); - EsGpsInfoVO2 esGpsInfoVO2 = JSON.parseObject(json, EsGpsInfoVO2.class); + + EsGpsInfoVO2 esGpsInfoVO2 = JSONUtil.toBean(o, EsGpsInfoVO2.class); //更新在线状态和时间，经纬度不变 esGpsInfoVO2.setOnline(gpsInfoVO2.getOnline()); @@ -412,7 +408,19 @@ public class GpsServiceImpl implements IGpsService { }*/ deviceEntityV2.setDeviceCode(deviceCode); deviceEntityV2.setDeviceType(deviceType); - RemoteDeviceVo deviceEntityV21 = BeanUtil.toBean(RedisUtils.getBucket("deviceInfo:" + deviceType+":"+deviceCode), RemoteDeviceVo.class) ; + RemoteDeviceVo deviceEntityV21 = new RemoteDeviceVo(); + if ("5".equals(deviceType)){ + deviceEntityV21 = BeanUtil.toBean(RedisUtils.getBucket("deviceInfo:" + deviceType+":"+deviceCode), RemoteDeviceVo.class) ; + if (null == deviceEntityV21){ + deviceEntityV21 = BeanUtil.toBean(RedisUtils.getBucket("deviceInfo:8" +":"+deviceCode), RemoteDeviceVo.class) ; + if (null == deviceEntityV21){ + deviceEntityV21 = BeanUtil.toBean(RedisUtils.getBucket("deviceInfo:7" +":"+deviceCode), RemoteDeviceVo.class) ; + + } + } + }else { + deviceEntityV21 = BeanUtil.toBean(RedisUtils.getBucket("deviceInfo:" + deviceType+":"+deviceCode), RemoteDeviceVo.class) ; + } if(Objects.isNull(deviceEntityV21)){ logger.error("库里没有这个数据,deviceCode={}",deviceCode); return null; @@ -435,11 +443,10 @@ public class GpsServiceImpl implements IGpsService { //如果定位是0的话 ,则上传最后一次有定位的坐标，如果最后一次是0的话，那就上传0 boolean nonLatLng = isNonLatLng(lat, lng); if(nonLatLng){ - Object o = RedisUtils.getBucket(RedisConstants.ONLINE_USERS + deviceType + ":" + deviceCode); + JSONObject o = RedisUtils.getBucket(RedisConstants.ONLINE_USERS + deviceType + ":" + deviceCode); if(!Objects.isNull(o)) { - com.alibaba.fastjson.JSONObject o1 = (JSONObject) o; - String json = o1.toJSONString(); - EsGpsInfoVO2 esGpsInfoVO3 = JSON.parseObject(json, EsGpsInfoVO2.class); + + EsGpsInfoVO2 esGpsInfoVO3 = JSONUtil.toBean(o, EsGpsInfoVO2.class); String lat1 = esGpsInfoVO3.getLat(); String lng1 = esGpsInfoVO3.getLng(); esGpsInfoVO2.setLat(lat1); diff --git a/stwzhj-modules/wzhj-extract/src/main/java/org/dromara/extract/controller/DeviceGPSController.java b/stwzhj-modules/wzhj-extract/src/main/java/org/dromara/extract/controller/DeviceGPSController.java index 650b419e..6fdd51fa 100644 --- a/stwzhj-modules/wzhj-extract/src/main/java/org/dromara/extract/controller/DeviceGPSController.java +++ b/stwzhj-modules/wzhj-extract/src/main/java/org/dromara/extract/controller/DeviceGPSController.java @@ -15,6 +15,7 @@ import org.dromara.extract.util.PathUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.Scheduled; @@ -39,8 +40,8 @@ public class DeviceGPSController { RemoteDataToEsService dataToEsService; - - private String lastUpdateTime = "2024-06-05 11:40:00"; + @Value("${ruansi.last_update_time}") + private String lastUpdateTime; @RequestMapping("/maxId") public String getMaxId(){ @@ -55,7 +56,7 @@ public class DeviceGPSController { return DateUtil.formatDateTime(info.getGpsTime()); } - @Scheduled(cron = "0/30 * * * * ?") + @Scheduled(cron = "0/10 * * * * ?") @Async public void bdgcGps(){ if(StringUtils.isBlank(lastUpdateTime)){ @@ -70,11 +71,13 @@ public class DeviceGPSController { gpsInfo.setGpsTime(DateUtil.parseDateTime(lastUpdateTime)); Instant start = Instant.now(); // some code + logger.info("进入公车定时任务"); List list = deviceGpsService.selectBDGCGPS(gpsInfo); + logger.info("查询结束"); Instant finish = Instant.now(); long timeElapsed = Duration.between(start, finish).toMillis(); - logger.info("查询耗时："+timeElapsed); - logger.info("数据大小size"+list.size()); + logger.info("公车查询耗时："+timeElapsed); + logger.info("公车数据大小size"+list.size()); Date nowDate = new Date(); for (int i = 0; i < list.size(); i++) { @@ -83,7 +86,7 @@ public class DeviceGPSController { lastUpdateTime = DateUtil.formatDateTime(info.getGpsTime()); // resetUpdateTime(info.getId()+""); } - if (DateUtil.between(nowDate,info.getGpsTime(),DateUnit.MINUTE) > 30){ + if (DateUtil.between(new Date(),info.getGpsTime(),DateUnit.MINUTE) > 10){ info.setOnline("0"); }else { info.setOnline("1"); @@ -93,9 +96,7 @@ public class DeviceGPSController { } ArrayList collect = list.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(EsGpsInfo::getDeviceCode))), ArrayList::new)); - logger.info("去重前size={},去重后size={}",list.size(),collect.size()); -// List remoteGpsInfos = new ArrayList<>(); -// remoteGpsInfos.add() + logger.info("公车去重前size={},公车去重后size={}",list.size(),collect.size()); dataToEsService.saveDataBatch(BeanUtil.copyToList(collect,RemoteGpsInfo.class)); Instant end = Instant.now(); long timeEnd = Duration.between(finish, end).toMillis(); @@ -104,6 +105,7 @@ public class DeviceGPSController { } + private void resetUpdateTime(String lastUpdateTime) { try { // lastUpdateTime = DateUtil.format(gpsTime,"yyyy-MM-dd HH:mm:ss"); diff --git a/stwzhj-modules/wzhj-extract/src/main/resources/mapper/DeviceGpsMapper.xml b/stwzhj-modules/wzhj-extract/src/main/resources/mapper/DeviceGpsMapper.xml index ac1a372c..62b83555 100644 --- a/stwzhj-modules/wzhj-extract/src/main/resources/mapper/DeviceGpsMapper.xml +++ b/stwzhj-modules/wzhj-extract/src/main/resources/mapper/DeviceGpsMapper.xml @@ -41,7 +41,7 @@ and time > #{gpsTime} - ) a group by deviceCode + ) a group by deviceCode order by gpsTime desc limit 100 @@ -50,6 +50,20 @@ order by time desc limit 1 + + diff --git a/stwzhj-modules/wzhj-location/src/main/java/org/dromara/location/service/impl/SearchServiceImpl.java b/stwzhj-modules/wzhj-location/src/main/java/org/dromara/location/service/impl/SearchServiceImpl.java index 64bffb6a..ea59d2fa 100644 --- a/stwzhj-modules/wzhj-location/src/main/java/org/dromara/location/service/impl/SearchServiceImpl.java +++ b/stwzhj-modules/wzhj-location/src/main/java/org/dromara/location/service/impl/SearchServiceImpl.java @@ -185,6 +185,9 @@ public class SearchServiceImpl implements ISearchService { List list = dictService.selectDictDataByType("zd_device_type"); List maps = new ArrayList<>(); for (RemoteDictDataVo dataVo : list) { + if (null != dataVo.getRemark() && dataVo.getRemark().contains("无短信")){ + continue; + } try { BoolQueryBuilder boolBuilder = QueryBuilders.boolQuery(); // 匹配第二个 diff --git a/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/config/YwryProperties.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/config/YwryProperties.java new file mode 100644 index 00000000..cafa02e3 --- /dev/null +++ b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/config/YwryProperties.java @@ -0,0 +1,24 @@ +package org.dromara.system.config; + +import lombok.Data; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.cloud.context.config.annotation.RefreshScope; +import org.springframework.context.annotation.Configuration; +import org.springframework.stereotype.Component; + +@Data +@Configuration +@RefreshScope +@ConfigurationProperties(prefix = "ywry") +public class YwryProperties { + + private String phone1; + + //运维人员2手机号 + private String phone2; + + private Boolean isSend; // 自动匹配 is_send/is-send/isSend + + +} diff --git a/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/system/IndexStaticsController.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/system/IndexStaticsController.java index 387bab71..5ba95909 100644 --- a/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/system/IndexStaticsController.java +++ b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/system/IndexStaticsController.java @@ -9,7 +9,9 @@ import org.dromara.common.core.domain.R; import org.dromara.common.redis.utils.RedisUtils; import org.dromara.common.web.core.BaseController; import org.dromara.location.api.RemoteElasticSearchService; +import org.dromara.system.config.YwryProperties; import org.dromara.system.domain.DeviceRedis; +import org.dromara.system.domain.SysMessageMas; import org.dromara.system.domain.SysNotice; import org.dromara.system.domain.bo.SysDeptBo; import org.dromara.system.domain.bo.SysNoticeBo; @@ -17,6 +19,7 @@ import org.dromara.system.domain.bo.TDeviceBo; import org.dromara.system.domain.vo.*; import org.dromara.system.service.*; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.web.bind.annotation.*; @@ -36,6 +39,10 @@ public class IndexStaticsController extends BaseController { private final ISysNoticeService noticeService; + private final ISysMessageMasService masService; + + private final YwryProperties ywryProperties; + @DubboReference RemoteElasticSearchService elasticSearchService; @@ -93,19 +100,30 @@ public class IndexStaticsController extends BaseController { @Scheduled(cron = "0 */30 * * * ?") public void listen(){ List strs = elasticSearchService.linstenDataStatus(); - if (strs.size() >0){ - List nlist = noticeService.selectTodayNoticeList(); - if (nlist.size() <=2){ - // -- todo 发送短信 - SysNoticeBo noticeBo = new SysNoticeBo(); - noticeBo.setNoticeTitle("手机号码"); + if (ywryProperties.getIsSend()){ + if (strs.size() >0){ + List nlist = noticeService.selectTodayNoticeList(); + if (nlist.size() <=2){ + // -- todo 发送短信 + SysNoticeBo noticeBo = new SysNoticeBo(); + noticeBo.setNoticeTitle(ywryProperties.getPhone1()); + noticeBo.setNoticeType("3"); + noticeBo.setNoticeContent(strs.toString()+"数据不正常，请检查服务是否正常"); + noticeBo.setCreateTime(DateUtil.date()); + noticeService.insertNotice(noticeBo); + noticeBo.setNoticeTitle(ywryProperties.getPhone2()); + noticeService.insertNotice(noticeBo); + + SysMessageMas mas = new SysMessageMas(); + mas.setContent(strs.toString()+"数据不正常，请检查服务是否正常"); + mas.setMobiles(ywryProperties.getPhone1()); + mas.setAddserial("1234"); + masService.insertMessage(mas); + mas.setMobiles(ywryProperties.getPhone2()); + masService.insertMessage(mas); + } - noticeBo.setNoticeType("3"); - noticeBo.setNoticeContent(strs.toString()+"数据不正常，请检查服务是否正常"); - noticeBo.setCreateTime(DateUtil.date()); - noticeService.insertNotice(noticeBo); } - } } diff --git a/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysMessageMas.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysMessageMas.java new file mode 100644 index 00000000..c5c02122 --- /dev/null +++ b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysMessageMas.java @@ -0,0 +1,20 @@ +package org.dromara.system.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +/* +* 宣城短信接口对接 实体类 +* */ +@Data +@TableName("sys_message_mas") +public class SysMessageMas { + + private String content; + + private String mobiles; + + private String status; + + private String addserial; +} diff --git a/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysdeptJly.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysdeptJly.java new file mode 100644 index 00000000..ad51822c --- /dev/null +++ b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/SysdeptJly.java @@ -0,0 +1,19 @@ +package org.dromara.system.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +@Data +@TableName("sys_dept_jly") +public class SysdeptJly { + + private String qymc; + + private String fqylj; + + private String qyCode; + + private String deptId; + + private String deptName; +} diff --git a/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/SysdeptJlyBo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/SysdeptJlyBo.java new file mode 100644 index 00000000..718498d1 --- /dev/null +++ b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/bo/SysdeptJlyBo.java @@ -0,0 +1,28 @@ +package org.dromara.system.domain.bo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.system.domain.SysDept; + +import java.io.Serial; +import java.io.Serializable; + +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = SysDept.class, reverseConvertGenerate = false) +public class SysdeptJlyBo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + private String qymc; + + private String fqylj; + + private String qyCode; + + private String deptId; + + private String deptName; +} diff --git a/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/SysdeptJlyVo.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/SysdeptJlyVo.java new file mode 100644 index 00000000..70a6ed04 --- /dev/null +++ b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/SysdeptJlyVo.java @@ -0,0 +1,30 @@ +package org.dromara.system.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.baomidou.mybatisplus.annotation.TableName; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.system.domain.SysDept; +import org.dromara.system.domain.SysdeptJly; + +import java.io.Serial; +import java.io.Serializable; + +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = SysdeptJly.class) +public class SysdeptJlyVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + private String qymc; + + private String fqylj; + + private String qyCode; + + private String deptId; + + private String deptName; +} diff --git a/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysDeptJlyMapper.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysDeptJlyMapper.java new file mode 100644 index 00000000..d7060107 --- /dev/null +++ b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysDeptJlyMapper.java @@ -0,0 +1,9 @@ +package org.dromara.system.mapper; + +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.system.domain.SysdeptJly; +import org.dromara.system.domain.vo.SysdeptJlyVo; + +public interface SysDeptJlyMapper extends BaseMapperPlus { + +} diff --git a/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysMessageMasMapper.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysMessageMasMapper.java new file mode 100644 index 00000000..dcc0ba11 --- /dev/null +++ b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/SysMessageMasMapper.java @@ -0,0 +1,8 @@ +package org.dromara.system.mapper; + +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.system.domain.SysMessageMas; + +public interface SysMessageMasMapper extends BaseMapperPlus { + +} diff --git a/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/TDeviceMapper.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/TDeviceMapper.java index 1a49ab3e..d35faf4d 100644 --- a/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/TDeviceMapper.java +++ b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/TDeviceMapper.java @@ -38,4 +38,6 @@ public interface TDeviceMapper extends BaseMapperPlus { int updateBatch(HashMap map); + int insertOrUpdateByCodeAndType(TDevice device); + } diff --git a/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/ISysMessageMasService.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/ISysMessageMasService.java new file mode 100644 index 00000000..93893946 --- /dev/null +++ b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/ISysMessageMasService.java @@ -0,0 +1,8 @@ +package org.dromara.system.service; + +import org.dromara.system.domain.SysMessageMas; + +public interface ISysMessageMasService { + + int insertMessage(SysMessageMas mas); +} diff --git a/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysMessageMasServiceImpl.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysMessageMasServiceImpl.java new file mode 100644 index 00000000..48054164 --- /dev/null +++ b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysMessageMasServiceImpl.java @@ -0,0 +1,21 @@ +package org.dromara.system.service.impl; + +import com.baomidou.dynamic.datasource.annotation.DS; +import lombok.RequiredArgsConstructor; +import org.dromara.system.domain.SysMessageMas; +import org.dromara.system.mapper.SysMessageMasMapper; +import org.dromara.system.service.ISysMessageMasService; +import org.springframework.stereotype.Service; + +@RequiredArgsConstructor +@Service +@DS("slave") +public class SysMessageMasServiceImpl implements ISysMessageMasService { + + private final SysMessageMasMapper baseMapper; + + @Override + public int insertMessage(SysMessageMas mas) { + return baseMapper.insert(mas); + } +} diff --git a/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/TDeviceServiceImpl.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/TDeviceServiceImpl.java index bcbf2257..6c1c44b0 100644 --- a/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/TDeviceServiceImpl.java +++ b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/TDeviceServiceImpl.java @@ -15,8 +15,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import org.dromara.system.api.RemoteDataScopeService; +import org.dromara.system.domain.SysdeptJly; import org.dromara.system.domain.vo.DeviceStaticsVo; +import org.dromara.system.domain.vo.SysdeptJlyVo; import org.dromara.system.domain.vo.TDeviceExportVo; +import org.dromara.system.mapper.SysDeptJlyMapper; import org.springframework.stereotype.Service; import org.dromara.system.domain.bo.TDeviceBo; import org.dromara.system.domain.vo.TDeviceVo; @@ -42,6 +45,8 @@ public class TDeviceServiceImpl implements ITDeviceService { private final TDeviceMapper baseMapper; + private final SysDeptJlyMapper deptJlyMapper; + @DubboReference private RemoteDataScopeService remoteDataScopeService; @@ -231,18 +236,29 @@ public class TDeviceServiceImpl implements ITDeviceService { public Boolean batchSaveOrUpdate(List list) { boolean flag = true; // 先根据 field1 和 field2 查询出已存在的记录 - List existingEntities = baseMapper.selectList(new QueryWrapper() + /*List existingEntities = baseMapper.selectList(new QueryWrapper() .in("device_code", list.stream().map(TDevice::getDeviceCode).collect(Collectors.toList())) .in("device_type", list.stream().map(TDevice::getDeviceType).collect(Collectors.toList()))); - +*/ // 找到需要更新的记录 List toUpdate = new ArrayList<>(); // 找到需要插入的记录 List toInsert = new ArrayList<>(); - + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); for (TDevice entity : list) { - boolean exists = false; - for (TDevice existingEntity : existingEntities) { +// boolean exists = false; + if (entity.getDeviceType().equals("5") || entity.getDeviceType().equals("8") + || entity.getDeviceType().equals("7")){ // 记录仪、5G车载、布控球 处理机构 + lqw.eq(SysdeptJly::getQyCode,entity.getZzjgdm()); + SysdeptJlyVo jlyVo = deptJlyMapper.selectVoOne(lqw); + if (null != jlyVo){ + entity.setZzjgdm(jlyVo.getDeptId()); + entity.setZzjgmc(jlyVo.getDeptName()); + } + baseMapper.insertOrUpdateByCodeAndType(entity); + } + + /*for (TDevice existingEntity : existingEntities) { if (entity.getDeviceCode().equals(existingEntity.getDeviceCode()) && entity.getDeviceType().equals(existingEntity.getDeviceType())) { entity.setId(existingEntity.getId()); // 设置 ID 以便更新 toUpdate.add(entity); @@ -252,18 +268,18 @@ public class TDeviceServiceImpl implements ITDeviceService { } if (!exists) { toInsert.add(entity); - } + }*/ } // 批量更新 - if (!toUpdate.isEmpty()) { + /*if (!toUpdate.isEmpty()) { flag = baseMapper.updateBatchById(toUpdate); } // 批量插入 if (!toInsert.isEmpty()) { flag = baseMapper.insertBatch(toInsert); // insertBatchSomeColumn 是 MyBatis-Plus 提供的批量插入方法 - } + }*/ return flag; // return baseMapper.insertOrUpdateBatch(List); } diff --git a/stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysDeptJlyMapper.xml b/stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysDeptJlyMapper.xml new file mode 100644 index 00000000..d7e98138 --- /dev/null +++ b/stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysDeptJlyMapper.xml @@ -0,0 +1,12 @@ + + + + + + + + + + diff --git a/stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysMessageMasMapper.xml b/stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysMessageMasMapper.xml new file mode 100644 index 00000000..85e6e78e --- /dev/null +++ b/stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysMessageMasMapper.xml @@ -0,0 +1,12 @@ + + + + + + + + + + diff --git a/stwzhj-modules/wzhj-system/src/main/resources/mapper/system/TDeviceMapper.xml b/stwzhj-modules/wzhj-system/src/main/resources/mapper/system/TDeviceMapper.xml index d81eb65f..42a53d6c 100644 --- a/stwzhj-modules/wzhj-system/src/main/resources/mapper/system/TDeviceMapper.xml +++ b/stwzhj-modules/wzhj-system/src/main/resources/mapper/system/TDeviceMapper.xml @@ -42,4 +42,15 @@ + + insert into t_device (device_code, device_type, zzjgdm, zzjgmc, police_no, police_name, phone_num, car_num, valid, + remark1, remark2, card_num, create_time, update_time) + values (#{deviceCode},#{deviceType},#{zzjgdm},#{zzjgmc},#{policeNo},#{policeName},#{phoneNum},#{carNum},#{valid}, + #{remark1},#{remark2},#{cardNum},#{createTime},#{updateTime}) + ON DUPLICATE KEY UPDATE + zzjgdm = values(zzjgdm),zzjgmc = values(zzjgmc),police_no = values(police_no),police_name = values(police_name),phone_num = values(phone_num), + car_num = values(car_num),valid = values(valid),remark1 = values(remark1),remark2 = values(remark2),card_num = values(card_num), + update_time = now() + + diff --git a/stwzhj-modules/wzhj-webscoket/pom.xml b/stwzhj-modules/wzhj-websocket/pom.xml similarity index 98% rename from stwzhj-modules/wzhj-webscoket/pom.xml rename to stwzhj-modules/wzhj-websocket/pom.xml index 02d179d2..01ae1289 100644 --- a/stwzhj-modules/wzhj-webscoket/pom.xml +++ b/stwzhj-modules/wzhj-websocket/pom.xml @@ -9,10 +9,10 @@ 4.0.0 - wzhj-webscoket + wzhj-websocket - wzhj-webscoket记录仪数据接收 + wzhj-websocket记录仪数据接收 diff --git a/stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/ZfjlyWebscoketApplication.java b/stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/webscoket/ZfjlyWebscoketApplication.java similarity index 100% rename from stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/ZfjlyWebscoketApplication.java rename to stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/webscoket/ZfjlyWebscoketApplication.java diff --git a/stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/config/AsyncConfiguration.java b/stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/webscoket/config/AsyncConfiguration.java similarity index 100% rename from stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/config/AsyncConfiguration.java rename to stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/webscoket/config/AsyncConfiguration.java diff --git a/stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/config/TestController.java b/stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/webscoket/config/TestController.java similarity index 100% rename from stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/config/TestController.java rename to stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/webscoket/config/TestController.java diff --git a/stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/config/ThreadConfig.java b/stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/webscoket/config/ThreadConfig.java similarity index 100% rename from stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/config/ThreadConfig.java rename to stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/webscoket/config/ThreadConfig.java diff --git a/stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/constants/WebSocketMessageConstant.java b/stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/webscoket/constants/WebSocketMessageConstant.java similarity index 100% rename from stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/constants/WebSocketMessageConstant.java rename to stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/webscoket/constants/WebSocketMessageConstant.java diff --git a/stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/domain/LocationZfjlyEntity.java b/stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/webscoket/domain/LocationZfjlyEntity.java similarity index 100% rename from stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/domain/LocationZfjlyEntity.java rename to stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/webscoket/domain/LocationZfjlyEntity.java diff --git a/stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/domain/LocationZfjlyEntityXml.java b/stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/webscoket/domain/LocationZfjlyEntityXml.java similarity index 100% rename from stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/domain/LocationZfjlyEntityXml.java rename to stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/webscoket/domain/LocationZfjlyEntityXml.java diff --git a/stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/domain/OriginDevice.java b/stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/webscoket/domain/OriginDevice.java similarity index 100% rename from stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/domain/OriginDevice.java rename to stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/webscoket/domain/OriginDevice.java diff --git a/stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/domain/XmlEntity.java b/stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/webscoket/domain/XmlEntity.java similarity index 100% rename from stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/domain/XmlEntity.java rename to stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/webscoket/domain/XmlEntity.java diff --git a/stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/handler/MyApplicationContextRefreshedListener.java b/stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/webscoket/handler/MyApplicationContextRefreshedListener.java similarity index 100% rename from stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/handler/MyApplicationContextRefreshedListener.java rename to stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/webscoket/handler/MyApplicationContextRefreshedListener.java diff --git a/stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/handler/MyWebSocketClientHandler.java b/stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/webscoket/handler/MyWebSocketClientHandler.java similarity index 100% rename from stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/handler/MyWebSocketClientHandler.java rename to stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/webscoket/handler/MyWebSocketClientHandler.java diff --git a/stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/mapper/OriginDeviceMapper.java b/stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/webscoket/mapper/OriginDeviceMapper.java similarity index 100% rename from stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/mapper/OriginDeviceMapper.java rename to stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/webscoket/mapper/OriginDeviceMapper.java diff --git a/stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/schedule/DeviceSchedule.java b/stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/webscoket/schedule/DeviceSchedule.java similarity index 97% rename from stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/schedule/DeviceSchedule.java rename to stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/webscoket/schedule/DeviceSchedule.java index a1561b63..83a75824 100644 --- a/stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/schedule/DeviceSchedule.java +++ b/stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/webscoket/schedule/DeviceSchedule.java @@ -49,7 +49,7 @@ public class DeviceSchedule { RemoteDeviceService deviceService; - @Scheduled( cron = "0 */3 * * * ?") + @Scheduled( cron = "0 */10 * * * ?") public void deviceTrans(){ if(StringUtils.isBlank(lastUpdateTime)){ lastUpdateTime = startUpdateTime; @@ -85,7 +85,8 @@ public class DeviceSchedule { Timestamp updateTime = originDevice.getUpdateTime(); // DateTime dateTime = DateUtil.offsetHour(updateTime, 13); newDevice.setUpdateTime(DateUtil.formatDateTime(updateTime) ); - setZzjgdm(newDevice,originDevice); + newDevice.setZzjgdm(originDevice.getParentId()); +// setZzjgdm(newDevice,originDevice); } if(StringUtils.isBlank(newDevice.getZzjgdm())){ diff --git a/stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/schedule/DeviceStatusSchedule.java b/stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/webscoket/schedule/DeviceStatusSchedule.java similarity index 100% rename from stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/schedule/DeviceStatusSchedule.java rename to stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/webscoket/schedule/DeviceStatusSchedule.java diff --git a/stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/strategy/ChuZhouTextMessageHandler.java b/stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/webscoket/strategy/ChuZhouTextMessageHandler.java similarity index 100% rename from stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/strategy/ChuZhouTextMessageHandler.java rename to stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/webscoket/strategy/ChuZhouTextMessageHandler.java diff --git a/stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/strategy/IMessageHandleStrategy.java b/stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/webscoket/strategy/IMessageHandleStrategy.java similarity index 100% rename from stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/strategy/IMessageHandleStrategy.java rename to stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/webscoket/strategy/IMessageHandleStrategy.java diff --git a/stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/strategy/TextMessageHandler.java b/stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/webscoket/strategy/TextMessageHandler.java similarity index 100% rename from stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/strategy/TextMessageHandler.java rename to stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/webscoket/strategy/TextMessageHandler.java diff --git a/stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/strategy/TonglingTextMessageHandler.java b/stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/webscoket/strategy/TonglingTextMessageHandler.java similarity index 100% rename from stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/strategy/TonglingTextMessageHandler.java rename to stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/webscoket/strategy/TonglingTextMessageHandler.java diff --git a/stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/strategy/WebMessageContext.java b/stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/webscoket/strategy/WebMessageContext.java similarity index 100% rename from stwzhj-modules/wzhj-webscoket/src/main/java/org/dromara/webscoket/strategy/WebMessageContext.java rename to stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/webscoket/strategy/WebMessageContext.java diff --git a/stwzhj-modules/wzhj-webscoket/src/main/resources/application.yml b/stwzhj-modules/wzhj-websocket/src/main/resources/application.yml similarity index 100% rename from stwzhj-modules/wzhj-webscoket/src/main/resources/application.yml rename to stwzhj-modules/wzhj-websocket/src/main/resources/application.yml diff --git a/stwzhj-modules/wzhj-webscoket/src/main/resources/mapper/OriginDeviceMapper.xml b/stwzhj-modules/wzhj-websocket/src/main/resources/mapper/OriginDeviceMapper.xml similarity index 100% rename from stwzhj-modules/wzhj-webscoket/src/main/resources/mapper/OriginDeviceMapper.xml rename to stwzhj-modules/wzhj-websocket/src/main/resources/mapper/OriginDeviceMapper.xml diff --git a/stwzhj-visual/stwzhj-monitor/src/main/resources/logback-plus.xml b/stwzhj-visual/stwzhj-monitor/src/main/resources/logback-plus.xml index caaa3455..b0141d71 100644 --- a/stwzhj-visual/stwzhj-monitor/src/main/resources/logback-plus.xml +++ b/stwzhj-visual/stwzhj-monitor/src/main/resources/logback-plus.xml @@ -1,28 +1,49 @@ - - - - - - + + + + + + + + ${log.path}/info.${log.file}.log + + INFO + ACCEPT + DENY + + + ${log.path}/info/info.${log.file}.%d{yyyy-MM-dd}.%i.log.gz + ${MAX_FILE_SIZE} + ${MAX_HISTORY} + - ${console.log.pattern} - utf-8 + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - + + + ${log.path}/error.${log.file}.log + + ERROR + + + ${log.path}/error/error.${log.file}.%d{yyyy-MM-dd}.%i.log.gz + ${MAX_FILE_SIZE} + ${MAX_HISTORY} + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + - - - - - - - - + + + + + diff --git a/stwzhj-visual/stwzhj-nacos/src/main/resources/application.properties b/stwzhj-visual/stwzhj-nacos/src/main/resources/application.properties index 7d30f1ae..b432db95 100644 --- a/stwzhj-visual/stwzhj-nacos/src/main/resources/application.properties +++ b/stwzhj-visual/stwzhj-nacos/src/main/resources/application.properties @@ -40,9 +40,10 @@ spring.sql.init.platform=mysql db.num=1 ### Connect URL of DB: -db.url.0=jdbc:mysql://127.0.0.1:3306/ry-config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true +#db.url.0=jdbc:mysql://127.0.0.1:3306/ry-config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true +db.url.0=jdbc:mysql://53.238.79.3:3306/wzhj-config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true db.user.0=root -db.password.0=root +db.password.0=ycgis ### the maximum retry times for push nacos.config.push.maxRetryTime=50 diff --git a/wzhj-gateway/src/main/resources/logback-plus.xml b/wzhj-gateway/src/main/resources/logback-plus.xml index 4d66014c..3d88b97a 100644 --- a/wzhj-gateway/src/main/resources/logback-plus.xml +++ b/wzhj-gateway/src/main/resources/logback-plus.xml @@ -1,114 +1,49 @@ - + + + + - - - - - + + + ${log.path}/info.${log.file}.log + + INFO + ACCEPT + DENY + + + ${log.path}/info/info.${log.file}.%d{yyyy-MM-dd}.%i.log.gz + ${MAX_FILE_SIZE} + ${MAX_HISTORY} + - ${console.log.pattern} - utf-8 + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - ${log.path}/console.log - - - ${log.path}/console.%d{yyyy-MM-dd}.log - - 1 - - - ${log.pattern} - utf-8 - + + + ${log.path}/error.${log.file}.log - - INFO - - - - - - ${log.path}/info.log - - - - ${log.path}/info.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - INFO - - ACCEPT - - DENY - - - - - ${log.path}/error.log - - - - ${log.path}/error.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - ERROR - - ACCEPT - - DENY + + ${log.path}/error/error.${log.file}.%d{yyyy-MM-dd}.%i.log.gz + ${MAX_FILE_SIZE} + ${MAX_HISTORY} + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + - - - - 0 - - 512 - - - - - - - - 0 - - 512 - - - - - - - - - - - - - - - + + + + +