admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug修改

Browse Source
This commit is contained in:
guo 2024-01-24 09:39:55 +08:00
parent f995385b49
commit ad13f5e8af
6 changed files with 49 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/zhgd/xmgl/modules/concretemixstation/controller/ConcreteMixStationDataController.java
View File

@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.zhgd.jeecg.common.api.vo.Result;
import com.zhgd.xmgl.base.entity.vo.TrendVo;
import com.zhgd.xmgl.modules.concretemixstation.entity.ConcreteMixStationData;
import com.zhgd.xmgl.modules.concretemixstation.entity.vo.CountConcreteMixStationDataVo;
import com.zhgd.xmgl.modules.concretemixstation.service.IConcreteMixStationDataService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@ -141,4 +142,13 @@ public class ConcreteMixStationDataController {
public Result<List<TrendVo>> countConcreteMixStationDataTrend(@ApiIgnore @RequestBody HashMap<String, Object> paramMap) {
return Result.success(concreteMixStationDataService.countConcreteMixStationDataTrend(paramMap));
}
@ApiOperation(value = "统计混凝土拌合站生产数据（实时监测）", notes = "统计混凝土拌合站生产数据（实时监测）", httpMethod = "POST")
@ApiImplicitParams({
@ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"),
})
@PostMapping(value = "/countConcreteMixStationData")
public Result<CountConcreteMixStationDataVo> countConcreteMixStationData(@ApiIgnore @RequestBody HashMap<String, Object> paramMap) {
return Result.success(concreteMixStationDataService.countConcreteMixStationData(paramMap));
}
}

17
src/main/java/com/zhgd/xmgl/modules/concretemixstation/entity/vo/CountConcreteMixStationDataVo.java Normal file
View File

@ -0,0 +1,17 @@
package com.zhgd.xmgl.modules.concretemixstation.entity.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class CountConcreteMixStationDataVo {
@ApiModelProperty(value = "日产量")
private java.lang.Double dailyOutput;
@ApiModelProperty(value = "总产量")
private java.lang.Double totalOutput;
@ApiModelProperty(value = "日盘数")
private java.lang.Double dayNumber;
@ApiModelProperty(value = "总盘数")
private java.lang.Double totalNumber;
}

3
src/main/java/com/zhgd/xmgl/modules/concretemixstation/mapper/ConcreteMixStationDataMapper.java
View File

@ -2,6 +2,7 @@ package com.zhgd.xmgl.modules.concretemixstation.mapper;
import com.zhgd.xmgl.base.entity.vo.TrendOneVo;
import com.zhgd.xmgl.modules.concretemixstation.entity.ConcreteMixStationData;
import com.zhgd.xmgl.modules.concretemixstation.entity.vo.CountConcreteMixStationDataVo;
import org.apache.ibatis.annotations.Mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@ -18,4 +19,6 @@ import java.util.List;
public interface ConcreteMixStationDataMapper extends BaseMapper<ConcreteMixStationData> {
List<TrendOneVo> countConcreteMixStationDataTrend(HashMap<String, Object> paramMap);
CountConcreteMixStationDataVo countConcreteMixStationData(HashMap<String, Object> paramMap);
}

10
src/main/java/com/zhgd/xmgl/modules/concretemixstation/mapper/xml/ConcreteMixStationDataMapper.xml
View File

@ -29,4 +29,14 @@
group by dev_sn, date_format(discharge_time, '%Y-%m-%d')
</if>
</select>
<select id="countConcreteMixStationData"
resultType="com.zhgd.xmgl.modules.concretemixstation.entity.vo.CountConcreteMixStationDataVo">
select *
from concrete_mix_station_data
where 1=1
<if test="projectSn != null and projectSn != ''">
and project_sn = #{projectSn}
</if>
</select>
</mapper>

3
src/main/java/com/zhgd/xmgl/modules/concretemixstation/service/IConcreteMixStationDataService.java
View File

@ -4,6 +4,7 @@ import com.zhgd.xmgl.base.entity.vo.TrendVo;
import com.zhgd.xmgl.modules.concretemixstation.entity.ConcreteMixStationData;
import com.baomidou.mybatisplus.extension.service.IService;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.zhgd.xmgl.modules.concretemixstation.entity.vo.CountConcreteMixStationDataVo;
import java.util.HashMap;
import java.util.List;
@ -25,4 +26,6 @@ public interface IConcreteMixStationDataService extends IService<ConcreteMixStat
void edit(ConcreteMixStationData concreteMixStationData);
List<TrendVo> countConcreteMixStationDataTrend(HashMap<String, Object> paramMap);
CountConcreteMixStationDataVo countConcreteMixStationData(HashMap<String, Object> paramMap);
}

6
src/main/java/com/zhgd/xmgl/modules/concretemixstation/service/impl/ConcreteMixStationDataServiceImpl.java
View File

@ -10,6 +10,7 @@ import com.zhgd.xmgl.base.entity.vo.TrendOneVo;
import com.zhgd.xmgl.base.entity.vo.TrendVo;
import com.zhgd.xmgl.modules.concretemixstation.entity.ConcreteMixStationData;
import com.zhgd.xmgl.modules.concretemixstation.entity.ConcreteMixStationDev;
import com.zhgd.xmgl.modules.concretemixstation.entity.vo.CountConcreteMixStationDataVo;
import com.zhgd.xmgl.modules.concretemixstation.mapper.ConcreteMixStationDataMapper;
import com.zhgd.xmgl.modules.concretemixstation.mapper.ConcreteMixStationDevMapper;
import com.zhgd.xmgl.modules.concretemixstation.service.IConcreteMixStationDataService;
@ -100,4 +101,9 @@ public class ConcreteMixStationDataServiceImpl extends ServiceImpl<ConcreteMixSt
return null;
}
}
@Override
public CountConcreteMixStationDataVo countConcreteMixStationData(HashMap<String, Object> paramMap) {
return baseMapper.countConcreteMixStationData(paramMap);
}
}