From eaa72b054722878d71974818ef6edab5cf99e1f9 Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Sat, 26 Oct 2024 18:32:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=85=E5=A4=B4=E8=B4=A8=E9=87=8F=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=A4=A7=E5=B1=8F=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/system/query/QueryGenerator.java | 11 +++-- .../zhgd/xmgl/base/entity/vo/SectorOneVo.java | 23 +++++++++ .../AntiPressureFoldManageServiceImpl.java | 4 -- .../baotou/controller/HomePageController.java | 2 - .../QualityBigScreenController.java | 47 +++++++++++++++++-- .../controller/WorkerAdmissionController.java | 14 +++++- .../mapper/PouringOrderLedgerMapper.java | 6 +++ .../QualityCommonProblemRecordMapper.java | 5 ++ .../baotou/mapper/QualityProblemMapper.java | 2 + .../mapper/xml/PouringOrderLedgerMapper.xml | 11 +++++ .../xml/QualityCommonProblemRecordMapper.xml | 9 ++++ .../mapper/xml/QualityProblemMapper.xml | 11 +++++ .../XzSecurityBigScreenController.java | 2 - ...rityQualityInspectionRecordController.java | 6 --- .../service/IPouringOrderLedgerService.java | 3 ++ .../IQualityCommonProblemRecordService.java | 4 ++ .../service/IQualityProblemService.java | 2 + .../impl/PouringOrderLedgerServiceImpl.java | 11 +++-- ...QualityCommonProblemRecordServiceImpl.java | 10 ++++ .../impl/QualityProblemServiceImpl.java | 5 ++ .../BridgeErectMachineDataController.java | 1 - .../ConcreteMonitorCurrentDataController.java | 1 - .../ConcreteMonitorCurrentDataMapper.java | 1 - .../IConcreteMonitorCurrentDataService.java | 1 - ...ConcreteMonitorCurrentDataServiceImpl.java | 1 - ...creteMixStationMaterialDataController.java | 2 - .../ConcreteMixStationDataServiceImpl.java | 3 -- .../DischargingPlatformAlarmMapper.java | 1 - .../DischargingPlatformAlarmServiceImpl.java | 1 - ...FrontierProtectionNoNetDataController.java | 1 - ...rontierProtectionNoNetDataServiceImpl.java | 3 -- .../impl/HighSlopeCurrentDataServiceImpl.java | 2 - .../PitchMixStationProdDataServiceImpl.java | 2 - .../mapper/SmartGroutDataMapper.java | 1 - .../impl/SmartGroutDataServiceImpl.java | 2 + .../SmartTensionSteelBeamDataController.java | 12 ----- .../impl/SmartTensionDataServiceImpl.java | 4 +- .../controller/SmokeDevAlarmController.java | 1 - ...eWaterMixStationRawMaterialDataMapper.java | 1 - .../StableWaterMixStationDataServiceImpl.java | 2 - .../mapper/TaskProgressMapper.java | 1 - .../UniversalTestManageController.java | 1 - .../impl/UniversalTestManageServiceImpl.java | 3 -- .../controller/WorkerInfoController.java | 16 ------- 44 files changed, 164 insertions(+), 88 deletions(-) diff --git a/src/main/java/com/zhgd/jeecg/common/system/query/QueryGenerator.java b/src/main/java/com/zhgd/jeecg/common/system/query/QueryGenerator.java index 3d8ae25b1..a40804016 100644 --- a/src/main/java/com/zhgd/jeecg/common/system/query/QueryGenerator.java +++ b/src/main/java/com/zhgd/jeecg/common/system/query/QueryGenerator.java @@ -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,7 +622,8 @@ public class QueryGenerator { /** * 根据规则走不同的查询 - * @param queryWrapper QueryWrapper + * + * @param queryWrapper QueryWrapper * @param name 字段名字 * @param rule 查询规则 * @param value 查询条件值 @@ -637,10 +638,12 @@ public class QueryGenerator { try { TableField declaredAnnotation = searchObj.getClass().getDeclaredField(name).getDeclaredAnnotation(TableField.class); if (declaredAnnotation != null) { - name = declaredAnnotation.value(); + if (StrUtil.isNotBlank(declaredAnnotation.value())) { + name = declaredAnnotation.value(); + } } } catch (NoSuchFieldException e) { - e.printStackTrace(); + log.error("处理mysql的关键字错误", e); } } name = oConvertUtils.camelToUnderline(name); diff --git a/src/main/java/com/zhgd/xmgl/base/entity/vo/SectorOneVo.java b/src/main/java/com/zhgd/xmgl/base/entity/vo/SectorOneVo.java index fac39c39e..2e8e21b3e 100644 --- a/src/main/java/com/zhgd/xmgl/base/entity/vo/SectorOneVo.java +++ b/src/main/java/com/zhgd/xmgl/base/entity/vo/SectorOneVo.java @@ -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 getSectorVo(List 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; + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/antipressurefold/service/impl/AntiPressureFoldManageServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/antipressurefold/service/impl/AntiPressureFoldManageServiceImpl.java index 0b3bfde2b..514716595 100644 --- a/src/main/java/com/zhgd/xmgl/modules/antipressurefold/service/impl/AntiPressureFoldManageServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/antipressurefold/service/impl/AntiPressureFoldManageServiceImpl.java @@ -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; diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/controller/HomePageController.java b/src/main/java/com/zhgd/xmgl/modules/baotou/controller/HomePageController.java index 664fcb415..43852ac1b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/controller/HomePageController.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/controller/HomePageController.java @@ -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.*; diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/controller/QualityBigScreenController.java b/src/main/java/com/zhgd/xmgl/modules/baotou/controller/QualityBigScreenController.java index fbbb9fa43..6d4a1fe85 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/controller/QualityBigScreenController.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/controller/QualityBigScreenController.java @@ -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> countSuperviseDevice(@RequestBody Map 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> countProblemName(@RequestBody Map 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> countPouringEnterprise(@RequestBody Map map) { + return Result.success(pouringOrderLedgerService.countPouringEnterprise(map)); + } + + } diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/controller/WorkerAdmissionController.java b/src/main/java/com/zhgd/xmgl/modules/baotou/controller/WorkerAdmissionController.java index 6c70f1d6f..6b51a6dff 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/controller/WorkerAdmissionController.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/controller/WorkerAdmissionController.java @@ -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 nums = workerAdmissionDetailService.list(new LambdaQueryWrapper().eq(WorkerAdmissionDetail::getProjectSn, projectSn)).stream().map(WorkerAdmissionDetail::getNum).collect(Collectors.toList()); List existNums = new ArrayList<>(); @@ -141,10 +143,20 @@ public class WorkerAdmissionController { throw new OpenAlertException("【" + StrUtil.join(",", existNums) + "】编号已存在"); } } + if (CollUtil.isNotEmpty(idCardList)) { + List existDetailIdCards = workerAdmissionDetailService.list(new LambdaQueryWrapper() + .in(WorkerAdmissionDetail::getIdCard, idCardList).eq(WorkerAdmissionDetail::getProjectSn, projectSn)).stream().map(WorkerAdmissionDetail::getIdCard).collect(Collectors.toList()); + List existWorkerIdCards = workerInfoService.list(new LambdaQueryWrapper() + .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") diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/PouringOrderLedgerMapper.java b/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/PouringOrderLedgerMapper.java index 006e8cd04..623d09a6d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/PouringOrderLedgerMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/PouringOrderLedgerMapper.java @@ -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 IPage queryList(Page page,@Param(Constants.WRAPPER) QueryWrapper queryWrapper); PouringOrderLedger getById(String id); + + List countPouringEnterprise(Map map); } diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/QualityCommonProblemRecordMapper.java b/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/QualityCommonProblemRecordMapper.java index 6e4ba8689..99648face 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/QualityCommonProblemRecordMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/QualityCommonProblemRecordMapper.java @@ -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 { + List countProblemName(Map map); } diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/QualityProblemMapper.java b/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/QualityProblemMapper.java index bc93c562b..641a1ccfb 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/QualityProblemMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/QualityProblemMapper.java @@ -64,4 +64,6 @@ public interface QualityProblemMapper extends BaseMapper { List countDevice(Map map); String getMaxIssueEnterprise(Map map); + + List countSuperviseDevice(Map map); } diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/PouringOrderLedgerMapper.xml b/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/PouringOrderLedgerMapper.xml index f97a1a4c3..aa5ba85c7 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/PouringOrderLedgerMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/PouringOrderLedgerMapper.xml @@ -31,4 +31,15 @@ ) t where id=#{id} + + diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/QualityCommonProblemRecordMapper.xml b/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/QualityCommonProblemRecordMapper.xml index f26ae45ef..a40b800a3 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/QualityCommonProblemRecordMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/QualityCommonProblemRecordMapper.xml @@ -2,4 +2,13 @@ + diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/QualityProblemMapper.xml b/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/QualityProblemMapper.xml index 4ab13e0c1..9d3cd9d37 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/QualityProblemMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/QualityProblemMapper.xml @@ -189,4 +189,15 @@ where t.project_sn = #{projectSn} )t on t.enterprise_id=ei.id + + diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/security/controller/XzSecurityBigScreenController.java b/src/main/java/com/zhgd/xmgl/modules/baotou/security/controller/XzSecurityBigScreenController.java index 310e40338..a3a7e73b0 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/security/controller/XzSecurityBigScreenController.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/security/controller/XzSecurityBigScreenController.java @@ -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; diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/security/controller/XzSecurityQualityInspectionRecordController.java b/src/main/java/com/zhgd/xmgl/modules/baotou/security/controller/XzSecurityQualityInspectionRecordController.java index 217408a43..f7117f4dc 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/security/controller/XzSecurityQualityInspectionRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/security/controller/XzSecurityQualityInspectionRecordController.java @@ -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; diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/service/IPouringOrderLedgerService.java b/src/main/java/com/zhgd/xmgl/modules/baotou/service/IPouringOrderLedgerService.java index b02a0546c..1fd130f15 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/service/IPouringOrderLedgerService.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/service/IPouringOrderLedgerService.java @@ -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 String getNextCastingNumber(String projectSn); + List countPouringEnterprise(Map map); } diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/service/IQualityCommonProblemRecordService.java b/src/main/java/com/zhgd/xmgl/modules/baotou/service/IQualityCommonProblemRecordService.java index 9d5c259b8..c3a4470f2 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/service/IQualityCommonProblemRecordService.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/service/IQualityCommonProblemRecordService.java @@ -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 countProblemName(Map map); } diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/service/IQualityProblemService.java b/src/main/java/com/zhgd/xmgl/modules/baotou/service/IQualityProblemService.java index 134b3b0ef..3e29bdff2 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/service/IQualityProblemService.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/service/IQualityProblemService.java @@ -66,4 +66,6 @@ public interface IQualityProblemService extends IService { void addFromFlow(Map map); String getMaxIssueEnterprise(Map map); + + List countSuperviseDevice(Map map); } diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/PouringOrderLedgerServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/PouringOrderLedgerServiceImpl.java index 721654f97..fd8b90f44 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/PouringOrderLedgerServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/PouringOrderLedgerServiceImpl.java @@ -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 countPouringEnterprise(Map map) { + return baseMapper.countPouringEnterprise(map); + } + } diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/QualityCommonProblemRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/QualityCommonProblemRecordServiceImpl.java index 4ee730cb9..6694a3a2a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/QualityCommonProblemRecordServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/QualityCommonProblemRecordServiceImpl.java @@ -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 countProblemName(Map map) { + List list = baseMapper.countProblemName(map); + return SectorOneVo.getSectorVo(list); + } + } diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/QualityProblemServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/QualityProblemServiceImpl.java index c374a552f..a35a2fc1d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/QualityProblemServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/QualityProblemServiceImpl.java @@ -252,4 +252,9 @@ public class QualityProblemServiceImpl extends ServiceImpl map) { return baseMapper.getMaxIssueEnterprise(map); } + + @Override + public List countSuperviseDevice(Map map) { + return baseMapper.countSuperviseDevice(map); + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/controller/BridgeErectMachineDataController.java b/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/controller/BridgeErectMachineDataController.java index 48b6fc010..54edc3069 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/controller/BridgeErectMachineDataController.java +++ b/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/controller/BridgeErectMachineDataController.java @@ -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; diff --git a/src/main/java/com/zhgd/xmgl/modules/concrete/controller/ConcreteMonitorCurrentDataController.java b/src/main/java/com/zhgd/xmgl/modules/concrete/controller/ConcreteMonitorCurrentDataController.java index c62569f7a..457384393 100644 --- a/src/main/java/com/zhgd/xmgl/modules/concrete/controller/ConcreteMonitorCurrentDataController.java +++ b/src/main/java/com/zhgd/xmgl/modules/concrete/controller/ConcreteMonitorCurrentDataController.java @@ -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; diff --git a/src/main/java/com/zhgd/xmgl/modules/concrete/mapper/ConcreteMonitorCurrentDataMapper.java b/src/main/java/com/zhgd/xmgl/modules/concrete/mapper/ConcreteMonitorCurrentDataMapper.java index 8cd405dab..d4f40a000 100644 --- a/src/main/java/com/zhgd/xmgl/modules/concrete/mapper/ConcreteMonitorCurrentDataMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/concrete/mapper/ConcreteMonitorCurrentDataMapper.java @@ -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; diff --git a/src/main/java/com/zhgd/xmgl/modules/concrete/service/IConcreteMonitorCurrentDataService.java b/src/main/java/com/zhgd/xmgl/modules/concrete/service/IConcreteMonitorCurrentDataService.java index 7dd2efff4..6a09ae2f4 100644 --- a/src/main/java/com/zhgd/xmgl/modules/concrete/service/IConcreteMonitorCurrentDataService.java +++ b/src/main/java/com/zhgd/xmgl/modules/concrete/service/IConcreteMonitorCurrentDataService.java @@ -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; diff --git a/src/main/java/com/zhgd/xmgl/modules/concrete/service/impl/ConcreteMonitorCurrentDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/concrete/service/impl/ConcreteMonitorCurrentDataServiceImpl.java index fe9abe18e..48bf99204 100644 --- a/src/main/java/com/zhgd/xmgl/modules/concrete/service/impl/ConcreteMonitorCurrentDataServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/concrete/service/impl/ConcreteMonitorCurrentDataServiceImpl.java @@ -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; diff --git a/src/main/java/com/zhgd/xmgl/modules/concretemixstation/controller/ConcreteMixStationMaterialDataController.java b/src/main/java/com/zhgd/xmgl/modules/concretemixstation/controller/ConcreteMixStationMaterialDataController.java index 9f080dcaa..ae50025c0 100644 --- a/src/main/java/com/zhgd/xmgl/modules/concretemixstation/controller/ConcreteMixStationMaterialDataController.java +++ b/src/main/java/com/zhgd/xmgl/modules/concretemixstation/controller/ConcreteMixStationMaterialDataController.java @@ -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; diff --git a/src/main/java/com/zhgd/xmgl/modules/concretemixstation/service/impl/ConcreteMixStationDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/concretemixstation/service/impl/ConcreteMixStationDataServiceImpl.java index 33ae4c857..2189133c2 100644 --- a/src/main/java/com/zhgd/xmgl/modules/concretemixstation/service/impl/ConcreteMixStationDataServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/concretemixstation/service/impl/ConcreteMixStationDataServiceImpl.java @@ -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; diff --git a/src/main/java/com/zhgd/xmgl/modules/discharging/mapper/DischargingPlatformAlarmMapper.java b/src/main/java/com/zhgd/xmgl/modules/discharging/mapper/DischargingPlatformAlarmMapper.java index c99b8b5ef..0f7d9d1b3 100644 --- a/src/main/java/com/zhgd/xmgl/modules/discharging/mapper/DischargingPlatformAlarmMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/discharging/mapper/DischargingPlatformAlarmMapper.java @@ -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; diff --git a/src/main/java/com/zhgd/xmgl/modules/discharging/service/impl/DischargingPlatformAlarmServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/discharging/service/impl/DischargingPlatformAlarmServiceImpl.java index b869126be..5536e1693 100644 --- a/src/main/java/com/zhgd/xmgl/modules/discharging/service/impl/DischargingPlatformAlarmServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/discharging/service/impl/DischargingPlatformAlarmServiceImpl.java @@ -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; diff --git a/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/controller/FrontierProtectionNoNetDataController.java b/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/controller/FrontierProtectionNoNetDataController.java index 15591952f..ff7a9bd59 100644 --- a/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/controller/FrontierProtectionNoNetDataController.java +++ b/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/controller/FrontierProtectionNoNetDataController.java @@ -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; diff --git a/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/service/impl/FrontierProtectionNoNetDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/service/impl/FrontierProtectionNoNetDataServiceImpl.java index 470be1121..b6c45f00e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/service/impl/FrontierProtectionNoNetDataServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/service/impl/FrontierProtectionNoNetDataServiceImpl.java @@ -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: 临边防护(无网)-数据 diff --git a/src/main/java/com/zhgd/xmgl/modules/highslope/service/impl/HighSlopeCurrentDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/highslope/service/impl/HighSlopeCurrentDataServiceImpl.java index 06f13fdef..30858f075 100644 --- a/src/main/java/com/zhgd/xmgl/modules/highslope/service/impl/HighSlopeCurrentDataServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/highslope/service/impl/HighSlopeCurrentDataServiceImpl.java @@ -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; diff --git a/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/service/impl/PitchMixStationProdDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/service/impl/PitchMixStationProdDataServiceImpl.java index 9406b3a81..3bfe72ac1 100644 --- a/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/service/impl/PitchMixStationProdDataServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/service/impl/PitchMixStationProdDataServiceImpl.java @@ -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; diff --git a/src/main/java/com/zhgd/xmgl/modules/smartgrout/mapper/SmartGroutDataMapper.java b/src/main/java/com/zhgd/xmgl/modules/smartgrout/mapper/SmartGroutDataMapper.java index 981a75011..0b2171d3b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/smartgrout/mapper/SmartGroutDataMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/smartgrout/mapper/SmartGroutDataMapper.java @@ -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; diff --git a/src/main/java/com/zhgd/xmgl/modules/smartgrout/service/impl/SmartGroutDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/smartgrout/service/impl/SmartGroutDataServiceImpl.java index 8081e202a..7719e0cf8 100644 --- a/src/main/java/com/zhgd/xmgl/modules/smartgrout/service/impl/SmartGroutDataServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/smartgrout/service/impl/SmartGroutDataServiceImpl.java @@ -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; diff --git a/src/main/java/com/zhgd/xmgl/modules/smarttension/controller/SmartTensionSteelBeamDataController.java b/src/main/java/com/zhgd/xmgl/modules/smarttension/controller/SmartTensionSteelBeamDataController.java index 8d9281c46..5df1d1ebf 100644 --- a/src/main/java/com/zhgd/xmgl/modules/smarttension/controller/SmartTensionSteelBeamDataController.java +++ b/src/main/java/com/zhgd/xmgl/modules/smarttension/controller/SmartTensionSteelBeamDataController.java @@ -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; diff --git a/src/main/java/com/zhgd/xmgl/modules/smarttension/service/impl/SmartTensionDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/smarttension/service/impl/SmartTensionDataServiceImpl.java index ba09407af..116406390 100644 --- a/src/main/java/com/zhgd/xmgl/modules/smarttension/service/impl/SmartTensionDataServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/smarttension/service/impl/SmartTensionDataServiceImpl.java @@ -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: 智能张拉-数据 diff --git a/src/main/java/com/zhgd/xmgl/modules/smoke/controller/SmokeDevAlarmController.java b/src/main/java/com/zhgd/xmgl/modules/smoke/controller/SmokeDevAlarmController.java index 5f15f80c5..311eb7605 100644 --- a/src/main/java/com/zhgd/xmgl/modules/smoke/controller/SmokeDevAlarmController.java +++ b/src/main/java/com/zhgd/xmgl/modules/smoke/controller/SmokeDevAlarmController.java @@ -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; diff --git a/src/main/java/com/zhgd/xmgl/modules/stablewater/mapper/StableWaterMixStationRawMaterialDataMapper.java b/src/main/java/com/zhgd/xmgl/modules/stablewater/mapper/StableWaterMixStationRawMaterialDataMapper.java index 830492cb9..cb33b5c44 100644 --- a/src/main/java/com/zhgd/xmgl/modules/stablewater/mapper/StableWaterMixStationRawMaterialDataMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/stablewater/mapper/StableWaterMixStationRawMaterialDataMapper.java @@ -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; /** diff --git a/src/main/java/com/zhgd/xmgl/modules/stablewater/service/impl/StableWaterMixStationDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/stablewater/service/impl/StableWaterMixStationDataServiceImpl.java index 479cb56f6..69e754d5f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/stablewater/service/impl/StableWaterMixStationDataServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/stablewater/service/impl/StableWaterMixStationDataServiceImpl.java @@ -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; diff --git a/src/main/java/com/zhgd/xmgl/modules/taskprogress/mapper/TaskProgressMapper.java b/src/main/java/com/zhgd/xmgl/modules/taskprogress/mapper/TaskProgressMapper.java index 06f08f4f6..5cd71c962 100644 --- a/src/main/java/com/zhgd/xmgl/modules/taskprogress/mapper/TaskProgressMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/taskprogress/mapper/TaskProgressMapper.java @@ -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; diff --git a/src/main/java/com/zhgd/xmgl/modules/universaltest/controller/UniversalTestManageController.java b/src/main/java/com/zhgd/xmgl/modules/universaltest/controller/UniversalTestManageController.java index d20bac56a..df58266e5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/universaltest/controller/UniversalTestManageController.java +++ b/src/main/java/com/zhgd/xmgl/modules/universaltest/controller/UniversalTestManageController.java @@ -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; diff --git a/src/main/java/com/zhgd/xmgl/modules/universaltest/service/impl/UniversalTestManageServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/universaltest/service/impl/UniversalTestManageServiceImpl.java index b7475f781..eebf64036 100644 --- a/src/main/java/com/zhgd/xmgl/modules/universaltest/service/impl/UniversalTestManageServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/universaltest/service/impl/UniversalTestManageServiceImpl.java @@ -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; diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerInfoController.java b/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerInfoController.java index 62027c2a9..63101aad6 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerInfoController.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerInfoController.java @@ -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.*;