diff --git a/jwtech-admin/src/main/resources/application-druid-test.yml b/jwtech-admin/src/main/resources/application-druid-test.yml index d0a12c80..e56b2981 100644 --- a/jwtech-admin/src/main/resources/application-druid-test.yml +++ b/jwtech-admin/src/main/resources/application-druid-test.yml @@ -15,7 +15,7 @@ spring: # url: jdbc:mysql://47.93.254.187:3306/shui_pro?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&allowMultiQueries=true # username: shuili # password: wuxukgdvJ1!@! - url: jdbc:mysql://47.93.254.187:3306/shui_pro?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&allowMultiQueries=true + url: jdbc:mysql://47.93.254.187:3306/shui_pro?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8&allowMultiQueries=true username: shuili password: wuxukgdvJ1!@! # 从库数据源 diff --git a/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiPayAmountInfoController.java b/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiPayAmountInfoController.java new file mode 100644 index 00000000..8ea4aab2 --- /dev/null +++ b/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiPayAmountInfoController.java @@ -0,0 +1,114 @@ +package com.kms.build.controller; + +import java.util.Arrays; +import java.util.List; + +import com.jianwei.common.core.controller.BaseController; +import com.jianwei.common.core.domain.SearchParam; +import com.jianwei.common.utils.poi.ExcelUtil; +import com.kms.common.utils.BaseEntityUtils; + + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jianwei.common.mybaitsplus.BeanToWrapper; + +import com.jianwei.common.annotation.Log; +import com.jianwei.common.core.domain.AjaxResult; +import com.jianwei.common.enums.BusinessType; +import com.kms.build.domain.BsSgcJsjdBuiPayAmountInfo; +import com.kms.build.service.BsSgcJsjdBuiPayAmountInfoService; + + +/** + * 资金支付-立项Controller + * + * @author kms + * @date 2025-04-09 + */ +@RestController +@RequestMapping("/build/payInfo") +@Api(tags = "资金支付-立项") +public class BsSgcJsjdBuiPayAmountInfoController extends BaseController +{ + @Autowired + private BsSgcJsjdBuiPayAmountInfoService bsSgcJsjdBuiPayAmountInfoService; + + /** + * 查询资金支付-立项列表 + */ + @PostMapping("/list") + @ApiOperation("资金支付-立项列表") + public IPage list(@RequestBody SearchParam sp) + { + return bsSgcJsjdBuiPayAmountInfoService.selectPage(sp); + } + + /** + * 导出资金支付-立项列表 + */ + @Log(title = "资金支付-立项导出", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ApiOperation("资金支付-立项导出") + public AjaxResult export(@RequestBody BsSgcJsjdBuiPayAmountInfo bsSgcJsjdBuiPayAmountInfo) + { + List list = bsSgcJsjdBuiPayAmountInfoService.listByIds(bsSgcJsjdBuiPayAmountInfo.getIds()); + ExcelUtil util = new ExcelUtil<>(BsSgcJsjdBuiPayAmountInfo.class); + return util.exportExcel(list, "payInfo"); + } + + /** + * 获取资金支付-立项详细信息 + */ + @ApiOperation(" 资金支付-立项详情") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") String id) + { + return AjaxResult.success(bsSgcJsjdBuiPayAmountInfoService.getById(id)); + } + + /** + * 新增资金支付-立项 + */ + @Log(title = "资金支付-立项新增", businessType = BusinessType.INSERT) + @PostMapping + @ApiOperation("资金支付-立项新增") + public AjaxResult add(@RequestBody BsSgcJsjdBuiPayAmountInfo bsSgcJsjdBuiPayAmountInfo) + { + BaseEntityUtils.preInsert(bsSgcJsjdBuiPayAmountInfo); + return toAjax(bsSgcJsjdBuiPayAmountInfoService.save(bsSgcJsjdBuiPayAmountInfo)); + } + + /** + * 修改资金支付-立项 + */ + @ApiOperation("资金支付-立项修改") + @Log(title = "资金支付-立项修改", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody BsSgcJsjdBuiPayAmountInfo bsSgcJsjdBuiPayAmountInfo) + { + return toAjax(bsSgcJsjdBuiPayAmountInfoService.updateById(bsSgcJsjdBuiPayAmountInfo)); + } + + /** + * 删除资金支付-立项 + */ + @ApiOperation("资金支付-立项删除") + @Log(title = "资金支付-立项删除", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable String[] ids) + { + return toAjax(bsSgcJsjdBuiPayAmountInfoService.removeByIds(Arrays.asList(ids))); + } +} diff --git a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiPayAmountInfo.java b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiPayAmountInfo.java new file mode 100644 index 00000000..f68662b0 --- /dev/null +++ b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiPayAmountInfo.java @@ -0,0 +1,87 @@ +package com.kms.build.domain; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.jianwei.common.annotation.Excel; + +import com.baomidou.mybatisplus.annotation.TableName; + + +import com.jianwei.common.core.domain.BaseEntity; + +/** + * 资金支付-立项对象 bs_sgc_jsjd_bui_pay_amount_info + * + * @author kms + * @date 2025-04-09 + */ +@TableName("bs_sgc_jsjd_bui_pay_amount_info") +@Data +@ApiModel("资金支付-立项") +public class BsSgcJsjdBuiPayAmountInfo extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 所属项目 */ + @Excel(name = "所属项目") + @ApiModelProperty("所属项目") + private String projectName; + + /** 项目编码 */ + @Excel(name = "项目编码") + @ApiModelProperty("项目编码") + private String proCode; + + /** 项目编号 */ + @Excel(name = "项目编号") + @ApiModelProperty("项目编号") + private String proNo; + + /** 支付期数 */ + @Excel(name = "支付期数") + @ApiModelProperty("支付期数") + private String payPeriods; + + /** 支付日期 */ + @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8") + @Excel(name = "支付日期", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("支付日期") + private Date payDate; + + /** 本期应付金额 */ + @Excel(name = "本期应付金额") + @ApiModelProperty("本期应付金额") + private String payAmount; + + /** 本期实付金额 */ + @Excel(name = "本期实付金额") + @ApiModelProperty("本期实付金额") + private String payActual; + + /** 本期暂扣款 */ + @Excel(name = "本期暂扣款") + @ApiModelProperty("本期暂扣款") + private String payDeduction; + + /** 状态（0:待审核，1：已审核，2：审核通过 */ + @Excel(name = "状态", readConverterExp = "状态（0:待审核，1：已审核，2：审核通过") + @ApiModelProperty("状态") + private String status; + + /** 创建人 */ + @Excel(name = "创建人") + @ApiModelProperty("创建人") + private String createUid; + private String opinion; + + /** 更新人 */ + @Excel(name = "更新人") + @ApiModelProperty("更新人") + private String updateUid; + +} diff --git a/jwtech-system/src/main/java/com/kms/build/mapper/BsSgcJsjdBuiPayAmountInfoMapper.java b/jwtech-system/src/main/java/com/kms/build/mapper/BsSgcJsjdBuiPayAmountInfoMapper.java new file mode 100644 index 00000000..9caf8c26 --- /dev/null +++ b/jwtech-system/src/main/java/com/kms/build/mapper/BsSgcJsjdBuiPayAmountInfoMapper.java @@ -0,0 +1,16 @@ +package com.kms.build.mapper; + +import org.springframework.stereotype.Repository; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.kms.build.domain.BsSgcJsjdBuiPayAmountInfo; + +/** + * 资金支付-立项Mapper接口 + * + * @author kms + * @date 2025-04-09 + */ +@Repository +public interface BsSgcJsjdBuiPayAmountInfoMapper extends BaseMapper { + +} diff --git a/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiPayAmountInfoService.java b/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiPayAmountInfoService.java new file mode 100644 index 00000000..571a4c2e --- /dev/null +++ b/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiPayAmountInfoService.java @@ -0,0 +1,17 @@ +package com.kms.build.service; + +import org.springframework.stereotype.Service; +import com.jianwei.common.core.service.BaseService; +import com.kms.build.mapper.BsSgcJsjdBuiPayAmountInfoMapper; +import com.kms.build.domain.BsSgcJsjdBuiPayAmountInfo; + +/** + * 资金支付-立项Service接口 + * + * @author kms + * @date 2025-04-09 + */ +@Service +public class BsSgcJsjdBuiPayAmountInfoService extends BaseService{ + +} diff --git a/jwtech-system/src/main/java/com/kms/site/controller/BsSgcAirQualityMonitoringController.java b/jwtech-system/src/main/java/com/kms/site/controller/BsSgcAirQualityMonitoringController.java index 8c3ae253..0afc610c 100644 --- a/jwtech-system/src/main/java/com/kms/site/controller/BsSgcAirQualityMonitoringController.java +++ b/jwtech-system/src/main/java/com/kms/site/controller/BsSgcAirQualityMonitoringController.java @@ -12,14 +12,7 @@ import com.kms.common.utils.BaseEntityUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jianwei.common.mybaitsplus.BeanToWrapper; @@ -78,6 +71,14 @@ public class BsSgcAirQualityMonitoringController extends BaseController return AjaxResult.success(bsSgcAirQualityMonitoringService.getById(id)); } + @PostMapping("/resultStaticList") + @ApiOperation("空气实时状态统计信息新增") + public AjaxResult resultStaticList(@RequestParam(required = false)String proNo, + @RequestParam(required = false)String type) + { + return AjaxResult.success(bsSgcAirQualityMonitoringService.resultStaticList(proNo,type)); + } + /** * 新增工区空气质量实时监测信息 */ diff --git a/jwtech-system/src/main/java/com/kms/site/controller/BsSgcGroutingStateStatisticsController.java b/jwtech-system/src/main/java/com/kms/site/controller/BsSgcGroutingStateStatisticsController.java index 88cc8590..ba9f27c6 100644 --- a/jwtech-system/src/main/java/com/kms/site/controller/BsSgcGroutingStateStatisticsController.java +++ b/jwtech-system/src/main/java/com/kms/site/controller/BsSgcGroutingStateStatisticsController.java @@ -12,14 +12,7 @@ import com.kms.common.utils.BaseEntityUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jianwei.common.mybaitsplus.BeanToWrapper; @@ -90,6 +83,14 @@ public class BsSgcGroutingStateStatisticsController extends BaseController return toAjax(bsSgcGroutingStateStatisticsService.save(bsSgcGroutingStateStatistics)); } + @PostMapping("/resultStaticList") + @ApiOperation("灌浆实时状态统计信息新增") + public AjaxResult resultStaticList(@RequestParam(required = false)String proNo, + @RequestParam(required = false)String type) + { + return AjaxResult.success(bsSgcGroutingStateStatisticsService.resultStaticList(proNo,type)); + } + /** * 修改灌浆实时状态统计信息 */ diff --git a/jwtech-system/src/main/java/com/kms/site/controller/BsSgcNoiseMonitoringController.java b/jwtech-system/src/main/java/com/kms/site/controller/BsSgcNoiseMonitoringController.java index 82596e22..656c0f4d 100644 --- a/jwtech-system/src/main/java/com/kms/site/controller/BsSgcNoiseMonitoringController.java +++ b/jwtech-system/src/main/java/com/kms/site/controller/BsSgcNoiseMonitoringController.java @@ -12,14 +12,7 @@ import com.kms.common.utils.BaseEntityUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jianwei.common.mybaitsplus.BeanToWrapper; @@ -100,7 +93,13 @@ public class BsSgcNoiseMonitoringController extends BaseController { return toAjax(bsSgcNoiseMonitoringService.updateById(bsSgcNoiseMonitoring)); } - + @PostMapping("/resultStaticList") + @ApiOperation("噪声实时状态统计信息新增") + public AjaxResult resultStaticList(@RequestParam(required = false)String proNo, + @RequestParam(required = false)String type) + { + return AjaxResult.success(bsSgcNoiseMonitoringService.resultStaticList(proNo,type)); + } /** * 删除工区噪声监测 */ diff --git a/jwtech-system/src/main/java/com/kms/site/domain/BsSgcAirQualityMonitoring.java b/jwtech-system/src/main/java/com/kms/site/domain/BsSgcAirQualityMonitoring.java index 6aa71023..b497e864 100644 --- a/jwtech-system/src/main/java/com/kms/site/domain/BsSgcAirQualityMonitoring.java +++ b/jwtech-system/src/main/java/com/kms/site/domain/BsSgcAirQualityMonitoring.java @@ -1,6 +1,8 @@ package com.kms.site.domain; import java.util.Date; + +import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -46,21 +48,25 @@ public class BsSgcAirQualityMonitoring extends BaseEntity /** PM2.5监测值 */ @Excel(name = "PM2.5监测值") @ApiModelProperty("PM2.5监测值") + @TableField("monitored_2") private String monitored2; /** PM2.5预警值 */ @Excel(name = "PM2.5预警值") @ApiModelProperty("PM2.5预警值") + @TableField("forewarning_2") private String forewarning2; /** PM10监测值 */ @Excel(name = "PM10监测值") @ApiModelProperty("PM10监测值") + @TableField("monitored_10") private String monitored10; /** PM10预警值 */ @Excel(name = "PM10预警值") @ApiModelProperty("PM10预警值") + @TableField("forewarning_10") private String forewarning10; /** 是否超标 */ diff --git a/jwtech-system/src/main/java/com/kms/site/domain/BsSgcGroutingStateStatistics.java b/jwtech-system/src/main/java/com/kms/site/domain/BsSgcGroutingStateStatistics.java index 19955ad7..d412843a 100644 --- a/jwtech-system/src/main/java/com/kms/site/domain/BsSgcGroutingStateStatistics.java +++ b/jwtech-system/src/main/java/com/kms/site/domain/BsSgcGroutingStateStatistics.java @@ -63,4 +63,11 @@ public class BsSgcGroutingStateStatistics extends BaseEntity @ApiModelProperty("是否超标") private String updateUid; + @ApiModelProperty("所在工区") + private String workArea; + @ApiModelProperty("工作时间") + private String timeRange; + + private String proNo; + } diff --git a/jwtech-system/src/main/java/com/kms/site/mapper/BsSgcAirQualityMonitoringMapper.java b/jwtech-system/src/main/java/com/kms/site/mapper/BsSgcAirQualityMonitoringMapper.java index f7dee3e5..08198aa9 100644 --- a/jwtech-system/src/main/java/com/kms/site/mapper/BsSgcAirQualityMonitoringMapper.java +++ b/jwtech-system/src/main/java/com/kms/site/mapper/BsSgcAirQualityMonitoringMapper.java @@ -1,9 +1,14 @@ package com.kms.site.mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import org.springframework.stereotype.Repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.site.domain.BsSgcAirQualityMonitoring; +import java.util.HashMap; +import java.util.List; + /** * 工区空气质量实时监测信息Mapper接口 * @@ -12,5 +17,16 @@ import com.kms.site.domain.BsSgcAirQualityMonitoring; */ @Repository public interface BsSgcAirQualityMonitoringMapper extends BaseMapper { + @Select(" select t.work_area,IFNULL(sum(IF(t.out_of_standard,1,1)),0)outCount,IFNULL(sum(IF(t.out_of_standard,0,1)),0)okCount from bs_sgc_air_quality_monitoring t\n" + + "where t.pro_no= #{proNo} \n" + + " group by t.work_area ") + List typeStatisticsWorkArea(@Param("proNo") String proNo, @Param("type") String type); + + @Select(" select DATE_FORMAT(t.date,'%Y-%m-%d') 'date',IFNULL(sum(IF(t.out_of_standard,1,1)),0)outCount,IFNULL(sum(IF(t.out_of_standard,0,1)),0)okCount from bs_sgc_air_quality_monitoring t\n" + + "where t.pro_no= #{proNo} \n" + + " group by DATE_FORMAT(t.date,'%Y-%m-%d') \n" + + "order by t.date asc\n" + + "\n ") + List typeStatisticsWorkDate(@Param("proNo") String proNo, @Param("type") String type); } diff --git a/jwtech-system/src/main/java/com/kms/site/mapper/BsSgcGroutingStateStatisticsMapper.java b/jwtech-system/src/main/java/com/kms/site/mapper/BsSgcGroutingStateStatisticsMapper.java index 31da51e9..baf235b9 100644 --- a/jwtech-system/src/main/java/com/kms/site/mapper/BsSgcGroutingStateStatisticsMapper.java +++ b/jwtech-system/src/main/java/com/kms/site/mapper/BsSgcGroutingStateStatisticsMapper.java @@ -1,9 +1,14 @@ package com.kms.site.mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import org.springframework.stereotype.Repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.site.domain.BsSgcGroutingStateStatistics; +import java.util.HashMap; +import java.util.List; + /** * 灌浆实时状态统计信息Mapper接口 * @@ -12,5 +17,8 @@ import com.kms.site.domain.BsSgcGroutingStateStatistics; */ @Repository public interface BsSgcGroutingStateStatisticsMapper extends BaseMapper { - + @Select(" SELECT ${type},COUNT(*) count from bs_sgc_grouting_state_statistics \n" + + " WHERE pro_no = #{proNo}\n" + + " group by ${type} ") + List typeStatistics(@Param("proNo") String proNo, @Param("type") String type); } diff --git a/jwtech-system/src/main/java/com/kms/site/mapper/BsSgcNoiseMonitoringMapper.java b/jwtech-system/src/main/java/com/kms/site/mapper/BsSgcNoiseMonitoringMapper.java index f8e5a295..1580367a 100644 --- a/jwtech-system/src/main/java/com/kms/site/mapper/BsSgcNoiseMonitoringMapper.java +++ b/jwtech-system/src/main/java/com/kms/site/mapper/BsSgcNoiseMonitoringMapper.java @@ -1,9 +1,14 @@ package com.kms.site.mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import org.springframework.stereotype.Repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.site.domain.BsSgcNoiseMonitoring; +import java.util.HashMap; +import java.util.List; + /** * 工区噪声监测Mapper接口 * @@ -12,5 +17,16 @@ import com.kms.site.domain.BsSgcNoiseMonitoring; */ @Repository public interface BsSgcNoiseMonitoringMapper extends BaseMapper { + @Select(" select t.work_area,IFNULL(sum(IF(t.out_of_standard,1,1)),0)outCount,IFNULL(sum(IF(t.out_of_standard,0,1)),0)okCount from bs_sgc_noise_monitoring t\n" + + "where t.pro_no= #{proNo} \n" + + " group by t.work_area ") + List typeStatisticsWorkArea(@Param("proNo") String proNo, @Param("type") String type); + + @Select(" select DATE_FORMAT(t.date,'%Y-%m-%d') 'date',IFNULL(sum(IF(t.out_of_standard,1,1)),0)outCount,IFNULL(sum(IF(t.out_of_standard,0,1)),0)okCount from bs_sgc_noise_monitoring t\n" + + "where t.pro_no= #{proNo} \n" + + " group by DATE_FORMAT(t.date,'%Y-%m-%d')\n" + + "order by t.date asc\n" + + "\n ") + List typeStatisticsWorkDate(@Param("proNo") String proNo, @Param("type") String type); } diff --git a/jwtech-system/src/main/java/com/kms/site/service/BsSgcAirQualityMonitoringService.java b/jwtech-system/src/main/java/com/kms/site/service/BsSgcAirQualityMonitoringService.java index 1e3639a7..0784f844 100644 --- a/jwtech-system/src/main/java/com/kms/site/service/BsSgcAirQualityMonitoringService.java +++ b/jwtech-system/src/main/java/com/kms/site/service/BsSgcAirQualityMonitoringService.java @@ -1,10 +1,15 @@ package com.kms.site.service; +import com.kms.site.mapper.BsSgcNoiseMonitoringMapper; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.jianwei.common.core.service.BaseService; import com.kms.site.mapper.BsSgcAirQualityMonitoringMapper; import com.kms.site.domain.BsSgcAirQualityMonitoring; +import java.util.HashMap; +import java.util.List; + /** * 工区空气质量实时监测信息Service接口 * @@ -13,5 +18,20 @@ import com.kms.site.domain.BsSgcAirQualityMonitoring; */ @Service public class BsSgcAirQualityMonitoringService extends BaseService{ + @Autowired + BsSgcAirQualityMonitoringMapper bsSgcAirQualityMonitoringMapper; + + private static final String qType = "date,work_area"; + + public List resultStaticList(String proNo, String type) { + if(qType.indexOf(type)<=-1){ + throw new RuntimeException(type+"参数异常"); + } + if(type.equals("work_area")){ + return bsSgcAirQualityMonitoringMapper.typeStatisticsWorkArea(proNo, type); + }else{ + return bsSgcAirQualityMonitoringMapper.typeStatisticsWorkDate(proNo, type); + } + } } diff --git a/jwtech-system/src/main/java/com/kms/site/service/BsSgcGroutingStateStatisticsService.java b/jwtech-system/src/main/java/com/kms/site/service/BsSgcGroutingStateStatisticsService.java index 91f6570b..010e0be3 100644 --- a/jwtech-system/src/main/java/com/kms/site/service/BsSgcGroutingStateStatisticsService.java +++ b/jwtech-system/src/main/java/com/kms/site/service/BsSgcGroutingStateStatisticsService.java @@ -1,10 +1,15 @@ package com.kms.site.service; +import com.kms.site.mapper.BsSgcProjectPersonnelMapper; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.jianwei.common.core.service.BaseService; import com.kms.site.mapper.BsSgcGroutingStateStatisticsMapper; import com.kms.site.domain.BsSgcGroutingStateStatistics; +import java.util.HashMap; +import java.util.List; + /** * 灌浆实时状态统计信息Service接口 * @@ -14,4 +19,15 @@ import com.kms.site.domain.BsSgcGroutingStateStatistics; @Service public class BsSgcGroutingStateStatisticsService extends BaseService{ + @Autowired + BsSgcGroutingStateStatisticsMapper bsSgcGroutingStateStatisticsMapper; + + private static final String qType = "time_range,work_area"; + + public List resultStaticList(String proNo, String type) { + if(qType.indexOf(type)<=-1){ + throw new RuntimeException(type+"参数异常"); + } + return bsSgcGroutingStateStatisticsMapper.typeStatistics(proNo, type); + } } diff --git a/jwtech-system/src/main/java/com/kms/site/service/BsSgcNoiseMonitoringService.java b/jwtech-system/src/main/java/com/kms/site/service/BsSgcNoiseMonitoringService.java index 36feb2d5..45d4c7d8 100644 --- a/jwtech-system/src/main/java/com/kms/site/service/BsSgcNoiseMonitoringService.java +++ b/jwtech-system/src/main/java/com/kms/site/service/BsSgcNoiseMonitoringService.java @@ -1,10 +1,15 @@ package com.kms.site.service; +import com.kms.site.mapper.BsSgcGroutingStateStatisticsMapper; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.jianwei.common.core.service.BaseService; import com.kms.site.mapper.BsSgcNoiseMonitoringMapper; import com.kms.site.domain.BsSgcNoiseMonitoring; +import java.util.HashMap; +import java.util.List; + /** * 工区噪声监测Service接口 * @@ -13,5 +18,20 @@ import com.kms.site.domain.BsSgcNoiseMonitoring; */ @Service public class BsSgcNoiseMonitoringService extends BaseService{ + @Autowired + BsSgcNoiseMonitoringMapper bsSgcNoiseMonitoringMapper; + + private static final String qType = "date,work_area"; + + public List resultStaticList(String proNo, String type) { + if(qType.indexOf(type)<=-1){ + throw new RuntimeException(type+"参数异常"); + } + if(type.equals("work_area")){ + return bsSgcNoiseMonitoringMapper.typeStatisticsWorkArea(proNo, type); + }else{ + return bsSgcNoiseMonitoringMapper.typeStatisticsWorkDate(proNo, type); + } + } } diff --git a/jwtech-system/src/main/java/com/kms/site/service/BsSgcProjectPersonnelService.java b/jwtech-system/src/main/java/com/kms/site/service/BsSgcProjectPersonnelService.java index 32299723..d546a234 100644 --- a/jwtech-system/src/main/java/com/kms/site/service/BsSgcProjectPersonnelService.java +++ b/jwtech-system/src/main/java/com/kms/site/service/BsSgcProjectPersonnelService.java @@ -25,13 +25,19 @@ public class BsSgcProjectPersonnelService extends BaseService typeStatistics(String proNo, String type) { if(qType.indexOf(type)<=-1){ - throw new RuntimeException("参数异常"); + throw new RuntimeException(type+"参数异常"); } + /* if("qualificationCertificate".equals(type)){ + type="qualification_certificate"; + } + if("enterArena".equals(type)){ + type="enter_arena"; + }*/ return bsSgcProjectPersonnelMapper.typeStatistics(proNo,type); } }