diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuEmployeesAdvisoryInfo/controller/NuEmployeesAdvisoryInfoController.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuEmployeesAdvisoryInfo/controller/NuEmployeesAdvisoryInfoController.java index 613d551..8c6f498 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuEmployeesAdvisoryInfo/controller/NuEmployeesAdvisoryInfoController.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuEmployeesAdvisoryInfo/controller/NuEmployeesAdvisoryInfoController.java @@ -83,7 +83,6 @@ public class NuEmployeesAdvisoryInfoController extends JeecgController add(@RequestBody NuEmployeesAdvisoryInfo nuEmployeesAdvisoryInfo) { nuEmployeesAdvisoryInfoService.save(nuEmployeesAdvisoryInfo); @@ -98,7 +97,6 @@ public class NuEmployeesAdvisoryInfoController extends JeecgController edit(@RequestBody NuEmployeesAdvisoryInfo nuEmployeesAdvisoryInfo) { nuEmployeesAdvisoryInfoService.updateById(nuEmployeesAdvisoryInfo); diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java b/nursing-unit-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java index 3b5c843..d87d51c 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java +++ b/nursing-unit-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java @@ -83,6 +83,8 @@ public class ShiroConfig { } // 配置不会被拦截的链接 顺序判断 + filterChainDefinitionMap.put("/iot/tq/api/electricityMeter/**", "anon"); //电表回调 + filterChainDefinitionMap.put("/iot/tq/api/waterMeter/**", "anon"); //水表回调 filterChainDefinitionMap.put("/sys/cas/client/validateLogin", "anon"); //cas验证登录 filterChainDefinitionMap.put("/sys/randomImage/**", "anon"); //登录验证码接口排除 filterChainDefinitionMap.put("/sys/checkCaptcha", "anon"); //登录验证码接口排除 diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/controller/NuIotTqApiRequestLogController.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/controller/NuIotTqApiRequestLogController.java new file mode 100644 index 0000000..e728b1d --- /dev/null +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/controller/NuIotTqApiRequestLogController.java @@ -0,0 +1,186 @@ +package com.nu.modules.nuIotTqApiRequestLog.controller; + +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.system.query.QueryRuleEnum; +import org.jeecg.common.util.oConvertUtils; +import com.nu.modules.nuIotTqApiRequestLog.entity.NuIotTqApiRequestLog; +import com.nu.modules.nuIotTqApiRequestLog.service.INuIotTqApiRequestLogService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.apache.shiro.authz.annotation.RequiresPermissions; + + /** + * @Description: api请求日志 + * @Author: jeecg-boot + * @Date: 2025-06-10 + * @Version: V1.0 + */ +@Api(tags="api请求日志") +@RestController +@RequestMapping("/nuIotTqApiRequestLog/nuIotTqApiRequestLog") +@Slf4j +public class NuIotTqApiRequestLogController extends JeecgController { + @Autowired + private INuIotTqApiRequestLogService nuIotTqApiRequestLogService; + + /** + * 分页列表查询 + * + * @param nuIotTqApiRequestLog + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "api请求日志-分页列表查询") + @ApiOperation(value="api请求日志-分页列表查询", notes="api请求日志-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(NuIotTqApiRequestLog 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); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param nuIotTqApiRequestLog + * @return + */ + @AutoLog(value = "api请求日志-添加") + @ApiOperation(value="api请求日志-添加", notes="api请求日志-添加") + @RequiresPermissions("nuIotTqApiRequestLog:nu_iot_tq_api_request_log:add") + @PostMapping(value = "/add") + public Result add(@RequestBody NuIotTqApiRequestLog nuIotTqApiRequestLog) { + nuIotTqApiRequestLogService.save(nuIotTqApiRequestLog); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param nuIotTqApiRequestLog + * @return + */ + @AutoLog(value = "api请求日志-编辑") + @ApiOperation(value="api请求日志-编辑", notes="api请求日志-编辑") + @RequiresPermissions("nuIotTqApiRequestLog:nu_iot_tq_api_request_log:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody NuIotTqApiRequestLog nuIotTqApiRequestLog) { + nuIotTqApiRequestLogService.updateById(nuIotTqApiRequestLog); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "api请求日志-通过id删除") + @ApiOperation(value="api请求日志-通过id删除", notes="api请求日志-通过id删除") + @RequiresPermissions("nuIotTqApiRequestLog:nu_iot_tq_api_request_log:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + nuIotTqApiRequestLogService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "api请求日志-批量删除") + @ApiOperation(value="api请求日志-批量删除", notes="api请求日志-批量删除") + @RequiresPermissions("nuIotTqApiRequestLog:nu_iot_tq_api_request_log:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.nuIotTqApiRequestLogService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "api请求日志-通过id查询") + @ApiOperation(value="api请求日志-通过id查询", notes="api请求日志-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + NuIotTqApiRequestLog nuIotTqApiRequestLog = nuIotTqApiRequestLogService.getById(id); + if(nuIotTqApiRequestLog==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(nuIotTqApiRequestLog); + } + + /** + * 导出excel + * + * @param request + * @param nuIotTqApiRequestLog + */ + @RequiresPermissions("nuIotTqApiRequestLog:nu_iot_tq_api_request_log:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, NuIotTqApiRequestLog nuIotTqApiRequestLog) { + return super.exportXls(request, nuIotTqApiRequestLog, NuIotTqApiRequestLog.class, "api请求日志"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("nuIotTqApiRequestLog:nu_iot_tq_api_request_log:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, NuIotTqApiRequestLog.class); + } + +} diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/entity/NuIotTqApiRequestLog.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/entity/NuIotTqApiRequestLog.java new file mode 100644 index 0000000..228685a --- /dev/null +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/entity/NuIotTqApiRequestLog.java @@ -0,0 +1,102 @@ +package com.nu.modules.nuIotTqApiRequestLog.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.TableLogic; +import org.jeecg.common.constant.ProvinceCityArea; +import org.jeecg.common.util.SpringContextUtils; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: api请求日志 + * @Author: jeecg-boot + * @Date: 2025-06-10 + * @Version: V1.0 + */ +@Data +@TableName("nu_iot_tq_api_request_log") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="nu_iot_tq_api_request_log对象", description="api请求日志") +public class NuIotTqApiRequestLog implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private Integer id; + /**操作ID*/ + @Excel(name = "操作ID", width = 15) + @ApiModelProperty(value = "操作ID") + private String oprId; + /**采集器号*/ + @Excel(name = "采集器号", width = 15) + @ApiModelProperty(value = "采集器号") + private String cid; + /**表号*/ + @Excel(name = "表号", width = 15) + @ApiModelProperty(value = "表号") + private String address; + /**类型*/ + @Excel(name = "类型", width = 15, dicCode = "dbsb_type") + @Dict(dicCode = "dbsb_type") + @ApiModelProperty(value = "类型") + private String type; + /**请求时的值*/ + @Excel(name = "请求时的值", width = 15) + @ApiModelProperty(value = "请求时的值") + private String requestValue; + /**请求时间*/ + @Excel(name = "请求时间", width = 15) + @ApiModelProperty(value = "请求时间") + private String requestTime; + /**请求状态*/ + @Excel(name = "请求状态", width = 15) + @Dict(dicCode = "dbsb_status") + @ApiModelProperty(value = "请求状态") + private String requestStatus; + /**请求描述*/ + @Excel(name = "请求描述", width = 15) + @ApiModelProperty(value = "请求描述") + private String requestRemark; + /**反馈值*/ + @Excel(name = "反馈值", width = 15) + @ApiModelProperty(value = "反馈值") + private String resolveValue; + /**反馈时间*/ + @Excel(name = "反馈时间", width = 15) + @ApiModelProperty(value = "反馈时间") + private String resolveTime; + /**反馈状态*/ + @Excel(name = "反馈状态", width = 15, dicCode = "dbsb_status") + @Dict(dicCode = "dbsb_status") + @ApiModelProperty(value = "反馈状态") + private String resolveStatus; + /**反馈描述*/ + @Excel(name = "反馈描述", width = 15) + @ApiModelProperty(value = "反馈描述") + private String resolveRemark; + /**创建时间*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建时间") + private Date createTime; + /**更新时间*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新时间") + private Date updateTime; +} diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/mapper/NuIotTqApiRequestLogMapper.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/mapper/NuIotTqApiRequestLogMapper.java new file mode 100644 index 0000000..16181e3 --- /dev/null +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/mapper/NuIotTqApiRequestLogMapper.java @@ -0,0 +1,17 @@ +package com.nu.modules.nuIotTqApiRequestLog.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.nu.modules.nuIotTqApiRequestLog.entity.NuIotTqApiRequestLog; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: api请求日志 + * @Author: jeecg-boot + * @Date: 2025-06-10 + * @Version: V1.0 + */ +public interface NuIotTqApiRequestLogMapper extends BaseMapper { + +} diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/mapper/xml/NuIotTqApiRequestLogMapper.xml b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/mapper/xml/NuIotTqApiRequestLogMapper.xml new file mode 100644 index 0000000..31f35b8 --- /dev/null +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/mapper/xml/NuIotTqApiRequestLogMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/service/INuIotTqApiRequestLogService.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/service/INuIotTqApiRequestLogService.java new file mode 100644 index 0000000..6b2ce12 --- /dev/null +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/service/INuIotTqApiRequestLogService.java @@ -0,0 +1,14 @@ +package com.nu.modules.nuIotTqApiRequestLog.service; + +import com.nu.modules.nuIotTqApiRequestLog.entity.NuIotTqApiRequestLog; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: api请求日志 + * @Author: jeecg-boot + * @Date: 2025-06-10 + * @Version: V1.0 + */ +public interface INuIotTqApiRequestLogService extends IService { + +} diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/service/impl/NuIotTqApiRequestLogServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/service/impl/NuIotTqApiRequestLogServiceImpl.java new file mode 100644 index 0000000..ab4638b --- /dev/null +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/service/impl/NuIotTqApiRequestLogServiceImpl.java @@ -0,0 +1,19 @@ +package com.nu.modules.nuIotTqApiRequestLog.service.impl; + +import com.nu.modules.nuIotTqApiRequestLog.entity.NuIotTqApiRequestLog; +import com.nu.modules.nuIotTqApiRequestLog.mapper.NuIotTqApiRequestLogMapper; +import com.nu.modules.nuIotTqApiRequestLog.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/tplink/camera/controller/CameraInfoController.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/controller/CameraInfoController.java index b363357..7842c76 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/controller/CameraInfoController.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/controller/CameraInfoController.java @@ -17,6 +17,7 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import cn.hutool.json.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.nu.modules.tplink.camera.entity.NuBaseInfo; import com.nu.modules.tplink.camera.model.CameraTreeModel; import org.jeecg.common.api.vo.Result; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -488,4 +489,22 @@ public class CameraInfoController extends JeecgController> getNuBaseList(NuBaseInfo nuBaseInfo, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + Page page = new Page(pageNo, pageSize); + String dataSourceCode = nuBaseInfo.getSysOrgCode(); + IPage pageList = service.getNuBaseList(dataSourceCode,page, nuBaseInfo); + return Result.OK(pageList); + } + } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/entity/CameraInfo.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/entity/CameraInfo.java index fe475d6..09177be 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/entity/CameraInfo.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/entity/CameraInfo.java @@ -292,4 +292,6 @@ public class CameraInfo implements Serializable { @ApiModelProperty(value = "IDS") @TableField(exist = false) private String ids; + @TableField(exist = false) + private String orgCode; } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/entity/NuBaseInfo.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/entity/NuBaseInfo.java new file mode 100644 index 0000000..b56c5e9 --- /dev/null +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/entity/NuBaseInfo.java @@ -0,0 +1,84 @@ +package com.nu.modules.tplink.camera.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +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.jeecg.common.aspect.annotation.Dict; +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-04-11 + * @Version: V1.0 + */ +@Data +@TableName("nu_base_info") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="nu_base_info对象", description="护理单元") +public class NuBaseInfo implements Serializable { + private static final long serialVersionUID = 1L; + + /**ID*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "ID") + private String id; + /**护理单元名称*/ + @Excel(name = "护理单元名称", width = 15) + @ApiModelProperty(value = "护理单元名称") + private String nuName; + /**护理单元编码*/ + @Excel(name = "护理单元编码", width = 15) + @ApiModelProperty(value = "护理单元编码") + private String code; + /**区域标签ID*/ + @Excel(name = "区域标签ID", width = 15, dicCode = "nu_type") + @Dict(dicCode = "nu_type") + @ApiModelProperty(value = "区域标签ID") + private String areaFlag; + /**使用状态 0未使用 1占用 2入住 3退住 4留床*/ + @Excel(name = "使用状态 0未使用 1占用 2入住 3退住 4留床", width = 15, dicCode = "nu_status") + @Dict(dicCode = "nu_status") + @ApiModelProperty(value = "使用状态 0未使用 1占用 2入住 3退住 4留床") + private String status; + /**客户*/ + @Excel(name = "客户", width = 15) + @ApiModelProperty(value = "客户") + private String customerId; + /**是否删除 0未删除 1删除*/ + @Excel(name = "是否删除 0未删除 1删除", width = 15) + @ApiModelProperty(value = "是否删除 0未删除 1删除") + @TableLogic + private String delFlag; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private Date updateTime; + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private String sysOrgCode; +} diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/mapper/CameraInfoMapper.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/mapper/CameraInfoMapper.java index 7c398e3..79775f8 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/mapper/CameraInfoMapper.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/mapper/CameraInfoMapper.java @@ -2,10 +2,12 @@ package com.nu.modules.tplink.camera.mapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.nu.modules.tplink.camera.entity.NuBaseInfo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import com.nu.modules.tplink.camera.entity.CameraInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.common.api.vo.Result; import java.util.List; @@ -27,4 +29,6 @@ public interface CameraInfoMapper extends BaseMapper { void insertCapability(CameraInfo cameraInfo); void updateCapabilityById(CameraInfo cameraInfo); void updatePlanByDevId(CameraInfo cameraInfo); + + IPage getNuBaseList(Page page, @Param("params") NuBaseInfo nuBaseInfo); } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/mapper/xml/CameraInfoMapper.xml b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/mapper/xml/CameraInfoMapper.xml index cb5864a..203ad6d 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/mapper/xml/CameraInfoMapper.xml +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/mapper/xml/CameraInfoMapper.xml @@ -262,4 +262,8 @@ where device_index = #{deviceIndex} + + \ No newline at end of file diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/ICameraInfoService.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/ICameraInfoService.java index 4d8d50a..7bc929d 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/ICameraInfoService.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/ICameraInfoService.java @@ -3,6 +3,7 @@ package com.nu.modules.tplink.camera.service; import cn.hutool.json.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.nu.modules.tplink.camera.entity.NuBaseInfo; import com.nu.modules.tplink.camera.model.CameraTreeModel; import org.jeecg.common.api.vo.Result; import com.nu.modules.tplink.camera.entity.CameraInfo; @@ -59,4 +60,6 @@ public interface ICameraInfoService extends IService { Result uploadToServer(CameraInfo cameraInfo); Result stopUploadToServer(CameraInfo cameraInfo); Result getUploadToServerProcess(CameraInfo cameraInfo); + + IPage getNuBaseList(String dataSourceCode,Page page, NuBaseInfo nuBaseInfo); } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/impl/CameraInfoServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/impl/CameraInfoServiceImpl.java index cebe578..515afe7 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/impl/CameraInfoServiceImpl.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/impl/CameraInfoServiceImpl.java @@ -2,9 +2,11 @@ package com.nu.modules.tplink.camera.service.impl; import cn.hutool.json.JSONArray; import cn.hutool.json.JSONObject; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.fasterxml.jackson.databind.ObjectMapper; +import com.nu.modules.tplink.camera.entity.NuBaseInfo; import com.nu.modules.tplink.camera.model.CameraTreeModel; import com.nu.modules.tplink.common.entity.TumsConfig; import com.nu.modules.tplink.common.mapper.TumsConfigMapper; @@ -2354,10 +2356,19 @@ public class CameraInfoServiceImpl extends ServiceImpl getNuBaseList(String dataSourceCode,Page page, NuBaseInfo nuBaseInfo) { + return baseMapper.getNuBaseList(page,nuBaseInfo); + } } 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 9e2dfb2..34ee997 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 @@ -1,14 +1,18 @@ package com.nu.modules.tq.electricity.controller; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.nu.modules.tq.electricity.entity.ElectricityMeter; import com.nu.modules.tq.electricity.service.IElectricityMeterService; +import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.api.vo.Result; +import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.system.base.controller.JeecgController; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletRequest; @Slf4j @RestController @@ -18,6 +22,25 @@ public class ElectricityMeterController extends JeecgController> queryPageList(ElectricityMeter electricityMeter, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + Page page = new Page(pageNo, pageSize); + IPage pageList = service.findPage(page, electricityMeter); + return Result.OK(pageList); + } + /** * 获取设备信息 * @param electricityMeter @@ -48,4 +71,13 @@ public class ElectricityMeterController extends JeecgController edit(@RequestBody ElectricityMeter electricityMeter) { + service.updateById(electricityMeter); + return Result.OK("编辑成功!"); + } } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/entity/ElectricityMeter.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/entity/ElectricityMeter.java index c7b193d..af22e23 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/entity/ElectricityMeter.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/entity/ElectricityMeter.java @@ -37,7 +37,7 @@ public class ElectricityMeter implements Serializable { @Excel(name = "操作类型", width = 15) @ApiModelProperty(value = "操作类型") @TableField(exist = false) - private Integer type;//9清零 3抄表 10电表拉闸 11电表合闸 43水表开闸 53水表关闸 + private Integer type;//9清零 3抄表 10电表拉闸 11电表合闸 @Excel(name = "电表值", width = 15) @ApiModelProperty(value = "电表值") private String eleValue; //电表-电量值 @@ -66,4 +66,10 @@ public class ElectricityMeter implements Serializable { @Excel(name = "描述", width = 15) @ApiModelProperty(value = "描述") private String remark; + + private String nuId;//护理单元ID + private String nuName;//护理单元 + private String departId;//机构ID + private String departName;//机构名称 + private String departServerUrl;//机构服务地址 } \ No newline at end of file diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/mapper/ElectricityMeterMapper.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/mapper/ElectricityMeterMapper.java index f0899de..18cf663 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/mapper/ElectricityMeterMapper.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/mapper/ElectricityMeterMapper.java @@ -1,9 +1,13 @@ package com.nu.modules.tq.electricity.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.nu.modules.tq.electricity.entity.ElectricityMeter; +import org.apache.ibatis.annotations.Param; public interface ElectricityMeterMapper extends BaseMapper { + IPage findPage(Page page, @Param("params") ElectricityMeter electricityMeter); ElectricityMeter getElectricityMeter(ElectricityMeter electricityMeter); int insert(ElectricityMeter electricityMeter); int update(ElectricityMeter electricityMeter); diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/mapper/xml/ElectricityMeterMapper.xml b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/mapper/xml/ElectricityMeterMapper.xml index 2c566d8..207e669 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/mapper/xml/ElectricityMeterMapper.xml +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/mapper/xml/ElectricityMeterMapper.xml @@ -2,6 +2,54 @@ + + + select + a.id, + a.cid, + a.address, + a.water_value as waterValue, + a.relay_state as relayState, + a.battery_state as batteryState, + a.read_time as readTime, + a.remark, + b.online, + b.csq, + b.disconnect_time as disconnectTime, + b.connect_time as connectTime, + a.nu_id as nuId, + a.nu_name as nuName, + a.depart_id as departId, + a.depart_name as departName + from nu_iot_tq_water_meter a + left join nu_iot_tq_collector b on a.cid = b.cid + + + AND a.address = #{params.address} + + + AND a.nuId = #{params.nuId} + + + AND a.departId = #{params.departId} + + + AND a.relay_state = #{params.relayState} + + + AND b.online = #{params.online} + + + AND b.csq > 20 + + + AND b.csq >= 10 AND b.csq <=20 + + + AND b.csq < 10 + + + +