App 菜单模板管理

esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/AppMenuTemplateDTO.java

@@ -0,0 +1,106 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * APP菜单模板管理
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2019-11-19
+ */
+@Data
+public class AppMenuTemplateDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 是否渐变色（0否1是）
+     */
+	private String gradationFlag;
+
+    /**
+     * 背景颜色（渐变色为0时使用）
+     */
+	private String backgroundColor;
+
+    /**
+     * 开始色（渐变色为1时使用）
+     */
+	private String startColor;
+
+    /**
+     * 终止色（渐变色为1时使用）
+     */
+	private String endColor;
+
+    /**
+     * 标签颜色
+     */
+	private String lableColor;
+
+    /**
+     * 菜单图标
+     */
+	private String icon;
+
+    /**
+     * 模板编码(tem-1,tem-2,tem-3)
+     */
+	private String templateCode;
+
+    /**
+     * 模板名称
+     */
+	private String templateName;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/AppMenuTemplateController.java

@@ -0,0 +1,85 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.controller;
+
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
+import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
+import com.elink.esua.epdc.dto.AppMenuTemplateDTO;
+import com.elink.esua.epdc.service.AppMenuTemplateService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+
+/**
+ * APP菜单模板管理
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2019-11-19
+ */
+@RestController
+@RequestMapping("appmenutemplate")
+public class AppMenuTemplateController {
+    
+    @Autowired
+    private AppMenuTemplateService appMenuTemplateService;
+
+    @GetMapping("page")
+    public Result<PageData<AppMenuTemplateDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<AppMenuTemplateDTO> page = appMenuTemplateService.page(params);
+        return new Result<PageData<AppMenuTemplateDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<AppMenuTemplateDTO> get(@PathVariable("id") String id){
+        AppMenuTemplateDTO data = appMenuTemplateService.get(id);
+        return new Result<AppMenuTemplateDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody AppMenuTemplateDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        appMenuTemplateService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody AppMenuTemplateDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        appMenuTemplateService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        appMenuTemplateService.delete(ids);
+        return new Result();
+    }
+
+}

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/AppMenuTemplateDao.java

@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.dao;
+
+import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.entity.AppMenuTemplateEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * APP菜单模板管理
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2019-11-19
+ */
+@Mapper
+public interface AppMenuTemplateDao extends BaseDao<AppMenuTemplateEntity> {
+	
+}

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/AppMenuTemplateEntity.java

@@ -0,0 +1,81 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * APP菜单模板管理
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2019-11-19
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("sys_app_menu_template")
+public class AppMenuTemplateEntity extends BaseEpdcEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 是否渐变色（0否1是）
+     */
+	private String gradationFlag;
+
+    /**
+     * 背景颜色（渐变色为0时使用）
+     */
+	private String backgroundColor;
+
+    /**
+     * 开始色（渐变色为1时使用）
+     */
+	private String startColor;
+
+    /**
+     * 终止色（渐变色为1时使用）
+     */
+	private String endColor;
+
+    /**
+     * 标签颜色
+     */
+	private String lableColor;
+
+    /**
+     * 菜单图标
+     */
+	private String icon;
+
+    /**
+     * 模板编码(tem-1,tem-2,tem-3)
+     */
+	private String templateCode;
+
+    /**
+     * 模板名称
+     */
+	private String templateName;
+
+}

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/redis/AppMenuTemplateRedis.java

@@ -0,0 +1,47 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.redis;
+
+import com.elink.esua.epdc.commons.tools.redis.RedisUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * APP菜单模板管理
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2019-11-19
+ */
+@Component
+public class AppMenuTemplateRedis {
+    @Autowired
+    private RedisUtils redisUtils;
+
+    public void delete(Object[] ids) {
+
+    }
+
+    public void set(){
+
+    }
+
+    public String get(String id){
+        return null;
+    }
+
+}

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/AppMenuTemplateService.java

