Merge remote-tracking branch 'origin/master'

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.skua.modules.system.datestandard.entity.SysStructDict;
 import com.skua.modules.system.datestandard.vo.SysStructDictVO;
 
+import java.util.Map;
+
 /**
  * 构筑物字典表
  */
@@ -12,8 +14,10 @@ public interface ISysStructDictService extends IService<SysStructDict> {
 	/**
 	 * 自定义查询逻辑
 	 * @param pageList
-	 * @param sysMonitorMetricInfoVO
+	 * @param sysStructDict
 	 * @return
 	 */
 	Page<SysStructDictVO> queryCustomPageList(Page<SysStructDictVO> pageList, SysStructDict sysStructDict);
+
+	Map<String, Map<String, String>> getListByDepart(String departId);
 }

 package com.skua.modules.system.datestandard.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.skua.modules.system.datestandard.entity.SysStructDict;
 import com.skua.modules.system.datestandard.mapper.SysMonitorMetricInfoMapper;
 import com.skua.modules.system.datestandard.mapper.SysStructDictMapper;
@@ -12,16 +13,40 @@ import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * 构筑物字典表
  */
 @Service
 public class SysStructDictServiceImpl extends ServiceImpl<SysStructDictMapper, SysStructDict> implements ISysStructDictService {
-	@Autowired
+
+	@Resource
 	private SysStructDictMapper sysStructDictMapper;
+
 	@Override
 	public Page<SysStructDictVO> queryCustomPageList(Page<SysStructDictVO> pageList, SysStructDict sysStructDict) {
 		return pageList.setRecords(sysStructDictMapper.queryCustomPageList(pageList,sysStructDict));
 	}
 
+	@Override
+	public Map<String, Map<String, String>> getListByDepart(String departId) {
+		Map<String, Map<String, String>> map = new HashMap<>();
+		Map<String, String> structMap = new HashMap<>();
+		LambdaQueryWrapper<SysStructDict> queryWrapper = new LambdaQueryWrapper<SysStructDict>();
+		queryWrapper.eq(SysStructDict::getDepartId, departId);
+		List<SysStructDict> list = sysStructDictMapper.selectList(queryWrapper);
+		if(list.size()>0){
+			for (SysStructDict structDict : list) {
+				structMap.put(structDict.getStructName(),structDict.getId());
+			}
+		}
+		map.put("sys_struct_dict",structMap);
+		return map;
+	}
+
 }

@@ -35,6 +35,7 @@
     <orderEntry type="library" name="Maven: com.belerweb:pinyin4j:2.5.1" level="project" />
     <orderEntry type="module" module-name="sk-module-datafill" />
     <orderEntry type="module" module-name="sk-module-equipment" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-test:5.1.5.RELEASE" level="project" />
     <orderEntry type="module" module-name="sk-module-expert" />
     <orderEntry type="library" name="Maven: com.kingtroldata:expert:2.0.0" level="project" />
     <orderEntry type="module" module-name="sk-module-inspection" />
@@ -255,7 +256,6 @@
     <orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-core:5.1.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.5.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.1.5.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.6.2" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.1.3.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.1.5.RELEASE" level="project" />

@@ -83,12 +83,23 @@
     <select id="getYhylqs" resultType="java.util.HashMap">
         SELECT
             LEFT( v3.time, 7 ) time,
