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

包头质量管理大屏接口

Browse Source
This commit is contained in:
guoshengxiong 2024-10-26 18:32:03 +08:00
parent 4fd1a95e65
commit eaa72b0547
44 changed files with 164 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/zhgd/jeecg/common/system/query/QueryGenerator.java
View File

@ -203,7 +203,7 @@ public class QueryGenerator {
//根据参数值带什么关键字符串判断走什么类型的查询
QueryRuleEnum rule = convert2Rule(value, name);
value = replaceValue(rule, value);
addEasyQuery(queryWrapper, name, rule, value, alias,searchObj);
addEasyQuery(queryWrapper, name, rule, value, alias, searchObj);
}
} catch (Exception e) {
@ -622,6 +622,7 @@ public class QueryGenerator {
/**
* 根据规则走不同的查询
*
* @param queryWrapper QueryWrapper
* @param name 字段名字
* @param rule 查询规则
@ -637,10 +638,12 @@ public class QueryGenerator {
try {
TableField declaredAnnotation = searchObj.getClass().getDeclaredField(name).getDeclaredAnnotation(TableField.class);
if (declaredAnnotation != null) {
if (StrUtil.isNotBlank(declaredAnnotation.value())) {
name = declaredAnnotation.value();
}
}
} catch (NoSuchFieldException e) {
e.printStackTrace();
log.error("处理mysql的关键字错误", e);
}
}
name = oConvertUtils.camelToUnderline(name);

23
src/main/java/com/zhgd/xmgl/base/entity/vo/SectorOneVo.java
View File

@ -1,12 +1,16 @@
package com.zhgd.xmgl.base.entity.vo;
import cn.hutool.core.util.NumberUtil;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.zhgd.xmgl.util.NumberUtils;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
/**
* 扇形图表
*/
@ -43,4 +47,23 @@ public class SectorOneVo {
this.count = count;
this.percent = percent;
}
/**
* 获取并计算SectorVo的count和percent
*
* @param list
* @return
*/
public static List<SectorOneVo> getSectorVo(List<SectorOneVo> list) {
String count = NumberUtils.subZeroAndDot(String.valueOf(list.stream().map(o -> Double.parseDouble(o.getCount())).mapToDouble(value -> value).sum()));
for (SectorOneVo one : list) {
Double d = Double.valueOf(count);
if (d.equals(0.0)) {
one.setPercent("0");
} else {
one.setPercent(NumberUtil.roundStr(Double.parseDouble(one.getCount()) / d * 100, 2));
}
}
return list;
}
}

4
src/main/java/com/zhgd/xmgl/modules/antipressurefold/service/impl/AntiPressureFoldManageServiceImpl.java
View File

@ -21,14 +21,10 @@ import com.zhgd.xmgl.modules.antipressurefold.mapper.AntiPressureFoldManageBlock
import com.zhgd.xmgl.modules.antipressurefold.mapper.AntiPressureFoldManageBlockNumberMapper;
import com.zhgd.xmgl.modules.antipressurefold.mapper.AntiPressureFoldManageMapper;
import com.zhgd.xmgl.modules.antipressurefold.service.IAntiPressureFoldManageService;
import com.zhgd.xmgl.modules.universaltest.entity.UniversalTestDev;
import com.zhgd.xmgl.modules.universaltest.entity.UniversalTestManageBlockData;
import com.zhgd.xmgl.modules.universaltest.entity.UniversalTestManageBlockNumber;
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.apache.http.impl.client.AIMDBackoffManager;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

2
src/main/java/com/zhgd/xmgl/modules/baotou/controller/HomePageController.java
View File

@ -27,14 +27,12 @@ import com.zhgd.xmgl.modules.worker.entity.vo.ProjectCompanyWorkTotal;
import com.zhgd.xmgl.modules.worker.service.IWorkerInfoService;
import com.zhgd.xmgl.security.util.SecurityUtils;
import com.zhgd.xmgl.util.FlowSeviceUtil;
import com.zhgd.xmgl.util.MapUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.MapUtils;
import org.simpleframework.xml.core.Validate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*;

47
src/main/java/com/zhgd/xmgl/modules/baotou/controller/QualityBigScreenController.java
View File

@ -1,14 +1,15 @@
package com.zhgd.xmgl.modules.baotou.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.wflow.workflow.service.ProcessInstanceService;
import com.zhgd.annotation.OperLog;
import com.zhgd.jeecg.common.api.vo.Result;
import com.zhgd.xmgl.base.entity.vo.SectorOneVo;
import com.zhgd.xmgl.base.entity.vo.SectorVo;
import com.zhgd.xmgl.base.entity.vo.TrendOneVo;
import com.zhgd.xmgl.modules.baotou.entity.QualityProblem;
import com.zhgd.xmgl.modules.baotou.security.entity.vo.XzSecurityQualityInspectionRecordVo;
import com.zhgd.xmgl.modules.baotou.service.IPouringOrderLedgerService;
import com.zhgd.xmgl.modules.baotou.service.IQualityCommonProblemRecordService;
import com.zhgd.xmgl.modules.baotou.service.IQualityProblemService;
import com.zhgd.xmgl.modules.basicdata.service.ISystemUserService;
import com.zhgd.xmgl.modules.dangerous.entity.vo.ProjectInspectRecordCountVo;
@ -35,8 +36,11 @@ import java.util.Map;
@RestController
@RequestMapping("/xmgl/qualityProblem/bigScreen")
@Slf4j
@Api(tags = "工程质量问题整改大屏")
@Api(tags = "工程质量问题整改/质量管理大屏")
public class QualityBigScreenController {
@Lazy
@Autowired
IQualityProblemService qualityProblemService;
@Lazy
@Autowired
WorkerInfoServiceImpl workerInfoService;
@ -61,7 +65,12 @@ public class QualityBigScreenController {
@Lazy
@Autowired
private ISystemUserService systemUserService;
@Lazy
@Autowired
private IQualityCommonProblemRecordService qualityCommonProblemRecordService;
@Lazy
@Autowired
private IPouringOrderLedgerService pouringOrderLedgerService;
@ApiOperation(value = "EPC责任单位分析", notes = "EPC责任单位分析", httpMethod = "POST")
@ApiImplicitParams({
@ -91,7 +100,7 @@ public class QualityBigScreenController {
}
@OperLog(operModul = "工程质量问题整改管理", operType = "分页查询", operDesc = "分页列表查询工程质量问题整改信息")
@ApiOperation(value = "分页列表查询工程质量问题整改信息", notes = "分页列表查询工程质量问题整改信息", httpMethod="GET")
@ApiOperation(value = "分页列表查询工程质量问题整改信息", notes = "分页列表查询工程质量问题整改信息", httpMethod = "GET")
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "query", required = true, dataType = "Integer"),
@ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"),
@ -122,4 +131,32 @@ public class QualityBigScreenController {
return Result.success(problemService.countDevice(map));
}
@ApiOperation(value = "质量监督检查", notes = "质量监督检查", httpMethod = "POST")
@ApiImplicitParams({
@ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "body", required = true, dataType = "String"),
})
@PostMapping(value = "/countSuperviseDevice")
public Result<List<TrendOneVo>> countSuperviseDevice(@RequestBody Map<String, Object> map) {
return Result.success(qualityProblemService.countSuperviseDevice(map));
}
@ApiOperation(value = "质量通病", notes = "质量通病", httpMethod = "POST")
@ApiImplicitParams({
@ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "body", required = true, dataType = "String"),
})
@PostMapping(value = "/countProblemName")
public Result<List<SectorOneVo>> countProblemName(@RequestBody Map<String, Object> map) {
return Result.success(qualityCommonProblemRecordService.countProblemName(map));
}
@ApiOperation(value = "混凝土浇筑", notes = "混凝土浇筑", httpMethod = "POST")
@ApiImplicitParams({
@ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "body", required = true, dataType = "String"),
})
@PostMapping(value = "/countPouringEnterprise")
public Result<List<TrendOneVo>> countPouringEnterprise(@RequestBody Map<String, Object> map) {
return Result.success(pouringOrderLedgerService.countPouringEnterprise(map));
}
}

