From a7bac8b4249db2d0438ac7a9dcfab487473746d5 Mon Sep 17 00:00:00 2001 From: guo Date: Mon, 4 Dec 2023 17:43:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8C=82=E7=AF=AE=E6=A3=80=E6=B5=8B=EF=BC=88?= =?UTF-8?q?=E5=87=AF=E5=BE=B7=E5=B0=94=EF=BC=89-=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HangBasketDetectKdeDataController.java | 143 ++++++++++++ .../entity/HangBasketDetectKdeData.java | 220 ++++++++++++++++++ .../mapper/HangBasketDetectKdeDataMapper.java | 16 ++ .../xml/HangBasketDetectKdeDataMapper.xml | 5 + .../IHangBasketDetectKdeDataService.java | 25 ++ .../HangBasketDetectKdeDataServiceImpl.java | 81 +++++++ .../zhgd/xmgl/security/WebSecurityConfig.java | 1 + .../xmgl/task/StableWaterMixStationTask.java | 20 +- 8 files changed, 502 insertions(+), 9 deletions(-) create mode 100644 src/main/java/com/zhgd/xmgl/modules/hangbasket/controller/HangBasketDetectKdeDataController.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/hangbasket/entity/HangBasketDetectKdeData.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/hangbasket/mapper/HangBasketDetectKdeDataMapper.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/hangbasket/mapper/xml/HangBasketDetectKdeDataMapper.xml create mode 100644 src/main/java/com/zhgd/xmgl/modules/hangbasket/service/IHangBasketDetectKdeDataService.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/hangbasket/service/impl/HangBasketDetectKdeDataServiceImpl.java diff --git a/src/main/java/com/zhgd/xmgl/modules/hangbasket/controller/HangBasketDetectKdeDataController.java b/src/main/java/com/zhgd/xmgl/modules/hangbasket/controller/HangBasketDetectKdeDataController.java new file mode 100644 index 000000000..1c377d0c0 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/hangbasket/controller/HangBasketDetectKdeDataController.java @@ -0,0 +1,143 @@ +package com.zhgd.xmgl.modules.hangbasket.controller; + +import com.zhgd.xmgl.modules.hangbasket.entity.HangBasketDetectKdeData; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiImplicitParams; +import java.util.HashMap; +import springfox.documentation.annotations.ApiIgnore; + +import java.util.List; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import com.zhgd.jeecg.common.api.vo.Result; +import com.zhgd.jeecg.common.system.query.QueryGenerator; +import com.zhgd.jeecg.common.util.oConvertUtils; +import org.apache.commons.collections.MapUtils; +import com.zhgd.xmgl.modules.hangbasket.service.IHangBasketDetectKdeDataService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import lombok.extern.slf4j.Slf4j; + +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; + + + /** + * @Title: Controller + * @Description: 挂篮检测（凯德尔）-数据 + * @author： pds + * @date： 2023-12-04 + * @version： V1.0 + */ +@RestController +@RequestMapping("/xmgl/hangBasketDetectKdeData") +@Slf4j +@Api(tags = "挂篮检测（凯德尔）-数据相关Api") +public class HangBasketDetectKdeDataController { + @Autowired + private IHangBasketDetectKdeDataService hangBasketDetectKdeDataService; + + /** + * 分页列表查询 + * @return + */ + @ApiOperation(value = "分页列表查询挂篮检测（凯德尔）-数据信息", notes = "分页列表查询挂篮检测（凯德尔）-数据信息", httpMethod="GET") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "query", required = true, dataType = "Integer"), + @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"), + }) + @GetMapping(value = "/page") + public Result> queryPageList(@ApiIgnore @RequestParam HashMap paramMap) { + return Result.success(hangBasketDetectKdeDataService.queryPageList(paramMap)); + } + + /** + * 列表查询 + * @return + */ + @ApiOperation(value = "列表查询挂篮检测（凯德尔）-数据信息", notes = "列表查询挂篮检测（凯德尔）-数据信息", httpMethod="GET") + @GetMapping(value = "/list") + public Result> queryList(@ApiIgnore @RequestParam HashMap paramMap) { + return Result.success(hangBasketDetectKdeDataService.queryList(paramMap)); + } + + /** + * 添加 + * @param hangBasketDetectKdeData + * @return + */ + @ApiOperation(value = "添加挂篮检测（凯德尔）-数据信息", notes = "添加挂篮检测（凯德尔）-数据信息" , httpMethod="POST") + @PostMapping(value = "/add") + public Result add(@RequestBody HangBasketDetectKdeData hangBasketDetectKdeData) { + log.info("添加挂篮检测（凯德尔）-数据信息:{}",hangBasketDetectKdeData); + hangBasketDetectKdeDataService.add(hangBasketDetectKdeData); + return Result.ok(); + } + + /** + * 编辑 + * @param hangBasketDetectKdeData + * @return + */ + @ApiOperation(value = "编辑挂篮检测（凯德尔）-数据信息", notes = "编辑挂篮检测（凯德尔）-数据信息" , httpMethod="POST") + @PostMapping(value = "/edit") + public Result edit(@RequestBody HangBasketDetectKdeData hangBasketDetectKdeData) { + hangBasketDetectKdeDataService.edit(hangBasketDetectKdeData); + return Result.ok(); + } + + /** + * 通过id删除 + * @return + */ + @ApiOperation(value = "删除挂篮检测（凯德尔）-数据信息", notes = "删除挂篮检测（凯德尔）-数据信息" , httpMethod="POST") + @ApiImplicitParam(name = "id", value = "挂篮检测（凯德尔）-数据ID", paramType = "body", required = true, dataType = "String", example = "{\"id\":\"1\"}") + @PostMapping(value = "/delete") + public Result delete(@ApiIgnore @RequestBody HashMap map) { + String id = MapUtils.getString(map, "id"); + Result result = new Result(); + HangBasketDetectKdeData hangBasketDetectKdeData = hangBasketDetectKdeDataService.getById(id); + if(hangBasketDetectKdeData==null) { + result.error500("未找到对应实体"); + }else { + boolean ok = hangBasketDetectKdeDataService.removeById(id); + if(ok) { + result.success("删除成功!"); + } + } + + return result; + } + + /** + * 通过id查询 + * @param id + * @return + */ + @ApiOperation(value = "通过id查询挂篮检测（凯德尔）-数据信息", notes = "通过id查询挂篮检测（凯德尔）-数据信息" , httpMethod="GET") + @ApiImplicitParam(name = "id", value = "挂篮检测（凯德尔）-数据ID", paramType = "query", required = true, dataType = "Integer") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + Result result = new Result(); + HangBasketDetectKdeData hangBasketDetectKdeData = hangBasketDetectKdeDataService.getById(id); + if(hangBasketDetectKdeData==null) { + result.error500("未找到对应实体"); + }else { + result.setResult(hangBasketDetectKdeData); + result.setSuccess(true); + } + return result; + } + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/hangbasket/entity/HangBasketDetectKdeData.java b/src/main/java/com/zhgd/xmgl/modules/hangbasket/entity/HangBasketDetectKdeData.java new file mode 100644 index 000000000..f3086b8c6 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/hangbasket/entity/HangBasketDetectKdeData.java @@ -0,0 +1,220 @@ +package com.zhgd.xmgl.modules.hangbasket.entity; + +import java.io.Serializable; +import java.util.Date; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +/** + * @Description: 挂篮检测（凯德尔）-数据 + * @author： pds + * @date： 2023-12-04 + * @version： V1.0 + */ +@Data +@TableName("hang_basket_detect_kde_data") +@ApiModel(value="HangBasketDetectKdeData实体类",description="HangBasketDetectKdeData") +public class HangBasketDetectKdeData implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value="id") + private java.lang.Long id ; + /**设备名称*/ + @Excel(name = "设备名称", width = 15) + @ApiModelProperty(value="设备名称") + private java.lang.String devName ; + /**设备编码*/ + @Excel(name = "设备编码", width = 15) + @ApiModelProperty(value="设备编码") + private java.lang.String devSn ; + /**时间(yyyy-MM-dd HH:mm:ss)*/ + @Excel(name = "时间(yyyy-MM-dd HH:mm:ss)", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value="时间(yyyy-MM-dd HH:mm:ss)") + private java.util.Date time ; + /**风速(m/s)*/ + @Excel(name = "风速(m/s)", width = 15) + @ApiModelProperty(value="风速(m/s)") + private java.lang.Double data1 ; + /**风级()*/ + @Excel(name = "风级()", width = 15) + @ApiModelProperty(value="风级()") + private java.lang.Double data2 ; + /**正负零激光测点1(米)*/ + @Excel(name = "正负零激光测点1(米)", width = 15) + @ApiModelProperty(value="正负零激光测点1(米)") + private java.lang.Double data3 ; + /**正负零激光测点2(米)*/ + @Excel(name = "正负零激光测点2(米)", width = 15) + @ApiModelProperty(value="正负零激光测点2(米)") + private java.lang.Double data4 ; + /**后锚应力测点1(Mpa)*/ + @Excel(name = "后锚应力测点1(Mpa)", width = 15) + @ApiModelProperty(value="后锚应力测点1(Mpa)") + private java.lang.Double data5 ; + /**后锚应力测点2(Mpa)*/ + @Excel(name = "后锚应力测点2(Mpa)", width = 15) + @ApiModelProperty(value="后锚应力测点2(Mpa)") + private java.lang.Double data6 ; + /**主桁架应力测点1(MpaƸ)*/ + @Excel(name = "主桁架应力测点1(MpaƸ)", width = 15) + @ApiModelProperty(value="主桁架应力测点1(MpaƸ)") + private java.lang.Double data7 ; + /**主桁架应力测点2(Mpa)*/ + @Excel(name = "主桁架应力测点2(Mpa)", width = 15) + @ApiModelProperty(value="主桁架应力测点2(Mpa)") + private java.lang.Double data8 ; + /**主桁架应力测点3(Mpa)*/ + @Excel(name = "主桁架应力测点3(Mpa)", width = 15) + @ApiModelProperty(value="主桁架应力测点3(Mpa)") + private java.lang.Double data9 ; + /**主桁架应力测点4(Mpa)*/ + @Excel(name = "主桁架应力测点4(Mpa)", width = 15) + @ApiModelProperty(value="主桁架应力测点4(Mpa)") + private java.lang.Double data10 ; + /**吊带应力测点1(Mpa)*/ + @Excel(name = "吊带应力测点1(Mpa)", width = 15) + @ApiModelProperty(value="吊带应力测点1(Mpa)") + private java.lang.Double data11 ; + /**吊带应力测点2(Mpa)*/ + @Excel(name = "吊带应力测点2(Mpa)", width = 15) + @ApiModelProperty(value="吊带应力测点2(Mpa)") + private java.lang.Double data12 ; + /**预埋应力测点1(Mpa)*/ + @Excel(name = "预埋应力测点1(Mpa)", width = 15) + @ApiModelProperty(value="预埋应力测点1(Mpa)") + private java.lang.Double data13 ; + /**预埋应力测点2(Mpa)*/ + @Excel(name = "预埋应力测点2(Mpa)", width = 15) + @ApiModelProperty(value="预埋应力测点2(Mpa)") + private java.lang.Double data14 ; + /**备用应力测点1(Mpa)*/ + @Excel(name = "备用应力测点1(Mpa)", width = 15) + @ApiModelProperty(value="备用应力测点1(Mpa)") + private java.lang.Double data15 ; + /**备用应力测点2(Mpa)*/ + @Excel(name = "备用应力测点2(Mpa)", width = 15) + @ApiModelProperty(value="备用应力测点2(Mpa)") + private java.lang.Double data16 ; + /**备用应力测点3(Mpa)*/ + @Excel(name = "备用应力测点3(Mpa)", width = 15) + @ApiModelProperty(value="备用应力测点3(Mpa)") + private java.lang.Double data17 ; + /**主桁架水平测点1(度)*/ + @Excel(name = "主桁架水平测点1(度)", width = 15) + @ApiModelProperty(value="主桁架水平测点1(度)") + private java.lang.Double data18 ; + /**主桁架水平测点2(度)*/ + @Excel(name = "主桁架水平测点2(度)", width = 15) + @ApiModelProperty(value="主桁架水平测点2(度)") + private java.lang.Double data19 ; + /**主桁架水平测点3(度)*/ + @Excel(name = "主桁架水平测点3(度)", width = 15) + @ApiModelProperty(value="主桁架水平测点3(度)") + private java.lang.Double data20 ; + /**主桁架水平测点4(度)*/ + @Excel(name = "主桁架水平测点4(度)", width = 15) + @ApiModelProperty(value="主桁架水平测点4(度)") + private java.lang.Double data21 ; + /**底部水平测点(度)*/ + @Excel(name = "底部水平测点(度)", width = 15) + @ApiModelProperty(value="底部水平测点(度)") + private java.lang.Double data22 ; + /**钢结构许用应力(Mpa)*/ + @Excel(name = "钢结构许用应力(Mpa)", width = 15) + @ApiModelProperty(value="钢结构许用应力(Mpa)") + private java.lang.Double data23 ; + /**混凝土许用应力(Mpa)*/ + @Excel(name = "混凝土许用应力(Mpa)", width = 15) + @ApiModelProperty(value="混凝土许用应力(Mpa)") + private java.lang.Double data24 ; + /**主桁架水平度阈值(度)*/ + @Excel(name = "主桁架水平度阈值(度)", width = 15) + @ApiModelProperty(value="主桁架水平度阈值(度)") + private java.lang.Double data25 ; + /**风速阈值(m/s)*/ + @Excel(name = "风速阈值(m/s)", width = 15) + @ApiModelProperty(value="风速阈值(m/s)") + private java.lang.Double data26 ; + /**后锚应力测点温度1(度)*/ + @Excel(name = "后锚应力测点温度1(度)", width = 15) + @ApiModelProperty(value="后锚应力测点温度1(度)") + private java.lang.Double data27 ; + /**后锚应力测点温度2(度)*/ + @Excel(name = "后锚应力测点温度2(度)", width = 15) + @ApiModelProperty(value="后锚应力测点温度2(度)") + private java.lang.Double data28 ; + /**传感器报警状态(Bit位编码，顺序见编号对照一览表。对应位为0表示正常，为1报警；)*/ + @Excel(name = "传感器报警状态(Bit位编码，顺序见编号对照一览表。对应位为0表示正常，为1报警；)", width = 15) + @ApiModelProperty(value="传感器报警状态(Bit位编码，顺序见编号对照一览表。对应位为0表示正常，为1报警；)") + private java.lang.Integer data29 ; + /**备用()*/ + @Excel(name = "备用()", width = 15) + @ApiModelProperty(value="备用()") + private java.lang.String data30 ; + /**备用()*/ + @Excel(name = "备用()", width = 15) + @ApiModelProperty(value="备用()") + private java.lang.String data31 ; + /**主桁架应力测点温度1(度)*/ + @Excel(name = "主桁架应力测点温度1(度)", width = 15) + @ApiModelProperty(value="主桁架应力测点温度1(度)") + private java.lang.Double data32 ; + /**主桁架应力测点温度2(度)*/ + @Excel(name = "主桁架应力测点温度2(度)", width = 15) + @ApiModelProperty(value="主桁架应力测点温度2(度)") + private java.lang.Double data33 ; + /**主桁架应力测点温度3(度)*/ + @Excel(name = "主桁架应力测点温度3(度)", width = 15) + @ApiModelProperty(value="主桁架应力测点温度3(度)") + private java.lang.Double data34 ; + /**主桁架应力测点温度4(度)*/ + @Excel(name = "主桁架应力测点温度4(度)", width = 15) + @ApiModelProperty(value="主桁架应力测点温度4(度)") + private java.lang.Double data35 ; + /**吊带应力测点温度1(度)*/ + @Excel(name = "吊带应力测点温度1(度)", width = 15) + @ApiModelProperty(value="吊带应力测点温度1(度)") + private java.lang.Double data36 ; + /**吊带应力测点温度2(度)*/ + @Excel(name = "吊带应力测点温度2(度)", width = 15) + @ApiModelProperty(value="吊带应力测点温度2(度)") + private java.lang.Double data37 ; + /**预埋应力测点温度1(度)*/ + @Excel(name = "预埋应力测点温度1(度)", width = 15) + @ApiModelProperty(value="预埋应力测点温度1(度)") + private java.lang.Double data38 ; + /**预埋应力测点温度2(度)*/ + @Excel(name = "预埋应力测点温度2(度)", width = 15) + @ApiModelProperty(value="预埋应力测点温度2(度)") + private java.lang.Double data39 ; + /**传感器是否正常(18路传感器状态。Bit0至bit17分别代表1到18路传感器状态。为0表示正常，为1表示传感器异常。编码顺序和报警的状态顺序一致。)*/ + @Excel(name = "传感器是否正常(18路传感器状态。Bit0至bit17分别代表1到18路传感器状态。为0表示正常，为1表示传感器异常。编码顺序和报警的状态顺序一致。)", width = 15) + @ApiModelProperty(value="传感器是否正常(18路传感器状态。Bit0至bit17分别代表1到18路传感器状态。为0表示正常，为1表示传感器异常。编码顺序和报警的状态顺序一致。)") + private java.lang.Integer data40 ; + /**创建时间 yyyy-MM-dd HH:mm:ss*/ + @Excel(name = "创建时间 yyyy-MM-dd HH:mm:ss", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value="创建时间 yyyy-MM-dd HH:mm:ss") + private java.util.Date createDate ; + /**更新时间 yyyy-MM-dd HH:mm:ss*/ + @Excel(name = "更新时间 yyyy-MM-dd HH:mm:ss", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value="更新时间 yyyy-MM-dd HH:mm:ss") + private java.util.Date updateDate ; + /**项目sn*/ + @Excel(name = "项目sn", width = 15) + @ApiModelProperty(value="项目sn") + private java.lang.String projectSn ; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/hangbasket/mapper/HangBasketDetectKdeDataMapper.java b/src/main/java/com/zhgd/xmgl/modules/hangbasket/mapper/HangBasketDetectKdeDataMapper.java new file mode 100644 index 000000000..2bcf18be5 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/hangbasket/mapper/HangBasketDetectKdeDataMapper.java @@ -0,0 +1,16 @@ +package com.zhgd.xmgl.modules.hangbasket.mapper; + +import org.apache.ibatis.annotations.Mapper; +import com.zhgd.xmgl.modules.hangbasket.entity.HangBasketDetectKdeData; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 挂篮检测（凯德尔）-数据 + * @author： pds + * @date： 2023-12-04 + * @version： V1.0 + */ +@Mapper +public interface HangBasketDetectKdeDataMapper extends BaseMapper { + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/hangbasket/mapper/xml/HangBasketDetectKdeDataMapper.xml b/src/main/java/com/zhgd/xmgl/modules/hangbasket/mapper/xml/HangBasketDetectKdeDataMapper.xml new file mode 100644 index 000000000..ab49aabe4 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/hangbasket/mapper/xml/HangBasketDetectKdeDataMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/src/main/java/com/zhgd/xmgl/modules/hangbasket/service/IHangBasketDetectKdeDataService.java b/src/main/java/com/zhgd/xmgl/modules/hangbasket/service/IHangBasketDetectKdeDataService.java new file mode 100644 index 000000000..228d7149c --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/hangbasket/service/IHangBasketDetectKdeDataService.java @@ -0,0 +1,25 @@ +package com.zhgd.xmgl.modules.hangbasket.service; + +import com.zhgd.xmgl.modules.hangbasket.entity.HangBasketDetectKdeData; +import com.baomidou.mybatisplus.extension.service.IService; +import com.baomidou.mybatisplus.core.metadata.IPage; + +import java.util.HashMap; +import java.util.List; + +/** + * @Description: 挂篮检测（凯德尔）-数据 + * @author： pds + * @date： 2023-12-04 + * @version： V1.0 + */ +public interface IHangBasketDetectKdeDataService extends IService { + + IPage queryPageList(HashMap paramMap); + + List queryList(HashMap paramMap); + + void add(HangBasketDetectKdeData hangBasketDetectKdeData); + + void edit(HangBasketDetectKdeData hangBasketDetectKdeData); +} diff --git a/src/main/java/com/zhgd/xmgl/modules/hangbasket/service/impl/HangBasketDetectKdeDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/hangbasket/service/impl/HangBasketDetectKdeDataServiceImpl.java new file mode 100644 index 000000000..117d94c9c --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/hangbasket/service/impl/HangBasketDetectKdeDataServiceImpl.java @@ -0,0 +1,81 @@ +package com.zhgd.xmgl.modules.hangbasket.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.zhgd.jeecg.common.execption.OpenAlertException; +import com.zhgd.xmgl.modules.hangbasket.entity.HangBasketDetectKdeData; +import com.zhgd.xmgl.modules.hangbasket.entity.HangBasketDev; +import com.zhgd.xmgl.modules.hangbasket.mapper.HangBasketDetectKdeDataMapper; +import com.zhgd.xmgl.modules.hangbasket.mapper.HangBasketDevMapper; +import com.zhgd.xmgl.modules.hangbasket.service.IHangBasketDetectKdeDataService; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.zhgd.jeecg.common.system.query.QueryGenerator; +import com.zhgd.xmgl.util.PageUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import java.util.HashMap; +import java.util.List; +import com.zhgd.xmgl.util.RefUtil; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.beans.factory.annotation.Autowired; + +/** + * @Description: 挂篮检测（凯德尔）-数据 + * @author： pds + * @date： 2023-12-04 + * @version： V1.0 + */ +@Service +@Transactional(rollbackFor = Exception.class) +public class HangBasketDetectKdeDataServiceImpl extends ServiceImpl implements IHangBasketDetectKdeDataService { + @Autowired + private HangBasketDetectKdeDataMapper hangBasketDetectKdeDataMapper; + @Autowired + private HangBasketDevMapper hangBasketDevMapper; + @Override + public IPage queryPageList(HashMap paramMap) { + QueryWrapper queryWrapper = getQueryWrapper(paramMap); + Page page = PageUtil.getPage(paramMap); + IPage pageList = this.page(page, queryWrapper); + pageList.setRecords(dealList(pageList.getRecords())); + return pageList; + } + + @Override + public List queryList(HashMap paramMap) { + QueryWrapper queryWrapper = getQueryWrapper(paramMap); + return dealList(this.list(queryWrapper)); + } + + private QueryWrapper getQueryWrapper(HashMap paramMap) { + String alias = ""; + QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(HangBasketDetectKdeData.class, paramMap, alias); + queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(HangBasketDetectKdeData::getId)); + return queryWrapper; + } + + private List dealList(List list) { + return list; + } + + @Override + public void add(HangBasketDetectKdeData hangBasketDetectKdeData) { + String devSn = hangBasketDetectKdeData.getDevSn(); + HangBasketDev dev = hangBasketDevMapper.selectOne(new LambdaQueryWrapper() + .eq(HangBasketDev::getDevSn, devSn)); + if (dev == null) { + throw new OpenAlertException("设备编号不正确"); + } + String projectSn = dev.getProjectSn(); + hangBasketDetectKdeData.setProjectSn(projectSn); + hangBasketDetectKdeData.setId(null); + hangBasketDetectKdeData.setDevName(dev.getDevName()); + baseMapper.insert(hangBasketDetectKdeData); + } + + @Override + public void edit(HangBasketDetectKdeData hangBasketDetectKdeData) { + baseMapper.updateById(hangBasketDetectKdeData); + } +} diff --git a/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java b/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java index 4db88b104..8ae4544c9 100644 --- a/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java +++ b/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java @@ -254,6 +254,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter { .antMatchers("/xmgl/smartGroutData/add").permitAll() .antMatchers("/xmgl/bimface/getDetailsByFileIdAndProjectSn").permitAll() .antMatchers("/xmgl/stableWaterMixStationData/add").permitAll() + .antMatchers("/xmgl/hangBasketDetectKdeData/add").permitAll() .antMatchers(HttpMethod.OPTIONS, "/**").anonymous() .anyRequest().authenticated() // 剩下所有的验证都需要验证 .and() diff --git a/src/main/java/com/zhgd/xmgl/task/StableWaterMixStationTask.java b/src/main/java/com/zhgd/xmgl/task/StableWaterMixStationTask.java index 1adeee6ab..b2438afc3 100644 --- a/src/main/java/com/zhgd/xmgl/task/StableWaterMixStationTask.java +++ b/src/main/java/com/zhgd/xmgl/task/StableWaterMixStationTask.java @@ -46,13 +46,13 @@ public class StableWaterMixStationTask { @GetMapping("1204")//todo public void executeTask() { log.info("定时拉取广联达的搅拌站数据任务开始"); - List projects = projectMapper.selectList(new LambdaQueryWrapper() - .isNotNull(Project::getGldProjectId) - .ne(Project::getGldProjectId, "") - ); - for (Project project : projects) { - sendHttp(project); - } + //List projects = projectMapper.selectList(new LambdaQueryWrapper() + // .isNotNull(Project::getGldProjectId) + // .ne(Project::getGldProjectId, "") + //); + //for (Project project : projects) { + // sendHttp(null); + //} } private void sendHttp(Project project) { @@ -68,7 +68,8 @@ public class StableWaterMixStationTask { //4.1构建认证信息 HmacRestAuthInfo restAuthInfo = new HmacRestAuthInfo(); //4.2设置授权文件路径 - restAuthInfo.setLicPath(project.getGldLicPath()); + restAuthInfo.setLicPath("C:\\Users\\Administrator\\Desktop\\auth.lic"); + //restAuthInfo.setLicPath(project.getGldLicPath()); //4.3权限认证 serviceClient.authenticate(restAuthInfo); @@ -76,7 +77,8 @@ public class StableWaterMixStationTask { //第5步：获取授权文件关联的GYS系统地址hostAddress String hostAddress = serviceClient.getRestRootAddress(); //第6步：设置请求接口的URI地址apiURI(以获取集成项目列表信息为例) - String apiURI = String.format("/api/mix/v1.0/mix/product/getMachineProductList?projectId=%s&beginTimestamp=20170710101010000", project.getGldProjectId()); + String apiURI = "/api/inspection/v1.0/project/getTenantHasCodeProject"; + //String apiURI = String.format("/api/mix/v1.0/mix/product/getMachineProductList?projectId=%s&beginTimestamp=20170710101010000", project.getGldProjectId()); //第7步：拼装完整的请求网址 String fullURL = hostAddress + apiURI; //第8步：请求数据准备（本例中为从GYS系统获取数据，无需进行请求数据的准备）