增加树查询

energy-manage-common/src/main/java/com/energy/manage/common/po/system/SysPermissionPO.java

@@ -80,4 +80,7 @@ public class SysPermissionPO {
      */
     @ApiModelProperty("所有父id集合")
     private Integer permissionDepth;
+
+    @ApiModelProperty("是否显示1-显示，2-不显示")
+    private Integer permissionShow;
 }

energy-manage-service/src/main/java/com/energy/manage/service/config/TemplateConfig.java

@@ -0,0 +1,29 @@
+package com.energy.manage.service.config;
+
+
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.stereotype.Component;
+
+@Data
+@Slf4j
+@Component
+@Configuration
+public class TemplateConfig {
+
+    @Value("${template.bzpower}")
+    private String bzPower;
+
+    @Value("${template.htpower}")
+    private String htPower;
+
+    @Value("${template.field}")
+    private String field;
+
+    @Value("${template.draught}")
+    private String draught;
+
+
+}

energy-manage-service/src/main/java/com/energy/manage/service/controller/system/SysPermissionController.java

@@ -55,6 +55,7 @@ public class SysPermissionController {
         po.setPermissionState(permissionDto.getPstat());
         po.setPermissionType(permissionDto.getPtype());
         po.setPermissionSort(permissionDto.getPsort());
+        po.setPermissionShow(permissionDto.getPermissionShow());
         boolean flg = sysPermissionService.addPermission(po);
         if (flg) {
             return ResultResp.SUCCESS();
@@ -92,7 +93,7 @@ public class SysPermissionController {
     @PostMapping(value = "update")
     public ResultResp updatePermission(@RequestBody PermissionUpdateDto permissionUpdateDto) {
 
-        if (!Optional.ofNullable(permissionUpdateDto.getPermissionId()).isPresent() || StringUtils.isEmpty(permissionUpdateDto.getPname()) || StringUtils.isEmpty(permissionUpdateDto.getPcode())) {
+        if (!Optional.ofNullable(permissionUpdateDto.getPermissionId()).isPresent()) {
             return ResultResp.NOTNULLPARAM();
         }
         SysPermissionPO po = new SysPermissionPO();
@@ -104,6 +105,7 @@ public class SysPermissionController {
         po.setPermissionState(permissionUpdateDto.getPstat());
         po.setPermissionType(permissionUpdateDto.getPtype());
         po.setPermissionSort(permissionUpdateDto.getPsort());
+        po.setPermissionShow(permissionUpdateDto.getPermissionShow());
         boolean flag = sysPermissionService.updatePermission(po);
         if (flag) {
             return ResultResp.SUCCESS();

energy-manage-service/src/main/java/com/energy/manage/service/controller/system/SysTemplateController.java

@@ -0,0 +1,62 @@
+package com.energy.manage.service.controller.system;
+
+import com.energy.manage.common.reponse.ResultResp;
+import com.energy.manage.service.config.TemplateConfig;
+import com.energy.manage.service.config.annotations.UserLoginToken;
+import com.energy.manage.service.domain.dto.system.SystemPermissionListDto;
+import com.energy.manage.service.domain.vo.system.SystemPermissionVo;
+import com.energy.manage.service.service.system.SysRoleService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * @menu: 后台模版管理
+ *
+ * @author sy
+ * @date 2021-10-18 13:32:05
+ */
+@RestController
+@RequestMapping("sysTemplate")
+@CrossOrigin
+@Api(value = "SysTemplateController", tags = "系统模版管理")
+public class SysTemplateController {
+
+	@Autowired
+	private TemplateConfig templateConfig;
+
+	/**
+	 * 获取系统模版
+	 *
+	 * @return
+	 */
+	@UserLoginToken
+	@ApiOperation(value = "获取模版")
+	@PostMapping(value = "getAllTemplate")
+	public ResultResp<Map<String,String>> getAllTemplate() {
+
+		Map<String,String> templateMap = new HashMap<>(4);
+		// 标准功率曲线
+		templateMap.put("bzPower",templateConfig.getBzPower());
+		// 合同功率曲线
+		templateMap.put("htPower",templateConfig.getHtPower());
+		// 风场
+		templateMap.put("field",templateConfig.getField());
+		// 风机
+		templateMap.put("draught",templateConfig.getDraught());
+
+		return ResultResp.SUCCESS(templateMap);
+	}
+}
+
+
+
+

energy-manage-service/src/main/java/com/energy/manage/service/controller/windfield/WindFieldController.java

@@ -120,7 +120,7 @@ public class WindFieldController {
     @UserLoginToken
     @PostMapping(value = "/getWindFieldVo")
     @ApiOperation(value = "查询风场对象")
-    public ResultResp getWindFieldVo(@RequestBody WindFieldCodeDto windFieldCodeDto) {
+    public ResultResp<WindFieldVo> getWindFieldVo(@RequestBody WindFieldCodeDto windFieldCodeDto) {
         WindFieldVo vo = windFieldService.getWindFieldVo(windFieldCodeDto);
         return ResultResp.SUCCESS(vo);
     }

energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/system/PermissionDto.java

@@ -29,6 +29,8 @@ public class PermissionDto {
     private Integer ptype = 1;
     @ApiModelProperty(value = "权限id")
     private Integer psort = 100000;
+    @ApiModelProperty("是否显示1-显示，2-不显示")
+    private Integer permissionShow;
 
 
 }

energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/system/PermissionUpdateDto.java

@@ -29,6 +29,8 @@ public class PermissionUpdateDto {
     private Integer ptype = 1;
     @ApiModelProperty(value = "")
     private Integer psort = 100000;
+    @ApiModelProperty("是否显示1-显示，2-不显示")
+    private Integer permissionShow;
 
 
 }

energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/system/SystemPermissionVo.java

@@ -55,4 +55,9 @@ public class SystemPermissionVo {
 
     private Integer permissionDepth;
 
+    @ApiModelProperty("是否显示1-显示，2-不显示")
+    private Integer permissionShow;
+
+    private String permissionCode;
+
 }

energy-manage-service/src/main/resources/bootstrap.properties

@@ -40,4 +40,11 @@ spring.cloud.nacos.config.group = @profiles.active@
 logging.level.com.energy.manage.service.mappers= debug
 
 # 接口文档
-knife4j.enable=true
+knife4j.enable=true
+
+
+
+template.bzpower = http://192.168.50.234:6900/bucket-zhzn/template/%E6%A0%87%E5%87%86%E5%8A%9F%E7%8E%87%E6%9B%B2%E7%BA%BF%E6%A8%A1%E7%89%88.xlsx
+template.htpower = http://192.168.50.234:6900/bucket-zhzn/template/%E5%90%88%E5%90%8C%E5%8A%9F%E7%8E%87%E6%9B%B2%E7%BA%BF%E6%A8%A1%E7%89%88.xlsx
+template.field = http://192.168.50.234:6900/bucket-zhzn/template/%E9%A3%8E%E5%9C%BA%E8%A1%A8%E6%A8%A1%E7%89%88.xlsx
+template.draught = http://192.168.50.234:6900/bucket-zhzn/template/%E9%A3%8E%E6%9C%BA%E8%A1%A8%E6%A8%A1%E7%89%88.xlsx

energy-manage-service/src/main/resources/mybatis/system/PermissionMapper.xml

@@ -13,7 +13,9 @@
       p.permission_state AS permissionState,
       p.permission_sort AS permissionSort,
       p.permission_icon_url AS permissionIconUrl,
-      p.permission_depth AS permissionDepth
+      p.permission_depth AS permissionDepth,
+      p.permission_show as permissionShow,
+      p.permission_code as permissionCode
     </sql>
 
     <select id="getMaxDepth" resultType="java.lang.Integer">