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

Merge branch 'master' of http://47.115.223.229:8888/yangjun/hldy_java_monomer

This commit is contained in:
1378012178@qq.com 2025-06-11 14:52:20 +08:00
parent b69cf6e7cd eefaa4191e
commit ba4dc39960
29 changed files with 720 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuEmployeesAdvisoryInfo/controller/NuEmployeesAdvisoryInfoController.java
View File

@ -83,7 +83,6 @@ public class NuEmployeesAdvisoryInfoController extends JeecgController<NuEmploye
*/
@AutoLog(value = "员工咨询信息-添加")
@ApiOperation(value="员工咨询信息-添加", notes="员工咨询信息-添加")
@RequiresPermissions("nuEmployeesAdvisoryInfo:nu_employees_advisory_info:add")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody NuEmployeesAdvisoryInfo nuEmployeesAdvisoryInfo) {
nuEmployeesAdvisoryInfoService.save(nuEmployeesAdvisoryInfo);
@ -98,7 +97,6 @@ public class NuEmployeesAdvisoryInfoController extends JeecgController<NuEmploye
*/
@AutoLog(value = "员工咨询信息-编辑")
@ApiOperation(value="员工咨询信息-编辑", notes="员工咨询信息-编辑")
@RequiresPermissions("nuEmployeesAdvisoryInfo:nu_employees_advisory_info:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<String> edit(@RequestBody NuEmployeesAdvisoryInfo nuEmployeesAdvisoryInfo) {
nuEmployeesAdvisoryInfoService.updateById(nuEmployeesAdvisoryInfo);

2
nursing-unit-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
View File

@ -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"); //登录验证码接口排除

186
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/controller/NuIotTqApiRequestLogController.java Normal file
View File

@ -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<NuIotTqApiRequestLog, INuIotTqApiRequestLogService> {
@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<IPage<NuIotTqApiRequestLog>> queryPageList(NuIotTqApiRequestLog nuIotTqApiRequestLog,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
// 自定义查询规则
Map<String, QueryRuleEnum> 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<NuIotTqApiRequestLog> queryWrapper = QueryGenerator.initQueryWrapper(nuIotTqApiRequestLog, req.getParameterMap(),customeRuleMap);
Page<NuIotTqApiRequestLog> page = new Page<NuIotTqApiRequestLog>(pageNo, pageSize);
IPage<NuIotTqApiRequestLog> 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<String> 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<String> 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<String> 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<String> 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<NuIotTqApiRequestLog> 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);
}
}

102
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/entity/NuIotTqApiRequestLog.java Normal file
View File

@ -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;
}

17
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/mapper/NuIotTqApiRequestLogMapper.java Normal file
View File

@ -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<NuIotTqApiRequestLog> {
}

5
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/mapper/xml/NuIotTqApiRequestLogMapper.xml Normal file
View File

@ -0,0 +1,5 @@
<?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">
<mapper namespace="com.nu.modules.nuIotTqApiRequestLog.mapper.NuIotTqApiRequestLogMapper">
</mapper>

14
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/service/INuIotTqApiRequestLogService.java Normal file
View File

@ -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<NuIotTqApiRequestLog> {
}

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

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

19
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/controller/CameraInfoController.java
View File

@ -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<CameraInfo, ICameraInf
return service.getUploadToServerProcess(cameraInfo);
}
/**
* 获取护理单元
* @param nuBaseInfo 主要根据orgCode进行获取
* @return
* @throws Exception
*/
@GetMapping(value = "/getNuBaseList")
public Result<IPage<NuBaseInfo>> getNuBaseList(NuBaseInfo nuBaseInfo,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
Page<NuBaseInfo> page = new Page<NuBaseInfo>(pageNo, pageSize);
String dataSourceCode = nuBaseInfo.getSysOrgCode();
IPage<NuBaseInfo> pageList = service.getNuBaseList(dataSourceCode,page, nuBaseInfo);
return Result.OK(pageList);
}
}

2
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/entity/CameraInfo.java
View File

@ -292,4 +292,6 @@ public class CameraInfo implements Serializable {
@ApiModelProperty(value = "IDS")
@TableField(exist = false)
private String ids;
@TableField(exist = false)
private String orgCode;
}

84
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/entity/NuBaseInfo.java Normal file
View File

@ -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;
}