14
src/main/java/com/zhgd/xmgl/modules/baotou/controller/WorkerAdmissionController.java
View File

@ -21,6 +21,7 @@ import com.zhgd.xmgl.modules.baotou.service.IWorkerAdmissionCertificateDetailSer
import com.zhgd.xmgl.modules.baotou.service.IWorkerAdmissionDetailService;
import com.zhgd.xmgl.modules.baotou.service.IWorkerAdmissionService;
import com.zhgd.xmgl.modules.basicdata.service.impl.NoticeServiceImpl;
import com.zhgd.xmgl.modules.worker.entity.WorkerInfo;
import com.zhgd.xmgl.modules.worker.service.IWorkerInfoService;
import com.zhgd.xmgl.util.*;
import io.swagger.annotations.Api;
@ -128,6 +129,7 @@ public class WorkerAdmissionController {
log.info("人员入场工作流检查参数是否正确:{}", JSON.toJSONString(map));
String projectSn = FlowUtil.getString(map, "projectSn");
JSONArray numList = JSON.parseArray(MapUtils.getString(map, "numList"));
JSONArray idCardList = JSON.parseArray(MapUtils.getString(map, "idCardList"));
if (CollUtil.isNotEmpty(numList)) {
List<String> nums = workerAdmissionDetailService.list(new LambdaQueryWrapper<WorkerAdmissionDetail>().eq(WorkerAdmissionDetail::getProjectSn, projectSn)).stream().map(WorkerAdmissionDetail::getNum).collect(Collectors.toList());
List<String> existNums = new ArrayList<>();
@ -141,10 +143,20 @@ public class WorkerAdmissionController {
throw new OpenAlertException("【" + StrUtil.join(",", existNums) + "】编号已存在");
}
}
if (CollUtil.isNotEmpty(idCardList)) {
List<String> existDetailIdCards = workerAdmissionDetailService.list(new LambdaQueryWrapper<WorkerAdmissionDetail>()
.in(WorkerAdmissionDetail::getIdCard, idCardList).eq(WorkerAdmissionDetail::getProjectSn, projectSn)).stream().map(WorkerAdmissionDetail::getIdCard).collect(Collectors.toList());
List<String> existWorkerIdCards = workerInfoService.list(new LambdaQueryWrapper<WorkerInfo>()
.in(WorkerInfo::getIdCard, idCardList).eq(WorkerInfo::getProjectSn, projectSn)).stream().map(WorkerInfo::getIdCard).collect(Collectors.toList());
existDetailIdCards.addAll(existWorkerIdCards);
existDetailIdCards.stream().distinct();
if (CollUtil.isNotEmpty(existDetailIdCards)) {
throw new OpenAlertException("【" + StrUtil.join(",", existDetailIdCards) + "】身份证号已存在");
}
}
return Result.ok();
}
@OperLog(operModul = "人员入场管理", operType = "添加", operDesc = "工作流添加人员入场信息")
@ApiOperation(value = "工作流添加人员入场信息", notes = "工作流添加人员入场信息", httpMethod = "POST")
@PostMapping(value = "/flow/add")

