From 7e0d4af40f9803251346dd969e02a604dc9c4e05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Fri, 8 Aug 2025 11:20:48 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E9=85=8D=E7=BD=AE=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SyncConfigLogController.java | 53 +++++++++++++++++++ .../modules/syncLog/entity/SyncConfigLog.java | 49 +++++++++++++++++ .../syncLog/mapper/SyncConfigLogMapper.java | 15 ++++++ .../mapper/xml/SyncConfigLogMapper.xml | 50 +++++++++++++++++ .../service/ISyncConfigLogService.java | 14 +++++ .../impl/SyncConfigLogServiceImpl.java | 21 ++++++++ .../tplink/common/entity/TumsConfig.java | 17 ------ .../common/mapper/TumsConfigMapper.java | 3 -- .../common/mapper/xml/TumsConfigMapper.xml | 31 ----------- .../common/service/ITumsConfigService.java | 2 - .../service/impl/TumsConfigServiceImpl.java | 22 ++++---- .../nu/modules/tq/common/entity/TqConfig.java | 18 +------ .../tq/common/mapper/TqConfigMapper.java | 2 - .../tq/common/mapper/xml/TqConfigMapper.xml | 31 ----------- .../tq/common/service/ITqConfigService.java | 1 - .../service/impl/TqConfigServiceImpl.java | 16 +++--- .../common/entity/YiweilianConfig.java | 19 +------ .../common/mapper/YiweilianConfigMapper.java | 2 - .../mapper/xml/YiweilianConfigMapper.xml | 31 ----------- .../service/IYiweilianConfigService.java | 1 - .../impl/YiweilianConfigServiceImpl.java | 16 +++--- .../config/listener/IotConfigMQListener.java | 22 ++++---- 22 files changed, 240 insertions(+), 196 deletions(-) create mode 100644 nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/syncLog/controller/SyncConfigLogController.java create mode 100644 nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/syncLog/entity/SyncConfigLog.java create mode 100644 nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/syncLog/mapper/SyncConfigLogMapper.java create mode 100644 nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/syncLog/mapper/xml/SyncConfigLogMapper.xml create mode 100644 nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/syncLog/service/ISyncConfigLogService.java create mode 100644 nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/syncLog/service/impl/SyncConfigLogServiceImpl.java diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/syncLog/controller/SyncConfigLogController.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/syncLog/controller/SyncConfigLogController.java new file mode 100644 index 0000000..4b6e135 --- /dev/null +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/syncLog/controller/SyncConfigLogController.java @@ -0,0 +1,53 @@ +package com.nu.modules.syncLog.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.nu.modules.syncLog.entity.SyncConfigLog; +import com.nu.modules.syncLog.service.ISyncConfigLogService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.base.controller.JeecgController; +import org.jeecg.common.system.query.QueryGenerator; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletRequest; + +/** +* @Description: 配置同步日志 +* @Author: jeecg-boot +* @Date: 2025-08-08 +* @Version: V1.0 +*/ +@Api(tags="配置同步日志") +@RestController +@RequestMapping("/iot/syncConfigLog") +@Slf4j +public class SyncConfigLogController extends JeecgController { + @Autowired + private ISyncConfigLogService service; + + /** + * 分页列表查询 + * + * @param syncConfigLog + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @ApiOperation(value="同步日志-分页列表查询", notes="同步日志-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(SyncConfigLog syncConfigLog, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(syncConfigLog, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = service.page(page, queryWrapper); + return Result.OK(pageList); + } + +} diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/syncLog/entity/SyncConfigLog.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/syncLog/entity/SyncConfigLog.java new file mode 100644 index 0000000..f12b65a --- /dev/null +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/syncLog/entity/SyncConfigLog.java @@ -0,0 +1,49 @@ +package com.nu.modules.syncLog.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.Date; + +/** + * @Description: 配置同步日志 + * @Author: jeecg-boot + * @Date: 2025-08-08 + * @Version: V1.0 + */ +@Data +@TableName("nu_iot_config_sync_log") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="nu_iot_config_sync_log", description="配置同步日志") +public class SyncConfigLog implements Serializable { + private static final long serialVersionUID = 1L; + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private String id; + private String logId; + private String orgCode; //机构编码 + private String orgName; //机构名称 + private String content; + private String syncType; + private String status; + private String serverType; + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date createTime; + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date updateTime; +} diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/syncLog/mapper/SyncConfigLogMapper.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/syncLog/mapper/SyncConfigLogMapper.java new file mode 100644 index 0000000..abf5fbc --- /dev/null +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/syncLog/mapper/SyncConfigLogMapper.java @@ -0,0 +1,15 @@ +package com.nu.modules.syncLog.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.nu.modules.syncLog.entity.SyncConfigLog; + +/** + * @Description: 配置同步日志 + * @Author: jeecg-boot + * @Date: 2025-08-08 + * @Version: V1.0 + */ +public interface SyncConfigLogMapper extends BaseMapper { + void addConfigLog(SyncConfigLog syncConfigLog); + void updateConfigLog(SyncConfigLog syncConfigLog); +} diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/syncLog/mapper/xml/SyncConfigLogMapper.xml b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/syncLog/mapper/xml/SyncConfigLogMapper.xml new file mode 100644 index 0000000..a36a0b4 --- /dev/null +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/syncLog/mapper/xml/SyncConfigLogMapper.xml @@ -0,0 +1,50 @@ + + + + + insert into nu_iot_config_sync_log ( + log_id, + org_code, + org_name, + content, + sync_type, + status, + server_type, + create_time + ) + values ( + #{logId}, + #{orgCode}, + #{orgName}, + #{content}, + #{syncType}, + #{status}, + #{serverType}, + now() + ) + + + + UPDATE nu_iot_config_sync_log + SET + status = #{status}, + update_time = now() + where log_id = #{logId} + + + + \ No newline at end of file diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/syncLog/service/ISyncConfigLogService.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/syncLog/service/ISyncConfigLogService.java new file mode 100644 index 0000000..27e9837 --- /dev/null +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/syncLog/service/ISyncConfigLogService.java @@ -0,0 +1,14 @@ +package com.nu.modules.syncLog.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.nu.modules.syncLog.entity.SyncConfigLog; + +/** + * @Description: 配置同步日志 + * @Author: jeecg-boot + * @Date: 2025-08-08 + * @Version: V1.0 + */ +public interface ISyncConfigLogService extends IService { + void updateConfigLog(SyncConfigLog syncConfigLog); +} diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/syncLog/service/impl/SyncConfigLogServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/syncLog/service/impl/SyncConfigLogServiceImpl.java new file mode 100644 index 0000000..fdfc262 --- /dev/null +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/syncLog/service/impl/SyncConfigLogServiceImpl.java @@ -0,0 +1,21 @@ +package com.nu.modules.syncLog.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.nu.modules.syncLog.entity.SyncConfigLog; +import com.nu.modules.syncLog.mapper.SyncConfigLogMapper; +import com.nu.modules.syncLog.service.ISyncConfigLogService; +import org.springframework.stereotype.Service; + +/** + * @Description: 配置同步日志 + * @Author: jeecg-boot + * @Date: 2025-08-08 + * @Version: V1.0 + */ +@Service +public class SyncConfigLogServiceImpl extends ServiceImpl implements ISyncConfigLogService { + @Override + public void updateConfigLog(SyncConfigLog syncConfigLog){ + baseMapper.updateConfigLog(syncConfigLog); + } +} diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/common/entity/TumsConfig.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/common/entity/TumsConfig.java index aad5fa7..c67924c 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/common/entity/TumsConfig.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/common/entity/TumsConfig.java @@ -45,26 +45,9 @@ public class TumsConfig implements Serializable { private String ftpUploadpath; //回放视频转FTP上传路径 private String updateDate; //更新时间 - @JsonIgnore @TableField(exist = false) private String orgCode; //机构编码 - @JsonIgnore @TableField(exist = false) private String orgName; //机构名称 - @JsonIgnore - @TableField(exist = false) - private String logId; - @JsonIgnore - @TableField(exist = false) - private String content; - @JsonIgnore - @TableField(exist = false) - private String syncType; - @JsonIgnore - @TableField(exist = false) - private String status; - @JsonIgnore - @TableField(exist = false) - private String serverType; } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/common/mapper/TumsConfigMapper.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/common/mapper/TumsConfigMapper.java index 87ad076..4b65007 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/common/mapper/TumsConfigMapper.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/common/mapper/TumsConfigMapper.java @@ -19,8 +19,5 @@ import java.util.List; @Mapper public interface TumsConfigMapper extends BaseMapper { TumsConfig getByCode(); - List getOrgList(); - void addConfigLog(TumsConfig tumsConfig); - void updateConfigLog(TumsConfig tumsConfig); } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/common/mapper/xml/TumsConfigMapper.xml b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/common/mapper/xml/TumsConfigMapper.xml index 1df7dd3..d2ad0c5 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/common/mapper/xml/TumsConfigMapper.xml +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/common/mapper/xml/TumsConfigMapper.xml @@ -27,35 +27,4 @@ where del_flag = '0' - - insert into nu_iot_config_sync_log ( - log_id, - org_code, - org_name, - content, - sync_type, - status, - server_type, - create_time - ) - values ( - #{logId}, - #{orgCode}, - #{orgName}, - #{content}, - #{syncType}, - #{status}, - #{serverType}, - now() - ) - - - - UPDATE nu_iot_config_sync_log - SET - status = #{status}, - update_time = now() - where log_id = #{logId} - - \ No newline at end of file diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/common/service/ITumsConfigService.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/common/service/ITumsConfigService.java index 7a8e045..3681dda 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/common/service/ITumsConfigService.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/common/service/ITumsConfigService.java @@ -14,8 +14,6 @@ import org.jeecg.common.api.vo.Result; */ public interface ITumsConfigService extends IService { TumsConfig getByCode(); - void add(TumsConfig tumsConfig); void edit(TumsConfig tumsConfig); - void updateConfigLog(TumsConfig tumsConfig); } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/common/service/impl/TumsConfigServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/common/service/impl/TumsConfigServiceImpl.java index 3ef8077..0e9adca 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/common/service/impl/TumsConfigServiceImpl.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/common/service/impl/TumsConfigServiceImpl.java @@ -1,8 +1,12 @@ package com.nu.modules.tplink.common.service.impl; import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.nu.dto.IotTumsConfigMQDto; +import com.nu.modules.syncLog.entity.SyncConfigLog; +import com.nu.modules.syncLog.mapper.SyncConfigLogMapper; import com.nu.modules.tplink.common.entity.TumsConfig; import com.nu.modules.tplink.common.mapper.TumsConfigMapper; import com.nu.modules.tplink.common.service.ITumsConfigService; @@ -26,6 +30,9 @@ public class TumsConfigServiceImpl extends ServiceImpl { TqConfig getConfig(); List getAllConfigList(); - void addConfigLog(TqConfig tqConfig); - void updateConfigLog(TqConfig tqConfig); TqConfig getOrgName(String orgCode); } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/common/mapper/xml/TqConfigMapper.xml b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/common/mapper/xml/TqConfigMapper.xml index 38d96c4..d85ea46 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/common/mapper/xml/TqConfigMapper.xml +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/common/mapper/xml/TqConfigMapper.xml @@ -31,37 +31,6 @@ order by a.id asc - - insert into nu_iot_config_sync_log ( - log_id, - org_code, - org_name, - content, - sync_type, - status, - server_type, - create_time - ) - values ( - #{logId}, - #{orgCode}, - #{orgName}, - #{content}, - #{syncType}, - #{status}, - #{serverType}, - now() - ) - - - - UPDATE nu_iot_config_sync_log - SET - status = #{status}, - update_time = now() - where log_id = #{logId} - - - - insert into nu_iot_config_sync_log ( - log_id, - org_code, - org_name, - content, - sync_type, - status, - server_type, - create_time - ) - values ( - #{logId}, - #{orgCode}, - #{orgName}, - #{content}, - #{syncType}, - #{status}, - #{serverType}, - now() - ) - - - - UPDATE nu_iot_config_sync_log - SET - status = #{status}, - update_time = now() - where log_id = #{logId} - - \ No newline at end of file diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/common/service/IYiweilianConfigService.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/common/service/IYiweilianConfigService.java index 4ef902b..dcda508 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/common/service/IYiweilianConfigService.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/common/service/IYiweilianConfigService.java @@ -13,5 +13,4 @@ public interface IYiweilianConfigService extends IService { YiweilianConfig getConfig(); void add(YiweilianConfig yiweilianConfig); void edit(YiweilianConfig yiweilianConfig); - void updateConfigLog(YiweilianConfig yiweilianConfig); } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/common/service/impl/YiweilianConfigServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/common/service/impl/YiweilianConfigServiceImpl.java index d936c42..6d76972 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/common/service/impl/YiweilianConfigServiceImpl.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/common/service/impl/YiweilianConfigServiceImpl.java @@ -3,6 +3,8 @@ package com.nu.modules.yiweilian.common.service.impl; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.nu.dto.IotYiweilianConfigMQDto; +import com.nu.modules.syncLog.entity.SyncConfigLog; +import com.nu.modules.syncLog.mapper.SyncConfigLogMapper; import com.nu.modules.yiweilian.common.entity.YiweilianConfig; import com.nu.modules.yiweilian.common.mapper.YiweilianConfigMapper; import com.nu.modules.yiweilian.common.service.IYiweilianConfigService; @@ -27,6 +29,9 @@ public class YiweilianConfigServiceImpl extends ServiceImpl