4
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/mapper/CameraInfoMapper.java
View File

@ -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<CameraInfo> {
void insertCapability(CameraInfo cameraInfo);
void updateCapabilityById(CameraInfo cameraInfo);
void updatePlanByDevId(CameraInfo cameraInfo);
IPage<NuBaseInfo> getNuBaseList(Page<NuBaseInfo> page, @Param("params") NuBaseInfo nuBaseInfo);
}

4
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/mapper/xml/CameraInfoMapper.xml
View File

@ -262,4 +262,8 @@
where device_index = #{deviceIndex}
</update>
<select id="getNuBaseList" parameterType="com.nu.modules.tplink.camera.entity.NuBaseInfo" resultType="com.nu.modules.tplink.camera.entity.NuBaseInfo">
select * from nu_base_info where del_flag = '0'
</select>
</mapper>

3
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/ICameraInfoService.java
View File

@ -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<CameraInfo> {
Result uploadToServer(CameraInfo cameraInfo);
Result<String> stopUploadToServer(CameraInfo cameraInfo);
Result getUploadToServerProcess(CameraInfo cameraInfo);
IPage<NuBaseInfo> getNuBaseList(String dataSourceCode,Page<NuBaseInfo> page, NuBaseInfo nuBaseInfo);
}

15
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/impl/CameraInfoServiceImpl.java
View File

@ -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<CameraInfoMapper, CameraI
cameraInfo.setProcess(process);
return Result.OK(cameraInfo);
}else{
ErrorCode errVo = errorCodeService.getByCode(String.valueOf(errorCode));
String errMsg = errVo.getErrorMsg();
String errMsg = jsonObject.getStr("msg");
if(errMsg == null || errMsg.equals("")) {
ErrorCode errVo = errorCodeService.getByCode(String.valueOf(errorCode));
errMsg = errVo.getErrorMsg();
}
log.info("getUploadToServerProcess:{}-{}",errorCode,errMsg);
return Result.error(errMsg);
}
}
@Override
@DS("#dataSourceCode")
public IPage<NuBaseInfo> getNuBaseList(String dataSourceCode,Page<NuBaseInfo> page, NuBaseInfo nuBaseInfo) {
return baseMapper.getNuBaseList(page,nuBaseInfo);
}
}

38
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/controller/ElectricityMeterController.java
View File

