yangjun
/
hldy_java_monomer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改文件夹命名

This commit is contained in:
yangjun 2025-06-30 15:49:45 +08:00
parent cb5456418b
commit 7affe43583
17 changed files with 109 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/controller/NuIotTqApiRequestLogController.java → nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/controller/ApiRequestLogController.java
View File

@ -10,8 +10,8 @@ import org.apache.commons.lang.StringUtils;
import org.jeecg.common.api.vo.Result; import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.query.QueryRuleEnum; import org.jeecg.common.system.query.QueryRuleEnum;
import com.nu.modules.tq.apiRequestLog.entity.NuIotTqApiRequestLog; import com.nu.modules.tq.apiRequestLog.entity.ApiRequestLog;
import com.nu.modules.tq.apiRequestLog.service.INuIotTqApiRequestLogService; import com.nu.modules.tq.apiRequestLog.service.IApiRequestLogService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
@ -35,11 +35,12 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
*/ */
@Api(tags="api请求日志") @Api(tags="api请求日志")
@RestController @RestController
@RequestMapping("/nuIotTqApiRequestLog/nuIotTqApiRequestLog") //@RequestMapping("/nuIotTqApiRequestLog/nuIotTqApiRequestLog")
@RequestMapping("/iot/tq/apiRequestLog")
@Slf4j @Slf4j
public class NuIotTqApiRequestLogController extends JeecgController<NuIotTqApiRequestLog, INuIotTqApiRequestLogService> { public class ApiRequestLogController extends JeecgController<ApiRequestLog, IApiRequestLogService> {
@Autowired @Autowired
private INuIotTqApiRequestLogService nuIotTqApiRequestLogService; private IApiRequestLogService nuIotTqApiRequestLogService;
/** /**
* 分页列表查询 * 分页列表查询
@ -53,26 +54,26 @@ public class NuIotTqApiRequestLogController extends JeecgController<NuIotTqApiRe
//@AutoLog(value = "api请求日志-分页列表查询") //@AutoLog(value = "api请求日志-分页列表查询")
@ApiOperation(value="api请求日志-分页列表查询", notes="api请求日志-分页列表查询") @ApiOperation(value="api请求日志-分页列表查询", notes="api请求日志-分页列表查询")
@GetMapping(value = "/list") @GetMapping(value = "/list")
public Result<IPage<NuIotTqApiRequestLog>> queryPageList(NuIotTqApiRequestLog nuIotTqApiRequestLog, public Result<IPage<ApiRequestLog>> queryPageList(ApiRequestLog nuIotTqApiRequestLog,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) { HttpServletRequest req) {
// 自定义查询规则 // 自定义查询规则
Map<String, QueryRuleEnum> customeRuleMap = new HashMap<>(); Map<String, QueryRuleEnum> customeRuleMap = new HashMap<>();
// 自定义多选的查询规则为：LIKE_WITH_OR // 自定义多选的查询规则为：LIKE_WITH_OR
customeRuleMap.put("type", QueryRuleEnum.LIKE_WITH_OR); customeRuleMap.put("type", QueryRuleEnum.LIKE_WITH_OR);
customeRuleMap.put("requestStatus", QueryRuleEnum.LIKE_WITH_OR); customeRuleMap.put("requestStatus", QueryRuleEnum.LIKE_WITH_OR);
customeRuleMap.put("resolveStatus", QueryRuleEnum.LIKE_WITH_OR); customeRuleMap.put("resolveStatus", QueryRuleEnum.LIKE_WITH_OR);
QueryWrapper<NuIotTqApiRequestLog> queryWrapper = QueryGenerator.initQueryWrapper(nuIotTqApiRequestLog, req.getParameterMap(),customeRuleMap); QueryWrapper<ApiRequestLog> queryWrapper = QueryGenerator.initQueryWrapper(nuIotTqApiRequestLog, req.getParameterMap(),customeRuleMap);
Page<NuIotTqApiRequestLog> page = new Page<NuIotTqApiRequestLog>(pageNo, pageSize); Page<ApiRequestLog> page = new Page<ApiRequestLog>(pageNo, pageSize);
IPage<NuIotTqApiRequestLog> pageList = nuIotTqApiRequestLogService.page(page, queryWrapper); IPage<ApiRequestLog> pageList = nuIotTqApiRequestLogService.page(page, queryWrapper);
// 获取当前时间 // 获取当前时间
Calendar calendar = Calendar.getInstance(); Calendar calendar = Calendar.getInstance();
// 减去5分钟 // 减去5分钟
calendar.add(Calendar.MINUTE, -5); calendar.add(Calendar.MINUTE, -5);
// 转换为Date对象 // 转换为Date对象
Date fiveMinutesAgo = calendar.getTime(); Date fiveMinutesAgo = calendar.getTime();
for(NuIotTqApiRequestLog par:pageList.getRecords()){ for(ApiRequestLog par:pageList.getRecords()){
String dateStr = par.getRequestTime(); String dateStr = par.getRequestTime();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Date date = null; Date date = null;
@ -122,7 +123,7 @@ public class NuIotTqApiRequestLogController extends JeecgController<NuIotTqApiRe
@ApiOperation(value="api请求日志-添加", notes="api请求日志-添加") @ApiOperation(value="api请求日志-添加", notes="api请求日志-添加")
@RequiresPermissions("nuIotTqApiRequestLog:nu_iot_tq_api_request_log:add") @RequiresPermissions("nuIotTqApiRequestLog:nu_iot_tq_api_request_log:add")
@PostMapping(value = "/add") @PostMapping(value = "/add")
public Result<String> add(@RequestBody NuIotTqApiRequestLog nuIotTqApiRequestLog) { public Result<String> add(@RequestBody ApiRequestLog nuIotTqApiRequestLog) {
nuIotTqApiRequestLogService.save(nuIotTqApiRequestLog); nuIotTqApiRequestLogService.save(nuIotTqApiRequestLog);
return Result.OK("添加成功！"); return Result.OK("添加成功！");
} }
@ -137,7 +138,7 @@ public class NuIotTqApiRequestLogController extends JeecgController<NuIotTqApiRe
@ApiOperation(value="api请求日志-编辑", notes="api请求日志-编辑") @ApiOperation(value="api请求日志-编辑", notes="api请求日志-编辑")
@RequiresPermissions("nuIotTqApiRequestLog:nu_iot_tq_api_request_log:edit") @RequiresPermissions("nuIotTqApiRequestLog:nu_iot_tq_api_request_log:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<String> edit(@RequestBody NuIotTqApiRequestLog nuIotTqApiRequestLog) { public Result<String> edit(@RequestBody ApiRequestLog nuIotTqApiRequestLog) {
nuIotTqApiRequestLogService.updateById(nuIotTqApiRequestLog); nuIotTqApiRequestLogService.updateById(nuIotTqApiRequestLog);
return Result.OK("编辑成功!"); return Result.OK("编辑成功!");
} }
@ -181,8 +182,8 @@ public class NuIotTqApiRequestLogController extends JeecgController<NuIotTqApiRe
//@AutoLog(value = "api请求日志-通过id查询") //@AutoLog(value = "api请求日志-通过id查询")
@ApiOperation(value="api请求日志-通过id查询", notes="api请求日志-通过id查询") @ApiOperation(value="api请求日志-通过id查询", notes="api请求日志-通过id查询")
@GetMapping(value = "/queryById") @GetMapping(value = "/queryById")
public Result<NuIotTqApiRequestLog> queryById(@RequestParam(name="id",required=true) String id) { public Result<ApiRequestLog> queryById(@RequestParam(name="id",required=true) String id) {
NuIotTqApiRequestLog nuIotTqApiRequestLog = nuIotTqApiRequestLogService.getById(id); ApiRequestLog nuIotTqApiRequestLog = nuIotTqApiRequestLogService.getById(id);
if(nuIotTqApiRequestLog==null) { if(nuIotTqApiRequestLog==null) {
return Result.error("未找到对应数据"); return Result.error("未找到对应数据");
} }
@ -197,8 +198,8 @@ public class NuIotTqApiRequestLogController extends JeecgController<NuIotTqApiRe
*/ */
@RequiresPermissions("nuIotTqApiRequestLog:nu_iot_tq_api_request_log:exportXls") @RequiresPermissions("nuIotTqApiRequestLog:nu_iot_tq_api_request_log:exportXls")
@RequestMapping(value = "/exportXls") @RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, NuIotTqApiRequestLog nuIotTqApiRequestLog) { public ModelAndView exportXls(HttpServletRequest request, ApiRequestLog nuIotTqApiRequestLog) {
return super.exportXls(request, nuIotTqApiRequestLog, NuIotTqApiRequestLog.class, "api请求日志"); return super.exportXls(request, nuIotTqApiRequestLog, ApiRequestLog.class, "api请求日志");
} }
/** /**
@ -211,7 +212,7 @@ public class NuIotTqApiRequestLogController extends JeecgController<NuIotTqApiRe
@RequiresPermissions("nuIotTqApiRequestLog:nu_iot_tq_api_request_log:importExcel") @RequiresPermissions("nuIotTqApiRequestLog:nu_iot_tq_api_request_log:importExcel")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST) @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, NuIotTqApiRequestLog.class); return super.importExcel(request, response, ApiRequestLog.class);
} }
} }

2
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/entity/NuIotTqApiRequestLog.java → nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/entity/ApiRequestLog.java
View File

@ -27,7 +27,7 @@ import lombok.experimental.Accessors;
@Accessors(chain = true) @Accessors(chain = true)
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)
@ApiModel(value="nu_iot_tq_api_request_log对象", description="api请求日志") @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; private static final long serialVersionUID = 1L;
/**id*/ /**id*/

4
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/mapper/NuIotTqApiRequestLogMapper.java → nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/mapper/ApiRequestLogMapper.java
View File

@ -1,6 +1,6 @@
package com.nu.modules.tq.apiRequestLog.mapper; 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; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/** /**
@ -9,6 +9,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* @Date: 2025-06-10 * @Date: 2025-06-10
* @Version: V1.0 * @Version: V1.0
*/ */
public interface NuIotTqApiRequestLogMapper extends BaseMapper<NuIotTqApiRequestLog> { public interface ApiRequestLogMapper extends BaseMapper<ApiRequestLog> {
} }

2
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/mapper/xml/NuIotTqElectricitySyncLogMapper.xml → nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/mapper/xml/ApiRequestLogMapper.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.nu.modules.tq.syncLog.mapper.NuIotTqElectricitySyncLogMapper"> <mapper namespace="com.nu.modules.tq.apiRequestLog.mapper.ApiRequestLogMapper">
</mapper> </mapper>

4
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/service/INuIotTqApiRequestLogService.java → nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/service/IApiRequestLogService.java
View File

@ -1,6 +1,6 @@
package com.nu.modules.tq.apiRequestLog.service; 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; import com.baomidou.mybatisplus.extension.service.IService;
/** /**
@ -9,6 +9,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
* @Date: 2025-06-10 * @Date: 2025-06-10
* @Version: V1.0 * @Version: V1.0
*/ */
public interface INuIotTqApiRequestLogService extends IService<NuIotTqApiRequestLog> { public interface IApiRequestLogService extends IService<ApiRequestLog> {
} }

19
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/service/impl/ApiRequestLogServiceImpl.java Normal file
View File

@ -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<ApiRequestLogMapper, ApiRequestLog> implements IApiRequestLogService {
}

19
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/service/impl/NuIotTqApiRequestLogServiceImpl.java
View File

@ -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<NuIotTqApiRequestLogMapper, NuIotTqApiRequestLog> implements INuIotTqApiRequestLogService {
}

12
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/service/impl/ElectricityMeterServiceImpl.java
View File

@ -8,8 +8,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.nu.modules.tq.syncLog.entity.NuIotTqElectricitySyncLog; import com.nu.modules.tq.syncLog.entity.SyncLog;
import com.nu.modules.tq.syncLog.service.INuIotTqElectricitySyncLogService; import com.nu.modules.tq.syncLog.service.ISyncLogService;
import com.nu.modules.tq.common.entity.TqApiLog; import com.nu.modules.tq.common.entity.TqApiLog;
import com.nu.modules.tq.common.service.ITqApiLogService; import com.nu.modules.tq.common.service.ITqApiLogService;
import com.nu.modules.tq.utils.HttpTool; import com.nu.modules.tq.utils.HttpTool;
@ -38,7 +38,7 @@ public class ElectricityMeterServiceImpl extends ServiceImpl<ElectricityMeterMap
ITqApiLogService logService; ITqApiLogService logService;
@Autowired @Autowired
public INuIotTqElectricitySyncLogService nuIotTqElectricitySyncLogService; public ISyncLogService nuIotTqElectricitySyncLogService;
@Lazy @Lazy
@Autowired @Autowired
@ -481,7 +481,7 @@ public class ElectricityMeterServiceImpl extends ServiceImpl<ElectricityMeterMap
if(StringUtils.equals(electricityMeter.getOldServerUrl(),electricityMeter.getDepartServerUrl()) || StringUtils.isEmpty(electricityMeter.getOldServerUrl())){ if(StringUtils.equals(electricityMeter.getOldServerUrl(),electricityMeter.getDepartServerUrl()) || StringUtils.isEmpty(electricityMeter.getOldServerUrl())){
syncImpl.syncElectricitySaveOrUpdate(electricityMeter.getOldServerUrl(),electricityMeter); syncImpl.syncElectricitySaveOrUpdate(electricityMeter.getOldServerUrl(),electricityMeter);
NuIotTqElectricitySyncLog nuIotTqElectricitySyncLog = new NuIotTqElectricitySyncLog(); SyncLog nuIotTqElectricitySyncLog = new SyncLog();
nuIotTqElectricitySyncLog.setId(null); nuIotTqElectricitySyncLog.setId(null);
nuIotTqElectricitySyncLog.setMainId(electricityMeter.getCid()+""); nuIotTqElectricitySyncLog.setMainId(electricityMeter.getCid()+"");
nuIotTqElectricitySyncLog.setMainName(electricityMeter.getCid()); nuIotTqElectricitySyncLog.setMainName(electricityMeter.getCid());
@ -503,7 +503,7 @@ public class ElectricityMeterServiceImpl extends ServiceImpl<ElectricityMeterMap
syncImpl.syncElectricitySaveOrUpdate(dataSourceCode,electricityMeter); syncImpl.syncElectricitySaveOrUpdate(dataSourceCode,electricityMeter);
NuIotTqElectricitySyncLog nuIotTqElectricitySyncLog = new NuIotTqElectricitySyncLog(); SyncLog nuIotTqElectricitySyncLog = new SyncLog();
nuIotTqElectricitySyncLog.setId(null); nuIotTqElectricitySyncLog.setId(null);
nuIotTqElectricitySyncLog.setMainId(electricityMeter.getCid()+""); nuIotTqElectricitySyncLog.setMainId(electricityMeter.getCid()+"");
nuIotTqElectricitySyncLog.setMainName(electricityMeter.getCid()); nuIotTqElectricitySyncLog.setMainName(electricityMeter.getCid());
@ -520,7 +520,7 @@ public class ElectricityMeterServiceImpl extends ServiceImpl<ElectricityMeterMap
nuIotTqElectricitySyncLogService.save(nuIotTqElectricitySyncLog); nuIotTqElectricitySyncLogService.save(nuIotTqElectricitySyncLog);
NuIotTqElectricitySyncLog nuIotTqElectricitySyncLogDel = new NuIotTqElectricitySyncLog(); SyncLog nuIotTqElectricitySyncLogDel = new SyncLog();
nuIotTqElectricitySyncLogDel.setId(null); nuIotTqElectricitySyncLogDel.setId(null);
nuIotTqElectricitySyncLogDel.setMainId(electricityMeter.getCid()+""); nuIotTqElectricitySyncLogDel.setMainId(electricityMeter.getCid()+"");
nuIotTqElectricitySyncLogDel.setMainName(electricityMeter.getCid()); nuIotTqElectricitySyncLogDel.setMainName(electricityMeter.getCid());

39
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/controller/NuIotTqElectricitySyncLogController.java → nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/controller/SyncLogController.java
View File

@ -5,8 +5,8 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.jeecg.common.api.vo.Result; import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.query.QueryGenerator;
import com.nu.modules.tq.syncLog.entity.NuIotTqElectricitySyncLog; import com.nu.modules.tq.syncLog.entity.SyncLog;
import com.nu.modules.tq.syncLog.service.INuIotTqElectricitySyncLogService; import com.nu.modules.tq.syncLog.service.ISyncLogService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
@ -30,11 +30,12 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
*/ */
@Api(tags="同步日志") @Api(tags="同步日志")
@RestController @RestController
@RequestMapping("/nuIotTqElectricitySyncLog/nuIotTqElectricitySyncLog") //@RequestMapping("/nuIotTqElectricitySyncLog/nuIotTqElectricitySyncLog")
@RequestMapping("/iot/tq/syncLog")
@Slf4j @Slf4j
public class NuIotTqElectricitySyncLogController extends JeecgController<NuIotTqElectricitySyncLog, INuIotTqElectricitySyncLogService> { public class SyncLogController extends JeecgController<SyncLog, ISyncLogService> {
@Autowired @Autowired
private INuIotTqElectricitySyncLogService nuIotTqElectricitySyncLogService; private ISyncLogService nuIotTqElectricitySyncLogService;
/** /**
* 分页列表查询 * 分页列表查询
@ -48,13 +49,13 @@ public class NuIotTqElectricitySyncLogController extends JeecgController<NuIotTq
//@AutoLog(value = "同步日志-分页列表查询") //@AutoLog(value = "同步日志-分页列表查询")
@ApiOperation(value="同步日志-分页列表查询", notes="同步日志-分页列表查询") @ApiOperation(value="同步日志-分页列表查询", notes="同步日志-分页列表查询")
@GetMapping(value = "/list") @GetMapping(value = "/list")
public Result<IPage<NuIotTqElectricitySyncLog>> queryPageList(NuIotTqElectricitySyncLog nuIotTqElectricitySyncLog, public Result<IPage<SyncLog>> queryPageList(SyncLog nuIotTqElectricitySyncLog,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) { HttpServletRequest req) {
QueryWrapper<NuIotTqElectricitySyncLog> queryWrapper = QueryGenerator.initQueryWrapper(nuIotTqElectricitySyncLog, req.getParameterMap()); QueryWrapper<SyncLog> queryWrapper = QueryGenerator.initQueryWrapper(nuIotTqElectricitySyncLog, req.getParameterMap());
Page<NuIotTqElectricitySyncLog> page = new Page<NuIotTqElectricitySyncLog>(pageNo, pageSize); Page<SyncLog> page = new Page<SyncLog>(pageNo, pageSize);
IPage<NuIotTqElectricitySyncLog> pageList = nuIotTqElectricitySyncLogService.page(page, queryWrapper); IPage<SyncLog> pageList = nuIotTqElectricitySyncLogService.page(page, queryWrapper);
return Result.OK(pageList); return Result.OK(pageList);
} }
@ -68,7 +69,7 @@ public class NuIotTqElectricitySyncLogController extends JeecgController<NuIotTq
@ApiOperation(value="同步日志-添加", notes="同步日志-添加") @ApiOperation(value="同步日志-添加", notes="同步日志-添加")
@RequiresPermissions("nuIotTqElectricitySyncLog:nu_iot_tq_electricity_sync_log:add") @RequiresPermissions("nuIotTqElectricitySyncLog:nu_iot_tq_electricity_sync_log:add")
@PostMapping(value = "/add") @PostMapping(value = "/add")
public Result<String> add(@RequestBody NuIotTqElectricitySyncLog nuIotTqElectricitySyncLog) { public Result<String> add(@RequestBody SyncLog nuIotTqElectricitySyncLog) {
nuIotTqElectricitySyncLogService.save(nuIotTqElectricitySyncLog); nuIotTqElectricitySyncLogService.save(nuIotTqElectricitySyncLog);
return Result.OK("添加成功！"); return Result.OK("添加成功！");
} }
@ -83,7 +84,7 @@ public class NuIotTqElectricitySyncLogController extends JeecgController<NuIotTq
@ApiOperation(value="同步日志-编辑", notes="同步日志-编辑") @ApiOperation(value="同步日志-编辑", notes="同步日志-编辑")
@RequiresPermissions("nuIotTqElectricitySyncLog:nu_iot_tq_electricity_sync_log:edit") @RequiresPermissions("nuIotTqElectricitySyncLog:nu_iot_tq_electricity_sync_log:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<String> edit(@RequestBody NuIotTqElectricitySyncLog nuIotTqElectricitySyncLog) { public Result<String> edit(@RequestBody SyncLog nuIotTqElectricitySyncLog) {
nuIotTqElectricitySyncLogService.updateById(nuIotTqElectricitySyncLog); nuIotTqElectricitySyncLogService.updateById(nuIotTqElectricitySyncLog);
return Result.OK("编辑成功!"); return Result.OK("编辑成功!");
} }
@ -127,8 +128,8 @@ public class NuIotTqElectricitySyncLogController extends JeecgController<NuIotTq
//@AutoLog(value = "同步日志-通过id查询") //@AutoLog(value = "同步日志-通过id查询")
@ApiOperation(value="同步日志-通过id查询", notes="同步日志-通过id查询") @ApiOperation(value="同步日志-通过id查询", notes="同步日志-通过id查询")
@GetMapping(value = "/queryById") @GetMapping(value = "/queryById")
public Result<NuIotTqElectricitySyncLog> queryById(@RequestParam(name="id",required=true) String id) { public Result<SyncLog> queryById(@RequestParam(name="id",required=true) String id) {
NuIotTqElectricitySyncLog nuIotTqElectricitySyncLog = nuIotTqElectricitySyncLogService.getById(id); SyncLog nuIotTqElectricitySyncLog = nuIotTqElectricitySyncLogService.getById(id);
if(nuIotTqElectricitySyncLog==null) { if(nuIotTqElectricitySyncLog==null) {
return Result.error("未找到对应数据"); return Result.error("未找到对应数据");
} }
@ -143,8 +144,8 @@ public class NuIotTqElectricitySyncLogController extends JeecgController<NuIotTq
*/ */
@RequiresPermissions("nuIotTqElectricitySyncLog:nu_iot_tq_electricity_sync_log:exportXls") @RequiresPermissions("nuIotTqElectricitySyncLog:nu_iot_tq_electricity_sync_log:exportXls")
@RequestMapping(value = "/exportXls") @RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, NuIotTqElectricitySyncLog nuIotTqElectricitySyncLog) { public ModelAndView exportXls(HttpServletRequest request, SyncLog nuIotTqElectricitySyncLog) {
return super.exportXls(request, nuIotTqElectricitySyncLog, NuIotTqElectricitySyncLog.class, "同步日志"); return super.exportXls(request, nuIotTqElectricitySyncLog, SyncLog.class, "同步日志");
} }
/** /**
@ -157,7 +158,7 @@ public class NuIotTqElectricitySyncLogController extends JeecgController<NuIotTq
@RequiresPermissions("nuIotTqElectricitySyncLog:nu_iot_tq_electricity_sync_log:importExcel") @RequiresPermissions("nuIotTqElectricitySyncLog:nu_iot_tq_electricity_sync_log:importExcel")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST) @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, NuIotTqElectricitySyncLog.class); return super.importExcel(request, response, SyncLog.class);
} }
} }

2
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/entity/NuIotTqElectricitySyncLog.java → nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/entity/SyncLog.java
View File

@ -26,7 +26,7 @@ import lombok.experimental.Accessors;
@Accessors(chain = true) @Accessors(chain = true)
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)
@ApiModel(value="nu_iot_tq_electricity_sync_log对象", description="同步日志") @ApiModel(value="nu_iot_tq_electricity_sync_log对象", description="同步日志")
public class NuIotTqElectricitySyncLog implements Serializable { public class SyncLog implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/**id*/ /**id*/

4
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/mapper/NuIotTqElectricitySyncLogMapper.java → nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/mapper/SyncLogMapper.java
View File

@ -1,6 +1,6 @@
package com.nu.modules.tq.syncLog.mapper; package com.nu.modules.tq.syncLog.mapper;
import com.nu.modules.tq.syncLog.entity.NuIotTqElectricitySyncLog; import com.nu.modules.tq.syncLog.entity.SyncLog;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/** /**
@ -9,6 +9,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* @Date: 2025-06-12 * @Date: 2025-06-12
* @Version: V1.0 * @Version: V1.0
*/ */
public interface NuIotTqElectricitySyncLogMapper extends BaseMapper<NuIotTqElectricitySyncLog> { public interface SyncLogMapper extends BaseMapper<SyncLog> {
} }

2
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/mapper/xml/NuIotTqApiRequestLogMapper.xml → nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/mapper/xml/SyncLogMapper.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.nu.modules.tq.apiRequestLog.mapper.NuIotTqApiRequestLogMapper"> <mapper namespace="com.nu.modules.tq.syncLog.mapper.SyncLogMapper">
</mapper> </mapper>

4
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/service/INuIotTqElectricitySyncLogService.java → nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/service/ISyncLogService.java
View File

@ -1,6 +1,6 @@
package com.nu.modules.tq.syncLog.service; package com.nu.modules.tq.syncLog.service;
import com.nu.modules.tq.syncLog.entity.NuIotTqElectricitySyncLog; import com.nu.modules.tq.syncLog.entity.SyncLog;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
/** /**
@ -9,6 +9,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
* @Date: 2025-06-12 * @Date: 2025-06-12
* @Version: V1.0 * @Version: V1.0
*/ */
public interface INuIotTqElectricitySyncLogService extends IService<NuIotTqElectricitySyncLog> { public interface ISyncLogService extends IService<SyncLog> {
} }

19
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/service/impl/NuIotTqElectricitySyncLogServiceImpl.java
View File

@ -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<NuIotTqElectricitySyncLogMapper, NuIotTqElectricitySyncLog> implements INuIotTqElectricitySyncLogService {
}

19
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/service/impl/SyncLogServiceImpl.java Normal file
View File

@ -0,0 +1,19 @@
package com.nu.modules.tq.syncLog.service.impl;
import com.nu.modules.tq.syncLog.entity.SyncLog;
import com.nu.modules.tq.syncLog.mapper.SyncLogMapper;
import com.nu.modules.tq.syncLog.service.ISyncLogService;
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 SyncLogServiceImpl extends ServiceImpl<SyncLogMapper, SyncLog> implements ISyncLogService {
}

12
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/service/impl/WaterMeterServiceImpl.java
View File

@ -8,8 +8,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.nu.modules.tq.syncLog.entity.NuIotTqElectricitySyncLog; import com.nu.modules.tq.syncLog.entity.SyncLog;
import com.nu.modules.tq.syncLog.service.INuIotTqElectricitySyncLogService; import com.nu.modules.tq.syncLog.service.ISyncLogService;
import com.nu.modules.tq.common.entity.TqApiLog; import com.nu.modules.tq.common.entity.TqApiLog;
import com.nu.modules.tq.common.service.ITqApiLogService; import com.nu.modules.tq.common.service.ITqApiLogService;
import com.nu.modules.tq.utils.HttpTool; import com.nu.modules.tq.utils.HttpTool;
@ -39,7 +39,7 @@ public class WaterMeterServiceImpl extends ServiceImpl<WaterMeterMapper, WaterMe
@Autowired @Autowired
public INuIotTqElectricitySyncLogService nuIotTqElectricitySyncLogService; public ISyncLogService nuIotTqElectricitySyncLogService;
@Lazy @Lazy
@Autowired @Autowired
@ -494,7 +494,7 @@ public class WaterMeterServiceImpl extends ServiceImpl<WaterMeterMapper, WaterMe
if(StringUtils.equals(waterMeter.getOldServerUrl(),waterMeter.getDepartServerUrl()) || StringUtils.isEmpty(waterMeter.getOldServerUrl())){ if(StringUtils.equals(waterMeter.getOldServerUrl(),waterMeter.getDepartServerUrl()) || StringUtils.isEmpty(waterMeter.getOldServerUrl())){
syncImpl.syncElectricitySaveOrUpdate(waterMeter.getOldServerUrl(),waterMeter); syncImpl.syncElectricitySaveOrUpdate(waterMeter.getOldServerUrl(),waterMeter);
NuIotTqElectricitySyncLog nuIotTqElectricitySyncLog = new NuIotTqElectricitySyncLog(); SyncLog nuIotTqElectricitySyncLog = new SyncLog();
nuIotTqElectricitySyncLog.setId(null); nuIotTqElectricitySyncLog.setId(null);
nuIotTqElectricitySyncLog.setMainId(waterMeter.getCid()); nuIotTqElectricitySyncLog.setMainId(waterMeter.getCid());
nuIotTqElectricitySyncLog.setMainName(waterMeter.getCid()); nuIotTqElectricitySyncLog.setMainName(waterMeter.getCid());
@ -516,7 +516,7 @@ public class WaterMeterServiceImpl extends ServiceImpl<WaterMeterMapper, WaterMe
syncImpl.syncElectricitySaveOrUpdate(dataSourceCode,waterMeter); syncImpl.syncElectricitySaveOrUpdate(dataSourceCode,waterMeter);
NuIotTqElectricitySyncLog nuIotTqElectricitySyncLog = new NuIotTqElectricitySyncLog(); SyncLog nuIotTqElectricitySyncLog = new SyncLog();
nuIotTqElectricitySyncLog.setId(null); nuIotTqElectricitySyncLog.setId(null);
nuIotTqElectricitySyncLog.setMainId(waterMeter.getCid()); nuIotTqElectricitySyncLog.setMainId(waterMeter.getCid());
nuIotTqElectricitySyncLog.setMainName(waterMeter.getCid()); nuIotTqElectricitySyncLog.setMainName(waterMeter.getCid());
@ -533,7 +533,7 @@ public class WaterMeterServiceImpl extends ServiceImpl<WaterMeterMapper, WaterMe
nuIotTqElectricitySyncLogService.save(nuIotTqElectricitySyncLog); nuIotTqElectricitySyncLogService.save(nuIotTqElectricitySyncLog);
NuIotTqElectricitySyncLog nuIotTqElectricitySyncLogDel = new NuIotTqElectricitySyncLog(); SyncLog nuIotTqElectricitySyncLogDel = new SyncLog();
nuIotTqElectricitySyncLogDel.setId(null); nuIotTqElectricitySyncLogDel.setId(null);
nuIotTqElectricitySyncLogDel.setMainId(waterMeter.getCid()+""); nuIotTqElectricitySyncLogDel.setMainId(waterMeter.getCid()+"");
nuIotTqElectricitySyncLogDel.setMainName(waterMeter.getCid()); nuIotTqElectricitySyncLogDel.setMainName(waterMeter.getCid());

12
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/service/impl/HumidDeviceServiceImpl.java
View File

@ -8,8 +8,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.nu.modules.tq.syncLog.entity.NuIotTqElectricitySyncLog; import com.nu.modules.tq.syncLog.entity.SyncLog;
import com.nu.modules.tq.syncLog.service.INuIotTqElectricitySyncLogService; import com.nu.modules.tq.syncLog.service.ISyncLogService;
import com.nu.modules.yiweilian.humid.entity.HumidDevice; import com.nu.modules.yiweilian.humid.entity.HumidDevice;
import com.nu.modules.yiweilian.humid.mapper.HumidDeviceMapper; import com.nu.modules.yiweilian.humid.mapper.HumidDeviceMapper;
import com.nu.modules.yiweilian.humid.service.IHumidDeviceService; import com.nu.modules.yiweilian.humid.service.IHumidDeviceService;
@ -37,7 +37,7 @@ public class HumidDeviceServiceImpl extends ServiceImpl<HumidDeviceMapper, Humid
@Autowired @Autowired
public INuIotTqElectricitySyncLogService nuIotTqElectricitySyncLogService; public ISyncLogService nuIotTqElectricitySyncLogService;
@Lazy @Lazy
@Autowired @Autowired
@ -453,7 +453,7 @@ public class HumidDeviceServiceImpl extends ServiceImpl<HumidDeviceMapper, Humid
if(StringUtils.equals(humidDevice.getOldServerUrl(),humidDevice.getDepartServerUrl()) || StringUtils.isEmpty(humidDevice.getOldServerUrl())){ if(StringUtils.equals(humidDevice.getOldServerUrl(),humidDevice.getDepartServerUrl()) || StringUtils.isEmpty(humidDevice.getOldServerUrl())){
syncImpl.syncElectricitySaveOrUpdate(humidDevice.getOldServerUrl(),humidDevice); syncImpl.syncElectricitySaveOrUpdate(humidDevice.getOldServerUrl(),humidDevice);
NuIotTqElectricitySyncLog nuIotTqElectricitySyncLog = new NuIotTqElectricitySyncLog(); SyncLog nuIotTqElectricitySyncLog = new SyncLog();
nuIotTqElectricitySyncLog.setId(null); nuIotTqElectricitySyncLog.setId(null);
nuIotTqElectricitySyncLog.setMainId(humidDevice.getSn()+""); nuIotTqElectricitySyncLog.setMainId(humidDevice.getSn()+"");
nuIotTqElectricitySyncLog.setMainName(humidDevice.getSn()); nuIotTqElectricitySyncLog.setMainName(humidDevice.getSn());
@ -475,7 +475,7 @@ public class HumidDeviceServiceImpl extends ServiceImpl<HumidDeviceMapper, Humid
syncImpl.syncElectricitySaveOrUpdate(dataSourceCode,humidDevice); syncImpl.syncElectricitySaveOrUpdate(dataSourceCode,humidDevice);
NuIotTqElectricitySyncLog nuIotTqElectricitySyncLog = new NuIotTqElectricitySyncLog(); SyncLog nuIotTqElectricitySyncLog = new SyncLog();
nuIotTqElectricitySyncLog.setId(null); nuIotTqElectricitySyncLog.setId(null);
nuIotTqElectricitySyncLog.setMainId(humidDevice.getSn()+""); nuIotTqElectricitySyncLog.setMainId(humidDevice.getSn()+"");
nuIotTqElectricitySyncLog.setMainName(humidDevice.getSn()); nuIotTqElectricitySyncLog.setMainName(humidDevice.getSn());
@ -492,7 +492,7 @@ public class HumidDeviceServiceImpl extends ServiceImpl<HumidDeviceMapper, Humid
nuIotTqElectricitySyncLogService.save(nuIotTqElectricitySyncLog); nuIotTqElectricitySyncLogService.save(nuIotTqElectricitySyncLog);
NuIotTqElectricitySyncLog nuIotTqElectricitySyncLogDel = new NuIotTqElectricitySyncLog(); SyncLog nuIotTqElectricitySyncLogDel = new SyncLog();
nuIotTqElectricitySyncLogDel.setId(null); nuIotTqElectricitySyncLogDel.setId(null);
nuIotTqElectricitySyncLogDel.setMainId(humidDevice.getSn()+""); nuIotTqElectricitySyncLogDel.setMainId(humidDevice.getSn()+"");
nuIotTqElectricitySyncLogDel.setMainName(humidDevice.getSn()); nuIotTqElectricitySyncLogDel.setMainName(humidDevice.getSn());