-            (SUM( v3.NACLO ) + SUM( v3.PFS ) + SUM( v3.FHTY ) + SUM( v3.RYXNJ ) + SUM( v3.YWL ) + SUM( v3.GXCLJ ) + SUM( v3.CH3COONA )
-                + SUM( v3.HXT ) + SUM( v3.FECL3 ) + SUM( v3.SH ) + SUM( v3.CH3COOH ) + SUM( v3.FESO4G ) + SUM( v3.FESO4Y ) + SUM( v3.H2O2 ) ) AS zyl,
-            v2.clsl,
-            ROUND((SUM( v3.NACLO ) + SUM( v3.PFS ) + SUM( v3.FHTY ) + SUM( v3.RYXNJ ) + SUM( v3.YWL ) + SUM( v3.GXCLJ ) + SUM( v3.CH3COONA )
-                + SUM( v3.HXT ) + SUM( v3.FECL3 ) + SUM( v3.SH ) + SUM( v3.CH3COOH ) + SUM( v3.FESO4G ) + SUM( v3.FESO4Y )
-                + SUM( v3.H2O2 ) ) / v2.clsl, 4 ) AS dsyh
+            ROUND(SUM( IFNULL( v3.PAMZ, 0 ) )+SUM( IFNULL( v3.PAMF, 0 ) )+SUM( IFNULL( v3.PAMRJ, 0 ) )+
+            SUM( IFNULL( v3.SCLPAMZ, 0 ) )+SUM( IFNULL( v3.SCLPAMF, 0 ) )+
+            SUM( IFNULL( v3.NACLO, 0 ) )+SUM( IFNULL( v3.PACGT, 0 ) )+SUM( IFNULL( v3.PACYT, 0 ) )+
+            SUM( IFNULL( v3.PFS, 0 ) )+SUM( IFNULL( v3.FHTY, 0 ) )+SUM( IFNULL( v3.RYXNJ, 0 ) )+
+            SUM( IFNULL( v3.YWL, 0 ) )+SUM( IFNULL( v3.GXCLJ, 0 ) )+SUM( IFNULL( v3.CH3COONA, 0 ) )+
+            SUM( IFNULL( v3.HXT, 0 ) )+SUM( IFNULL( v3.FECL3, 0 ) )+SUM( IFNULL( v3.SH, 0 ) )+
+            SUM( IFNULL( v3.CH3COOH, 0 ) )+SUM( IFNULL( v3.FESO4G, 0 ) )+SUM( IFNULL( v3.FESO4Y, 0 ) )+
+            SUM( IFNULL( v3.H2O2, 0 ) ),4) AS zyl,
+            ROUND(v2.clsl,2) AS clsl,
+            ROUND((SUM( IFNULL( v3.PAMZ, 0 ) )+SUM( IFNULL( v3.PAMF, 0 ) )+SUM( IFNULL( v3.PAMRJ, 0 ) )+
+            SUM( IFNULL( v3.SCLPAMZ, 0 ) )+SUM( IFNULL( v3.SCLPAMF, 0 ) )+
+            SUM( IFNULL( v3.NACLO, 0 ) )+SUM( IFNULL( v3.PACGT, 0 ) )+SUM( IFNULL( v3.PACYT, 0 ) )+
+            SUM( IFNULL( v3.PFS, 0 ) )+SUM( IFNULL( v3.FHTY, 0 ) )+SUM( IFNULL( v3.RYXNJ, 0 ) )+
+            SUM( IFNULL( v3.YWL, 0 ) )+SUM( IFNULL( v3.GXCLJ, 0 ) )+SUM( IFNULL( v3.CH3COONA, 0 ) )+
+            SUM( IFNULL( v3.HXT, 0 ) )+SUM( IFNULL( v3.FECL3, 0 ) )+SUM( IFNULL( v3.SH, 0 ) )+
+            SUM( IFNULL( v3.CH3COOH, 0 ) )+SUM( IFNULL( v3.FESO4G, 0 ) )+SUM( IFNULL( v3.FESO4Y, 0 ) )+
+            SUM( IFNULL( v3.H2O2, 0 ) ))/v2.clsl,4) AS dsyh
         FROM
             ${dataViewName3a24} v3
         LEFT JOIN

@@ -89,13 +89,13 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:mysql://47.104.179.187:6003/sk-zhongye?characterEncoding=UTF-8&useUnicode=true&useSSL=false&connectTimeout=60000&socketTimeout=1800
+          url: jdbc:mysql://47.104.179.187:6003/sk-zhongye?characterEncoding=UTF-8&useUnicode=true&useSSL=false
           username: root
           password: jkauto@123
           driver-class-name: com.mysql.jdbc.Driver
         # 恩菲数据同步
         nf-db:
-          url: jdbc:mysql://113.249.91.27:3306/zhongye?characterEncoding=UTF-8&useUnicode=true&useSSL=false&connectTimeout=60000&socketTimeout=1800
+          url: jdbc:mysql://113.249.91.27:3306/zhongye?characterEncoding=UTF-8&useUnicode=true&useSSL=false
           username: root
           password: jkauto@123
           driver-class-name: com.mysql.jdbc.Driver

@@ -89,13 +89,13 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:mysql://113.249.91.27:3306/sk-zhongye?characterEncoding=UTF-8&useUnicode=true&useSSL=false&connectTimeout=60000&socketTimeout=1800
+          url: jdbc:mysql://113.249.91.27:3306/sk-zhongye?characterEncoding=UTF-8&useUnicode=true&useSSL=false
           username: root
           password: jkauto@123
           driver-class-name: com.mysql.jdbc.Driver
         # 恩菲数据同步
         nf-db:
-          url: jdbc:mysql://113.249.91.27:3306/zhongye?characterEncoding=UTF-8&useUnicode=true&useSSL=false&connectTimeout=60000&socketTimeout=1800
+          url: jdbc:mysql://113.249.91.27:3306/zhongye?characterEncoding=UTF-8&useUnicode=true&useSSL=false
           username: root
           password: jkauto@123
           driver-class-name: com.mysql.jdbc.Driver

@@ -89,13 +89,13 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:mysql://47.104.179.187:6003/sk-zhongye?characterEncoding=UTF-8&useUnicode=true&useSSL=false&connectTimeout=60000&socketTimeout=1800
+          url: jdbc:mysql://47.104.179.187:6003/sk-zhongye?characterEncoding=UTF-8&useUnicode=true&useSSL=false
           username: root
           password: jkauto@123
           driver-class-name: com.mysql.jdbc.Driver
         # 恩菲数据同步
         nf-db:
-          url: jdbc:mysql://47.104.179.187:6003/sk-zhongye?characterEncoding=UTF-8&useUnicode=true&useSSL=false&connectTimeout=60000&socketTimeout=1800
+          url: jdbc:mysql://47.104.179.187:6003/sk-zhongye?characterEncoding=UTF-8&useUnicode=true&useSSL=false
           username: root
           password: jkauto@123
           driver-class-name: com.mysql.jdbc.Driver

@@ -23,7 +23,11 @@
             <artifactId>sk-module-system</artifactId>
     		<version>1.0.0</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+        </dependency>
     </dependencies>
 
 
-</project>
\ No newline at end of file
+</project>

@@ -33,6 +33,9 @@
     <orderEntry type="library" name="Maven: org.javassist:javassist:3.21.0-GA" level="project" />
     <orderEntry type="library" name="Maven: com.belerweb:pinyin4j:2.5.1" level="project" />
     <orderEntry type="module" module-name="sk-module-system" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-test:5.1.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.1.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.kingtroldata:core:2.0.3" level="project" />
     <orderEntry type="library" name="Maven: org.apache.kafka:kafka-clients:2.0.1" level="project" />
     <orderEntry type="library" name="Maven: org.lz4:lz4-java:1.4.1" level="project" />
@@ -199,9 +202,6 @@
     <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.1.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.5.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.1.5.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.6.2" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.1.3.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.1.5.RELEASE" level="project" />

 package com.skua.modules.equipment.controller;
 
-import java.io.File;
-import java.io.InputStream;
-import java.io.OutputStream;
+import java.io.*;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
@@ -11,13 +9,8 @@ import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
-
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-
-import com.skua.modules.system.datestandard.entity.SysMetricDict;
-import com.skua.modules.system.datestandard.service.ISysMetricDictService;
 import org.apache.commons.lang.StringUtils;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.Sheet;