@ -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<ElectricityMeter
@Autowired
private IElectricityMeterService service;
/**
* 分页列表查询
*
* @param electricityMeter
* @param pageNo
* @param pageSize
* @param req
* @return
*/
@GetMapping(value = "/list")
public Result<IPage<ElectricityMeter>> queryPageList(ElectricityMeter electricityMeter,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
Page<ElectricityMeter> page = new Page<ElectricityMeter>(pageNo, pageSize);
IPage<ElectricityMeter> pageList = service.findPage(page, electricityMeter);
return Result.OK(pageList);
}
/**
* 获取设备信息
* @param electricityMeter
@ -48,4 +71,13 @@ public class ElectricityMeterController extends JeecgController<ElectricityMeter
return service.eleRead(electricityMeter);
}
@AutoLog(value = "修改机构及护理单元信息")
@ApiOperation(value="修改机构及护理单元信息-编辑", notes="修改机构及护理单元信息-编辑")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<String> edit(@RequestBody ElectricityMeter electricityMeter) {
service.updateById(electricityMeter);
return Result.OK("编辑成功!");
}
}

8
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/entity/ElectricityMeter.java
View File

@ -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;//机构服务地址
}

4
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/mapper/ElectricityMeterMapper.java
View File

@ -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<ElectricityMeter> {
IPage<ElectricityMeter> findPage(Page<ElectricityMeter> page, @Param("params") ElectricityMeter electricityMeter);
ElectricityMeter getElectricityMeter(ElectricityMeter electricityMeter);
int insert(ElectricityMeter electricityMeter);
int update(ElectricityMeter electricityMeter);

48
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/mapper/xml/ElectricityMeterMapper.xml
View File

@ -2,6 +2,54 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.nu.modules.tq.electricity.mapper.ElectricityMeterMapper">
<select id="findPage" parameterType="com.nu.modules.tq.electricity.entity.ElectricityMeter" resultType="com.nu.modules.tq.electricity.entity.ElectricityMeter">
select
a.id,
a.cid,
a.address,
a.ele_value as eleValue,
a.relay_state as relayState,
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,
a.depart_server_url as departServerUrl
from nu_iot_tq_electricity_meter a
left join nu_iot_tq_collector b on a.cid = b.cid
<where>
<if test="params.address != null and params.address != ''">
AND a.address = #{params.address}
</if>
<if test="params.nuId != null and params.nuId != ''">
AND a.nuId = #{params.nuId}
</if>
<if test="params.departId != null and params.departId != ''">
AND a.departId = #{params.departId}
</if>
<if test="params.relayState != null and params.relayState != ''">
AND a.relay_state = #{params.relayState}
</if>
<if test="params.online != null and params.online != ''">
AND b.online = #{params.online}
</if>
<if test="params.csq != null and params.csq != '' and params.csq == 1">
AND b.csq &gt; 20
</if>
<if test="params.csq != null and params.csq != '' and params.csq == 2">
AND b.csq &gt;= 10 AND b.csq &lt;=20
</if>
<if test="params.csq != null and params.csq != '' and params.csq == 3">
AND b.csq &lt; 10
</if>
</where>
</select>
<select id="getElectricityMeter" parameterType="com.nu.modules.tq.electricity.entity.ElectricityMeter" resultType="com.nu.modules.tq.electricity.entity.ElectricityMeter">
select
id,

5
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/service/IElectricityMeterService.java
View File

@ -1,12 +1,13 @@
package com.nu.modules.tq.electricity.service;
import cn.hutool.json.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.nu.modules.tq.electricity.entity.ElectricityMeter;
import org.jeecg.common.api.vo.Result;
public interface IElectricityMeterService extends IService<ElectricityMeter> {
IPage<ElectricityMeter> findPage(Page<ElectricityMeter> page, ElectricityMeter electricityMeter);
Result<String> eleReset(ElectricityMeter electricityMeter);
Result<String> eleControl(ElectricityMeter electricityMeter);
Result<String> eleRead(ElectricityMeter electricityMeter);

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

@ -3,6 +3,8 @@ package com.nu.modules.tq.electricity.service.impl;
import cn.hutool.core.date.DateUtil;
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
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.common.entity.TqApiLog;
import com.nu.modules.tq.common.service.ITqApiLogService;
@ -29,6 +31,10 @@ public class ElectricityMeterServiceImpl extends ServiceImpl<ElectricityMeterMap
@Autowired
ITqApiLogService logService;
public IPage<ElectricityMeter> findPage(Page<ElectricityMeter> page, ElectricityMeter electricityMeter){
return baseMapper.findPage(page,electricityMeter);
}
/**
* 清零
*/
@ -77,7 +83,7 @@ public class ElectricityMeterServiceImpl extends ServiceImpl<ElectricityMeterMap
tqApiLog.setCid(electricityMeter.getCid());
tqApiLog.setAddress(electricityMeter.getAddress());
tqApiLog.setType(9);
tqApiLog.setResolveValue(entity.getEleValue());
tqApiLog.setRequestValue(entity.getEleValue());
tqApiLog.setRequestTime(DateUtil.now());
tqApiLog.setRequestStatus(status);
logService.insert(tqApiLog);
@ -88,7 +94,7 @@ public class ElectricityMeterServiceImpl extends ServiceImpl<ElectricityMeterMap
tqApiLog.setCid(electricityMeter.getCid());
tqApiLog.setAddress(electricityMeter.getAddress());
tqApiLog.setType(9);
tqApiLog.setResolveValue(entity.getEleValue());
tqApiLog.setRequestValue(entity.getEleValue());
tqApiLog.setRequestTime(DateUtil.now());
tqApiLog.setRequestStatus(status);
tqApiLog.setRequestRemark(errorMsg);
@ -102,7 +108,7 @@ public class ElectricityMeterServiceImpl extends ServiceImpl<ElectricityMeterMap
tqApiLog.setCid(electricityMeter.getCid());
tqApiLog.setAddress(electricityMeter.getAddress());
tqApiLog.setType(9);
tqApiLog.setResolveValue(entity.getEleValue());
tqApiLog.setRequestValue(entity.getEleValue());
tqApiLog.setRequestTime(DateUtil.now());
tqApiLog.setRequestStatus(httpStatus);
tqApiLog.setRequestRemark(errorMsg);
@ -223,7 +229,7 @@ public class ElectricityMeterServiceImpl extends ServiceImpl<ElectricityMeterMap
tqApiLog.setCid(electricityMeter.getCid());
tqApiLog.setAddress(electricityMeter.getAddress());
tqApiLog.setType(3);
tqApiLog.setResolveValue(entity.getEleValue());
tqApiLog.setRequestValue(entity.getEleValue());
tqApiLog.setRequestTime(DateUtil.now());
tqApiLog.setRequestStatus(status);
logService.insert(tqApiLog);
@ -234,7 +240,7 @@ public class ElectricityMeterServiceImpl extends ServiceImpl<ElectricityMeterMap
tqApiLog.setCid(electricityMeter.getCid());
tqApiLog.setAddress(electricityMeter.getAddress());
tqApiLog.setType(3);
tqApiLog.setResolveValue(entity.getEleValue());
tqApiLog.setRequestValue(entity.getEleValue());
tqApiLog.setRequestTime(DateUtil.now());
tqApiLog.setRequestStatus(status);
tqApiLog.setRequestRemark(errorMsg);
@ -248,7 +254,7 @@ public class ElectricityMeterServiceImpl extends ServiceImpl<ElectricityMeterMap
tqApiLog.setCid(electricityMeter.getCid());
tqApiLog.setAddress(electricityMeter.getAddress());
tqApiLog.setType(3);
tqApiLog.setResolveValue(entity.getEleValue());
tqApiLog.setRequestValue(entity.getEleValue());
tqApiLog.setRequestTime(DateUtil.now());
tqApiLog.setRequestStatus(httpStatus);
tqApiLog.setRequestRemark(errorMsg);
@ -275,7 +281,7 @@ public class ElectricityMeterServiceImpl extends ServiceImpl<ElectricityMeterMap
String status = jsonObject.getStr("status");//返回状态
String oprId = jsonObject.getStr("opr_id");//操作ID
String resolveTime = jsonObject.getStr("resolve_time");//反馈时间
String data = jsonObject.getStr("data");//反馈时间
String data = jsonObject.getStr("data");//反馈备注
TqApiLog tqApiLog = new TqApiLog();
tqApiLog.setOprId(oprId);
tqApiLog.setResolveValue("0");
@ -378,7 +384,6 @@ public class ElectricityMeterServiceImpl extends ServiceImpl<ElectricityMeterMap
Integer type = data.getInt("type");//类型
String resolveValue = data.getJSONArray("value").get(0).toString();//值
String dsp = data.getStr("dsp");//描述
TqApiLog tqApiLog = new TqApiLog();
tqApiLog.setOprId(oprId);
tqApiLog.setType(type);

