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

安全首页接口bug修复

Browse Source
This commit is contained in:
guoshengxiong 2024-05-13 15:49:24 +08:00
parent 6d24138445
commit 6f576c48c8
5 changed files with 23 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerInfoController.java
View File

@ -7,8 +7,7 @@ import com.zhgd.jeecg.common.api.vo.Result;
import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.jeecg.common.mybatis.EntityMap;
import com.zhgd.redis.annotation.ApiIdempotent; import com.zhgd.redis.annotation.ApiIdempotent;
import com.zhgd.redis.lock.RedisRepository; import com.zhgd.redis.lock.RedisRepository;
import com.zhgd.xmgl.base.entity.vo.SectorVo; import com.zhgd.xmgl.base.entity.vo.TrendOneVo;
import com.zhgd.xmgl.base.entity.vo.TrendVo;
import com.zhgd.xmgl.modules.worker.entity.WorkerInfo; import com.zhgd.xmgl.modules.worker.entity.WorkerInfo;
import com.zhgd.xmgl.modules.worker.entity.vo.*; import com.zhgd.xmgl.modules.worker.entity.vo.*;
import com.zhgd.xmgl.modules.worker.service.IWorkerInfoService; import com.zhgd.xmgl.modules.worker.service.IWorkerInfoService;
@ -678,8 +677,8 @@ public class WorkerInfoController {
@ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"), @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"),
}) })
@PostMapping(value = "/statsSafeScore") @PostMapping(value = "/statsSafeScore")
public Result<SectorVo> statsSafeScore(@RequestBody Map<String, Object> map) { public Result<StatsTrendVo> statsSafeScore(@RequestBody Map<String, Object> map) {
return Result.success(workerInfoService.statsSector(map)); return Result.success(workerInfoService.statsSafeScore(map));
} }
@ApiOperation(value = "企业安全评分汇总", notes = "企业安全评分汇总", httpMethod = "POST") @ApiOperation(value = "企业安全评分汇总", notes = "企业安全评分汇总", httpMethod = "POST")
@ -687,7 +686,7 @@ public class WorkerInfoController {
@ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"), @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"),
}) })
@PostMapping(value = "/statsEnterprise") @PostMapping(value = "/statsEnterprise")
public Result<SectorVo> statsEnterprise(@RequestBody Map<String, Object> map) { public Result<List<TrendOneVo>> statsEnterprise(@RequestBody Map<String, Object> map) {
return Result.success(workerInfoService.statsEnterprise(map)); return Result.success(workerInfoService.statsEnterprise(map));
} }

7
src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerInfoMapper.java
View File

@ -5,8 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zhgd.annotation.DataScope; import com.zhgd.annotation.DataScope;
import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.jeecg.common.mybatis.EntityMap;
import com.zhgd.xmgl.base.entity.vo.SectorOneVo; import com.zhgd.xmgl.base.entity.vo.TrendOneVo;
import com.zhgd.xmgl.base.entity.vo.SectorVo;
import com.zhgd.xmgl.modules.worker.entity.WorkerInfo; import com.zhgd.xmgl.modules.worker.entity.WorkerInfo;
import com.zhgd.xmgl.modules.worker.entity.vo.*; import com.zhgd.xmgl.modules.worker.entity.vo.*;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
@ -242,9 +241,9 @@ public interface WorkerInfoMapper extends BaseMapper<WorkerInfo> {
List<StatsTrendVo> stats(@Param("param") Map<String, Object> map); List<StatsTrendVo> stats(@Param("param") Map<String, Object> map);
List<SectorOneVo> statsSector(@Param("param") Map<String, Object> map); StatsTrendVo statsSafeScore(@Param("param") Map<String, Object> map);
List<SectorOneVo> statsEnterprise(@Param("param") Map<String, Object> map); List<TrendOneVo> statsEnterprise(@Param("param") Map<String, Object> map);
List<StatsTrendVo> statsEnterpriseRisk(@Param("param") Map<String, Object> map); List<StatsTrendVo> statsEnterpriseRisk(@Param("param") Map<String, Object> map);
} }

16
src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml
View File

