大屏-查询接口

business-common/src/main/java/com/rongwei/bscommon/sys/dao/ZhcxProjectDeviceIndicatorDao.java

@@ -4,6 +4,10 @@ import com.rongwei.bsentity.domain.ZhcxProjectDeviceIndicatorDo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.rongwei.bsentity.dto.project.indicator.DelPhysicalParam;
 import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.Date;
+import java.util.Map;
 
 /**
  * <p>
@@ -24,4 +28,14 @@ public interface ZhcxProjectDeviceIndicatorDao extends BaseMapper<ZhcxProjectDev
             "</where>" +
             "</script>")
     void delPhysical(DelPhysicalParam param);
+
+    @Select("select FINALASSEMBLEDATE from ZHCX_LOWALTITUDE_DEBTFREE_CHECK_MAIN \n" +
+            "where PROJECTID = #{projectId} and MACHINENO = #{machineno} \n" +
+            "and DELETED = '0' LIMIT 1")
+    Date getzzDate(Map<String, Object> map);
+
+    @Select("SELECT x.BEGINDATE FROM INCONTROL.ZHCX_COMMISSION_CHECK_PARAMETER_SET_DETAL x\n" +
+            "JOIN INCONTROL.ZHCX_COMMISSION_CHECK se ON se.ID = x.CHECKID AND se.DELETED ='0'\n" +
+            "WHERE x.DELETED = '0' AND x.BEGINDATE IS NOT NULL AND x.PROJECTID = #{projectId} AND x.MACHINENO = #{machineno} LIMIT 1")
+    Date getscDate(Map<String, Object> map);
 }

business-common/src/main/java/com/rongwei/bscommon/sys/service/ZhcxProjectDeviceIndicatorService.java

@@ -2,10 +2,9 @@ package com.rongwei.bscommon.sys.service;
 
 import com.rongwei.bsentity.domain.ZhcxProjectDeviceIndicatorDo;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.rongwei.bsentity.dto.ZhcxProjectDeviceIndicatorDto;
+import com.rongwei.bsentity.dto.ZhcxProjectDeviceScreenDataDto;
 import com.rongwei.bsentity.dto.project.indicator.DelPhysicalParam;
 
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -25,5 +24,5 @@ public interface ZhcxProjectDeviceIndicatorService extends IService<ZhcxProjectD
      */
     void delPhysical(DelPhysicalParam param);
 
-    List<ZhcxProjectDeviceIndicatorDto> getListData(Map<String, Object> map);
+    ZhcxProjectDeviceScreenDataDto getListData(Map<String, Object> map);
 }

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxProjectDeviceIndicatorServiceImpl.java

@@ -6,8 +6,8 @@ import com.rongwei.bsentity.domain.ZhcxProjectDeviceIndicatorDo;
 import com.rongwei.bscommon.sys.dao.ZhcxProjectDeviceIndicatorDao;
 import com.rongwei.bscommon.sys.service.ZhcxProjectDeviceIndicatorService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.rongwei.bsentity.domain.ZhcxProjectManageDo;
 import com.rongwei.bsentity.dto.ZhcxProjectDeviceIndicatorDto;
+import com.rongwei.bsentity.dto.ZhcxProjectDeviceScreenDataDto;
 import com.rongwei.bsentity.dto.project.indicator.DelPhysicalParam;
 import com.rongwei.rwcommon.base.exception.CustomException;
 import com.rongwei.rwcommon.utils.StringUtils;
@@ -15,10 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * <p>
@@ -45,12 +42,13 @@ public class ZhcxProjectDeviceIndicatorServiceImpl extends ServiceImpl<ZhcxProje
     }
 
     @Override
-    public List<ZhcxProjectDeviceIndicatorDto> getListData(Map<String, Object> map) {
+    public ZhcxProjectDeviceScreenDataDto getListData(Map<String, Object> map) {
         Object projectIdObj = map.get("projectId");
         Object machinenoObj = map.get("machineno");
         if(projectIdObj == null || machinenoObj == null){
             throw new CustomException("缺少项目或机号参数");
         }
+        ZhcxProjectDeviceScreenDataDto dataDto = new ZhcxProjectDeviceScreenDataDto();
         String projectId = projectIdObj.toString();
         String machineno = machinenoObj.toString();
         final LambdaQueryWrapper<ZhcxProjectDeviceIndicatorDo> queryWrapper = Wrappers.lambdaQuery();
@@ -84,7 +82,11 @@ public class ZhcxProjectDeviceIndicatorServiceImpl extends ServiceImpl<ZhcxProje
             dtoList.add(dto);
         });
         dtoList.sort(Comparator.comparingInt(ZhcxProjectDeviceIndicatorDto::getSort));
-
-        return dtoList;
+        dataDto.setIndicatorList(dtoList);
+        Date zzDate = dao.getzzDate(map);
+        Date scDate = dao.getscDate(map);
+        dataDto.setScDate(scDate);
+        dataDto.setZzDate(zzDate);
+        return dataDto;
     }
 }

business-entity/src/main/java/com/rongwei/bsentity/dto/ZhcxProjectDeviceScreenDataDto.java

@@ -0,0 +1,25 @@
+package com.rongwei.bsentity.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class ZhcxProjectDeviceScreenDataDto {
+
+    private List<ZhcxProjectDeviceIndicatorDto> indicatorList;
+
+    @JsonFormat(pattern = "yyyy年MM月dd日")
+    private Date zzDate;
+
+    @JsonFormat(pattern = "yyyy年MM月dd日")
+    private Date sdDate;
+
+    @JsonFormat(pattern = "yyyy年MM月dd日")
+    private Date scDate;
+
+    @JsonFormat(pattern = "yyyy年MM月dd日")
+    private Date njDate;
+}

business-server/src/main/java/com/rongwei/bsserver/controller/ZhcxProjectDeviceIndicatorController.java

@@ -3,6 +3,7 @@ package com.rongwei.bsserver.controller;
 import com.rongwei.bscommon.sys.service.ZhcxProjectDeviceIndicatorService;
 import com.rongwei.bsentity.domain.ZhcxProjectDeviceIndicatorDo;
 import com.rongwei.bsentity.dto.ZhcxProjectDeviceIndicatorDto;
+import com.rongwei.bsentity.dto.ZhcxProjectDeviceScreenDataDto;
 import com.rongwei.rwcommon.base.R;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -22,7 +23,7 @@ public class ZhcxProjectDeviceIndicatorController {
 
     @RequestMapping("/getData")
     public R getData(@RequestBody Map<String,Object> map) {
-        List<ZhcxProjectDeviceIndicatorDto> listData = service.getListData(map);
-        return R.ok(listData);
+        ZhcxProjectDeviceScreenDataDto data = service.getListData(map);
+        return R.ok(data);
     }
 }