fix menu

zhongzheng-admin/src/main/java/com/zhongzheng/controller/common/CaptchaController.java

@@ -112,7 +112,7 @@ public class CaptchaController {
 			code = captcha.getCode();
 		}
 		redisCache.setCacheObject(verifyKey, code, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES);
-		Map map = new HashMap<String,String>();
+		Map<String,Object> map = new HashMap();
 		map.put("uuid", uuid);
 		map.put("img", captcha.getImageBase64());
 		return AjaxResult.success(map);

zhongzheng-admin/src/main/java/com/zhongzheng/controller/system/SysMenuController.java

@@ -152,7 +152,7 @@ public class SysMenuController extends BaseController
     @ApiOperation("删除菜单")
     @PreAuthorize("@ss.hasPermi('system:menu:remove')")
     @Log(title = "菜单管理", businessType = BusinessType.DELETE)
-    @PostMapping("/{menuId}")
+    @PostMapping("/delete/{menuId}")
     public AjaxResult remove(@PathVariable("menuId") Long menuId)
     {
         if (menuService.hasChildByMenuId(menuId))

zhongzheng-admin/src/main/java/com/zhongzheng/controller/system/SysUserController.java

@@ -80,7 +80,7 @@ public class SysUserController extends BaseController
     @Log(title = "用户管理", businessType = BusinessType.IMPORT)
     @PreAuthorize("@ss.hasPermi('system:user:import')")
     @PostMapping("/importData")
-    public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
+  /*  public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
     {
         ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
         List<SysUser> userList = util.importExcel(file.getInputStream());
@@ -88,7 +88,7 @@ public class SysUserController extends BaseController
         String operName = loginUser.getUsername();
         String message = userService.importUser(userList, updateSupport, operName);
         return AjaxResult.success(message);
-    }
+    }*/
 
     @GetMapping("/importTemplate")
     public AjaxResult importTemplate()
@@ -103,7 +103,7 @@ public class SysUserController extends BaseController
     @ApiOperation("获取用户详细")
     @ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "int", paramType = "path")
     @PreAuthorize("@ss.hasPermi('system:user:query')")