@@ -26,6 +19,7 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
+import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.transaction.TransactionStatus;
 import org.springframework.transaction.support.TransactionCallbackWithoutResult;
 import org.springframework.transaction.support.TransactionTemplate;
@@ -679,12 +673,29 @@ public class EquipmentController {
                 MultipartFile file = entity.getValue();// 获取上传文件对象
                 equipmentInfoService.importExcel(file,departId);
             }
+//            String filePath = "D:\\app\\file\\files\\equipment.xls";
+//            String fileName = "equipment.xls";
+//            String contentType = "application/vnd.ms-excel";
+//            MultipartFile file = toMultipartFile(filePath, fileName, contentType);
+//            equipmentInfoService.importExcel(file,departId);
             return Result.ok("设备台账导入完成");
         } catch (Exception e) {
             return Result.error("设备台账导入失败");
         }
     }
 
+    public static MultipartFile toMultipartFile(String filePath, String fileName, String contentType) throws IOException {
+        FileInputStream inputStream = new FileInputStream(filePath);
+        InputStream resourceInputStream = inputStream;
+        try {
+            return new MockMultipartFile(fileName, fileName, contentType, resourceInputStream);
+        } finally {
+            if (inputStream != null) {
+                inputStream.close();
+            }
+        }
+    }
+
     @AutoLog(value = "设备台账-excel导入")
     @ApiOperation(value = "设备台账-excel导入", notes = "设备台账-excel导入")
     @RequestMapping(value = "/importData", method = RequestMethod.POST)

@@ -16,6 +16,8 @@ import com.skua.core.excel.CustomExcelUtil07;
 import com.skua.core.excel.entity.HeadEntity;
 import com.skua.modules.equipment.entity.EquipmentAsset;
 import com.skua.modules.equipment.service.IEquipmentAssetService;
+import com.skua.modules.system.datestandard.mapper.SysStructDictMapper;
+import com.skua.modules.system.datestandard.service.ISysStructDictService;
 import com.skua.modules.system.service.ISysDictService;
 import org.apache.commons.lang.StringUtils;
 import org.apache.poi.ss.usermodel.Workbook;
@@ -63,6 +65,8 @@ public class EquipmentInfoServiceImpl extends ServiceImpl<EquipmentInfoMapper, E
 	private ISequenceService sequenceService;
 	@Autowired
     private ICrudSqlService iCrudSqlService;
+	@Resource
+	private ISysStructDictService sysStructDictService;
 	@Autowired
 	private IEquipmentInfoExtParamService equipmentInfoExtParamService;
 	@Resource
@@ -229,12 +233,14 @@ public class EquipmentInfoServiceImpl extends ServiceImpl<EquipmentInfoMapper, E
 		Workbook wb= WorkbookFactory.create(inputStream);
 		//构造字典数据对象
 		Map<String, Map<String, String>> dictMap = new HashMap<String,Map<String,String>>();
+		Map<String, Map<String, String>> structMap = new HashMap<String,Map<String,String>>();
+		structMap = sysStructDictService.getListByDepart(departId);
 		//基础字典
 		dictMap.putAll(sysDictService.getDictMap("spareTag","import"));//有无备用
 		dictMap.putAll(sysDictService.getDictMap("equipment-equipment_level","import"));//设备级别
 		dictMap.putAll(sysDictService.getDictMap("equipment-equipment_status","import"));//使用状况
 		//业务字典
-		dictMap.putAll(sysDictService.getBusinessMap("id", "sys_struct_dict", "struct_name","import"));//构筑物
+		dictMap.putAll(structMap);//构筑物
 		dictMap.putAll(sysDictService.getBusinessMap("id", "ajh_supplier_manage", "supp_name","import"));//供应商
 		dictMap.putAll(sysDictService.getBusinessMap("id", "equipment_brand", "brand_name","import"));//品牌
 		dictMap.putAll(sysDictService.getBusinessMap("tree_path", "equipment_category", "tree_path_name","import"));//设备类别
