modify unit

slope-common/slope-common-core/src/main/java/com/sckw/core/model/enums/DictItemEnum.java

@@ -1,8 +1,6 @@
 package com.sckw.core.model.enums;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 
 /**
  * @author lfdc
@@ -39,6 +37,15 @@ public enum DictItemEnum {
         return name;
     }
 
+    public static String getName(String value) {
+        for (DictItemEnum entry : values()) {
+            if (entry.getValue().equals(value)) {
+                return entry.getName();
+            }
+        }
+        return null;
+    }
+
     public static DictItemEnum getData(String value) {
         for (DictItemEnum entry : values()) {
             if(!Objects.isNull(entry.getValue())){
@@ -63,13 +70,15 @@ public enum DictItemEnum {
         return 0;
     }
 
-    public static List<String> getAll() {
-        List<String> list = new ArrayList<>();
+    public static List<Map<String,String>> getAll() {
+        Map<String,String> map = new HashMap<>();
+        List<Map<String,String>> list = new ArrayList<>();
         for (DictItemEnum entry : values()) {
             if(!"ISNULL".equals(entry.getValue())){
-                list.add(entry.getValue());
+                map.put(entry.getValue(),entry.getName());
             }
         }
+        list.add(map);
         return list;
     }
 }

slope-common/slope-common-excel/src/main/java/com/sckw/excel/utils/ExcelUtil.java

@@ -18,6 +18,7 @@ import com.aliyun.oss.ServiceException;
 import com.sckw.core.exception.BusinessException;
 import com.sckw.core.model.constant.Global;
 import com.sckw.core.model.constant.NumberConstant;
+import com.sckw.core.model.enums.DictItemEnum;
 import com.sckw.core.model.enums.FileEnum;
 import com.sckw.core.utils.FileUtils;
 import com.sckw.core.web.response.HttpResult;
@@ -535,7 +536,12 @@ public class ExcelUtil {
         //listTitle.add(head);
         for(int k=0;k<listHead.size();k++){
             List<String> head1 = new ArrayList<>();
-            head1.add(listHead.get(k));
+            if(Objects.isNull(DictItemEnum.getName(listHead.get(k)))){
+                head1.add(listHead.get(k));
+            }else{
+                head1.add(DictItemEnum.getName(listHead.get(k)));
+            }
+
             listTitle.add(head1);
         }
         //listTitle.add(listHead);

slope-modules/slope-detection/src/main/java/com/sckw/slope/detection/dao/mysql/KwsIntegrationMapper.java

@@ -31,5 +31,7 @@ public interface KwsIntegrationMapper extends BaseMapper<KwsIntegration> {
 
     List<IntegrationVo> getDataByName(@Param("integrationQuery") IntegrationQuery integrationQuery);
 
+    List<IntegrationVo> getDataByStringName(@Param("integrationName") String integrationName);
+
     List<IntegrationVo> getDataByInNames(@Param("mountainId") String  mountainId,@Param("integrationName") String[]  integrationName);
 }

slope-modules/slope-detection/src/main/java/com/sckw/slope/detection/service/BackTrackService.java

@@ -99,6 +99,9 @@ public class BackTrackService {
             put("code", DictEnum.MODEL_PART.getCodeType());
             put("type", "1");
         }});
+        //获取全部集成要素单位
+        Map<String, SystemDict> dictCode = commonService.getDictByDictCode(DictEnum.INTEGRATION_UNIT);
+
         List<DeviceReferenceVo> vo = new ArrayList<>();
         //BeanUtils.copyProperties(references, vo);
         for (KwsDeviceReference re : references) {
@@ -109,6 +112,13 @@ public class BackTrackService {
                     re.setItemName(value.getLabel());
                 }
             }
+            if(Objects.isNull(re.getItemName())){
+                List<IntegrationVo> inter = integrationMapper.getDataByStringName(re.getItem());
+                re.setItemName(re.getItem());
+                String unit = dictCode.get(inter.get(0).getUnit()).getDescription();
+                re.setUnit(unit);
+                re.setUnitNe(unit);
+            }
         }
         return HttpResult.ok(references);
     }

slope-modules/slope-detection/src/main/java/com/sckw/slope/detection/service/task/ReportTemplateTaskService.java

@@ -8,9 +8,12 @@ import com.sckw.core.utils.IdWorker;
 import com.sckw.excel.annotation.ExcelContext;
 import com.sckw.excel.utils.ExcelUtil;
 import com.sckw.slope.detection.dao.mysql.KwsDeviceIntegrationMapper;
+import com.sckw.slope.detection.dao.mysql.KwsProjectMapper;
 import com.sckw.slope.detection.dao.mysql.KwsReportDataMapper;
 import com.sckw.slope.detection.dao.mysql.KwsReportTemplateMapper;
 import com.sckw.slope.detection.dao.tdengine.SlopeDataMapper;
+import com.sckw.slope.detection.model.dos.mysql.KwsDeviceReference;
+import com.sckw.slope.detection.model.dos.mysql.KwsProject;
 import com.sckw.slope.detection.model.dos.mysql.KwsReportData;
 import com.sckw.slope.detection.model.dos.mysql.KwsReportTemplate;
 import com.sckw.slope.detection.model.dos.tdengine.SlopeData;
@@ -22,6 +25,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
 
@@ -63,6 +67,9 @@ public class ReportTemplateTaskService {
     @Autowired
     KwsDeviceIntegrationMapper deviceIntegrationMapper;
 
+    @Autowired
+    KwsProjectMapper kwsProjectMapper;
+
     @Autowired
     CommonService commonService;
 
@@ -72,7 +79,7 @@ public class ReportTemplateTaskService {
         String[] part = kwsReportTemplate.getPartNames().split(",");
         String[] intergrationName = kwsReportTemplate.getIntergrationNames().split(",");
 
-        List<String> intergration = DictItemEnum.getAll();//获取系统中的全部基础要素
+        //List<Map<String,String>> intergration = DictItemEnum.getAll();//获取系统中的全部基础要素
         List<String> list = new ArrayList<>();
         list.addAll(Arrays.asList(title));
         list.addAll(Arrays.asList(part));
@@ -138,7 +145,11 @@ public class ReportTemplateTaskService {
             report.setMountainId(kwsReportTemplate.getCompanyId());
             report.setCompanyId(kwsReportTemplate.getCompanyId());
             report.setTemplateId(kwsReportTemplate.getId());
+            KwsProject project = kwsProjectMapper.selectOne(new LambdaQueryWrapper<KwsProject>()
+                    .eq(KwsProject::getId, kwsReportTemplate.getProjectId())
+            );
             report.setProjectId(Long.parseLong(kwsReportTemplate.getProjectId()));
+            report.setProjectName(project.getName());
             report.setFileSize(new BigDecimal(fileSize));
             report.setFileUrl(filePath);
             report.setId(id);
@@ -151,7 +162,7 @@ public class ReportTemplateTaskService {
     /**
      * 报表生成定时任务-天
      */
-    //@Scheduled(cron = "* * * * * *")
+    @Scheduled(cron = "0 0 * * * *")
     public void templateTaskDay() throws IOException, NoSuchAlgorithmException {
         List<KwsReportTemplate> kwsReportTemplates = reportTemplateMapper.selectList(new LambdaQueryWrapper<KwsReportTemplate>()
                 .eq(KwsReportTemplate::getStatus, 0)

slope-modules/slope-detection/src/main/resources/mapper/mysql/KwsIntegrationMapper.xml

@@ -52,6 +52,17 @@
       order by create_time desc
     </select>
 
+  <select id="getDataByStringName" resultType="com.sckw.slope.detection.model.vo.IntegrationVo">
+    <!--@mbg.generated-->
+    select
+    <include refid="Base_Column_List" />
+    from kws_integration
+    where del_flag=0
+    <if test="integrationName != null and integrationName != ''">
+      and integration_name = #{integrationName,jdbcType=VARCHAR}
+    </if>
+  </select>
+
   <select id="getDataByInNames" resultType="com.sckw.slope.detection.model.vo.IntegrationVo">
     <!--@mbg.generated-->
     select