-    @GetMapping(value = { "/", "/{userId}" })
+    @GetMapping(value = {  "/{userId}" })
     public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId)
     {
         AjaxResult ajax = AjaxResult.success();

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/SchoolAddBo.java

@@ -0,0 +1,42 @@
+package com.zhongzheng.modules.user.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 高校添加对象 school
+ *
+ * @author hjl
+ * @date 2021-05-19
+ */
+@Data
+@ApiModel("高校添加对象")
+public class SchoolAddBo {
+
+    /** 学校类型 */
+    @ApiModelProperty("学校类型")
+    private Integer schoolTypeId;
+    /**  高校名称 */
+    @ApiModelProperty(" 高校名称")
+    private String schoolName;
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Integer status;
+    /** 创建时间 */
+    @ApiModelProperty("创建时间")
+    private Long createtime;
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long updateTime;
+    /** 简介 */
+    @ApiModelProperty("简介")
+    private String introduction;
+    /** 学校城市 */
+    @ApiModelProperty("学校城市")
+    private String schoolCity;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/SchoolEditBo.java

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.user.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+/**
+ * 高校编辑对象 school
+ *
+ * @author hjl
+ * @date 2021-05-19
+ */
+@Data
+@ApiModel("高校编辑对象")
+public class SchoolEditBo {
+
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long id;
+
+    /** 学校类型 */
+    @ApiModelProperty("学校类型")
+    private Integer schoolTypeId;
+
+    /**  高校名称 */
+    @ApiModelProperty(" 高校名称")
+    private String schoolName;
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Integer status;
+
+    /** 创建时间 */
+    @ApiModelProperty("创建时间")
+    private Long createtime;
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long updateTime;
+
+    /** 简介 */
+    @ApiModelProperty("简介")
+    private String introduction;
+
+    /** 学校城市 */
+    @ApiModelProperty("学校城市")
+    private String schoolCity;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/SchoolQueryBo.java

@@ -0,0 +1,55 @@
+package com.zhongzheng.modules.user.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.Map;
+import java.util.HashMap;
+
+import com.zhongzheng.common.core.domain.BaseEntity;
+
+/**
+ * 高校分页查询对象 school
+ *
+ * @author hjl
+ * @date 2021-05-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("高校分页查询对象")
+public class SchoolQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** 学校类型 */
+	@ApiModelProperty("学校类型")
+	private Integer schoolTypeId;
+	/**  高校名称 */
+	@ApiModelProperty(" 高校名称")
+	private String schoolName;
+	/** $column.columnComment */
+	@ApiModelProperty("$column.columnComment")
+	private Integer status;
+	/** 简介 */
+	@ApiModelProperty("简介")
+	private String introduction;
+	/** 学校城市 */
+	@ApiModelProperty("学校城市")
+	private String schoolCity;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/domain/School.java

@@ -0,0 +1,53 @@
+package com.zhongzheng.modules.user.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.zhongzheng.common.annotation.Excel;
+
+/**
+ * 高校对象 school
+ *
+ * @author hjl
+ * @date 2021-05-19
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("school")
+public class School implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+
+    /** $column.columnComment */
+    @TableId(value = "id")
+    private Long id;
+
+    /** 学校类型 */
+    private Integer schoolTypeId;
+
+    /**  高校名称 */
+    private String schoolName;
+
+    /** $column.columnComment */
+    private Integer status;
+
+    /** 创建时间 */
+    private Long createtime;
+
+    /** $column.columnComment */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+
+    /** 简介 */
+    private String introduction;
+
+    /** 学校城市 */
+    private String schoolCity;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/mapper/SchoolMapper.java

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.user.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.user.domain.School;
+
+/**
+ * 高校Mapper接口
+ *
+ * @author hjl
+ * @date 2021-05-19
+ */
+public interface SchoolMapper extends BaseMapper<School> {
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/ISchoolService.java

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.user.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.user.bo.SchoolAddBo;
+import com.zhongzheng.modules.user.bo.SchoolEditBo;
+import com.zhongzheng.modules.user.bo.SchoolQueryBo;
+import com.zhongzheng.modules.user.domain.School;
+import com.zhongzheng.modules.user.vo.SchoolVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 高校Service接口
+ *
+ * @author hjl
+ * @date 2021-05-19
+ */
+public interface ISchoolService extends IService<School> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	SchoolVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+	List<SchoolVo> queryList(SchoolQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入高校
+	 * @param bo 高校新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(SchoolAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改高校
+	 * @param bo 高校编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(SchoolEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/SchoolServiceImpl.java

@@ -0,0 +1,99 @@
+package com.zhongzheng.modules.user.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.modules.user.bo.SchoolAddBo;
+import com.zhongzheng.modules.user.bo.SchoolEditBo;
+import com.zhongzheng.modules.user.bo.SchoolQueryBo;
+import com.zhongzheng.modules.user.domain.School;
+import com.zhongzheng.modules.user.mapper.SchoolMapper;
+import com.zhongzheng.modules.user.service.ISchoolService;
+import com.zhongzheng.modules.user.vo.SchoolVo;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.Page;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 高校Service业务层处理
+ *
+ * @author hjl
+ * @date 2021-05-19
+ */
+@Service
+public class SchoolServiceImpl extends ServiceImpl<SchoolMapper, School> implements ISchoolService {
+
+    @Override
+    public SchoolVo queryById(Long id){
+        School db = this.baseMapper.selectById(id);
+        return BeanUtil.toBean(db, SchoolVo.class);
+    }
+
+    @Override
+    public List<SchoolVo> queryList(SchoolQueryBo bo) {
+        LambdaQueryWrapper<School> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getSchoolTypeId() != null, School::getSchoolTypeId, bo.getSchoolTypeId());
+        lqw.like(StrUtil.isNotBlank(bo.getSchoolName()), School::getSchoolName, bo.getSchoolName());
+        lqw.eq(bo.getStatus() != null, School::getStatus, bo.getStatus());
+        lqw.eq(StrUtil.isNotBlank(bo.getIntroduction()), School::getIntroduction, bo.getIntroduction());
+        lqw.eq(StrUtil.isNotBlank(bo.getSchoolCity()), School::getSchoolCity, bo.getSchoolCity());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<SchoolVo> entity2Vo(Collection<School> collection) {
+        List<SchoolVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, SchoolVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<School> page = (Page<School>)collection;
+            Page<SchoolVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(SchoolAddBo bo) {
+        School add = BeanUtil.toBean(bo, School.class);
+        validEntityBeforeSave(add);
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(SchoolEditBo bo) {
+        School update = BeanUtil.toBean(bo, School.class);
+        validEntityBeforeSave(update);
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(School entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/SchoolVo.java

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.user.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 高校视图对象 mall_package
+ *
+ * @author hjl
+ * @date 2021-05-19
+ */
+@Data
+@ApiModel("高校视图对象")
+public class SchoolVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long id;
+
+	/** 学校类型 */
+	@Excel(name = "学校类型")
+	@ApiModelProperty("学校类型")
+	private Integer schoolTypeId;
+	/**  高校名称 */
+	@Excel(name = " 高校名称")
+	@ApiModelProperty(" 高校名称")
+	private String schoolName;
+	/** $column.columnComment */
+	@Excel(name = " 高校名称")
+	@ApiModelProperty("$column.columnComment")
+	private Integer status;
+	/** 创建时间 */
+	@Excel(name = "创建时间")
+	@ApiModelProperty("创建时间")
+	private Long createtime;
+	/** 简介 */
+	@Excel(name = "简介")
+	@ApiModelProperty("简介")
+	private String introduction;
+	/** 学校城市 */
+	@Excel(name = "学校城市")
+	@ApiModelProperty("学校城市")
+	private String schoolCity;
+
+}

zhongzheng-system/src/main/resources/mapper/modules/user/SchoolMapper.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zhongzheng.system.mapper.SchoolMapper">
+
+    <resultMap type="com.zhongzheng.system.domain.School" id="SchoolResult">
+        <result property="id" column="id"/>
+        <result property="schoolTypeId" column="school_type_id"/>
+        <result property="schoolName" column="school_name"/>
+        <result property="status" column="status"/>
+        <result property="createtime" column="createtime"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="introduction" column="introduction"/>
+        <result property="schoolCity" column="school_city"/>
+    </resultMap>
+
+
+</mapper>