@@ -255,7 +261,7 @@ public class EquipmentInfoServiceImpl extends ServiceImpl<EquipmentInfoMapper, E
 		HeadEntity headEntity7 = CustomExcelUtil.createHeadEntity("使用年限（年）", "workingLife", 7, CustomExcelUtil.FieldType.INPUT, "");
 		HeadEntity headEntity8 = CustomExcelUtil.createHeadEntity("使用状况", "equipmentStatus", 8, CustomExcelUtil.FieldType.COMMON_DICT, "equipment-equipment_status");
 		headEntity8.setDictArray(dictMap.get("equipment-equipment_status").values().toArray(new String[0]));
-		HeadEntity headEntity9 = CustomExcelUtil.createHeadEntity("供应商", "manufacturer", 9, CustomExcelUtil.FieldType.BUSINESS_DICT, "ajh_supplier_manage");
+		HeadEntity headEntity9 = CustomExcelUtil.createHeadEntity("厂家", "manufacturer", 9, CustomExcelUtil.FieldType.BUSINESS_DICT, "ajh_supplier_manage");
 		headEntity9.setDictArray(dictMap.get("ajh_supplier_manage").values().toArray(new String[0]));
 		HeadEntity headEntity10 = CustomExcelUtil.createHeadEntity("设备品牌", "equipmentBrand", 10, CustomExcelUtil.FieldType.BUSINESS_DICT, "equipment_brand");
 		headEntity10.setDictArray(dictMap.get("equipment_brand").values().toArray(new String[0]));
@@ -265,11 +271,12 @@ public class EquipmentInfoServiceImpl extends ServiceImpl<EquipmentInfoMapper, E
 		HeadEntity headEntity14 = CustomExcelUtil.createHeadEntity("安装日期", "installDate", 14, CustomExcelUtil.FieldType.INPUT, "");
 		HeadEntity headEntity15 = CustomExcelUtil.createHeadEntity("移交日期", "handoverDate", 15, CustomExcelUtil.FieldType.INPUT, "");
 		HeadEntity headEntity16 = CustomExcelUtil.createHeadEntity("报废日期", "scrapDate", 16, CustomExcelUtil.FieldType.INPUT, "");
+		HeadEntity headEntity17 = CustomExcelUtil.createHeadEntity("技术参数", "technicalParameter", 17, CustomExcelUtil.FieldType.INPUT, "");
 
 		headEntityList.add(headEntity0);headEntityList.add(headEntity1);headEntityList.add(headEntity2);headEntityList.add(headEntity3);headEntityList.add(headEntity4);
 		headEntityList.add(headEntity5);headEntityList.add(headEntity6);headEntityList.add(headEntity7); headEntityList.add(headEntity8);headEntityList.add(headEntity9);
 		headEntityList.add(headEntity10);headEntityList.add(headEntity11);headEntityList.add(headEntity12);headEntityList.add(headEntity13);headEntityList.add(headEntity14);
-		headEntityList.add(headEntity15);headEntityList.add(headEntity16);
+		headEntityList.add(headEntity15);headEntityList.add(headEntity16);headEntityList.add(headEntity17);
 
 		List<EquipmentInfo> excelDataList = CustomExcelUtil07.readExcel(wb, "设备台账", 0, 1, headEntityList, EquipmentInfo.class, dictMap);
 		//新增设备

@@ -145,6 +145,7 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/jmeter/**", "anon");
         filterChainDefinitionMap.put("/jmReport/**", "anon");
         filterChainDefinitionMap.put("/v1/operate/**", "anon");
+//        filterChainDefinitionMap.put("/equipment/importExcel", "anon");
 
         //哈工大报表填报数据
         filterChainDefinitionMap.put("/harbinTechnology/fillReport/**", "anon"); //哈工大报表填报数据