@@ -0,0 +1,95 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.service;
+
+import com.elink.esua.epdc.commons.mybatis.service.BaseService;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.dto.AppMenuTemplateDTO;
+import com.elink.esua.epdc.entity.AppMenuTemplateEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * APP菜单模板管理
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2019-11-19
+ */
+public interface AppMenuTemplateService extends BaseService<AppMenuTemplateEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<AppMenuTemplateDTO>
+     * @author generator
+     * @date 2019-11-19
+     */
+    PageData<AppMenuTemplateDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<AppMenuTemplateDTO>
+     * @author generator
+     * @date 2019-11-19
+     */
+    List<AppMenuTemplateDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return AppMenuTemplateDTO
+     * @author generator
+     * @date 2019-11-19
+     */
+    AppMenuTemplateDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2019-11-19
+     */
+    void save(AppMenuTemplateDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2019-11-19
+     */
+    void update(AppMenuTemplateDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2019-11-19
+     */
+    void delete(String[] ids);
+}

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/AppMenuTemplateServiceImpl.java

@@ -0,0 +1,104 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
+import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
+import com.elink.esua.epdc.dao.AppMenuTemplateDao;
+import com.elink.esua.epdc.dto.AppMenuTemplateDTO;
+import com.elink.esua.epdc.entity.AppMenuTemplateEntity;
+import com.elink.esua.epdc.redis.AppMenuTemplateRedis;
+import com.elink.esua.epdc.service.AppMenuTemplateService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * APP菜单模板管理
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2019-11-19
+ */
+@Service
+public class AppMenuTemplateServiceImpl extends BaseServiceImpl<AppMenuTemplateDao, AppMenuTemplateEntity> implements AppMenuTemplateService {
+
+    @Autowired
+    private AppMenuTemplateRedis appMenuTemplateRedis;
+
+    @Override
+    public PageData<AppMenuTemplateDTO> page(Map<String, Object> params) {
+        IPage<AppMenuTemplateEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, AppMenuTemplateDTO.class);
+    }
+
+    @Override
+    public List<AppMenuTemplateDTO> list(Map<String, Object> params) {
+        List<AppMenuTemplateEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, AppMenuTemplateDTO.class);
+    }
+
+    private QueryWrapper<AppMenuTemplateEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<AppMenuTemplateEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public AppMenuTemplateDTO get(String id) {
+        AppMenuTemplateEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, AppMenuTemplateDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(AppMenuTemplateDTO dto) {
+        AppMenuTemplateEntity entity = ConvertUtils.sourceToTarget(dto, AppMenuTemplateEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(AppMenuTemplateDTO dto) {
+        AppMenuTemplateEntity entity = ConvertUtils.sourceToTarget(dto, AppMenuTemplateEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+}

esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/AppMenuTemplateDao.xml

@@ -0,0 +1,24 @@
+<?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.elink.esua.epdc.dao.AppMenuTemplateDao">
+
+    <resultMap type="com.elink.esua.epdc.entity.AppMenuTemplateEntity" id="appMenuTemplateMap">
+        <result property="id" column="ID"/>
+        <result property="gradationFlag" column="GRADATION_FLAG"/>
+        <result property="backgroundColor" column="BACKGROUND_COLOR"/>
+        <result property="startColor" column="START_COLOR"/>
+        <result property="endColor" column="END_COLOR"/>
+        <result property="lableColor" column="LABLE_COLOR"/>
+        <result property="icon" column="ICON"/>
+        <result property="templateCode" column="TEMPLATE_CODE"/>
+        <result property="templateName" column="TEMPLATE_NAME"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+
+</mapper>

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml

@@ -301,6 +301,9 @@
             AND ug_r.GRID_ID = #{deptId}
         </if>
         AND u.CREATED_TIME &lt;= STR_TO_DATE( #{timestamp}, '%Y-%m-%d %H:%i:%s' )
+        AND ug_l.DEL_FLAG = '0'
+        AND ug_r.DEL_FLAG = '0'
+        AND u.DEL_FLAG = '0'
         GROUP BY
         u.ID
         ORDER BY
@@ -323,5 +326,8 @@
         <if test='allGridFlag=="0"'>
             AND ug_r.GRID_ID = #{deptId}
         </if>
+        AND ug_l.DEL_FLAG = '0'
+        AND ug_r.DEL_FLAG = '0'
+        AND u.DEL_FLAG = '0'
     </select>
 </mapper>