From 96163bc587dd861f6a096ec30ffb5995c53f9a2e Mon Sep 17 00:00:00 2001 From: guo Date: Thu, 28 Dec 2023 15:32:31 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../GantryCraneAlarmController.java | 9 + .../mapper/GantryCraneAlarmMapper.java | 2 + .../mapper/xml/GantryCraneAlarmMapper.xml | 13 ++ .../service/IGantryCraneAlarmService.java | 2 + .../impl/GantryCraneAlarmServiceImpl.java | 5 + .../RtProgressPaymentContractController.java | 216 +++++++++--------- .../vo/CountRtProgressPaymentContractVo.java | 10 + .../RtProgressPaymentContractMapper.java | 4 + .../xml/RtProgressPaymentContractMapper.xml | 6 + .../IRtProgressPaymentContractService.java | 3 + .../RtProgressPaymentContractServiceImpl.java | 6 + .../zhgd/xmgl/security/WebSecurityConfig.java | 4 + 12 files changed, 173 insertions(+), 107 deletions(-) create mode 100644 src/main/java/com/zhgd/xmgl/modules/rt/entity/vo/CountRtProgressPaymentContractVo.java diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/GantryCraneAlarmController.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/GantryCraneAlarmController.java index a9b802988..d819bd1da 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/GantryCraneAlarmController.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/GantryCraneAlarmController.java @@ -147,4 +147,13 @@ public class GantryCraneAlarmController { return Result.success(gantryCraneAlarmService.countGantryCraneAlarmWindSpeed(map)); } + @ApiOperation(value = "查询最新一条龙门吊报警数据表信息", notes = "查询最新一条龙门吊报警数据表信息", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "devSn", value = "设备编号", dataType = "String", paramType = "body", required = false), + @ApiImplicitParam(name = "projectSn", value = "项目sn", dataType = "String", paramType = "body", required = false), + }) + @PostMapping(value = "/getNewestOne") + public Result getNewestOne(@RequestBody @ApiIgnore Map map) { + return Result.success(gantryCraneAlarmService.getNewestOne(map)); + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/GantryCraneAlarmMapper.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/GantryCraneAlarmMapper.java index ab21cc00c..512c60aa8 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/GantryCraneAlarmMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/GantryCraneAlarmMapper.java @@ -28,4 +28,6 @@ public interface GantryCraneAlarmMapper extends BaseMapper { GantryCraneAlarmTypeBo countGantryCraneAlarmType(Map map); List countGantryCraneAlarmWindSpeed(Map map); + + GantryCraneAlarm getNewestOne(Map map); } diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/GantryCraneAlarmMapper.xml b/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/GantryCraneAlarmMapper.xml index f01cb285c..1985d8bd4 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/GantryCraneAlarmMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/GantryCraneAlarmMapper.xml @@ -84,4 +84,17 @@ group by x + + diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/IGantryCraneAlarmService.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/IGantryCraneAlarmService.java index dcd8e4728..dc6ad8524 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/IGantryCraneAlarmService.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/IGantryCraneAlarmService.java @@ -27,4 +27,6 @@ public interface IGantryCraneAlarmService extends IService { List countGantryCraneAlarmType(Map map); List countGantryCraneAlarmWindSpeed(Map map); + + GantryCraneAlarm getNewestOne(Map map); } diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/GantryCraneAlarmServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/GantryCraneAlarmServiceImpl.java index 7ee64e83f..60d1fde9f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/GantryCraneAlarmServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/GantryCraneAlarmServiceImpl.java @@ -104,4 +104,9 @@ public class GantryCraneAlarmServiceImpl extends ServiceImpl map) { + return baseMapper.getNewestOne(map); + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/controller/RtProgressPaymentContractController.java b/src/main/java/com/zhgd/xmgl/modules/rt/controller/RtProgressPaymentContractController.java index b1d41b696..737415f66 100644 --- a/src/main/java/com/zhgd/xmgl/modules/rt/controller/RtProgressPaymentContractController.java +++ b/src/main/java/com/zhgd/xmgl/modules/rt/controller/RtProgressPaymentContractController.java @@ -1,27 +1,23 @@ package com.zhgd.xmgl.modules.rt.controller; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.xmgl.modules.rt.entity.RtProgressPaymentContract; +import com.zhgd.xmgl.modules.rt.entity.vo.CountRtProgressPaymentContractVo; +import com.zhgd.xmgl.modules.rt.service.IRtProgressPaymentContractService; 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 com.zhgd.jeecg.common.api.vo.Result; -import org.apache.commons.collections.MapUtils; -import com.zhgd.xmgl.modules.rt.service.IRtProgressPaymentContractService; - -import org.simpleframework.xml.core.Validate; -import com.baomidou.mybatisplus.core.metadata.IPage; +import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; - +import org.apache.commons.collections.MapUtils; +import org.simpleframework.xml.core.Validate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; + +import java.util.HashMap; +import java.util.List; /** @@ -36,104 +32,110 @@ import org.springframework.web.bind.annotation.*; @Slf4j @Api(tags = "榕图-进度款合同相关Api") public class RtProgressPaymentContractController { - @Autowired - private IRtProgressPaymentContractService rtProgressPaymentContractService; + @Autowired + private IRtProgressPaymentContractService rtProgressPaymentContractService; - /** - * 分页列表查询 - * - * @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(rtProgressPaymentContractService.queryPageList(paramMap)); - } + /** + * 分页列表查询 + * + * @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(rtProgressPaymentContractService.queryPageList(paramMap)); + } - /** - * 列表查询 - * - * @return - */ - @ApiOperation(value = "列表查询榕图-进度款合同信息", notes = "列表查询榕图-进度款合同信息", httpMethod = "GET") - @GetMapping(value = "/list") - public Result> queryList(@ApiIgnore @RequestParam HashMap paramMap) { - return Result.success(rtProgressPaymentContractService.queryList(paramMap)); - } + /** + * 列表查询 + * + * @return + */ + @ApiOperation(value = "列表查询榕图-进度款合同信息", notes = "列表查询榕图-进度款合同信息", httpMethod = "GET") + @GetMapping(value = "/list") + public Result> queryList(@ApiIgnore @RequestParam HashMap paramMap) { + return Result.success(rtProgressPaymentContractService.queryList(paramMap)); + } - /** - * 添加 - * - * @param rtProgressPaymentContract - * @return - */ - @ApiOperation(value = "添加榕图-进度款合同信息", notes = "添加榕图-进度款合同信息", httpMethod = "POST") - @PostMapping(value = "/add") - public Result add(@RequestBody @Validate RtProgressPaymentContract rtProgressPaymentContract) { - rtProgressPaymentContractService.add(rtProgressPaymentContract); - return Result.ok(); - } + /** + * 添加 + * + * @param rtProgressPaymentContract + * @return + */ + @ApiOperation(value = "添加榕图-进度款合同信息", notes = "添加榕图-进度款合同信息", httpMethod = "POST") + @PostMapping(value = "/add") + public Result add(@RequestBody @Validate RtProgressPaymentContract rtProgressPaymentContract) { + rtProgressPaymentContractService.add(rtProgressPaymentContract); + return Result.ok(); + } - /** - * 编辑 - * - * @param rtProgressPaymentContract - * @return - */ - @ApiOperation(value = "编辑榕图-进度款合同信息", notes = "编辑榕图-进度款合同信息", httpMethod = "POST") - @PostMapping(value = "/edit") - public Result edit(@RequestBody RtProgressPaymentContract rtProgressPaymentContract) { - rtProgressPaymentContractService.edit(rtProgressPaymentContract); - return Result.ok(); - } + /** + * 编辑 + * + * @param rtProgressPaymentContract + * @return + */ + @ApiOperation(value = "编辑榕图-进度款合同信息", notes = "编辑榕图-进度款合同信息", httpMethod = "POST") + @PostMapping(value = "/edit") + public Result edit(@RequestBody RtProgressPaymentContract rtProgressPaymentContract) { + rtProgressPaymentContractService.edit(rtProgressPaymentContract); + 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(); - RtProgressPaymentContract rtProgressPaymentContract = rtProgressPaymentContractService.getById(id); - if (rtProgressPaymentContract == null) { - result.error500("未找到对应实体"); - } else { - boolean ok = rtProgressPaymentContractService.removeById(id); - if (ok) { - result.success("删除成功!"); - } - } + /** + * 通过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(); + RtProgressPaymentContract rtProgressPaymentContract = rtProgressPaymentContractService.getById(id); + if (rtProgressPaymentContract == null) { + result.error500("未找到对应实体"); + } else { + boolean ok = rtProgressPaymentContractService.removeById(id); + if (ok) { + result.success("删除成功!"); + } + } - return result; - } + 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(); - RtProgressPaymentContract rtProgressPaymentContract = rtProgressPaymentContractService.getById(id); - if (rtProgressPaymentContract == null) { - result.error500("未找到对应实体"); - } else { - result.setResult(rtProgressPaymentContract); - result.setSuccess(true); - } - 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(); + RtProgressPaymentContract rtProgressPaymentContract = rtProgressPaymentContractService.getById(id); + if (rtProgressPaymentContract == null) { + result.error500("未找到对应实体"); + } else { + result.setResult(rtProgressPaymentContract); + result.setSuccess(true); + } + return result; + } + @ApiOperation(value = "统计榕图-进度款合同信息", notes = "统计榕图-进度款合同信息", httpMethod = "POST") + @ApiImplicitParam(name = "projectSn", value = "项目sn", dataType = "String", paramType = "body", required = true) + @PostMapping(value = "/countRtProgressPaymentContract") + public Result countRtProgressPaymentContract(@ApiIgnore @RequestBody HashMap map) { + return Result.success(rtProgressPaymentContractService.countRtProgressPaymentContract(map)); + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/entity/vo/CountRtProgressPaymentContractVo.java b/src/main/java/com/zhgd/xmgl/modules/rt/entity/vo/CountRtProgressPaymentContractVo.java new file mode 100644 index 000000000..490064505 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/rt/entity/vo/CountRtProgressPaymentContractVo.java @@ -0,0 +1,10 @@ +package com.zhgd.xmgl.modules.rt.entity.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class CountRtProgressPaymentContractVo { + @ApiModelProperty("合同总金额") + private Double totalContractPrice; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/mapper/RtProgressPaymentContractMapper.java b/src/main/java/com/zhgd/xmgl/modules/rt/mapper/RtProgressPaymentContractMapper.java index d661d997c..ffec2ee44 100644 --- a/src/main/java/com/zhgd/xmgl/modules/rt/mapper/RtProgressPaymentContractMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/rt/mapper/RtProgressPaymentContractMapper.java @@ -1,9 +1,12 @@ package com.zhgd.xmgl.modules.rt.mapper; import com.zhgd.xmgl.modules.rt.entity.RtProgressPaymentContract; +import com.zhgd.xmgl.modules.rt.entity.vo.CountRtProgressPaymentContractVo; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import java.util.HashMap; + /** * @Description: 榕图-进度款合同 * @author： pds @@ -13,4 +16,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; @Mapper public interface RtProgressPaymentContractMapper extends BaseMapper { + CountRtProgressPaymentContractVo countRtProgressPaymentContract(HashMap map); } diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/mapper/xml/RtProgressPaymentContractMapper.xml b/src/main/java/com/zhgd/xmgl/modules/rt/mapper/xml/RtProgressPaymentContractMapper.xml index b7a15ea3b..65b460838 100644 --- a/src/main/java/com/zhgd/xmgl/modules/rt/mapper/xml/RtProgressPaymentContractMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/rt/mapper/xml/RtProgressPaymentContractMapper.xml @@ -1,4 +1,10 @@ + diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/service/IRtProgressPaymentContractService.java b/src/main/java/com/zhgd/xmgl/modules/rt/service/IRtProgressPaymentContractService.java index db7301d15..9715e14b8 100644 --- a/src/main/java/com/zhgd/xmgl/modules/rt/service/IRtProgressPaymentContractService.java +++ b/src/main/java/com/zhgd/xmgl/modules/rt/service/IRtProgressPaymentContractService.java @@ -3,6 +3,7 @@ package com.zhgd.xmgl.modules.rt.service; import com.zhgd.xmgl.modules.rt.entity.RtProgressPaymentContract; import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.zhgd.xmgl.modules.rt.entity.vo.CountRtProgressPaymentContractVo; import java.util.HashMap; import java.util.List; @@ -22,4 +23,6 @@ public interface IRtProgressPaymentContractService extends IService map); } diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtProgressPaymentContractServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtProgressPaymentContractServiceImpl.java index 62c084560..c19724f86 100644 --- a/src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtProgressPaymentContractServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtProgressPaymentContractServiceImpl.java @@ -1,6 +1,7 @@ package com.zhgd.xmgl.modules.rt.service.impl; import com.zhgd.xmgl.modules.rt.entity.RtProgressPaymentContract; +import com.zhgd.xmgl.modules.rt.entity.vo.CountRtProgressPaymentContractVo; import com.zhgd.xmgl.modules.rt.mapper.RtProgressPaymentContractMapper; import com.zhgd.xmgl.modules.rt.service.IRtProgressPaymentContractService; import org.springframework.stereotype.Service; @@ -66,4 +67,9 @@ public class RtProgressPaymentContractServiceImpl extends ServiceImpl map) { + return baseMapper.countRtProgressPaymentContract(map); + } } diff --git a/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java b/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java index e41a1d6a1..729ebee94 100644 --- a/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java +++ b/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java @@ -284,6 +284,10 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter { .antMatchers("/xmgl/workerInfo/getWorkerStatisticsCount").permitAll() .antMatchers("/xmgl/environmentDev/updateEnvironmentDevSprayStatus").permitAll() .antMatchers("/xmgl/aiAnalyseHardWareAlarmRecord/violatorListSort").permitAll() + .antMatchers("/xmgl/rtMaterialOrder/page").permitAll() + .antMatchers("/xmgl/rtDesignChangeContactSheet/page").permitAll() + .antMatchers("/xmgl/rtProgressPaymentContract/page").permitAll() + .antMatchers("/xmgl/rtProgressPaymentContract/countRtProgressPaymentContract").permitAll() .antMatchers(HttpMethod.OPTIONS, "/**").anonymous() .anyRequest().authenticated() // 剩下所有的验证都需要验证 .and()