6
src/main/java/com/zhgd/xmgl/modules/baotou/mapper/PouringOrderLedgerMapper.java
View File

@ -4,11 +4,15 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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.base.entity.vo.TrendOneVo;
import com.zhgd.xmgl.modules.baotou.entity.PouringOrderLedger;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import java.util.List;
import java.util.Map;
/**
* @Description: 浇筑令台账
* @author： pds
@ -21,4 +25,6 @@ public interface PouringOrderLedgerMapper extends BaseMapper<PouringOrderLedger>
IPage<PouringOrderLedger> queryList(Page<PouringOrderLedger> page,@Param(Constants.WRAPPER) QueryWrapper<PouringOrderLedger> queryWrapper);
PouringOrderLedger getById(String id);
List<TrendOneVo> countPouringEnterprise(Map<String, Object> map);
}

5
src/main/java/com/zhgd/xmgl/modules/baotou/mapper/QualityCommonProblemRecordMapper.java
View File

@ -1,9 +1,13 @@
package com.zhgd.xmgl.modules.baotou.mapper;
import com.zhgd.xmgl.base.entity.vo.SectorOneVo;
import com.zhgd.xmgl.modules.baotou.entity.QualityCommonProblemRecord;
import org.apache.ibatis.annotations.Mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import java.util.List;
import java.util.Map;
/**
* @Description: 质量通病记录
* @author： pds
@ -13,4 +17,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@Mapper
public interface QualityCommonProblemRecordMapper extends BaseMapper<QualityCommonProblemRecord> {
List<SectorOneVo> countProblemName(Map<String, Object> map);
}

2
src/main/java/com/zhgd/xmgl/modules/baotou/mapper/QualityProblemMapper.java
View File

@ -64,4 +64,6 @@ public interface QualityProblemMapper extends BaseMapper<QualityProblem> {
List<TrendOneVo> countDevice(Map<String, Object> map);
String getMaxIssueEnterprise(Map<String, Object> map);
List<TrendOneVo> countSuperviseDevice(Map<String, Object> map);
}

11
src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/PouringOrderLedgerMapper.xml
View File

@ -31,4 +31,15 @@
) t
where id=#{id}
</select>
<select id="countPouringEnterprise" resultType="com.zhgd.xmgl.base.entity.vo.TrendOneVo">
select
ei.enterprise_name x,
count(*) y
from
pouring_order_ledger pol
join enterprise_info ei on ei.id=pol.epc_pc_contractor
where 1 = 1 and pol.project_sn = #{projectSn}
group by ei.id
</select>
</mapper>

9
src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/QualityCommonProblemRecordMapper.xml
View File

@ -2,4 +2,13 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zhgd.xmgl.modules.baotou.mapper.QualityCommonProblemRecordMapper">
<select id="countProblemName" resultType="com.zhgd.xmgl.base.entity.vo.SectorOneVo">
select
qcpl.quality_common_problem_name name,
count(*) count
from quality_common_problem_record t
join quality_common_problem_library qcpl on t.quality_common_problem_library_id = qcpl.id
where t.project_sn=#{projectSn}
group by qcpl.id
</select>
</mapper>

11
src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/QualityProblemMapper.xml
View File

@ -189,4 +189,15 @@
where t.project_sn = #{projectSn}
)t on t.enterprise_id=ei.id
</select>
<select id="countSuperviseDevice" resultType="com.zhgd.xmgl.base.entity.vo.TrendOneVo">
select
du.device_unit_name x,
count(*) y
from
quality_problem qp
join device_unit du on du.id=qp.device_id
where qp.project_sn = #{projectSn}
group by du.id
</select>
</mapper>

2
src/main/java/com/zhgd/xmgl/modules/baotou/security/controller/XzSecurityBigScreenController.java
View File

@ -3,11 +3,9 @@ package com.zhgd.xmgl.modules.baotou.security.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.wflow.workflow.service.ProcessInstanceService;
import com.zhgd.jeecg.common.api.vo.Result;
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.modules.baotou.security.entity.vo.XzSecurityQualityInspectionRecordVo;
import com.zhgd.xmgl.modules.baotou.security.entity.vo.XzSecurityRecordVo;
import com.zhgd.xmgl.modules.baotou.security.service.IXzSecurityQualityInspectionRecordService;
import com.zhgd.xmgl.modules.basicdata.service.ISystemUserService;
import com.zhgd.xmgl.modules.dangerous.entity.vo.ProjectInspectRecordCountVo;

6
src/main/java/com/zhgd/xmgl/modules/baotou/security/controller/XzSecurityQualityInspectionRecordController.java
View File

@ -1,13 +1,10 @@
package com.zhgd.xmgl.modules.baotou.security.controller;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.gexin.fastjson.JSON;
import com.wflow.workflow.bean.process.OrgUser;
import com.wflow.workflow.bean.vo.ProcessProgressVo;
import com.wflow.workflow.service.ProcessInstanceService;
import com.zhgd.annotation.OperLog;
import com.zhgd.jeecg.common.api.vo.Result;
@ -19,11 +16,9 @@ import com.zhgd.xmgl.modules.baotou.security.entity.XzSecurityQualityInspectionR
import com.zhgd.xmgl.modules.baotou.security.entity.dto.XzSecurityDepartmentRectifiedRankDto;
import com.zhgd.xmgl.modules.baotou.security.entity.vo.*;
import com.zhgd.xmgl.modules.baotou.security.service.IXzSecurityQualityInspectionRecordService;
import com.zhgd.xmgl.modules.basicdata.entity.SystemUser;
import com.zhgd.xmgl.modules.basicdata.service.ISystemUserService;
import com.zhgd.xmgl.modules.dangerous.service.IDangerousEngineeringRecordService;
import com.zhgd.xmgl.modules.video.service.IAiAnalyseHardWareAlarmRecordService;
import com.zhgd.xmgl.modules.worker.entity.WorkerInfo;
import com.zhgd.xmgl.modules.worker.service.impl.WorkerInfoServiceImpl;
import com.zhgd.xmgl.util.MessageUtil;
import io.swagger.annotations.Api;
@ -34,7 +29,6 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.MapUtils;
import org.flowable.engine.HistoryService;
import org.flowable.engine.RuntimeService;
import org.flowable.engine.history.HistoricActivityInstance;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.validation.annotation.Validated;

3
src/main/java/com/zhgd/xmgl/modules/baotou/service/IPouringOrderLedgerService.java
View File

@ -1,10 +1,12 @@
package com.zhgd.xmgl.modules.baotou.service;
import com.zhgd.xmgl.base.entity.vo.TrendOneVo;
import com.zhgd.xmgl.modules.baotou.entity.PouringOrderLedger;
import com.baomidou.mybatisplus.extension.service.IService;
import com.baomidou.mybatisplus.core.metadata.IPage;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* @Description: 浇筑令台账
@ -52,4 +54,5 @@ public interface IPouringOrderLedgerService extends IService<PouringOrderLedger>
String getNextCastingNumber(String projectSn);
List<TrendOneVo> countPouringEnterprise(Map<String, Object> map);
}

4
src/main/java/com/zhgd/xmgl/modules/baotou/service/IQualityCommonProblemRecordService.java
View File

@ -1,10 +1,13 @@
package com.zhgd.xmgl.modules.baotou.service;
import com.zhgd.xmgl.base.entity.vo.SectorOneVo;
import com.zhgd.xmgl.base.entity.vo.SectorVo;
import com.zhgd.xmgl.modules.baotou.entity.QualityCommonProblemRecord;
import com.baomidou.mybatisplus.extension.service.IService;
import com.baomidou.mybatisplus.core.metadata.IPage;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* @Description: 质量通病记录
@ -50,4 +53,5 @@ public interface IQualityCommonProblemRecordService extends IService<QualityComm
*/
QualityCommonProblemRecord queryById(String id);
List<SectorOneVo> countProblemName(Map<String, Object> map);
}

