1.防火监督

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/controller/HiddenDangerController.java

@@ -69,7 +69,7 @@ public class HiddenDangerController extends AbstractBaseController {
     }
 
 
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "下载模板")
     @GetMapping("/download/template")
     public void downloadTemplate(HttpServletResponse response) {

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dto/HiddenDangerImportDto.java

@@ -11,32 +11,32 @@ public class HiddenDangerImportDto {
     /**
      * 隐患名称
      */
-    @Excel(name = "隐患名称", orderNum = "1")
+    @Excel(name = "隐患名称", orderNum = "0")
     private String name;
 
 
     /**
      * 隐患级别名称
      */
-    @Excel(name = "隐患级别名称", orderNum = "2")
+    @Excel(name = "隐患级别", orderNum = "1")
     private String dangerLevelName;
 
     /**
      * 治理方式
      */
-    @Excel(name = "治理方式", orderNum = "3")
+    @Excel(name = "治理方式", orderNum = "2")
     private String reformTypeName;
 
     /**
      * 整改期限
      */
-    @Excel(name = "整改期限", orderNum = "4")
+    @Excel(name = "整改期限", orderNum = "3")
     private Date reformLimitDate;
 
     /**
      * 责任单位
      */
-    @Excel(name = "责任单位", orderNum = "5")
+    @Excel(name = "责任单位", orderNum = "4")
     private String pointName;
 
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dto/HiddenDangerTemplateDto.java

@@ -31,21 +31,21 @@ public class HiddenDangerTemplateDto implements Serializable {
     /**
      * 隐患级别
      */
-    @ExcelProperty(value = "隐患级别", index = 2)
-    @ExplicitConstraint(sourceClass = CommonExplicitConstraint.class, method = "getDangerLevelData")
+    @ExcelProperty(value = "隐患级别", index = 1)
+    @ExplicitConstraint(indexNum = 1, sourceClass = CommonExplicitConstraint.class, method = "getDangerLevelData")
     private String dangerLevelName;
 
     /**
      * 治理方式
      */
-    @ExcelProperty(value = "治理方式", index = 3)
-    @ExplicitConstraint(sourceClass = CommonExplicitConstraint.class, method = "getReformTypeData")
+    @ExcelProperty(value = "治理方式", index = 2)
+    @ExplicitConstraint(indexNum = 2, sourceClass = CommonExplicitConstraint.class, method = "getReformTypeData")
     private String reformTypeName;
 
     /**
      * 整改期限
      */
-    @ExcelProperty(value = "整改期限", index = 4)
+    @ExcelProperty(value = "整改期限", index = 3)
     private Date reformLimitDate;
 
     /**
@@ -66,8 +66,8 @@ public class HiddenDangerTemplateDto implements Serializable {
     /**
      * 责任单位
      */
-    @ExcelProperty(value = "责任单位", index = 7)
-    @ExplicitConstraint(sourceClass = CommonExplicitConstraint.class, method = "getCompanyData")
+    @ExcelProperty(value = "责任单位", index = 4)
+    @ExplicitConstraint(indexNum = 4, sourceClass = CommonExplicitConstraint.class, method = "getCompanyData")
     private String pointName;
 
     /**

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/feign/DangerFeignClient.java

@@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import java.util.Collection;
 import java.util.List;
 
 /**
@@ -69,7 +70,7 @@ public interface DangerFeignClient {
      * @return List<Object>
      */
     @GetMapping(value = "/dangerLevel")
-    FeignClientResult<List<DictionarieValueModel>> getDangerLevelData();
+    FeignClientResult<Collection<DictionarieValueModel>> getDangerLevelData();
 
     /**
      * 治理方式
@@ -77,6 +78,6 @@ public interface DangerFeignClient {
      * @return List<Object>
      */
     @GetMapping(value = "/dangerGovernance")
-    FeignClientResult<List<DictionarieValueModel>> getDangerGovernanceData();
+    FeignClientResult<Collection<DictionarieValueModel>> getDangerGovernanceData();
 
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/DataSourcesImpl.java

@@ -11,6 +11,7 @@ import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -31,20 +32,20 @@ public class DataSourcesImpl implements DataSources {
     @Override
     public String[] selectList(String type, String method) {
         String[] str = {};
-        FeignClientResult<List<DictionarieValueModel>> feignClientResult;
-        List<DictionarieValueModel> models;
+        FeignClientResult<Collection<DictionarieValueModel>> feignClientResult;
+        Collection<DictionarieValueModel> models;
         switch (method) {
             //隐患级别
             case "getDangerLevelData":
                 feignClientResult = dangerFeignClient.getDangerLevelData();
                 models = feignClientResult.getResult();
-                str = models.stream().map(p -> p.getDictDataValue() + "@" + p.getDictCode()).toArray(String[]::new);
+                str = models.stream().map(p -> p.getDictDataValue() + "@" + p.getDictDataKey()).toArray(String[]::new);
                 break;
             //治理方式
             case "getReformTypeData":
                 feignClientResult = dangerFeignClient.getDangerGovernanceData();
                 models = feignClientResult.getResult();
-                str = models.stream().map(p -> p.getDictDataValue() + "@" + p.getDictCode()).toArray(String[]::new);
+                str = models.stream().map(p -> p.getDictDataValue() + "@" + p.getDictDataKey()).toArray(String[]::new);
                 break;
             //责任单位
             case "getCompanyData":

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/HiddenDangerServiceImpl.java

@@ -13,6 +13,7 @@ import com.yeejoin.amos.supervision.business.dao.repository.IHiddenDangerDao;
 import com.yeejoin.amos.supervision.business.dto.HiddenDangerDto;
 import com.yeejoin.amos.supervision.business.dto.HiddenDangerExportDto;
 import com.yeejoin.amos.supervision.business.dto.HiddenDangerImportDto;
+import com.yeejoin.amos.supervision.business.dto.HiddenDangerTemplateDto;
 import com.yeejoin.amos.supervision.business.feign.DangerFeignClient;
 import com.yeejoin.amos.supervision.business.service.intfc.IHiddenDangerService;
 import com.yeejoin.amos.supervision.core.common.dto.DangerDto;
@@ -132,7 +133,7 @@ public class HiddenDangerServiceImpl implements IHiddenDangerService {
             String[] reformTypeArray = s.getReformTypeName().split("@");
             DangerDto dangerDto = new DangerDto();
             Bean.copyExistPropertis(s, dangerDto);
-            dangerDto.setBizType(contextPath);
+            dangerDto.setBizType(contextPath.substring(1));
             dangerDto.setBizId(sequence.nextId());
             dangerDto.setDangerLevel(dangerArray.length > 1 ? dangerArray[1] : "");
             dangerDto.setDangerLevelName(dangerArray.length > 1 ? dangerArray[0] : "");
@@ -165,6 +166,6 @@ public class HiddenDangerServiceImpl implements IHiddenDangerService {
 
     @Override
     public void templateExport(HttpServletResponse response) {
-        ExcelUtil.createTemplate(response, "隐患清单", "隐患清单", null, HiddenDangerExportDto.class, dataSources, true);
+        ExcelUtil.createTemplate(response, "隐患清单", "隐患清单", null, HiddenDangerTemplateDto.class, dataSources, true);
     }
 }