tree update

energy-manage-common/src/main/java/com/energy/manage/common/base/NewBaseDomain.java

@@ -25,6 +25,7 @@ public class NewBaseDomain {
     private Integer id;
 
     @ApiModelProperty(value = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone = "GMT+8")
     private Date createTime;
 
     @ApiModelProperty(value = "修改时间")

energy-manage-service/src/main/java/com/energy/manage/service/controller/company/WindCompanyController.java

@@ -16,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Map;
 
 @Slf4j
 @RestController
@@ -66,8 +67,8 @@ public class WindCompanyController {
     @UserLoginToken
     @PostMapping(value = "/getAllWindCompany")
     @ApiOperation(value = "查询企业树")
-    public ResultResp<List<WindCompanyPageVo>> getAllWindCompany() {
-        List<WindCompanyPageVo> list = windCompanyService.getAllWindCompany();
+    public ResultResp<List<Map<String, Object>>> getAllWindCompany() {
+        List<Map<String, Object>> list = windCompanyService.getAllWindCompany();
         return ResultResp.SUCCESS(list);
     }
 

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

@@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 
 /**
@@ -111,6 +112,18 @@ public class SysRoleController {
 		return ResultResp.FAIL();
 	}
 
+	@UserLoginToken
+	@PostMapping(value = "/updateRoleAvailable")
+	@ApiOperation(value = "更新角色状态")
+	public ResultResp updateRoleAvailable(@RequestBody RoleUpdateStateDto updateStateDto) {
+
+		boolean flag = sysRoleService.updateRoleAvailable(updateStateDto);
+		if (flag) {
+			return ResultResp.SUCCESS();
+		}
+		return ResultResp.FAIL();
+	}
+
 	/**
 	 * 通过角色id ，获取角色详情
 	 * @return
@@ -162,11 +175,11 @@ public class SysRoleController {
 	@UserLoginToken
 	@PostMapping(value = "/getRoleOrganization")
 	@ApiOperation(value = "通过角色获取组织架构权限")
-	public ResultResp<List<SysRelationVo>> getRoleOrganization(@RequestBody RoleDelDto roleDelDto) {
+	public ResultResp<List<Map<String, Object>>> getRoleOrganization(@RequestBody RoleDelDto roleDelDto) {
 		if (!Optional.ofNullable(roleDelDto.getRoleId()).isPresent()) {
 			return ResultResp.NOTNULLPARAM();
 		}
-		List<SysRelationVo> list = permissionService.getRoleOrganization(roleDelDto.getRoleId());
+		List<Map<String, Object>> list = permissionService.getRoleOrganization(roleDelDto.getRoleId());
 		return ResultResp.SUCCESS(list);
 	}
 

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

@@ -338,20 +338,6 @@ public class SysUserInfoController {
     }
 
 
-    /**
-     * 获取未绑定过教师的可用状态的用户账号
-     *
-     * @return
-     */
-    @UserLoginToken
-    @GetMapping(value = "getNonBoundTeacherUser")
-    @ApiOperation(value = "获取未绑定老师的账号")
-    public ResultResp<List<UserVo>> getNonBoundTeacherUser(@RequestParam  String userName) {
-        List<UserVo> sysUserInfoPOList = sysUserInfoService.getNonBoundTeacherUser(userName);
-        return ResultResp.SUCCESS(sysUserInfoPOList);
-    }
-
-
 //    public static void main(String[] args) {
 //        System.out.println(BCryptTools.checkpw("123456","$2a$10$t0ZYLlopxXmwpwdQ4xfTr.84sk.U8EpguUeNkAPXdm0MF4I3N5jOa"));
 //    }

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

@@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
+import java.util.Map;
 
 @Slf4j
 @RestController
@@ -135,8 +136,8 @@ public class WindFieldController {
     @UserLoginToken
     @PostMapping(value = "/getWindFieldTree")
     @ApiOperation(value = "查询风场树")
-    public ResultResp<List<WindRelationVo>> getWindFieldTree() {
-        List<WindRelationVo> list = windFieldService.getWindFieldTree();
+    public ResultResp< List<Map<String, Object>>> getWindFieldTree() {
+        List<Map<String, Object>> list = windFieldService.getWindFieldTree();
         return ResultResp.SUCCESS(list);
     }
 

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

@@ -0,0 +1,23 @@
+package com.energy.manage.service.domain.dto.system;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ *
+ */
+@Getter
+@Setter
+public class RoleUpdateStateDto {
+
+    @ApiModelProperty(value = "角色id")
+    private Integer roleId;
+
+
+    /**
+     * 是否可用
+     */
+    @ApiModelProperty("是否可用")
+    private Integer roleAvailable;
+}

energy-manage-service/src/main/java/com/energy/manage/service/service/company/WindCompanyService.java

@@ -9,6 +9,7 @@ import com.energy.manage.service.domain.vo.company.WindCompanyPageVo;
 import com.energy.manage.service.domain.vo.system.PermissionVo;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 企业信息接口
@@ -53,7 +54,7 @@ public interface WindCompanyService extends BaseService<WindCompanyPO> {
      * 查询企业树关系
      * @return
      */
-    List<WindCompanyPageVo> getAllWindCompany();
+    List<Map<String, Object>> getAllWindCompany();
 
 
     /**

energy-manage-service/src/main/java/com/energy/manage/service/service/company/impl/WindCompanyServiceImpl.java

@@ -143,7 +143,7 @@ public class WindCompanyServiceImpl extends BaseServiceImpl<WindCompanyPO> imple
     }
 
     @Override
-    public List<WindCompanyPageVo> getAllWindCompany() {
+    public List<Map<String, Object>> getAllWindCompany() {
         return windRelationService.getWindRelationCompany();
     }
 

energy-manage-service/src/main/java/com/energy/manage/service/service/system/SysPermissionService.java

@@ -8,6 +8,7 @@ import com.energy.manage.service.domain.vo.system.PermissionVo;
 import com.energy.manage.service.domain.vo.system.SysRelationVo;
 
 import java.util.List;
+import java.util.Map;
 
 public interface SysPermissionService extends BaseService<SysPermissionPO> {
 
@@ -21,7 +22,7 @@ public interface SysPermissionService extends BaseService<SysPermissionPO> {
 
     List<PermissionVo> getRolePermission(Integer roleId);
 
-    List<SysRelationVo> getRoleOrganization(Integer roleId);
+    List<Map<String, Object>> getRoleOrganization(Integer roleId);
 
     List<PermissionVo> getRolePermissionByUserId(Integer userId);
 

energy-manage-service/src/main/java/com/energy/manage/service/service/system/SysRoleService.java

@@ -6,6 +6,7 @@ import com.energy.manage.common.base.BaseService;
 import com.energy.manage.common.base.Page;
 import com.energy.manage.common.po.system.SysRolePO;
 import com.energy.manage.common.reponse.ResultResp;
+import com.energy.manage.service.domain.dto.system.RoleUpdateStateDto;
 
 public interface SysRoleService extends BaseService<SysRolePO> {
 
@@ -15,6 +16,8 @@ public interface SysRoleService extends BaseService<SysRolePO> {
 
     ResultResp deleteRole(SysRolePO rolePO);
 
+    boolean updateRoleAvailable(RoleUpdateStateDto updateStateDto);
+
     boolean updateRole(SysRolePO rolePO);
 
     Page<SysRolePO> getRoleListByName(Integer pageNum, Integer pageSize, String roleName,Integer roleAvailable);

energy-manage-service/src/main/java/com/energy/manage/service/service/system/impl/SysPermissionServiceImpl.java

@@ -29,6 +29,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -91,7 +92,7 @@ public class SysPermissionServiceImpl extends BaseServiceImpl<SysPermissionPO> i
 
 
     @Override
-    public List<SysRelationVo> getRoleOrganization(Integer roleId) {
+    public List<Map<String, Object>> getRoleOrganization(Integer roleId) {
 
         List<String> roleOrganizationCode = rolePermissionMapper.getRoleOrganization(roleId);
         SysRelationVo sysRelationVo = null;
@@ -109,9 +110,9 @@ public class SysPermissionServiceImpl extends BaseServiceImpl<SysPermissionPO> i
         // 获取树形结构
         List<Map<String, Object>> java8ResultTree = TreeUtil.getJava8ResultTree(mapList);
         // map转list
-        List<SysRelationVo> voList = BeanMapUtils.listMapToListBean(java8ResultTree, SysRelationVo.class);
+//        List<SysRelationVo> voList = BeanMapUtils.convertListMapToJavaBean(java8ResultTree, SysRelationVo.class);
 
-        return voList;
+        return java8ResultTree;
     }
 
 
@@ -157,6 +158,8 @@ public class SysPermissionServiceImpl extends BaseServiceImpl<SysPermissionPO> i
             sysOrganizationAuthPO.setRoleId(roleId);
             sysOrganizationAuthPO.setCodeNumber(item.getCodeNumber());
             sysOrganizationAuthPO.setCodeType(item.getCodeType());
+            sysOrganizationAuthPO.setCreateTime(new Date());
+            sysOrganizationAuthPO.setUpdateTime(new Date());
             dataList.add(sysOrganizationAuthPO);
         }
         return sysOrganizationAuthMapper.insertList(dataList) > 0;

energy-manage-service/src/main/java/com/energy/manage/service/service/system/impl/SysRoleServiceImpl.java

@@ -9,6 +9,7 @@ import com.energy.manage.common.po.system.SysRolePermissionPO;
 import com.energy.manage.common.po.system.SysUserRolePO;
 import com.energy.manage.common.reponse.RespMsg;
 import com.energy.manage.common.reponse.ResultResp;
+import com.energy.manage.service.domain.dto.system.RoleUpdateStateDto;
 import com.energy.manage.service.mappers.system.SysRoleMapper;
 import com.energy.manage.service.mappers.system.SysRolePermissionMapper;
 import com.energy.manage.service.mappers.system.SysUserRoleMapper;
@@ -18,6 +19,7 @@ import com.github.pagehelper.PageInfo;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import tk.mybatis.mapper.entity.Example;
 
 import java.util.List;
 
@@ -64,6 +66,16 @@ public class SysRoleServiceImpl extends BaseServiceImpl<SysRolePO> implements Sy
 	}
 
 	@Override
+	public boolean updateRoleAvailable(RoleUpdateStateDto updateStateDto) {
+		SysRolePO sysRolePO = new SysRolePO();
+		sysRolePO.setRoleAvailable(updateStateDto.getRoleAvailable());
+		Example queryExample = new Example(SysRolePO.class);
+		Example.Criteria criteria = queryExample.createCriteria();
+		criteria.andEqualTo("id", updateStateDto.getRoleId());
+		return sysRoleMapper.updateByExampleSelective(sysRolePO,queryExample) >= 0;
+	}
+
+	@Override
 	public boolean updateRole(SysRolePO rolePO) {
 		return sysRoleMapper.updateRoleSelective(rolePO) >= 0;
 	}

energy-manage-service/src/main/java/com/energy/manage/service/service/windfield/WindFieldService.java

@@ -8,6 +8,7 @@ import com.energy.manage.service.domain.vo.windrelation.WindRelationVo;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 风场信息业务层
@@ -96,7 +97,7 @@ public interface WindFieldService {
      * 整体树结构
      * @return
      */
-    List<WindRelationVo> getWindFieldTree();
+    List<Map<String, Object>> getWindFieldTree();
 
 
 

energy-manage-service/src/main/java/com/energy/manage/service/service/windfield/impl/WindFieldServiceImpl.java

@@ -46,6 +46,7 @@ import tk.mybatis.mapper.entity.Example;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 
 @Slf4j
@@ -301,7 +302,7 @@ public class WindFieldServiceImpl extends BaseServiceImpl<WindFieldPO> implement
     }
 
     @Override
-    public List<WindRelationVo> getWindFieldTree() {
+    public List<Map<String, Object>> getWindFieldTree() {
         return windRelationServic.getWindRelationTree();
     }
 

energy-manage-service/src/main/java/com/energy/manage/service/service/windrelation/WindRelationService.java

@@ -6,6 +6,7 @@ import com.energy.manage.service.domain.vo.company.WindCompanyPageVo;
 import com.energy.manage.service.domain.vo.windrelation.WindRelationVo;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 关系表
@@ -49,7 +50,7 @@ public interface WindRelationService {
      *
      * @return
      */
-    List<WindCompanyPageVo> getWindRelationCompany();
+    List<Map<String, Object>> getWindRelationCompany();
 
 
     /**
@@ -57,6 +58,6 @@ public interface WindRelationService {
      *
      * @return
      */
-    List<WindRelationVo> getWindRelationTree();
+    List<Map<String, Object>> getWindRelationTree();
 
 }

energy-manage-service/src/main/java/com/energy/manage/service/service/windrelation/impl/WindRelationServiceImpl.java

@@ -86,7 +86,7 @@ public class WindRelationServiceImpl extends BaseServiceImpl<WindRelationPO> imp
 
 
     @Override
-    public List<WindCompanyPageVo> getWindRelationCompany() {
+    public  List<Map<String, Object>> getWindRelationCompany() {
 
         List<WindCompanyPageVo> windCompanyPageVos = windRelationMapper.selectWindRelationCompanyByType(TypeRelationEnum.COMPANY_NUMBER.getCode());
         // 转化为Map集合
@@ -94,13 +94,13 @@ public class WindRelationServiceImpl extends BaseServiceImpl<WindRelationPO> imp
         // 获取树形结构
         List<Map<String, Object>> java8ResultTree = TreeUtil.getJava8ResultTree(mapList);
         // map转list
-        List<WindCompanyPageVo> poList = BeanMapUtils.listMapToListBean(java8ResultTree, WindCompanyPageVo.class);
+//        List<WindCompanyPageVo> poList = BeanMapUtils.listMapToListBean(java8ResultTree, WindCompanyPageVo.class);
 
-        return poList;
+        return java8ResultTree;
     }
 
     @Override
-    public List<WindRelationVo> getWindRelationTree() {
+    public  List<Map<String, Object>> getWindRelationTree() {
 
         WindRelationVo windRelationVo = null;
         List<WindRelationVo> windRelationVos = Lists.newArrayList();
@@ -115,9 +115,9 @@ public class WindRelationServiceImpl extends BaseServiceImpl<WindRelationPO> imp
         // 获取树形结构
         List<Map<String, Object>> java8ResultTree = TreeUtil.getJava8ResultTree(mapList);
         // map转list
-        List<WindRelationVo> voList = BeanMapUtils.listMapToListBean(java8ResultTree, WindRelationVo.class);
+//        List<WindRelationVo> voList = BeanMapUtils.listMapToListBean(java8ResultTree, WindRelationVo.class);
 
-        return voList;
+        return java8ResultTree;
     }
 
 

energy-manage-service/src/main/java/com/energy/manage/service/util/BeanMapUtils.java

@@ -3,12 +3,10 @@ package com.energy.manage.service.util;
 import com.alibaba.fastjson.JSONObject;
 import com.google.common.collect.Maps;
 import lombok.SneakyThrows;
+import org.apache.commons.beanutils.BeanUtils;
 import org.springframework.cglib.beans.BeanMap;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -114,4 +112,26 @@ public class BeanMapUtils {
     }
 
 
+
+    public static <T> List<T> convertListMapToJavaBean(List<Map<String, Object>> listMaps, Class<T> beanClass) {
+        List<T> listBeans = new ArrayList<>();
+        for (Map<String, Object> map : listMaps) {
+            T bean;
+            try {
+                bean = beanClass.newInstance();
+                for (Map.Entry<String, Object> entry : map.entrySet()) {
+                    String fieldName = entry.getKey();
+                    Object fieldValue = entry.getValue();
+                    // 使用反射设置JavaBean的字段值
+                    BeanUtils.setProperty(bean, fieldName, fieldValue);
+                }
+                listBeans.add(bean);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        return listBeans;
+    }
+
+
 }

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

@@ -12,14 +12,14 @@
         source as source,
         create_time as createTime
         FROM sys_role
-        <where>
+        where 1=1
             <if test="null != roleName and '' != roleName">
-                role_description LIKE CONCAT('%',#{roleName,jdbcType=VARCHAR},'%')
+               and role_description LIKE CONCAT('%',#{roleName,jdbcType=VARCHAR},'%')
             </if>
-            <if test="null != roleAvailable and '' != roleAvailable">
-                role_available = #{roleAvailable}
+            <if test="null != roleAvailable ">
+               and role_available = #{roleAvailable}
             </if>
-        </where>
+
         ORDER BY id ASC
     </select>