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

bug修复

Browse Source
This commit is contained in:
guo 2023-12-26 18:50:19 +08:00
parent f56f59c0a1
commit dde4b73111
10 changed files with 108 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/zhgd/xmgl/modules/rt/controller/RtToolController.java
View File

@ -3,6 +3,7 @@ package com.zhgd.xmgl.modules.rt.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.gexin.fastjson.JSON;
import com.zhgd.jeecg.common.api.vo.Result;
import com.zhgd.xmgl.base.entity.vo.FlexibleBigScreenVo;
import com.zhgd.xmgl.modules.rt.entity.RtTool;
import com.zhgd.xmgl.modules.rt.entity.vo.CountRtToolVo;
import com.zhgd.xmgl.modules.rt.service.IRtToolService;
@ -152,5 +153,15 @@ public class RtToolController {
return Result.success(rtToolService.countRtTool(paramMap));
}
@ApiOperation(value = "统计榕图-工器具信息动态", notes = "统计榕图-工器具信息动态", httpMethod = "POST")
@ApiImplicitParams({
@ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"),
@ApiImplicitParam(name = "type", value = "1过期7天", paramType = "body", required = true, dataType = "String"),
})
@PostMapping(value = "/countRtToolTrend")
public Result<FlexibleBigScreenVo> countRtToolTrend(@ApiIgnore @RequestBody HashMap<String, Object> paramMap) {
return Result.success(rtToolService.countRtToolTrend(paramMap));
}
}

36
src/main/java/com/zhgd/xmgl/modules/rt/entity/RtDesignChangeContactSheet.java
View File