4
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/utils/TqApi.java
View File

@ -111,11 +111,11 @@ public class TqApi {
public String waterReset(List<Map<String, Object>> req){
this.initTqConfig();
String request_content = JSON.toJSONString(req);
log.info("eleReset:request:{}",request_content);
log.info("waterReset:request:{}",request_content);
String url = tqConfig.getRequestUrl()+TqApiEnum.WATER_RESET.getValue();
String notifyUrl = tqConfig.getNotifyUrl()+"/waterMeter/waterResetNotify";
String responseStr = requestAsync(url,request_content,notifyUrl);
log.info("eleReset:response:{}",responseStr);
log.info("waterReset:response:{}",responseStr);
return responseStr;
}

23
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/controller/WaterMeterController.java
View File

@ -1,5 +1,7 @@
package com.nu.modules.tq.water.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.nu.modules.tq.water.entity.WaterMeter;
import com.nu.modules.tq.water.service.IWaterMeterService;
import lombok.extern.slf4j.Slf4j;
@ -8,7 +10,9 @@ 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.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
@Slf4j
@RestController
@ -18,6 +22,25 @@ public class WaterMeterController extends JeecgController<WaterMeter, IWaterMete
@Autowired
private IWaterMeterService service;
/**
* 分页列表查询
*
* @param waterMeter
* @param pageNo
* @param pageSize
* @param req
* @return
*/
@GetMapping(value = "/list")
public Result<IPage<WaterMeter>> queryPageList(WaterMeter waterMeter,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
Page<WaterMeter> page = new Page<WaterMeter>(pageNo, pageSize);
IPage<WaterMeter> pageList = service.findPage(page, waterMeter);
return Result.OK(pageList);
}
/**
* 清零
* @param waterMeter

13
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/entity/WaterMeter.java
View File

@ -37,13 +37,13 @@ public class WaterMeter implements Serializable {
@Excel(name = "操作类型", width = 15)
@ApiModelProperty(value = "操作类型")
@TableField(exist = false)
private Integer type;//49清零 42抄表 10电表拉闸 11电表合闸 43水表开闸 53水表关闸
private Integer type;//49清零 42抄表 43水表开闸 53水表关闸
@Excel(name = "水表值", width = 15)
@ApiModelProperty(value = "水表值")
private String waterValue; //电表-电量值
@Excel(name = "阀门状态", width = 15)
@ApiModelProperty(value = "阀门状态")
private String relayState; //电表-阀门状态 1 表示合闸/开阀， 0 表示拉闸/关阀，其他，表示未知状态或异常
private String relayState; //水表-阀门状态 1 开阀， 0 表示关阀，其他，表示未知状态或异常
@Excel(name = "水表电池状态", width = 15)
@ApiModelProperty(value = "水表电池状态")
private String batteryState; //水表电池状态 0 正常 ， 1 电池低电压,其他 电池低电压
@ -69,4 +69,13 @@ public class WaterMeter implements Serializable {
@Excel(name = "描述", width = 15)
@ApiModelProperty(value = "描述")
private String remark;
@TableField(exist = false)
private String nuId;//护理单元ID
@TableField(exist = false)
private String nuName;//护理单元
@TableField(exist = false)
private String departId;//机构ID
@TableField(exist = false)
private String departName;//机构名称
}

4
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/mapper/WaterMeterMapper.java
View File

@ -1,9 +1,13 @@
package com.nu.modules.tq.water.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.water.entity.WaterMeter;
import org.apache.ibatis.annotations.Param;
public interface WaterMeterMapper extends BaseMapper<WaterMeter> {
IPage<WaterMeter> findPage(Page<WaterMeter> page, @Param("params") WaterMeter waterMeter);
WaterMeter getWaterMeter(WaterMeter waterMeter);
int insert(WaterMeter waterMeter);
int update(WaterMeter waterMeter);

49
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/mapper/xml/WaterMeterMapper.xml
View File

@ -2,6 +2,54 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.nu.modules.tq.water.mapper.WaterMeterMapper">
<select id="findPage" parameterType="com.nu.modules.tq.water.entity.WaterMeter" resultType="com.nu.modules.tq.water.entity.WaterMeter">
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
<where>
<if test="params.address != null and params.address != ''">
AND a.address = #{params.address}
</if>
<if test="params.nuId != null and params.nuId != ''">
AND a.nuId = #{params.nuId}
</if>
<if test="params.departId != null and params.departId != ''">
AND a.departId = #{params.departId}
</if>
<if test="params.relayState != null and params.relayState != ''">
AND a.relay_state = #{params.relayState}
</if>
<if test="params.online != null and params.online != ''">
AND b.online = #{params.online}
</if>
<if test="params.csq != null and params.csq != '' and params.csq == 1">
AND b.csq &gt; 20
</if>
<if test="params.csq != null and params.csq != '' and params.csq == 2">
AND b.csq &gt;= 10 AND b.csq &lt;=20
</if>
<if test="params.csq != null and params.csq != '' and params.csq == 3">
AND b.csq &lt; 10
</if>
</where>
</select>
<select id="getWaterMeter" parameterType="com.nu.modules.tq.water.entity.WaterMeter" resultType="com.nu.modules.tq.water.entity.WaterMeter">
select
id,
@ -10,6 +58,7 @@
water_value as waterValue,
relay_state as relayState,
battery_state as batteryState,
read_time as readTime,
remark
from nu_iot_tq_water_meter
where cid = #{cid}

4
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/service/IWaterMeterService.java
View File

@ -1,11 +1,13 @@
package com.nu.modules.tq.water.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.nu.modules.tq.water.entity.WaterMeter;
import org.jeecg.common.api.vo.Result;
public interface IWaterMeterService extends IService<WaterMeter> {
IPage<WaterMeter> findPage(Page<WaterMeter> page, WaterMeter waterMeter);
Result<String> waterReset(WaterMeter waterMeter);
Result<String> waterControl(WaterMeter waterMeter);
Result<String> waterRead(WaterMeter waterMeter);

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

@ -3,12 +3,11 @@ package com.nu.modules.tq.water.service.impl;
import cn.hutool.core.date.DateUtil;
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
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.common.entity.TqApiLog;
import com.nu.modules.tq.common.service.ITqApiLogService;
import com.nu.modules.tq.electricity.entity.ElectricityMeter;
import com.nu.modules.tq.electricity.mapper.ElectricityMeterMapper;
import com.nu.modules.tq.electricity.service.IElectricityMeterService;
import com.nu.modules.tq.utils.HttpTool;
import com.nu.modules.tq.utils.SignTool;
import com.nu.modules.tq.utils.TqApi;
@ -32,6 +31,10 @@ public class WaterMeterServiceImpl extends ServiceImpl<WaterMeterMapper, WaterMe
@Autowired
ITqApiLogService logService;
public IPage<WaterMeter> findPage(Page<WaterMeter> page, WaterMeter waterMeter){
return baseMapper.findPage(page,waterMeter);
}
/**
* 清零
*/
@ -80,7 +83,7 @@ public class WaterMeterServiceImpl extends ServiceImpl<WaterMeterMapper, WaterMe
tqApiLog.setCid(waterMeter.getCid());
tqApiLog.setAddress(waterMeter.getAddress());
tqApiLog.setType(49);
tqApiLog.setResolveValue(entity.getWaterValue());
tqApiLog.setRequestValue(entity.getWaterValue());
tqApiLog.setRequestTime(DateUtil.now());
tqApiLog.setRequestStatus(status);
logService.insert(tqApiLog);
@ -91,7 +94,7 @@ public class WaterMeterServiceImpl extends ServiceImpl<WaterMeterMapper, WaterMe
tqApiLog.setCid(waterMeter.getCid());
tqApiLog.setAddress(waterMeter.getAddress());
tqApiLog.setType(49);
tqApiLog.setResolveValue(entity.getWaterValue());
tqApiLog.setRequestValue(entity.getWaterValue());
tqApiLog.setRequestTime(DateUtil.now());
tqApiLog.setRequestStatus(status);
tqApiLog.setRequestRemark(errorMsg);
@ -105,7 +108,7 @@ public class WaterMeterServiceImpl extends ServiceImpl<WaterMeterMapper, WaterMe
tqApiLog.setCid(waterMeter.getCid());
tqApiLog.setAddress(waterMeter.getAddress());
tqApiLog.setType(49);
tqApiLog.setResolveValue(entity.getWaterValue());
tqApiLog.setRequestValue(entity.getWaterValue());
tqApiLog.setRequestTime(DateUtil.now());
tqApiLog.setRequestStatus(httpStatus);
tqApiLog.setRequestRemark(errorMsg);
@ -123,7 +126,7 @@ public class WaterMeterServiceImpl extends ServiceImpl<WaterMeterMapper, WaterMe
Integer type = waterMeter.getType();
WaterMeter entity = baseMapper.getWaterMeter(waterMeter);
if(entity == null){
if(type.equals("43")){
if(type.equals(43)){
return Result.error("请先同步水表设备信息后再进行开闸");
}else{
return Result.error("请先同步水表设备信息后再进行关闸");
@ -139,7 +142,7 @@ public class WaterMeterServiceImpl extends ServiceImpl<WaterMeterMapper, WaterMe
item.put("address", waterMeter.getAddress());
item.put("type", type);
req.add(item);
String responseStr = tqApi.waterReset(req);
String responseStr = tqApi.waterControl(req);
JSONObject jsonObject = new JSONObject(responseStr);
String httpStatus = jsonObject.getStr("status");
if(httpStatus.equals("SUCCESS")){
@ -226,7 +229,7 @@ public class WaterMeterServiceImpl extends ServiceImpl<WaterMeterMapper, WaterMe
tqApiLog.setCid(waterMeter.getCid());
tqApiLog.setAddress(waterMeter.getAddress());
tqApiLog.setType(42);
tqApiLog.setResolveValue(entity.getWaterValue());
tqApiLog.setRequestValue(entity.getWaterValue());
tqApiLog.setRequestTime(DateUtil.now());
tqApiLog.setRequestStatus(status);
logService.insert(tqApiLog);
@ -237,7 +240,7 @@ public class WaterMeterServiceImpl extends ServiceImpl<WaterMeterMapper, WaterMe
tqApiLog.setCid(waterMeter.getCid());
tqApiLog.setAddress(waterMeter.getAddress());
tqApiLog.setType(42);
tqApiLog.setResolveValue(entity.getWaterValue());
tqApiLog.setRequestValue(entity.getWaterValue());
tqApiLog.setRequestTime(DateUtil.now());
tqApiLog.setRequestStatus(status);
tqApiLog.setRequestRemark(errorMsg);
@ -251,7 +254,7 @@ public class WaterMeterServiceImpl extends ServiceImpl<WaterMeterMapper, WaterMe
tqApiLog.setCid(waterMeter.getCid());
tqApiLog.setAddress(waterMeter.getAddress());
tqApiLog.setType(42);
tqApiLog.setResolveValue(entity.getWaterValue());
tqApiLog.setRequestValue(entity.getWaterValue());
tqApiLog.setRequestTime(DateUtil.now());
tqApiLog.setRequestStatus(httpStatus);
tqApiLog.setRequestRemark(errorMsg);
@ -278,11 +281,13 @@ public class WaterMeterServiceImpl extends ServiceImpl<WaterMeterMapper, WaterMe
String status = jsonObject.getStr("status");//返回状态
String oprId = jsonObject.getStr("opr_id");//操作ID
String resolveTime = jsonObject.getStr("resolve_time");//反馈时间
String data = jsonObject.getStr("data");//反馈备注
TqApiLog tqApiLog = new TqApiLog();
tqApiLog.setOprId(oprId);
tqApiLog.setResolveValue("0");
tqApiLog.setResolveTime(resolveTime);
tqApiLog.setResolveStatus(status);
tqApiLog.setResolveRemark(data);
TqApiLog logEntity = logService.getApiLog(tqApiLog);
if(logEntity!=null) {
tqApiLog.setId(logEntity.getId());
@ -378,12 +383,16 @@ public class WaterMeterServiceImpl extends ServiceImpl<WaterMeterMapper, WaterMe
JSONObject data = (JSONObject)datas.get(j);
Integer type = data.getInt("type");//类型
String resolveValue = data.getJSONArray("value").get(0).toString();//值
String[] waterVelues = resolveValue.split("\\|");
String dsp = data.getStr("dsp");//描述
TqApiLog tqApiLog = new TqApiLog();
tqApiLog.setOprId(oprId);
tqApiLog.setType(type);
tqApiLog.setResolveValue(resolveValue);
if(waterVelues.length>0){
tqApiLog.setResolveValue(waterVelues[0]);
}else{
tqApiLog.setResolveValue(resolveValue);
}
tqApiLog.setResolveTime(resolveTime);
tqApiLog.setResolveStatus(status);
tqApiLog.setResolveRemark(dsp);
@ -394,7 +403,11 @@ public class WaterMeterServiceImpl extends ServiceImpl<WaterMeterMapper, WaterMe
WaterMeter wm = new WaterMeter();
wm.setCid(cid);
wm.setAddress(address);
wm.setWaterValue(resolveValue);
if(waterVelues.length>0){
wm.setWaterValue(waterVelues[0]);
}else{
wm.setWaterValue(resolveValue);
}
wm.setReadTime(resolveTime);
baseMapper.updateValue(wm);
tqApiLog.setId(logEntity.getId());
@ -418,4 +431,5 @@ public class WaterMeterServiceImpl extends ServiceImpl<WaterMeterMapper, WaterMe
}
return "SUCCESS";
}
}

16
nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java
View File

@ -726,4 +726,20 @@ public class SysDepartController {
}
/**
* 查询所有子区域信息
* @return
*/
@GetMapping("getDepartServerUrl")
public Result<List<SysDepart>> getDepartServerUrl() {
Result<List<SysDepart>> result = new Result<>();
QueryWrapper<SysDepart> query = new QueryWrapper<>();
query.isNotNull("server_url");
List<SysDepart> ls = this.sysDepartService.list(query);
result.setSuccess(true);
result.setResult(ls);
return result;
}
}