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-25 17:33:31 +08:00
parent 147de25b70
commit b4ac183029
7 changed files with 62 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/main/java/com/zhgd/xmgl/modules/rt/controller/RtWorkTicketController.java
View File

@ -1,27 +1,22 @@
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.RtWorkTicket;
import com.zhgd.xmgl.modules.rt.entity.vo.CountRtWorkTicketVo;
import com.zhgd.xmgl.modules.rt.service.IRtWorkTicketService;
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 org.simpleframework.xml.core.Validate;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
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;
/**
@ -48,6 +43,7 @@ public class RtWorkTicketController {
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "query", required = true, dataType = "Integer"),
@ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"),
@ApiImplicitParam(name = "type", value = "1：当日工作票2:历史工作票", paramType = "query", required = false, dataType = "Integer"),
})
@GetMapping(value = "/page")
public Result<IPage<RtWorkTicket>> queryPageList(@ApiIgnore @RequestParam HashMap<String, Object> paramMap) {
@ -125,4 +121,12 @@ public class RtWorkTicketController {
return result;
}
@ApiOperation(value = "统计榕图-工作票信息", notes = "统计榕图-工作票信息", httpMethod = "GET")
@ApiImplicitParams({
@ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "query", required = true, dataType = "String"),
})
@GetMapping(value = "/countRtWorkTicket")
public Result<CountRtWorkTicketVo> countRtWorkTicket(@ApiIgnore @RequestParam HashMap<String, Object> paramMap) {
return Result.success(rtWorkTicketService.countRtWorkTicket(paramMap));
}
}

12
src/main/java/com/zhgd/xmgl/modules/rt/entity/vo/CountRtWorkTicketVo.java Normal file
View File

@ -0,0 +1,12 @@
package com.zhgd.xmgl.modules.rt.entity.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class CountRtWorkTicketVo {
@ApiModelProperty("历史工作票数")
private Integer historyCount;
@ApiModelProperty("今日工作票数")
private Integer todayCount;
}

4
src/main/java/com/zhgd/xmgl/modules/rt/mapper/RtWorkTicketMapper.java
View File

@ -5,10 +5,12 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zhgd.xmgl.modules.rt.entity.RtWorkTicket;
import com.zhgd.xmgl.modules.rt.entity.vo.CountRtWorkTicketVo;
import org.apache.ibatis.annotations.Mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import java.util.HashMap;
import java.util.List;
/**
@ -23,4 +25,6 @@ public interface RtWorkTicketMapper extends BaseMapper<RtWorkTicket> {
IPage<RtWorkTicket> queryList(Page<RtWorkTicket> page, @Param(Constants.WRAPPER) QueryWrapper<RtWorkTicket> queryWrapper);
List<RtWorkTicket> queryList(@Param(Constants.WRAPPER) QueryWrapper<RtWorkTicket> queryWrapper);
CountRtWorkTicketVo countRtWorkTicket(HashMap<String, Object> paramMap);
}

8
src/main/java/com/zhgd/xmgl/modules/rt/mapper/xml/RtWorkTicketMapper.xml
View File

@ -27,4 +27,12 @@
${ew.customSqlSegment}
</select>
<select id="countRtWorkTicket" resultType="com.zhgd.xmgl.modules.rt.entity.vo.CountRtWorkTicketVo">
select t.*,(count-t.todayCount) historyCount
from (select
count(*) count,
ifnull(sum(if(create_time >= CURDATE(), 1, 0)), 0) as todayCount
from rt_work_ticket
where project_sn = #{projectSn}) t
</select>
</mapper>

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

@ -3,6 +3,7 @@ package com.zhgd.xmgl.modules.rt.service;
import com.zhgd.xmgl.modules.rt.entity.RtWorkTicket;
import com.baomidou.mybatisplus.extension.service.IService;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.zhgd.xmgl.modules.rt.entity.vo.CountRtWorkTicketVo;
import java.util.HashMap;
import java.util.List;
@ -24,4 +25,6 @@ public interface IRtWorkTicketService extends IService<RtWorkTicket> {
void edit(RtWorkTicket rtWorkTicket);
void delete(HashMap<String, Object> map);
CountRtWorkTicketVo countRtWorkTicket(HashMap<String, Object> paramMap);
}

20
src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtWorkTicketServiceImpl.java
View File

@ -1,6 +1,7 @@
package com.zhgd.xmgl.modules.rt.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@ -11,7 +12,11 @@ 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.modules.project.mapper.ProjectVideoConfigMapper;
import com.zhgd.xmgl.modules.rt.entity.*;
import com.zhgd.xmgl.modules.rt.entity.RtRiskSecurityLibraryType;
import com.zhgd.xmgl.modules.rt.entity.RtWorkTicket;
import com.zhgd.xmgl.modules.rt.entity.RtWorkTicketToRiskSecurityLibraryType;
import com.zhgd.xmgl.modules.rt.entity.RtWorkTicketToVideoItem;
import com.zhgd.xmgl.modules.rt.entity.vo.CountRtWorkTicketVo;
import com.zhgd.xmgl.modules.rt.mapper.*;
import com.zhgd.xmgl.modules.rt.service.IRtWorkTicketService;
import com.zhgd.xmgl.modules.video.entity.VideoItem;
@ -24,10 +29,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
@ -72,9 +74,12 @@ public class RtWorkTicketServiceImpl extends ServiceImpl<RtWorkTicketMapper, RtW
}
private QueryWrapper<RtWorkTicket> getQueryWrapper(HashMap<String, Object> paramMap) {
Integer type = MapUtils.getInteger(paramMap, "type");
String alias = "rwt.";
QueryWrapper<RtWorkTicket> queryWrapper = QueryGenerator.initPageQueryWrapper(RtWorkTicket.class, paramMap, alias);
queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(RtWorkTicket::getId));
queryWrapper.ge(Objects.equals(type, 1), RefUtil.fieldNameUlc(RtWorkTicket::getCreateTime), DateUtil.today());
queryWrapper.le(Objects.equals(type, 2), RefUtil.fieldNameUlc(RtWorkTicket::getCreateTime), DateUtil.formatDateTime(DateUtil.endOfDay(DateUtil.offsetDay(DateUtil.date(), -1))));
return queryWrapper;
}
@ -173,4 +178,9 @@ public class RtWorkTicketServiceImpl extends ServiceImpl<RtWorkTicketMapper, RtW
}
removeById(id);
}
@Override
public CountRtWorkTicketVo countRtWorkTicket(HashMap<String, Object> paramMap) {
return baseMapper.countRtWorkTicket(paramMap);
}
}

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

@ -275,6 +275,8 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
.antMatchers("/service-address/photo").permitAll()
.antMatchers("/xmgl/sewageData/add").permitAll()
.antMatchers("/xmgl/rtTool/updateRtToolStatus").permitAll()
.antMatchers("/xmgl/rtWorkTicket/countRtWorkTicket").permitAll()
.antMatchers("/xmgl/rtWorkTicket/page").permitAll()
.antMatchers(HttpMethod.OPTIONS, "/**").anonymous()
.anyRequest().authenticated() // 剩下所有的验证都需要验证
.and()