diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/controller/NuIotTqApiRequestLogController.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/controller/ApiRequestLogController.java similarity index 79% rename from nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/controller/NuIotTqApiRequestLogController.java rename to nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/controller/ApiRequestLogController.java index c26a000..1c9d04c 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/controller/NuIotTqApiRequestLogController.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/controller/ApiRequestLogController.java @@ -10,8 +10,8 @@ import org.apache.commons.lang.StringUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.query.QueryRuleEnum; -import com.nu.modules.tq.apiRequestLog.entity.NuIotTqApiRequestLog; -import com.nu.modules.tq.apiRequestLog.service.INuIotTqApiRequestLogService; +import com.nu.modules.tq.apiRequestLog.entity.ApiRequestLog; +import com.nu.modules.tq.apiRequestLog.service.IApiRequestLogService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -35,11 +35,11 @@ import org.apache.shiro.authz.annotation.RequiresPermissions; */ @Api(tags="api请求日志") @RestController -@RequestMapping("/nuIotTqApiRequestLog/nuIotTqApiRequestLog") +@RequestMapping("/iot/tq/ApiRequestLog") @Slf4j -public class NuIotTqApiRequestLogController extends JeecgController { +public class ApiRequestLogController extends JeecgController { @Autowired - private INuIotTqApiRequestLogService nuIotTqApiRequestLogService; + private IApiRequestLogService nuIotTqApiRequestLogService; /** * 分页列表查询 @@ -53,26 +53,26 @@ public class NuIotTqApiRequestLogController extends JeecgController> queryPageList(NuIotTqApiRequestLog nuIotTqApiRequestLog, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { + public Result> queryPageList(ApiRequestLog nuIotTqApiRequestLog, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { // 自定义查询规则 Map customeRuleMap = new HashMap<>(); // 自定义多选的查询规则为：LIKE_WITH_OR customeRuleMap.put("type", QueryRuleEnum.LIKE_WITH_OR); customeRuleMap.put("requestStatus", QueryRuleEnum.LIKE_WITH_OR); customeRuleMap.put("resolveStatus", QueryRuleEnum.LIKE_WITH_OR); - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(nuIotTqApiRequestLog, req.getParameterMap(),customeRuleMap); - Page page = new Page(pageNo, pageSize); - IPage pageList = nuIotTqApiRequestLogService.page(page, queryWrapper); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(nuIotTqApiRequestLog, req.getParameterMap(),customeRuleMap); + Page page = new Page(pageNo, pageSize); + IPage pageList = nuIotTqApiRequestLogService.page(page, queryWrapper); // 获取当前时间 Calendar calendar = Calendar.getInstance(); // 减去5分钟 calendar.add(Calendar.MINUTE, -5); // 转换为Date对象 Date fiveMinutesAgo = calendar.getTime(); - for(NuIotTqApiRequestLog par:pageList.getRecords()){ + for(ApiRequestLog par:pageList.getRecords()){ String dateStr = par.getRequestTime(); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); Date date = null; @@ -122,7 +122,7 @@ public class NuIotTqApiRequestLogController extends JeecgController add(@RequestBody NuIotTqApiRequestLog nuIotTqApiRequestLog) { + public Result add(@RequestBody ApiRequestLog nuIotTqApiRequestLog) { nuIotTqApiRequestLogService.save(nuIotTqApiRequestLog); return Result.OK("添加成功！"); } @@ -137,7 +137,7 @@ public class NuIotTqApiRequestLogController extends JeecgController edit(@RequestBody NuIotTqApiRequestLog nuIotTqApiRequestLog) { + public Result edit(@RequestBody ApiRequestLog nuIotTqApiRequestLog) { nuIotTqApiRequestLogService.updateById(nuIotTqApiRequestLog); return Result.OK("编辑成功!"); } @@ -181,8 +181,8 @@ public class NuIotTqApiRequestLogController extends JeecgController queryById(@RequestParam(name="id",required=true) String id) { - NuIotTqApiRequestLog nuIotTqApiRequestLog = nuIotTqApiRequestLogService.getById(id); + public Result queryById(@RequestParam(name="id",required=true) String id) { + ApiRequestLog nuIotTqApiRequestLog = nuIotTqApiRequestLogService.getById(id); if(nuIotTqApiRequestLog==null) { return Result.error("未找到对应数据"); } @@ -197,8 +197,8 @@ public class NuIotTqApiRequestLogController extends JeecgController importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, NuIotTqApiRequestLog.class); + return super.importExcel(request, response, ApiRequestLog.class); } } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/entity/NuIotTqApiRequestLog.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/entity/ApiRequestLog.java similarity index 98% rename from nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/entity/NuIotTqApiRequestLog.java rename to nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/entity/ApiRequestLog.java index 2d94c75..1570975 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/entity/NuIotTqApiRequestLog.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/entity/ApiRequestLog.java @@ -27,7 +27,7 @@ import lombok.experimental.Accessors; @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) @ApiModel(value="nu_iot_tq_api_request_log对象", description="api请求日志") -public class NuIotTqApiRequestLog implements Serializable { +public class ApiRequestLog implements Serializable { private static final long serialVersionUID = 1L; /**id*/ diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/mapper/NuIotTqApiRequestLogMapper.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/mapper/ApiRequestLogMapper.java similarity index 57% rename from nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/mapper/NuIotTqApiRequestLogMapper.java rename to nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/mapper/ApiRequestLogMapper.java index 1f12182..0b9d19b 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/mapper/NuIotTqApiRequestLogMapper.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/mapper/ApiRequestLogMapper.java @@ -1,6 +1,6 @@ package com.nu.modules.tq.apiRequestLog.mapper; -import com.nu.modules.tq.apiRequestLog.entity.NuIotTqApiRequestLog; +import com.nu.modules.tq.apiRequestLog.entity.ApiRequestLog; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** @@ -9,6 +9,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @Date: 2025-06-10 * @Version: V1.0 */ -public interface NuIotTqApiRequestLogMapper extends BaseMapper { +public interface ApiRequestLogMapper extends BaseMapper { } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/mapper/xml/NuIotTqElectricitySyncLogMapper.xml b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/mapper/xml/ApiRequestLogMapper.xml similarity index 64% rename from nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/mapper/xml/NuIotTqElectricitySyncLogMapper.xml rename to nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/mapper/xml/ApiRequestLogMapper.xml index b441196..e64f87a 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/mapper/xml/NuIotTqElectricitySyncLogMapper.xml +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/mapper/xml/ApiRequestLogMapper.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/mapper/xml/NuIotTqApiRequestLogMapper.xml b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/mapper/xml/NuIotTqApiRequestLogMapper.xml deleted file mode 100644 index 4706e40..0000000 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/mapper/xml/NuIotTqApiRequestLogMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/service/INuIotTqApiRequestLogService.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/service/IApiRequestLogService.java similarity index 58% rename from nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/service/INuIotTqApiRequestLogService.java rename to nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/service/IApiRequestLogService.java index 506afcd..ff2a8d1 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/service/INuIotTqApiRequestLogService.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/service/IApiRequestLogService.java @@ -1,6 +1,6 @@ package com.nu.modules.tq.apiRequestLog.service; -import com.nu.modules.tq.apiRequestLog.entity.NuIotTqApiRequestLog; +import com.nu.modules.tq.apiRequestLog.entity.ApiRequestLog; import com.baomidou.mybatisplus.extension.service.IService; /** @@ -9,6 +9,6 @@ import com.baomidou.mybatisplus.extension.service.IService; * @Date: 2025-06-10 * @Version: V1.0 */ -public interface INuIotTqApiRequestLogService extends IService { +public interface IApiRequestLogService extends IService { } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/service/impl/ApiRequestLogServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/service/impl/ApiRequestLogServiceImpl.java new file mode 100644 index 0000000..ae13657 --- /dev/null +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/service/impl/ApiRequestLogServiceImpl.java @@ -0,0 +1,19 @@ +package com.nu.modules.tq.apiRequestLog.service.impl; + +import com.nu.modules.tq.apiRequestLog.entity.ApiRequestLog; +import com.nu.modules.tq.apiRequestLog.mapper.ApiRequestLogMapper; +import com.nu.modules.tq.apiRequestLog.service.IApiRequestLogService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: api请求日志 + * @Author: jeecg-boot + * @Date: 2025-06-10 + * @Version: V1.0 + */ +@Service +public class ApiRequestLogServiceImpl extends ServiceImpl implements IApiRequestLogService { + +} diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/service/impl/NuIotTqApiRequestLogServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/service/impl/NuIotTqApiRequestLogServiceImpl.java deleted file mode 100644 index 1437058..0000000 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/service/impl/NuIotTqApiRequestLogServiceImpl.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.nu.modules.tq.apiRequestLog.service.impl; - -import com.nu.modules.tq.apiRequestLog.entity.NuIotTqApiRequestLog; -import com.nu.modules.tq.apiRequestLog.mapper.NuIotTqApiRequestLogMapper; -import com.nu.modules.tq.apiRequestLog.service.INuIotTqApiRequestLogService; -import org.springframework.stereotype.Service; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - -/** - * @Description: api请求日志 - * @Author: jeecg-boot - * @Date: 2025-06-10 - * @Version: V1.0 - */ -@Service -public class NuIotTqApiRequestLogServiceImpl extends ServiceImpl implements INuIotTqApiRequestLogService { - -} diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/controller/ElectricityMeterController.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/controller/ElectricityMeterController.java index fa5d769..da5323e 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/controller/ElectricityMeterController.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/controller/ElectricityMeterController.java @@ -84,12 +84,4 @@ public class ElectricityMeterController extends JeecgController syncElectricity(@RequestBody ElectricityMeter electricityMeter) { - String dataSourceCode = electricityMeter.getDepartServerUrl(); - service.syncElectricity(dataSourceCode,electricityMeter); - return Result.OK("同步成功!"); - } } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/service/IElectricityMeterService.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/service/IElectricityMeterService.java index 592d643..87565bc 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/service/IElectricityMeterService.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/service/IElectricityMeterService.java @@ -19,7 +19,6 @@ public interface IElectricityMeterService extends IService { String eleControlNotify(String response_content, String timestamp, String sign); String eleReadNotify(String response_content, String timestamp, String sign); - void syncElectricity(String dataSourceCode, ElectricityMeter electricityMeter); void editHldy(ElectricityMeter electricityMeter); } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/service/impl/ElectricityMeterServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/service/impl/ElectricityMeterServiceImpl.java index 48f512e..b49919e 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/service/impl/ElectricityMeterServiceImpl.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/service/impl/ElectricityMeterServiceImpl.java @@ -8,8 +8,6 @@ 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.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.nu.modules.tq.syncLog.entity.NuIotTqElectricitySyncLog; -import com.nu.modules.tq.syncLog.service.INuIotTqElectricitySyncLogService; import com.nu.modules.tq.common.entity.TqApiLog; import com.nu.modules.tq.common.service.ITqApiLogService; import com.nu.modules.tq.utils.HttpTool; @@ -37,8 +35,6 @@ public class ElectricityMeterServiceImpl extends ServiceImpl { - @Autowired - private INuIotTqElectricitySyncLogService nuIotTqElectricitySyncLogService; - - /** - * 分页列表查询 - * - * @param nuIotTqElectricitySyncLog - * @param pageNo - * @param pageSize - * @param req - * @return - */ - //@AutoLog(value = "同步日志-分页列表查询") - @ApiOperation(value="同步日志-分页列表查询", notes="同步日志-分页列表查询") - @GetMapping(value = "/list") - public Result> queryPageList(NuIotTqElectricitySyncLog nuIotTqElectricitySyncLog, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(nuIotTqElectricitySyncLog, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = nuIotTqElectricitySyncLogService.page(page, queryWrapper); - return Result.OK(pageList); - } - - /** - * 添加 - * - * @param nuIotTqElectricitySyncLog - * @return - */ - @AutoLog(value = "同步日志-添加") - @ApiOperation(value="同步日志-添加", notes="同步日志-添加") - @RequiresPermissions("nuIotTqElectricitySyncLog:nu_iot_tq_electricity_sync_log:add") - @PostMapping(value = "/add") - public Result add(@RequestBody NuIotTqElectricitySyncLog nuIotTqElectricitySyncLog) { - nuIotTqElectricitySyncLogService.save(nuIotTqElectricitySyncLog); - return Result.OK("添加成功！"); - } - - /** - * 编辑 - * - * @param nuIotTqElectricitySyncLog - * @return - */ - @AutoLog(value = "同步日志-编辑") - @ApiOperation(value="同步日志-编辑", notes="同步日志-编辑") - @RequiresPermissions("nuIotTqElectricitySyncLog:nu_iot_tq_electricity_sync_log:edit") - @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) - public Result edit(@RequestBody NuIotTqElectricitySyncLog nuIotTqElectricitySyncLog) { - nuIotTqElectricitySyncLogService.updateById(nuIotTqElectricitySyncLog); - return Result.OK("编辑成功!"); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @AutoLog(value = "同步日志-通过id删除") - @ApiOperation(value="同步日志-通过id删除", notes="同步日志-通过id删除") - @RequiresPermissions("nuIotTqElectricitySyncLog:nu_iot_tq_electricity_sync_log:delete") - @DeleteMapping(value = "/delete") - public Result delete(@RequestParam(name="id",required=true) String id) { - nuIotTqElectricitySyncLogService.removeById(id); - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - @AutoLog(value = "同步日志-批量删除") - @ApiOperation(value="同步日志-批量删除", notes="同步日志-批量删除") - @RequiresPermissions("nuIotTqElectricitySyncLog:nu_iot_tq_electricity_sync_log:deleteBatch") - @DeleteMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { - this.nuIotTqElectricitySyncLogService.removeByIds(Arrays.asList(ids.split(","))); - return Result.OK("批量删除成功!"); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - //@AutoLog(value = "同步日志-通过id查询") - @ApiOperation(value="同步日志-通过id查询", notes="同步日志-通过id查询") - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name="id",required=true) String id) { - NuIotTqElectricitySyncLog nuIotTqElectricitySyncLog = nuIotTqElectricitySyncLogService.getById(id); - if(nuIotTqElectricitySyncLog==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(nuIotTqElectricitySyncLog); - } - - /** - * 导出excel - * - * @param request - * @param nuIotTqElectricitySyncLog - */ - @RequiresPermissions("nuIotTqElectricitySyncLog:nu_iot_tq_electricity_sync_log:exportXls") - @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, NuIotTqElectricitySyncLog nuIotTqElectricitySyncLog) { - return super.exportXls(request, nuIotTqElectricitySyncLog, NuIotTqElectricitySyncLog.class, "同步日志"); - } - - /** - * 通过excel导入数据 - * - * @param request - * @param response - * @return - */ - @RequiresPermissions("nuIotTqElectricitySyncLog:nu_iot_tq_electricity_sync_log:importExcel") - @RequestMapping(value = "/importExcel", method = RequestMethod.POST) - public Result importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, NuIotTqElectricitySyncLog.class); - } - -} diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/entity/NuIotTqElectricitySyncLog.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/entity/NuIotTqElectricitySyncLog.java deleted file mode 100644 index c2d93c8..0000000 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/entity/NuIotTqElectricitySyncLog.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.nu.modules.tq.syncLog.entity; - -import java.io.Serializable; -import java.util.Date; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; -import org.jeecgframework.poi.excel.annotation.Excel; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - * @Description: 同步日志 - * @Author: jeecg-boot - * @Date: 2025-06-12 - * @Version: V1.0 - */ -@Data -@TableName("nu_iot_tq_electricity_sync_log") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -@ApiModel(value="nu_iot_tq_electricity_sync_log对象", description="同步日志") -public class NuIotTqElectricitySyncLog implements Serializable { - private static final long serialVersionUID = 1L; - - /**id*/ - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "id") - private String id; - /**createBy*/ - @ApiModelProperty(value = "createBy") - private String createBy; - /**createTime*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "createTime") - private Date createTime; - /**updateBy*/ - @ApiModelProperty(value = "updateBy") - private String updateBy; - /**updateTime*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "updateTime") - private Date updateTime; - /**主表id*/ - @Excel(name = "主表id", width = 15) - @ApiModelProperty(value = "主表id") - private String mainId; - /**主表名称*/ - @Excel(name = "主表名称", width = 15) - @ApiModelProperty(value = "主表名称") - private String mainName; - /**同步类型*/ - @Excel(name = "同步类型", width = 15) - @ApiModelProperty(value = "同步类型") - private String syncType; - /**原机构id*/ - @Excel(name = "原机构id", width = 15) - @ApiModelProperty(value = "原机构id") - private String orgId; - /**原机构名称*/ - @Excel(name = "原机构名称", width = 15) - @ApiModelProperty(value = "原机构名称") - private String orgName; - /**原机构编码*/ - @Excel(name = "原机构编码", width = 15) - @ApiModelProperty(value = "原机构编码") - private String orgCode; - /**新机构id*/ - @Excel(name = "新机构id", width = 15) - @ApiModelProperty(value = "新机构id") - private String newOrgId; - /**新机构名称*/ - @Excel(name = "新机构名称", width = 15) - @ApiModelProperty(value = "新机构名称") - private String newOrgName; - /**新机构编码*/ - @Excel(name = "新机构编码", width = 15) - @ApiModelProperty(value = "新机构编码") - private String newOrgCode; - /**状态*/ - @Excel(name = "状态", width = 15) - @ApiModelProperty(value = "状态") - private String status; - /**备注*/ - @Excel(name = "备注", width = 15) - @ApiModelProperty(value = "备注") - private String content; - /**服务类型*/ - @Excel(name = "服务类型", width = 15) - @ApiModelProperty(value = "服务类型") - private String serverType; -} diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/mapper/NuIotTqElectricitySyncLogMapper.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/mapper/NuIotTqElectricitySyncLogMapper.java deleted file mode 100644 index 459ca0b..0000000 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/mapper/NuIotTqElectricitySyncLogMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.nu.modules.tq.syncLog.mapper; - -import com.nu.modules.tq.syncLog.entity.NuIotTqElectricitySyncLog; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * @Description: 同步日志 - * @Author: jeecg-boot - * @Date: 2025-06-12 - * @Version: V1.0 - */ -public interface NuIotTqElectricitySyncLogMapper extends BaseMapper { - -} diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/service/INuIotTqElectricitySyncLogService.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/service/INuIotTqElectricitySyncLogService.java deleted file mode 100644 index c68c1e8..0000000 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/service/INuIotTqElectricitySyncLogService.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.nu.modules.tq.syncLog.service; - -import com.nu.modules.tq.syncLog.entity.NuIotTqElectricitySyncLog; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * @Description: 同步日志 - * @Author: jeecg-boot - * @Date: 2025-06-12 - * @Version: V1.0 - */ -public interface INuIotTqElectricitySyncLogService extends IService { - -} diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/service/impl/NuIotTqElectricitySyncLogServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/service/impl/NuIotTqElectricitySyncLogServiceImpl.java deleted file mode 100644 index b62ed93..0000000 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/service/impl/NuIotTqElectricitySyncLogServiceImpl.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.nu.modules.tq.syncLog.service.impl; - -import com.nu.modules.tq.syncLog.entity.NuIotTqElectricitySyncLog; -import com.nu.modules.tq.syncLog.mapper.NuIotTqElectricitySyncLogMapper; -import com.nu.modules.tq.syncLog.service.INuIotTqElectricitySyncLogService; -import org.springframework.stereotype.Service; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - -/** - * @Description: 同步日志 - * @Author: jeecg-boot - * @Date: 2025-06-12 - * @Version: V1.0 - */ -@Service -public class NuIotTqElectricitySyncLogServiceImpl extends ServiceImpl implements INuIotTqElectricitySyncLogService { - -} diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/service/impl/WaterMeterServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/service/impl/WaterMeterServiceImpl.java index 3c8a1b2..100f03e 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/service/impl/WaterMeterServiceImpl.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/service/impl/WaterMeterServiceImpl.java @@ -8,8 +8,6 @@ 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.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.nu.modules.tq.syncLog.entity.NuIotTqElectricitySyncLog; -import com.nu.modules.tq.syncLog.service.INuIotTqElectricitySyncLogService; import com.nu.modules.tq.common.entity.TqApiLog; import com.nu.modules.tq.common.service.ITqApiLogService; import com.nu.modules.tq.utils.HttpTool; @@ -19,7 +17,6 @@ import com.nu.modules.tq.water.entity.WaterMeter; import com.nu.modules.tq.water.mapper.WaterMeterMapper; import com.nu.modules.tq.water.service.IWaterMeterService; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang.StringUtils; import org.jeecg.common.api.vo.Result; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; @@ -38,8 +35,6 @@ public class WaterMeterServiceImpl extends ServiceImpl syncHumidDevice(@RequestBody HumidDevice humidDevice) { - String dataSourceCode = humidDevice.getDepartServerUrl(); - service.syncHumidDevice(dataSourceCode,humidDevice); - return Result.OK("同步成功!"); - } } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/service/IHumidDeviceService.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/service/IHumidDeviceService.java index a28145d..c2533f1 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/service/IHumidDeviceService.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/service/IHumidDeviceService.java @@ -16,7 +16,5 @@ public interface IHumidDeviceService extends IService { Result getDeviceParameters(HumidDevice humidDevice); IPage findLogPage(Page page, HumidDevice humidDevice); - void syncHumidDevice(String dataSourceCode, HumidDevice humidDevice); - void editHldy(HumidDevice humidDevice); } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/service/impl/HumidDeviceServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/service/impl/HumidDeviceServiceImpl.java index 044ae88..1384a06 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/service/impl/HumidDeviceServiceImpl.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/service/impl/HumidDeviceServiceImpl.java @@ -8,14 +8,11 @@ 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.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.nu.modules.tq.syncLog.entity.NuIotTqElectricitySyncLog; -import com.nu.modules.tq.syncLog.service.INuIotTqElectricitySyncLogService; import com.nu.modules.yiweilian.humid.entity.HumidDevice; import com.nu.modules.yiweilian.humid.mapper.HumidDeviceMapper; import com.nu.modules.yiweilian.humid.service.IHumidDeviceService; import com.nu.modules.yiweilian.utils.YiweilianApi; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang.StringUtils; import org.apache.shiro.SecurityUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.vo.LoginUser; @@ -36,8 +33,6 @@ public class HumidDeviceServiceImpl extends ServiceImpl