量子点光谱

sxgk-projet/sxgk-survey/survey-boot/src/main/java/com/tofly/survey/controller/DeviceCheckDataController.java

@@ -1,5 +1,6 @@
 package com.tofly.survey.controller;
 
+import cn.hutool.core.collection.CollUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -95,24 +96,29 @@ public class DeviceCheckDataController {
         if(dto.getIsOther()==null){
             dto.setIsOther(false);
         }
-        Page<DeviceCheckListVo> pg= deviceCheckDataService.getDeviceCheckList(page, dto);
-        if(pg.getRecords()==null){
-            for (DeviceCheckListVo vo:pg.getRecords() ) {
-                vo.setSid(String.valueOf(vo.getId()));
-            }
-        }
-        if(dto.getExport()!=null&&dto.getExport().equals(1)&&pg.getRecords()!=null){
-            ExcelExportFileTypeEnum excelExportFileTypeEnum = ExcelExportFileTypeEnum.getExcelExportFileTypeEnum(Constant.EXPORT_SERVICE, String.valueOf(dto.getExport()));
-            if (null == excelExportFileTypeEnum) {
-                return null;
+        if(dto.getExport()!=null&&dto.getExport().equals(1)){
+            List<DeviceCheckListVo> list= deviceCheckDataService.getDeviceCheckList(dto);
+            if(CollUtil.isNotEmpty(list)) {
+                for (DeviceCheckListVo vo:list ) {
+                    vo.setSid(String.valueOf(vo.getId()));
+                }
+                ExcelExportFileTypeEnum excelExportFileTypeEnum = ExcelExportFileTypeEnum.getExcelExportFileTypeEnum(Constant.EXPORT_SERVICE, String.valueOf(dto.getExport()));
+                if (null == excelExportFileTypeEnum) {
+                    return null;
+                }
+                //将查询的结果转json字符串的格式，因为导出的时候只能传一个字符串
+                String resultListToString = JSONArray.toJSONStringWithDateFormat(list, "yyyy-MM-dd HH:mm:ss");
+                // 从模型类型枚举根据templateServiceType获取策略对应模板数据
+                List<Map<String, Object>> dataList = excelStrategyContext.getExportData(Constant.EXPORT_SERVICE, String.valueOf(dto.getExport()), resultListToString);
+                ExcelUtil.export(dataList.get(0), excelExportFileTypeEnum, Constant.FILE_PATH_TEST_EXPORT_EXCEL, response);
             }
-            //将查询的结果转json字符串的格式，因为导出的时候只能传一个字符串
-            String resultListToString = JSONArray.toJSONStringWithDateFormat(pg.getRecords(),"yyyy-MM-dd HH:mm:ss");
-            // 从模型类型枚举根据templateServiceType获取策略对应模板数据
-            List<Map<String, Object>> dataList = excelStrategyContext.getExportData(Constant.EXPORT_SERVICE, String.valueOf(dto.getExport()), resultListToString);
-            ExcelUtil.export(dataList.get(0), excelExportFileTypeEnum, Constant.FILE_PATH_TEST_EXPORT_EXCEL, response);
-
         }else {
+            Page<DeviceCheckListVo> pg= deviceCheckDataService.getDeviceCheckList(page, dto);
+            if(pg.getRecords()==null){
+                for (DeviceCheckListVo vo:pg.getRecords() ) {
+                    vo.setSid(String.valueOf(vo.getId()));
+                }
+            }
             return ResultRespone.success(pg);
         }
         return ResultRespone.success("");

sxgk-projet/sxgk-survey/survey-boot/src/main/java/com/tofly/survey/controller/DeviceTypePController.java

@@ -100,6 +100,10 @@ public class DeviceTypePController {
     @ApiOperation(value = "修改设备类型配置表（展示设备类型）")
     @PutMapping
     public ResultRespone updateById(MultipartFile file, @Valid DeviceTypePPutDto deviceTypeP) {
+        String check = deviceTypePService.checkUpdate(deviceTypeP);
+        if(StringUtils.isNotEmpty(check)){
+            return ResultRespone.failed(check);
+        }
         if(file!=null&&deviceTypeP.getFileTypeID()==null){
             return ResultRespone.failed(TipsConstants.FILE_TYPE_NOT_NULL);
         }

sxgk-projet/sxgk-survey/survey-boot/src/main/java/com/tofly/survey/mapper/DeviceCheckDataMapper.java

@@ -30,10 +30,16 @@ public interface DeviceCheckDataMapper extends BaseMapper<DeviceCheckData> {
 
     Page<DeviceCheckListVo> getDeviceCheckList(Page page,  @Param("dto")DeviceCheckListDto dto);
 
+    List<DeviceCheckListVo> getDeviceCheckList(@Param("dto")DeviceCheckListDto dto);
+
     Page<DeviceCheckListVo> getDeviceCheckAllList(Page page,  @Param("dto") DeviceCheckListDto dto);
 
+    List<DeviceCheckListVo> getDeviceCheckAllList(@Param("dto") DeviceCheckListDto dto);
+
     Page<DeviceCheckListVo> getDeviceCheckAllWarningList(Page page,@Param("dto") DeviceCheckListDto dto);
 
+    List<DeviceCheckListVo> getDeviceCheckAllWarningList(@Param("dto") DeviceCheckListDto dto);
+
     List<CheckDataVo> checkMinData(@Param("beginTime")Date begTime, @Param("dto")DeviceCheckAnalyseDto dto);
 
     int getDeviceCheckAllListCount(@Param("dto")DeviceCheckListDto dto);

sxgk-projet/sxgk-survey/survey-boot/src/main/java/com/tofly/survey/service/DeviceCheckDataService.java

@@ -37,6 +37,8 @@ public interface DeviceCheckDataService extends IService<DeviceCheckData> {
 
     Page<DeviceCheckListVo> getDeviceCheckList(Page page, DeviceCheckListDto dto);
 
+    List<DeviceCheckListVo> getDeviceCheckList( DeviceCheckListDto dto);
+
     DeviceCheckDataNewVo getDeviceCheckDataById(Long id);
 
     String curveCheck(DeviceCheckCurveDto dto);

sxgk-projet/sxgk-survey/survey-boot/src/main/java/com/tofly/survey/service/DeviceTypePService.java

@@ -31,4 +31,6 @@ public interface DeviceTypePService extends IService<DeviceTypeP> {
     Object updateRemoveByIds(String ids);
 
     String removeCheck(Long id);
+
+    String checkUpdate(DeviceTypePPutDto deviceTypeP);
 }

sxgk-projet/sxgk-survey/survey-boot/src/main/java/com/tofly/survey/service/impl/DeviceCheckDataServiceImpl.java

@@ -305,22 +305,41 @@ public class DeviceCheckDataServiceImpl extends ServiceImpl<DeviceCheckDataMappe
             }else {
                 Map<Long,List<UploadFile>> map = new HashMap<>();
                 Page<DeviceCheckListVo> listVoPage = this.baseMapper.getDeviceCheckAllWarningList(page, dto);
-                for (DeviceCheckListVo vo:listVoPage.getRecords()) {
-                    Long deviceType = vo.getDeviceType();
-                    if(deviceType != null){
-                        if(map.containsKey(deviceType)){
-                            vo.setIconFiles(map.get(deviceType));
-                        }else {
-                            DeviceTypeP typeP=deviceTypePService.getById(deviceType);
-                            vo.setIconFiles(typeP.getIconFiles());
-                            map.put(deviceType,typeP.getIconFiles());
-                        }
-                    }
-                }
+                extracted(map, listVoPage.getRecords());
                 return listVoPage;
             }
         }
     }
+    @Override
+    public List<DeviceCheckListVo> getDeviceCheckList(DeviceCheckListDto dto) {
+        if(!dto.getIsOther()){
+            return this.baseMapper.getDeviceCheckList(dto);
+        }else {
+            if(dto.getExport()!=null&& dto.getExport().equals(1)) {
+                return this.baseMapper.getDeviceCheckAllList(dto);
+            }else {
+                Map<Long,List<UploadFile>> map = new HashMap<>();
+                List<DeviceCheckListVo> listVoPage = this.baseMapper.getDeviceCheckAllWarningList(dto);
+                extracted(map, listVoPage);
+                return listVoPage;
+            }
+        }
+    }
+
+    private void extracted(Map<Long, List<UploadFile>> map, List<DeviceCheckListVo> list) {
+        for (DeviceCheckListVo vo: list) {
+            Long deviceType = vo.getDeviceType();
+            if(deviceType != null){
+                if(map.containsKey(deviceType)){
+                    vo.setIconFiles(map.get(deviceType));
+                }else {
+                    DeviceTypeP typeP=deviceTypePService.getById(deviceType);
+                    vo.setIconFiles(typeP.getIconFiles());
+                    map.put(deviceType,typeP.getIconFiles());
+                }
+            }
+        }
+    }
 
     /**
      * 查询实时数据详情

sxgk-projet/sxgk-survey/survey-boot/src/main/java/com/tofly/survey/service/impl/DeviceTypePServiceImpl.java

@@ -87,6 +87,16 @@ public class DeviceTypePServiceImpl extends ServiceImpl<DeviceTypePMapper, Devic
         return this.save(dtp);
     }
 
+    @Override
+    public String checkUpdate(DeviceTypePPutDto deviceTypeP) {
+        int count = count(new QueryWrapper<DeviceTypeP>().lambda()
+                .eq(DeviceTypeP::getIsdel,CommonConstants.ZERO_SHORT)
+                .eq(DeviceTypeP::getId,deviceTypeP.getId()));
+        if(count==0){
+            return TipsConstants.ID_NOT_DEVICE;
+        }
+        return null;
+    }
     /**
      * 修改设备类型
      * @param file
@@ -96,10 +106,7 @@ public class DeviceTypePServiceImpl extends ServiceImpl<DeviceTypePMapper, Devic
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean updateDeviceType(MultipartFile file, DeviceTypePPutDto deviceTypeP) {
-        int count = count(new QueryWrapper<DeviceTypeP>().lambda().eq(DeviceTypeP::getId,deviceTypeP.getId()));
-        if(count==0){
-            return false;
-        }
+
         DeviceTypeP dtp = new DeviceTypeP();
         BeanUtils.copyProperties(deviceTypeP,dtp);
         DeviceTypeP dtdb = this.getById(deviceTypeP.getId());
@@ -164,4 +171,5 @@ public class DeviceTypePServiceImpl extends ServiceImpl<DeviceTypePMapper, Devic
         }
         return null;
     }
+
 }

sxgk-projet/sxgk-survey/survey-boot/src/main/java/com/tofly/survey/vo/SurveySiteListVo.java

@@ -81,6 +81,12 @@ public class SurveySiteListVo implements Serializable {
     @ApiModelProperty(value = "设备类型名称")
     private String deviceTypeName;
 
+    /**
+     * 设备类型名称
+     */
+    @ApiModelProperty(value = "设备类型名称")
+    private Long deviceType;
+
     /**
      * 监测指标
      */

sxgk-projet/sxgk-survey/survey-boot/src/main/resources/mapper/CollectDeviceMapper.xml

@@ -43,7 +43,7 @@
         SELECT d.ID,d.PROJECT_ID,d.DEVICE_NAME,d.DEVICE_TYPE,d.DEVICE_TYPE_NAME,d.DEVICE_SN,d.DEVICE_CODE,d.DEVICE_MODEL,d.DEVICE_STATE,(case d.DEVICE_STATE when 0 then '停用' when 1 then '启用' else '停用' end) DEVICE_STATE_NAME ,d.DEVICE_FIRM,d.FIRM_LIAISON,d.LIAISON_PHONE,d.FILES,d.THUMBNAIL_FILES ,s.SITE_NAME,BUY_TIME,
                (SELECT wm_concat(TARGET_NAME)  from TF_YWPN_DEVICE_TARGET_P WHERE TYPE_ID = d.DEVICE_TYPE) as TARGETS
         FROM  TF_YWPN_COLLECT_DEVICE_W  d
-                  LEFT JOIN TF_YWPN_DEVICE_INSTALL_W i ON (d.id = i.DEVICE_ID)
+                  LEFT JOIN TF_YWPN_DEVICE_INSTALL_W i ON (d.id = i.DEVICE_ID AND (i.ISDISMANTLE !=1 OR i.ISDEL !=1))
                   LEFT JOIN TF_YWPN_SURVEY_SITE_W s ON (i.SITE_ID=s.id) WHERE d.ISDEL = 0 AND (i.ISDISMANTLE =0 OR i.ISDISMANTLE is NULL) AND d.PROJECT_ID = #{dto.projectId}
         <if test="dto.deviceCode != null and dto.deviceCode.trim() != ''">
             and d.DEVICE_CODE like CONCAT(CONCAT('%',#{dto.deviceCode}),'%')

sxgk-projet/sxgk-survey/survey-boot/src/main/resources/mapper/SurveySiteMapper.xml

@@ -79,6 +79,7 @@
         <result property="deviceSn" column="DEVICE_SN"/>
         <result property="deviceId" column="DEVICE_ID"/>
         <result property="deviceTypeName" column="DEVICE_TYPE_NAME"/>
+        <result property="deviceType" column="DEVICE_TYPE"/>
         <result property="targets" column="TARGETS"/>
         <result property="deviceName" column="DEVICE_NAME"/>
         <result property="installPeople" column="INSTALL_PEOPLE"/>
@@ -91,7 +92,7 @@
     </resultMap>
 
     <select id="getSurveySiteList" resultMap="SurveySiteListMap">
-        SELECT s.ID,s.SITE_CODE,s.SITE_NAME,s.SECTION_ID,s.SITE_ADDRESS,s.LONGITUDE,s.LATITUDE,s.SITE_STATE ,i.INSTALL_PEOPLE,i.INSTALL_TIME,i.LIAISON_PHONE,i.FILES,i.THUMBNAIL_FILES,d.DEVICE_SN,d.DEVICE_TYPE_NAME,d.DEVICE_NAME,d.ID as DEVICE_ID,
+        SELECT s.ID,s.SITE_CODE,s.SITE_NAME,s.SECTION_ID,s.SITE_ADDRESS,s.LONGITUDE,s.LATITUDE,s.SITE_STATE ,i.INSTALL_PEOPLE,i.INSTALL_TIME,i.LIAISON_PHONE,i.FILES,i.THUMBNAIL_FILES,d.DEVICE_SN,d.DEVICE_TYPE_NAME,d.DEVICE_TYPE,d.DEVICE_NAME,d.ID as DEVICE_ID,
         (SELECT wm_concat(TARGET_NAME)  from TF_YWPN_DEVICE_TARGET_P WHERE TYPE_ID = d.DEVICE_TYPE) as TARGETS
         FROM TF_YWPN_SURVEY_SITE_W s LEFT JOIN TF_YWPN_DEVICE_INSTALL_W i ON(s.ID = i.SITE_ID AND (i.ISDISMANTLE!=1 or i.ISDEL=1))
                                      LEFT JOIN TF_YWPN_COLLECT_DEVICE_W d ON (i.DEVICE_ID = d.ID)
@@ -163,7 +164,6 @@
         FROM TF_YWPN_SURVEY_SITE_W s LEFT JOIN TF_YWPN_CHECK_DATA_DAY_W d ON (s.ID = d.SITE_ID)
         WHERE s.ISDEL = 0
         GROUP BY s.ID
-        ORDER BY s.ID
     </select>
 
     <select id="getMinValidCount" resultType="com.tofly.survey.vo.ValidCountVo">
@@ -171,7 +171,6 @@
         FROM TF_YWPN_SURVEY_SITE_W s LEFT JOIN TF_YWPN_DEVICE_CHECK_DATA_W d ON (s.ID = d.SITE_ID)
         WHERE s.ISDEL = 0 AND COLLECTION_DATE > #{date}
         GROUP BY s.ID
-        ORDER BY s.ID
     </select>
 
     <resultMap id="SiteCheckTargetMap" type="com.tofly.survey.vo.SiteCheckTargetVo">