2
src/main/java/com/zhgd/xmgl/modules/baotou/service/IQualityProblemService.java
View File

@ -66,4 +66,6 @@ public interface IQualityProblemService extends IService<QualityProblem> {
void addFromFlow(Map<String, Object> map);
String getMaxIssueEnterprise(Map<String, Object> map);
List<TrendOneVo> countSuperviseDevice(Map<String, Object> map);
}

11
src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/PouringOrderLedgerServiceImpl.java
View File

@ -8,6 +8,7 @@ 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.TrendOneVo;
import com.zhgd.xmgl.modules.baotou.entity.PouringOrderLedger;
import com.zhgd.xmgl.modules.baotou.mapper.PouringOrderLedgerMapper;
import com.zhgd.xmgl.modules.baotou.service.IPouringOrderLedgerService;
@ -17,10 +18,7 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Optional;
import java.util.*;
/**
* @Description: 浇筑令台账
@ -108,4 +106,9 @@ public class PouringOrderLedgerServiceImpl extends ServiceImpl<PouringOrderLedge
return castingNumber;
}
@Override
public List<TrendOneVo> countPouringEnterprise(Map<String, Object> map) {
return baseMapper.countPouringEnterprise(map);
}
}

10
src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/QualityCommonProblemRecordServiceImpl.java
View File

@ -1,6 +1,8 @@
package com.zhgd.xmgl.modules.baotou.service.impl;
import com.zhgd.jeecg.common.execption.OpenAlertException;
import com.zhgd.xmgl.base.entity.vo.SectorOneVo;
import com.zhgd.xmgl.base.entity.vo.SectorVo;
import com.zhgd.xmgl.modules.baotou.entity.QualityCommonProblemRecord;
import com.zhgd.xmgl.modules.baotou.mapper.QualityCommonProblemRecordMapper;
import com.zhgd.xmgl.modules.baotou.service.IQualityCommonProblemRecordService;
@ -13,6 +15,8 @@ import com.zhgd.xmgl.util.PageUtil;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.zhgd.xmgl.util.RefUtil;
import org.springframework.beans.factory.annotation.Autowired;
@ -84,4 +88,10 @@ public class QualityCommonProblemRecordServiceImpl extends ServiceImpl<QualityCo
return entity;
}
@Override
public List<SectorOneVo> countProblemName(Map<String, Object> map) {
List<SectorOneVo> list = baseMapper.countProblemName(map);
return SectorOneVo.getSectorVo(list);
}
}

5
src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/QualityProblemServiceImpl.java
View File

@ -252,4 +252,9 @@ public class QualityProblemServiceImpl extends ServiceImpl<QualityProblemMapper,
public String getMaxIssueEnterprise(Map<String, Object> map) {
return baseMapper.getMaxIssueEnterprise(map);
}
@Override
public List<TrendOneVo> countSuperviseDevice(Map<String, Object> map) {
return baseMapper.countSuperviseDevice(map);
}
}

1
src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/controller/BridgeErectMachineDataController.java
View File

@ -1,6 +1,5 @@
package com.zhgd.xmgl.modules.bridgeerectmachine.controller;
import com.zhgd.jeecg.common.mybatis.EntityMap;
import com.zhgd.xmgl.base.entity.vo.TrendOneVo;
import com.zhgd.xmgl.modules.bridgeerectmachine.entity.vo.CountTodayVo;
import io.swagger.annotations.Api;

1
src/main/java/com/zhgd/xmgl/modules/concrete/controller/ConcreteMonitorCurrentDataController.java
View File

@ -7,7 +7,6 @@ import com.zhgd.xmgl.entity.vo.ConcreteMonitorCurrentDataVo;
import com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorCurrentData;
import com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorDevPointPosition;
import com.zhgd.xmgl.modules.concrete.service.IConcreteMonitorCurrentDataService;
import com.zhgd.xmgl.modules.taskprogress.entity.TaskProgressMaterialRel;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;

1
src/main/java/com/zhgd/xmgl/modules/concrete/mapper/ConcreteMonitorCurrentDataMapper.java
View File

@ -1,7 +1,6 @@
package com.zhgd.xmgl.modules.concrete.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zhgd.jeecg.common.mybatis.EntityMap;
import com.zhgd.xmgl.base.entity.vo.TrendOneVo;
import com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorCurrentData;
import org.apache.ibatis.annotations.Mapper;

1
src/main/java/com/zhgd/xmgl/modules/concrete/service/IConcreteMonitorCurrentDataService.java
View File

@ -1,7 +1,6 @@
package com.zhgd.xmgl.modules.concrete.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.zhgd.jeecg.common.mybatis.EntityMap;
import com.zhgd.xmgl.base.entity.vo.TrendOneVo;
import com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorCurrentData;
import com.zhgd.xmgl.entity.vo.ConcreteMonitorCurrentDataVo;

1
src/main/java/com/zhgd/xmgl/modules/concrete/service/impl/ConcreteMonitorCurrentDataServiceImpl.java
View File

@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zhgd.jeecg.common.execption.OpenAlertException;
import com.zhgd.jeecg.upload.util.DateUtil;
import com.zhgd.xmgl.base.entity.vo.TrendOneVo;
import com.zhgd.xmgl.entity.vo.ConcreteMonitorCurrentDataVo;
import com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorAlarm;

2
src/main/java/com/zhgd/xmgl/modules/concretemixstation/controller/ConcreteMixStationMaterialDataController.java
View File

@ -1,8 +1,6 @@
package com.zhgd.xmgl.modules.concretemixstation.controller;
import com.zhgd.xmgl.base.entity.vo.SectorOneVo;
import com.zhgd.xmgl.base.entity.vo.SectorVo;
import com.zhgd.xmgl.base.entity.vo.TrendOneVo;
import com.zhgd.xmgl.modules.concretemixstation.service.IConcreteMixStationMaterialDataService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;

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

@ -21,9 +21,6 @@ import com.zhgd.xmgl.modules.concretemixstation.mapper.ConcreteMixStationDataMap
import com.zhgd.xmgl.modules.concretemixstation.mapper.ConcreteMixStationDevMapper;
import com.zhgd.xmgl.modules.concretemixstation.mapper.ConcreteMixStationMaterialDataMapper;
import com.zhgd.xmgl.modules.concretemixstation.service.IConcreteMixStationDataService;
import com.zhgd.xmgl.modules.universaltest.entity.UniversalTestDev;
import com.zhgd.xmgl.modules.universaltest.entity.UniversalTestManageBlockData;
import com.zhgd.xmgl.modules.universaltest.entity.UniversalTestManageBlockNumber;
import com.zhgd.xmgl.util.DateUtils;
import com.zhgd.xmgl.util.PageUtil;
import com.zhgd.xmgl.util.RefUtil;

1
src/main/java/com/zhgd/xmgl/modules/discharging/mapper/DischargingPlatformAlarmMapper.java
View File

@ -1,7 +1,6 @@
package com.zhgd.xmgl.modules.discharging.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zhgd.jeecg.common.mybatis.EntityMap;
import com.zhgd.xmgl.base.entity.vo.SectorOneVo;

1
src/main/java/com/zhgd/xmgl/modules/discharging/service/impl/DischargingPlatformAlarmServiceImpl.java
View File

@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zhgd.jeecg.common.mybatis.EntityMap;
import com.zhgd.xmgl.base.entity.vo.SectorOneVo;
import com.zhgd.xmgl.base.entity.vo.SectorVo;
import com.zhgd.xmgl.modules.basicdata.entity.Notice;
import com.zhgd.xmgl.modules.basicdata.service.INoticeService;

1
src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/controller/FrontierProtectionNoNetDataController.java
View File

@ -1,7 +1,6 @@
package com.zhgd.xmgl.modules.frontierprotectionnonet.controller;
import com.zhgd.xmgl.base.entity.vo.TrendOneVo;
import com.zhgd.xmgl.base.entity.vo.TrendVo;
import com.zhgd.xmgl.modules.frontierprotectionnonet.entity.FrontierProtectionNoNetData;
import com.zhgd.xmgl.modules.frontierprotectionnonet.entity.dto.FrontierProtectionNoNetDataDto;
import com.zhgd.xmgl.modules.frontierprotectionnonet.service.IFrontierProtectionNoNetDataService;

3
src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/service/impl/FrontierProtectionNoNetDataServiceImpl.java
View File

@ -1,6 +1,5 @@
package com.zhgd.xmgl.modules.frontierprotectionnonet.service.impl;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@ -10,7 +9,6 @@ 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.TrendOneVo;
import com.zhgd.xmgl.modules.ammeter.entity.AmmeterRecordDetail;
import com.zhgd.xmgl.modules.frontierprotectionnonet.entity.FrontierProtectionNoNetData;
import com.zhgd.xmgl.modules.frontierprotectionnonet.entity.FrontierProtectionNoNetDev;
import com.zhgd.xmgl.modules.frontierprotectionnonet.entity.dto.FrontierProtectionNoNetDataDto;
@ -28,7 +26,6 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.*;
import java.util.stream.Collectors;
/**
* @Description: 临边防护(无网)-数据

2
src/main/java/com/zhgd/xmgl/modules/highslope/service/impl/HighSlopeCurrentDataServiceImpl.java
View File

@ -19,7 +19,6 @@ import com.zhgd.jeecg.common.mybatis.EntityMap;
import com.zhgd.xmgl.async.AsyncDevExcavation;
import com.zhgd.xmgl.base.entity.vo.TrendOneVo;
import com.zhgd.xmgl.base.entity.vo.TrendVo;
import com.zhgd.xmgl.modules.concretemixstation.entity.ConcreteMixStationDev;
import com.zhgd.xmgl.modules.discharging.service.impl.DischargingPlatformAlarmServiceImpl;
import com.zhgd.xmgl.modules.highformwork.entity.vo.NumberDifferentTypesAlarmsRadarChartOneMonthVo;
import com.zhgd.xmgl.modules.highslope.entity.HighSlopeCurrentData;
@ -37,7 +36,6 @@ import com.zhgd.xmgl.util.DateUtils;
import com.zhgd.xmgl.util.JxlExcelUtils;
import com.zhgd.xmgl.util.TimeUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.MapUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

2
src/main/java/com/zhgd/xmgl/modules/pitchmixstation/service/impl/PitchMixStationProdDataServiceImpl.java
View File

@ -8,8 +8,6 @@ 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.enums.ParamEnum;
import com.zhgd.xmgl.modules.concretemixstation.entity.ConcreteMixStationDev;
import com.zhgd.xmgl.modules.concretemixstation.entity.ConcreteMixStationMaterialData;
import com.zhgd.xmgl.modules.concretemixstation.entity.vo.CountConcreteMixStationDataVo;
import com.zhgd.xmgl.modules.pitchmixstation.entity.PitchMixStationDev;
import com.zhgd.xmgl.modules.pitchmixstation.entity.PitchMixStationMaterialData;

1
src/main/java/com/zhgd/xmgl/modules/smartgrout/mapper/SmartGroutDataMapper.java
View File

@ -9,7 +9,6 @@ import com.zhgd.xmgl.base.entity.vo.TrendOneVo;
import com.zhgd.xmgl.modules.smartgrout.entity.SmartGroutData;
import com.zhgd.xmgl.modules.smartgrout.entity.vo.CountSmartGroutDataVo;
import com.zhgd.xmgl.modules.smarttension.entity.vo.CountSmartGroutDataRealTimeVo;
import com.zhgd.xmgl.modules.smarttension.entity.vo.CountSmartTensionDataRealTimeVo;
import org.apache.ibatis.annotations.Mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;

2
src/main/java/com/zhgd/xmgl/modules/smartgrout/service/impl/SmartGroutDataServiceImpl.java
View File

@ -9,6 +9,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.gexin.fastjson.JSON;
import com.zhgd.jeecg.common.execption.OpenAlertException;
import com.zhgd.jeecg.common.system.query.QueryGenerator;
import com.zhgd.xmgl.base.entity.vo.SectorOneVo;
import com.zhgd.xmgl.base.entity.vo.TrendOneVo;
import com.zhgd.xmgl.base.entity.vo.*;
import com.zhgd.xmgl.modules.smartgrout.entity.SmartGroutData;
import com.zhgd.xmgl.modules.smartgrout.entity.SmartGroutDev;

12
src/main/java/com/zhgd/xmgl/modules/smarttension/controller/SmartTensionSteelBeamDataController.java
View File

@ -1,11 +1,7 @@
package com.zhgd.xmgl.modules.smarttension.controller;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.zhgd.jeecg.common.api.vo.Result;
import com.zhgd.jeecg.common.system.query.QueryGenerator;
import com.zhgd.jeecg.common.util.oConvertUtils;
import com.zhgd.xmgl.base.entity.vo.FlexibleBigScreenVo;
import com.zhgd.xmgl.base.entity.vo.TrendOneVo;
import com.zhgd.xmgl.modules.smarttension.entity.SmartTensionSteelBeamData;
@ -16,18 +12,10 @@ import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.MapUtils;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import springfox.documentation.annotations.ApiIgnore;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.util.HashMap;
import java.util.List;

4
src/main/java/com/zhgd/xmgl/modules/smarttension/service/impl/SmartTensionDataServiceImpl.java
View File

@ -9,8 +9,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.gexin.fastjson.JSON;
import com.zhgd.jeecg.common.execption.OpenAlertException;
import com.zhgd.jeecg.common.system.query.QueryGenerator;
import com.zhgd.xmgl.base.entity.vo.SectorOneVo;
import com.zhgd.xmgl.base.entity.vo.TrendOneVo;
import com.zhgd.xmgl.base.entity.vo.*;
import com.zhgd.xmgl.modules.concretemixstation.entity.ConcreteMixStationDev;
import com.zhgd.xmgl.modules.smarttension.entity.SmartTensionData;
import com.zhgd.xmgl.modules.smarttension.entity.SmartTensionDev;
import com.zhgd.xmgl.modules.smarttension.entity.SmartTensionSteelBeamData;
@ -32,7 +33,6 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
/**
* @Description: 智能张拉-数据

1
src/main/java/com/zhgd/xmgl/modules/smoke/controller/SmokeDevAlarmController.java
View File

@ -9,7 +9,6 @@ import com.zhgd.jeecg.common.system.query.QueryGenerator;
import com.zhgd.jeecg.common.util.oConvertUtils;
import com.zhgd.xmgl.base.entity.vo.TrendOneVo;
import com.zhgd.xmgl.modules.smoke.entity.AddAlarmDto;
import com.zhgd.xmgl.modules.smoke.entity.SmokeDev;
import com.zhgd.xmgl.modules.smoke.entity.SmokeDevAlarm;
import com.zhgd.xmgl.modules.smoke.entity.vo.CountSmokeDevAlarmVo;
import com.zhgd.xmgl.modules.smoke.service.ISmokeDevAlarmService;

1
src/main/java/com/zhgd/xmgl/modules/stablewater/mapper/StableWaterMixStationRawMaterialDataMapper.java
View File

@ -6,7 +6,6 @@ import java.util.List;
import com.zhgd.xmgl.base.entity.vo.SectorOneVo;
import com.zhgd.xmgl.modules.stablewater.entity.StableWaterMixStationRawMaterialData;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**

2
src/main/java/com/zhgd/xmgl/modules/stablewater/service/impl/StableWaterMixStationDataServiceImpl.java
View File

@ -12,9 +12,7 @@ import com.zhgd.xmgl.base.entity.vo.SectorOneVo;
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.enums.ParamEnum;
import com.zhgd.xmgl.modules.concretemixstation.entity.vo.CountConcreteMixStationDataVo;
import com.zhgd.xmgl.modules.pitchmixstation.entity.PitchMixStationDev;
import com.zhgd.xmgl.modules.stablewater.entity.StableWaterMixStationData;
import com.zhgd.xmgl.modules.stablewater.entity.StableWaterMixStationDev;
import com.zhgd.xmgl.modules.stablewater.entity.StableWaterMixStationRawMaterialData;

1
src/main/java/com/zhgd/xmgl/modules/taskprogress/mapper/TaskProgressMapper.java
View File

@ -9,7 +9,6 @@ import com.zhgd.xmgl.modules.taskprogress.entity.vo.CountTaskProgressVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;

1
src/main/java/com/zhgd/xmgl/modules/universaltest/controller/UniversalTestManageController.java
View File

@ -7,7 +7,6 @@ import com.zhgd.jeecg.common.api.vo.Result;
import com.zhgd.jeecg.common.system.query.QueryGenerator;
import com.zhgd.jeecg.common.util.oConvertUtils;
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.antipressurefold.entity.vo.CountAntiPressureFoldManageVo;
import com.zhgd.xmgl.modules.universaltest.entity.UniversalTestManage;

3
src/main/java/com/zhgd/xmgl/modules/universaltest/service/impl/UniversalTestManageServiceImpl.java
View File

@ -13,9 +13,6 @@ import com.zhgd.xmgl.base.entity.vo.TrendOneVo;
import com.zhgd.xmgl.base.entity.vo.TrendVo;
import com.zhgd.xmgl.enums.ParamEnum;
import com.zhgd.xmgl.modules.antipressurefold.entity.vo.CountAntiPressureFoldManageVo;
import com.zhgd.xmgl.modules.bridgeerectmachine.entity.BridgeErectMachineDev;
import com.zhgd.xmgl.modules.pressuretest.entity.PressureTestMachineManageBlockData;
import com.zhgd.xmgl.modules.pressuretest.entity.PressureTestMachineManageBlockNumber;
import com.zhgd.xmgl.modules.universaltest.entity.UniversalTestDev;
import com.zhgd.xmgl.modules.universaltest.entity.UniversalTestManage;
import com.zhgd.xmgl.modules.universaltest.entity.UniversalTestManageBlockData;

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

@ -1,16 +1,6 @@
package com.zhgd.xmgl.modules.worker.controller;
import cn.afterturn.easypoi.excel.ExcelExportUtil;
import cn.afterturn.easypoi.excel.entity.ExportParams;
import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.img.ImgUtil;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ZipUtil;
import cn.hutool.extra.qrcode.QrCodeUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.zhgd.annotation.OperLog;
import com.zhgd.jeecg.common.api.vo.Result;
@ -21,24 +11,18 @@ import com.zhgd.xmgl.base.entity.vo.TrendOneVo;
import com.zhgd.xmgl.modules.worker.entity.WorkerInfo;
import com.zhgd.xmgl.modules.worker.entity.vo.*;
import com.zhgd.xmgl.modules.worker.service.IWorkerInfoService;
import com.zhgd.xmgl.util.JoBuilder;
import com.zhgd.xmgl.util.PathUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import springfox.documentation.annotations.ApiIgnore;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.util.*;