diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/DeviceDataVo.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/DeviceDataVo.java index 7d15b46..7d1bea9 100644 --- a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/DeviceDataVo.java +++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/DeviceDataVo.java @@ -1,6 +1,7 @@ package com.securitycontrol.entity.background.vo; import lombok.Data; +import org.omg.CORBA.PRIVATE_MEMBER; /** * 数据维护u实体类 @@ -69,5 +70,9 @@ public class DeviceDataVo { private String unit; + private String type; + + private String local; + } diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/SystemGlobal.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/SystemGlobal.java index 589fd2b..f2596af 100644 --- a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/SystemGlobal.java +++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/SystemGlobal.java @@ -148,4 +148,18 @@ public class SystemGlobal { * 异常日志 */ public final static String LOG_ERR="2"; + + /** + * 沉降检测类型 + */ + public final static String ZL_TYPE_A="A"; + /** + *平整度检测记录 + */ + public final static String ZL_TYPE_B="B"; + + /** + * 焊缝检测记录 + */ + public final static String ZL_TYPE_C="C"; } diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/ConstructionQualityMapper.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/ConstructionQualityMapper.java index 68cab2e..73db110 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/ConstructionQualityMapper.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/ConstructionQualityMapper.java @@ -66,4 +66,6 @@ public interface ConstructionQualityMapper { * @return */ List getDevDataList(DeviceDataVo dto); + + List getDevDataList2(DeviceDataVo dto); } diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/AccessMgeServiceImpl.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/AccessMgeServiceImpl.java index 46fa11a..7f4d0f7 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/AccessMgeServiceImpl.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/AccessMgeServiceImpl.java @@ -8,6 +8,7 @@ import com.securitycontrol.common.core.constant.SecurityConstants; import com.securitycontrol.common.core.domain.Result; import com.securitycontrol.common.core.utils.StringUtils; import com.securitycontrol.common.core.utils.aes.DateTimeHelper; +import com.securitycontrol.common.core.utils.aes.StringHelper; import com.securitycontrol.common.core.web.domain.AjaxResult; import com.securitycontrol.entity.background.vo.HumanManageVo; import com.securitycontrol.entity.screen.dto.AccessMgeDto; @@ -88,6 +89,10 @@ public class AccessMgeServiceImpl implements AccessMgeService { try { dto.setModeName(Constant.PHOTO); dto.setTypeCode(Constant.PERSON_CAR_TYPE); + if(StringHelper.isEmpty(dto.getStartDate())){ + dto.setStartDate(DateTimeHelper.getNowDate()); + dto.setEndDate(DateTimeHelper.getNowDate()); + } list = mapper.getPerStatisticsPhoto(dto); if(CollectionUtils.isNotEmpty(list)){ for (int i = 0;i < list.size();i++) { @@ -151,6 +156,10 @@ public class AccessMgeServiceImpl implements AccessMgeService { try { dto.setTypeCode(Objects.equals(Constant.TYPE, type) ? Constant.CAR_GATE: Constant.PERSON_CAR_TYPE); dto.setModeName(Objects.equals(Constant.TYPE, type) ? Constant.CAR : Constant.PERSON); + if(StringHelper.isEmpty(dto.getStartDate())){ + dto.setStartDate(DateTimeHelper.getNowDate()); + dto.setEndDate(DateTimeHelper.getNowDate()); + } list = Objects.equals(Constant.TYPE, type) ? mapper.getVehicleStatisticsList(dto) : mapper.getPerStatisticsList(dto); } catch (Exception e) { log.error(Objects.equals(Constant.TYPE, type) ? "获取车辆出入场记录" : "获取人员出入场记录", e); diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/ConstructionQualityImpl.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/ConstructionQualityImpl.java index 0ea4196..7293f5c 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/ConstructionQualityImpl.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/ConstructionQualityImpl.java @@ -4,6 +4,7 @@ import com.securitycontrol.common.core.utils.aes.StringHelper; import com.securitycontrol.entity.background.vo.DeviceDataVo; import com.securitycontrol.entity.screen.dto.ConstructionQualityDto; import com.securitycontrol.entity.screen.vo.ConstructionQualityVo; +import com.securitycontrol.entity.system.SystemGlobal; import com.securitycontrol.screen.mapper.ConstructionQualityMapper; import com.securitycontrol.screen.service.ConstructionQualityService; import lombok.extern.slf4j.Slf4j; @@ -104,7 +105,13 @@ public class ConstructionQualityImpl implements ConstructionQualityService { public List getDevDataList(DeviceDataVo dto) { List list = new ArrayList<>(); try{ - list = mapper.getDevDataList(dto); + if(SystemGlobal.ZL_TYPE_A.equals(dto.getType())){ + list = mapper.getDevDataList(dto); + } else if(SystemGlobal.ZL_TYPE_B.equals(dto.getType())){ + list = mapper.getDevDataList2(dto); + }else if(SystemGlobal.ZL_TYPE_C.equals(dto.getType())){ + list = mapper.getDevDataList2(dto); + } }catch (Exception e){ log.error(e.toString(),e); } diff --git a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/AccessMgeMapper.xml b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/AccessMgeMapper.xml index a13fb53..eee3902 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/AccessMgeMapper.xml +++ b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/AccessMgeMapper.xml @@ -79,6 +79,9 @@ INNER JOIN tb_device_detail tdd ON thdv.attribute_id = tdd.id AND tdd.del_flag = 0 AND tdd.device_code = #{modeName} INNER JOIN tb_bd_device tbd ON tdd.device_id = tbd.device_id AND tbd.del_flag = 0 AND tbd.devic_type = #{typeCode} WHERE bid_code = #{bidCode} + + and thdv.create_time BETWEEN CONCAT(#{startDate},' 00:00:00') AND CONCAT(#{endDate},' 23:59:59') + ORDER BY a.val DESC diff --git a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/ConstructionQualityMapper.xml b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/ConstructionQualityMapper.xml index 427bbc8..7508bcd 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/ConstructionQualityMapper.xml +++ b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/ConstructionQualityMapper.xml @@ -52,7 +52,7 @@ LEFT JOIN tb_device_detail tdd ON tdd.device_id = tbd.device_id LEFT JOIN tb_device_value tdv ON tdd.id = tdv.attribute_id WHERE - tbd.devic_type =1906 and tpb.bid_code = #{bidCode} + tbd.devic_type =1906 and tpb.bid_code = #{bidCode} and tbd.del_flag=0 + select jdd.id, jdd.bid_code bidCode, pro.pro_name bidName,jdd.`name`, + jdd.`local`,jdd.is_hg val,jdd.create_time createTime,jdd.jc_user jcUser + from tb_device_data2 jdd + left join tb_project pro on pro.bid_code=jdd.bid_code + where jdd.bid_code=#{bidCode} and jdd.data_type=#{type} + order by jdd.id desc + \ No newline at end of file