@ -2485,20 +2485,20 @@
</choose> </choose>
</select> </select>
<select id="statsSector" resultType="com.zhgd.xmgl.base.entity.vo.SectorOneVo"> <select id="statsSafeScore" resultType="com.zhgd.xmgl.modules.worker.entity.vo.StatsTrendVo">
select select
CASE WHEN t.safe_score &lt; 80 THEN '高风险' When t.safe_score >= 80 and t.safe_score &lt; 90 then '中风险' ELSE '低风险' ifnull(round(sum(if(t.safe_score &lt; 80,1,0)),2),0) as highRiskNum,
END as name, ifnull(round(sum(if(t.safe_score >= 80 and t.safe_score &lt; 90,1,0)),2),0) as mediumRiskNum,
count(*) as count ifnull(round(sum(if(t.safe_score >= 90,1,0)),2),0) as lowRiskNum,
count(*) as workerNum
from worker_info t from worker_info t
where t.project_sn=#{param.projectSn} where t.project_sn=#{param.projectSn}
group by name
</select> </select>
<select id="statsEnterprise" resultType="com.zhgd.xmgl.base.entity.vo.SectorOneVo"> <select id="statsEnterprise" resultType="com.zhgd.xmgl.base.entity.vo.TrendOneVo">
select select
ei.enterprise_name as name, ei.enterprise_name as x,
avg(t.safe_score) as count ifnull(round(avg(t.safe_score),2),0) as y
from worker_info t from worker_info t
join enterprise_info ei on ei.id=t.enterprise_id join enterprise_info ei on ei.id=t.enterprise_id
where t.project_sn=#{param.projectSn} where t.project_sn=#{param.projectSn}

7
src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerInfoService.java
View File

@ -4,8 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.api.vo.Result;
import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.jeecg.common.mybatis.EntityMap;
import com.zhgd.xmgl.base.entity.vo.SectorVo; import com.zhgd.xmgl.base.entity.vo.TrendOneVo;
import com.zhgd.xmgl.base.entity.vo.TrendVo;
import com.zhgd.xmgl.modules.worker.entity.WorkerInfo; import com.zhgd.xmgl.modules.worker.entity.WorkerInfo;
import com.zhgd.xmgl.modules.worker.entity.dto.GetWorkerInfoByDevDto; import com.zhgd.xmgl.modules.worker.entity.dto.GetWorkerInfoByDevDto;
import com.zhgd.xmgl.modules.worker.entity.vo.*; import com.zhgd.xmgl.modules.worker.entity.vo.*;
@ -135,9 +134,9 @@ public interface IWorkerInfoService extends IService<WorkerInfo> {
WorkerInfo selectWorkerInfoByIdCard(Map<String, Object> map); WorkerInfo selectWorkerInfoByIdCard(Map<String, Object> map);
SectorVo statsSector(Map<String, Object> map); StatsTrendVo statsSafeScore(Map<String, Object> map);
SectorVo statsEnterprise(Map<String, Object> map); List<TrendOneVo> statsEnterprise(Map<String, Object> map);
List<StatsTrendVo> statsEnterpriseRisk(Map<String, Object> map); List<StatsTrendVo> statsEnterpriseRisk(Map<String, Object> map);
} }

11
src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java
View File

@ -24,9 +24,8 @@ import com.zhgd.jeecg.common.mybatis.EntityMap;
import com.zhgd.xmgl.async.AsyncHikvision; import com.zhgd.xmgl.async.AsyncHikvision;
import com.zhgd.xmgl.async.AsyncJiLianDa; import com.zhgd.xmgl.async.AsyncJiLianDa;
import com.zhgd.xmgl.async.AsyncWorker; import com.zhgd.xmgl.async.AsyncWorker;
import com.zhgd.xmgl.base.entity.vo.SectorOneVo;
import com.zhgd.xmgl.base.entity.vo.SectorVo; import com.zhgd.xmgl.base.entity.vo.SectorVo;
import com.zhgd.xmgl.base.entity.vo.TrendVo; import com.zhgd.xmgl.base.entity.vo.TrendOneVo;
import com.zhgd.xmgl.call.HikvisionCall; import com.zhgd.xmgl.call.HikvisionCall;
import com.zhgd.xmgl.modules.basicdata.entity.Company; import com.zhgd.xmgl.modules.basicdata.entity.Company;
import com.zhgd.xmgl.modules.basicdata.entity.SystemUser; import com.zhgd.xmgl.modules.basicdata.entity.SystemUser;
@ -2128,13 +2127,13 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
} }
@Override @Override
public SectorVo statsSector(Map<String, Object> map) { public StatsTrendVo statsSafeScore(Map<String, Object> map) {
return SectorVo.getSectorVo(baseMapper.statsSector(map)); return baseMapper.statsSafeScore(map);
} }
@Override @Override
public SectorVo statsEnterprise(Map<String, Object> map) { public List<TrendOneVo> statsEnterprise(Map<String, Object> map) {
return SectorVo.getSectorVo(baseMapper.statsEnterprise(map)); return baseMapper.statsEnterprise(map);
} }
@Override @Override