@ -56,23 +56,25 @@ public class RtDesignChangeContactSheet implements Serializable {
@ApiModelProperty(value = "负责人")
private java.lang.String principal;
/**
* 提出单位
*/
@Excel(name = "提出单位", width = 15)
@ApiModelProperty(value = "提出单位")
private java.lang.String proposingUnit;
/**
* 提出变更日期
*/
@Excel(name = "提出变更日期", width = 15)
@ApiModelProperty(value = "提出变更日期")
private java.lang.String proposedChangeDate;
/**
* 业主项目部审核意见
*/
@Excel(name = "业主项目部审核意见", width = 15)
@ApiModelProperty(value = "业主项目部审核意见")
private java.lang.String reviewOpinion;
* 提出单位
*/
@Excel(name = "提出单位", width = 15)
@ApiModelProperty(value = "提出单位")
private java.lang.String proposingUnit;
/**
* 提出变更日期
*/
@Excel(name = "提出变更日期", width = 15)
@ApiModelProperty(value = "提出变更日期")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date proposedChangeDate;
/**
* 业主项目部审核意见
*/
@Excel(name = "业主项目部审核意见", width = 15)
@ApiModelProperty(value = "业主项目部审核意见")
private java.lang.String reviewOpinion;
/**
* 项目经理
*/

6
src/main/java/com/zhgd/xmgl/modules/rt/entity/vo/CountRtToolVo.java
View File

@ -7,8 +7,10 @@ import lombok.Data;
public class CountRtToolVo {
@ApiModelProperty("工器具总数")
private Integer count;
@ApiModelProperty("今日在场总数（当日所有状态为在场的工器具）")
private Integer presentCountToday;
@ApiModelProperty("当日入库量")
private Integer entryCount;
private Integer entryCountToday;
@ApiModelProperty("当日出库量")
private Integer exitCount;
private Integer exitCountToday;
}

3
src/main/java/com/zhgd/xmgl/modules/rt/mapper/RtToolMapper.java
View File

@ -6,6 +6,7 @@ import org.apache.ibatis.annotations.Mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import java.util.HashMap;
import java.util.List;
/**
* @Description: 榕图-工器具
@ -17,4 +18,6 @@ import java.util.HashMap;
public interface RtToolMapper extends BaseMapper<RtTool> {
CountRtToolVo countRtTool(HashMap<String, Object> paramMap);
List<HashMap<String, Object>> countRtToolTrend(HashMap<String, Object> paramMap);
}

1
src/main/java/com/zhgd/xmgl/modules/rt/mapper/xml/RtRiskSecurityLibraryTypeConcreteMapper.xml
View File

@ -17,7 +17,6 @@
SELECT a.*
from rt_risk_security_library_type_concrete a
WHERE a.rt_risk_security_library_type_id=#{rtRiskSecurityLibraryTypeId}
ORDER BY a.order_sort
</select>
<select id="selectProjectDangerItemList"
resultType="com.zhgd.xmgl.modules.rt.entity.RtRiskSecurityLibraryTypeConcrete">

43
src/main/java/com/zhgd/xmgl/modules/rt/mapper/xml/RtToolMapper.xml
View File

@ -3,9 +3,48 @@
<mapper namespace="com.zhgd.xmgl.modules.rt.mapper.RtToolMapper">
<select id="countRtTool" resultType="com.zhgd.xmgl.modules.rt.entity.vo.CountRtToolVo">
select count(*) count,
ifnull(sum(if(tool_status=1 and entry_time>=current_date,1,0)),0) entryCount,
ifnull(sum(if(tool_status=2 and exit_time>=current_date,1,0)),0) exitCount
ifnull(sum(if(tool_status=1,1,0)),0) presentCountToday,
ifnull(sum(if( entry_time>=current_date,1,0)),0) entryCountToday,
ifnull(sum(if( exit_time>=current_date,1,0)),0) exitCountToday
from rt_tool
where project_sn=#{projectSn}
</select>
<select id="countRtToolTrend" resultType="java.util.HashMap">
select t1.day,t1.当日入库量,t2.当日出库量 from (
select date_format(entry_time, '%Y-%m-%d') day, count(*) 当日入库量
from rt_tool
where project_sn = #{projectSn}
<if test="type == '1'.toString()">
and entry_time >= date_sub(current_date,interval 8 day)
group by day
</if>
)t1 left join (
select date_format(exit_time, '%Y-%m-%d') day, count(*) 当日出库量
from rt_tool
where project_sn = #{projectSn}
<if test="type == '1'.toString()">
and exit_time >= date_sub(current_date,interval 8 day)
group by day
</if>
)t2 on t1.day=t2.day
union
select t1.day,t1.当日入库量,t2.当日出库量 from (
select date_format(entry_time, '%Y-%m-%d') day, count(*) 当日入库量
from rt_tool
where project_sn = #{projectSn}
<if test="type == '1'.toString()">
and entry_time >= date_sub(current_date,interval 8 day)
group by day
</if>
)t1 right join (
select date_format(exit_time, '%Y-%m-%d') day, count(*) 当日出库量
from rt_tool
where project_sn = #{projectSn}
<if test="type == '1'.toString()">
and exit_time >= date_sub(current_date,interval 8 day)
group by day
</if>
)t2 on t1.day=t2.day
</select>
</mapper>

3
src/main/java/com/zhgd/xmgl/modules/rt/service/IRtToolService.java
View File

@ -1,5 +1,6 @@
package com.zhgd.xmgl.modules.rt.service;
import com.zhgd.xmgl.base.entity.vo.FlexibleBigScreenVo;
import com.zhgd.xmgl.modules.rt.entity.RtTool;
import com.baomidou.mybatisplus.extension.service.IService;
import com.baomidou.mybatisplus.core.metadata.IPage;
@ -27,4 +28,6 @@ public interface IRtToolService extends IService<RtTool> {
void updateRtToolStatus(RtTool rtTool);
CountRtToolVo countRtTool(HashMap<String, Object> paramMap);
FlexibleBigScreenVo countRtToolTrend(HashMap<String, Object> paramMap);
}

1
src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtRiskInventoryTypeServiceImpl.java
View File

@ -58,7 +58,6 @@ public class RtRiskInventoryTypeServiceImpl extends ServiceImpl<RtRiskInventoryT
private QueryWrapper<RtRiskInventoryType> getQueryWrapper(HashMap<String, Object> paramMap) {
String alias = "";
QueryWrapper<RtRiskInventoryType> queryWrapper = QueryGenerator.initPageQueryWrapper(RtRiskInventoryType.class, paramMap, alias);
queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(RtRiskInventoryType::getId));
return queryWrapper;
}

27
src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtToolServiceImpl.java
View File

@ -8,20 +8,20 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zhgd.jeecg.common.execption.OpenAlertException;
import com.zhgd.jeecg.common.system.query.QueryGenerator;
import com.zhgd.xmgl.base.entity.vo.FlexibleBigScreenVo;
import com.zhgd.xmgl.modules.rt.entity.RtTool;
import com.zhgd.xmgl.modules.rt.entity.vo.CountRtToolVo;
import com.zhgd.xmgl.modules.rt.mapper.RtToolMapper;
import com.zhgd.xmgl.modules.rt.service.IRtToolService;
import com.zhgd.xmgl.util.DateUtils;
import com.zhgd.xmgl.util.PageUtil;
import com.zhgd.xmgl.util.RefUtil;
import org.apache.commons.collections.MapUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Objects;
import java.util.*;
/**
* @Description: 榕图-工器具
@ -108,6 +108,25 @@ public class RtToolServiceImpl extends ServiceImpl<RtToolMapper, RtTool> impleme
return baseMapper.countRtTool(paramMap);
}
@Override
public FlexibleBigScreenVo countRtToolTrend(HashMap<String, Object> paramMap) {
Integer type = MapUtils.getInteger(paramMap, "type");
if (Objects.equals(1, type)) {
FlexibleBigScreenVo flexibleBigScreenVo = new FlexibleBigScreenVo();
List<HashMap<String, Object>> source = baseMapper.countRtToolTrend(paramMap);
List<String> dimensions = new ArrayList<>();
dimensions.add("day");
dimensions.add("当日入库量");
dimensions.add("当日出库量");
flexibleBigScreenVo.setDimensions(dimensions);
flexibleBigScreenVo.setSource(source);
List<String> strList = DateUtils.getDateStrList(60, "yyyy-MM-dd");
FlexibleBigScreenVo.fillTrendVos(flexibleBigScreenVo, strList, "MM-dd");
return flexibleBigScreenVo;
}
return null;
}
private void setExitTimeIf(RtTool rtTool) {
if (Objects.equals(rtTool.getToolStatus(), 2)) {
rtTool.setExitTime(new Date());

4
src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java
View File

@ -278,6 +278,10 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
.antMatchers("/xmgl/rtWorkTicket/countRtWorkTicket").permitAll()
.antMatchers("/xmgl/rtWorkTicket/page").permitAll()
.antMatchers("/xmgl/rtWorkTicket/queryPlayUrlFromHikvision").permitAll()
.antMatchers("/xmgl/rtTool/countRtTool").permitAll()
.antMatchers("/xmgl/rtTool/page").permitAll()
.antMatchers("/xmgl/rtTool/countRtToolTrend").permitAll()
.antMatchers("/xmgl/workerInfo/getWorkerStatisticsCount").permitAll()
.antMatchers(HttpMethod.OPTIONS, "/**").anonymous()
.anyRequest().authenticated() // 剩下所有的验证都需要验证
.and()