系统管理的功能接口调整

microservice-admin/src/main/java/com/devplatform/admin/modules/liresource/bean/LiResource.java

@@ -3,9 +3,11 @@ package com.devplatform.admin.modules.liresource.bean;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 
@@ -16,9 +18,6 @@ import java.io.Serializable;
 @TableName("li_resource")
 @Data
 public class LiResource implements Serializable {
-    /**
-     *
-     */
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "主键ID", name = "id")
@@ -34,9 +33,38 @@ public class LiResource implements Serializable {
     /** 资源点编码*/
     private java.lang.String code;
 
-    @ApiModelProperty(value = "资源点类型(1枪机，2球机)", name = "type")
-    /** 资源点类型(1枪机，2球机)*/
+    @ApiModelProperty(value = "资源点类型(数据字典id)", name = "type")
+    /** 资源点类型(数据字典id)*/
     private java.lang.String type;
+
+    @ApiModelProperty(value = "所属区域(1候车大厅，2办公区域，3屋顶)", name = "region")
+    /** 所属区域(1候车大厅，2办公区域，3屋顶)*/
+    private Integer region;
+
+    @ApiModelProperty(value = "品牌", name = "brand")
+    /** 品牌*/
+    private java.lang.String brand;
+
+    @ApiModelProperty(value = "资源点型号", name = "equipmentModel")
+    /** 资源点型号*/
+    private java.lang.String equipmentModel;
+
+    @ApiModelProperty(value = "最大功率", name = "maxPower")
+    /** 最大功率*/
+    private java.lang.String maxPower;
+
+    @ApiModelProperty(value = "安装日期", name = "installDate")
+    /** 安装日期*/
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private java.util.Date installDate;
+
+    @ApiModelProperty(value = "维保日期", name = "maintenanceDate")
+    /** 维保日期*/
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private java.util.Date maintenanceDate;
+
     @ApiModelProperty(value = "站点ID", name = "stationId")
     /** 站点ID*/
     private java.lang.String stationId;
@@ -49,14 +77,6 @@ public class LiResource implements Serializable {
     /** 站层id(li_station_map表id)*/
     private java.lang.String tierId;
 
-    @ApiModelProperty(value = "子系统", name = "subSystem")
-    /** 子系统*/
-    private java.lang.String subSystem;
-
-    @ApiModelProperty(value = "子系统资源编码", name = "subCode")
-    /** 子系统资源编码*/
-    private java.lang.String subCode;
-
     @ApiModelProperty(value = "地址码", name = "addressCode")
     /** 地址码*/
     private java.lang.String addressCode;
@@ -65,10 +85,6 @@ public class LiResource implements Serializable {
     /** 端口号*/
     private java.lang.String port;
 
-    @ApiModelProperty(value = "输送带端口号", name = "ajjPort")
-    /** 输送带端口号*/
-    private java.lang.String ajjPort;
-
     @ApiModelProperty(value = "用户名", name = "username")
     /** 用户名*/
     private java.lang.String username;
@@ -117,16 +133,8 @@ public class LiResource implements Serializable {
     /** 图标*/
     private java.lang.String icon;
 
-    @ApiModelProperty(value = "父节点id", name = "parentName")
-    /** 父节点id*/
-    private java.lang.String parentName;
-
-    @ApiModelProperty(value = "系统标识", name = "sysSign")
-    /** 系统标识*/
-    private java.lang.String sysSign;
-
-    @ApiModelProperty(value = "资源点状态(1正常，0不可用)", name = "status")
-    /** 资源点状态(1正常，0不可用)*/
+    @ApiModelProperty(value = "资源点状态(1在线，2离线，3故障)", name = "status")
+    /** 资源点状态(1在线，2离线，3故障)*/
     private Integer status;
 
     @ApiModelProperty(value = "是否已删除（0未删除，1已删除）", name = "deleted")
@@ -161,10 +169,6 @@ public class LiResource implements Serializable {
     /** 备用项3*/
     private java.lang.String byx3;
 
-    @ApiModelProperty(value = "品牌", name = "brand")
-    /** 品牌*/
-    private java.lang.String brand;
-
     @ApiModelProperty(value = "经度", name = "xlongit")
     /** 经度*/
     private java.lang.String xlongit;
@@ -186,17 +190,13 @@ public class LiResource implements Serializable {
     private String iconPath;
 
     @TableField(exist = false)
-    /** 资源点名称*/
+    /** 资源点类型名称*/
     private String resourceName;
 
     @TableField(exist = false)
     /** 品牌名称*/
     private String brandName;
 
-    @TableField(exist = false)
-    /** 父节点名称*/
-    private String pName;
-
     @TableField(exist = false)
     /** 资源点编码的前缀*/
     private String codeType;

microservice-admin/src/main/java/com/devplatform/admin/modules/liresource/dao/LiResourceDao.java

@@ -3,12 +3,12 @@ package com.devplatform.admin.modules.liresource.dao;
 import com.devplatform.admin.modules.liresource.bean.LiResource;
 import com.devplatform.admin.modules.liresource.model.LiResourceModel;
 import com.devplatform.common.dao.MyBaseMapper;
-import java.util.List;
-import java.util.Map;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 /**
  * LiResource Mapper 用于资源点管理表的数据库操作
  *
@@ -32,13 +32,6 @@ public interface LiResourceDao extends MyBaseMapper<LiResource> {
    */
   List<LiResource> queryPageByList(LiResourceModel model);
 
-  /**
-   * 批量删除资源点
-   * @param list
-   * @param sysSign
-   */
-  void deleteByIds(@Param("list") List<String> list, @Param("sysSign") String sysSign);
-
   /**
    * 查询资源点树信息
    * @param model
@@ -54,13 +47,6 @@ public interface LiResourceDao extends MyBaseMapper<LiResource> {
    */
   LiResource getBeanById(@Param("id") String id, @Param("stationId") String stationId);
 
-  /**
-   * 根据类型查询资源点
-   * @param model
-   * @return
-   */
-  List<Map<String, Object>> queryResourceType(LiResourceModel model);
-
   /**
    * 查询图层中资源点的数量
    * @param tierId

microservice-admin/src/main/java/com/devplatform/admin/modules/liresource/model/LiResourceModel.java

@@ -12,80 +12,144 @@ import java.util.List;
  */
 @Data
 public class LiResourceModel extends BaseModel {
-
-	/** 主键id*/
+    /**
+     * 主键id
+     */
     private java.lang.String id;
-	/** 资源点名称*/
+    /**
+     * 资源点名称
+     */
     private java.lang.String name;
-	/** 资源点编码*/
+    /**
+     * 资源点编码
+     */
     private java.lang.String code;
-	/** 资源点类型(1枪机，2球机)*/
+    /**
+     * 资源点类型(数据字典id)
+     */
     private java.lang.String type;
-	/** 站点ID*/
+    /** 所属区域(1候车大厅，2办公区域，3屋顶)*/
+    private Integer region;
+    /**
+     * 品牌
+     */
+    private java.lang.String brand;
+    /**
+     * 资源点型号
+     */
+    private java.lang.String equipmentModel;
+    /**
+     * 最大功率
+     */
+    private java.lang.String maxPower;
+    /**
+     * 安装日期
+     */
+    private java.util.Date installDate;
+    /**
+     * 维保日期
+     */
+    private java.util.Date maintenanceDate;
+    /**
+     * 站点ID
+     */
     private java.lang.String stationId;
-	/** 站点名称*/
+    /**
+     * 站点名称
+     */
     private java.lang.String stationName;
-	/** 站层id(li_station_map表id)*/
+    /**
+     * 站层id(li_station_map表id)
+     */
     private java.lang.String tierId;
-	/** 子系统*/
-  private java.lang.String subSystem; 
-	/** 子系统资源编码*/
-  private java.lang.String subCode; 
-	/** 地址码*/
+    /**
+     * 地址码
+     */
     private java.lang.String addressCode;
-	/** 端口号*/
+    /**
+     * 端口号
+     */
     private java.lang.String port;
-  /** 输送带端口号*/
-  private java.lang.String ajjPort;
-	/** 用户名*/
+    /**
+     * 用户名
+     */
     private java.lang.String username;
-	/** 密码*/
+    /**
+     * 密码
+     */
     private java.lang.String password;
-	/** x轴坐标*/
+    /**
+     * x轴坐标
+     */
     private java.lang.String xpoint;
-	/** y轴坐标*/
+    /**
+     * y轴坐标
+     */
     private java.lang.String ypoint;
-	/** 部署位置*/
+    /**
+     * 部署位置
+     */
     private java.lang.String deployLocation;
-	/** 当前操作员id*/
+    /**
+     * 当前操作员id
+     */
     private java.lang.String operatorId;
-	/** 当前操作员姓名*/
+    /**
+     * 当前操作员姓名
+     */
     private java.lang.String operatorName;
-	/** 附属信息*/
+    /**
+     * 附属信息
+     */
     private java.lang.String attachedInfo;
-	/** 资源点简介*/
+    /**
+     * 资源点简介
+     */
     private java.lang.String remark;
-	/** 资源点图标*/
+    /**
+     * 资源点图标
+     */
     private java.lang.String icon;
-	/** 父节点名称*/
-  private java.lang.String parentName; 
-	/** 系统标识*/
-  private java.lang.String sysSign; 
-	/** 资源点状态(1正常，0不可用)*/
+    /**
+     * 资源点状态(1在线，2离线，3故障)
+     */
     private Integer status;
-	/** 是否已删除（0未删除，1已删除）*/
+    /**
+     * 是否已删除（0未删除，1已删除）
+     */
     private Integer deleted;
-	/** 创建人*/
+    /**
+     * 创建人
+     */
     private java.lang.String createUserId;
-	/** 创建时间*/
+    /**
+     * 创建时间
+     */
     private java.util.Date createTime;
-	/** 修改人*/
+    /**
+     * 修改人
+     */
     private java.lang.String updateUserId;
-	/** 修改时间*/
+    /**
+     * 修改时间
+     */
     private java.util.Date updateTime;
-	/** 备用项1*/
+    /**
+     * 备用项1
+     */
     private java.lang.String byx1;
-	/** 备用项2*/
+    /**
+     * 备用项2
+     */
     private java.lang.String byx2;
-	/** 备用项3*/
+    /**
+     * 备用项3
+     */
     private java.lang.String byx3;
-	/** 品牌*/
-  private java.lang.String brand; 
-	/** 多种资源点类型*/
+
+    /**
+     * 多种资源点类型
+     */
     private List<String> list;
-  private java.lang.String myId;
-  /** 预案关联 */
-  private java.lang.String queryInfo;
-  /** 预案关联 （1：新建/编辑;2:查看） */
-  private java.lang.String glType;
+
 }

microservice-admin/src/main/java/com/devplatform/admin/modules/liresource/service/LiResourceService.java

@@ -3,8 +3,8 @@ package com.devplatform.admin.modules.liresource.service;
 import com.devplatform.admin.modules.liresource.bean.LiResource;
 import com.devplatform.admin.modules.liresource.model.LiResourceModel;
 import com.devplatform.common.service.MyBaseService;
+
 import java.util.List;
-import java.util.Map;
 
 /**
  * 资源点管理表的service接口 <br>
@@ -22,13 +22,6 @@ public interface LiResourceService extends MyBaseService<LiResource> {
    */
   List<LiResource> queryPageByList(LiResourceModel model);
 
-  /**
-   * 逻辑删除
-   * @param list
-   * @param sysSign
-   */
-  void deleteByIds(List<String> list, String sysSign);
-
   /**
    * 获取线路-站点-资源点树
    *
@@ -45,14 +38,6 @@ public interface LiResourceService extends MyBaseService<LiResource> {
    */
   LiResource getBeanById(String id, String stationId);
 
-  /**
-   * 根据子系统查询下面的资源类型
-   *
-   * @param model
-   * @return
-   */
-  List<Map<String, Object>> queryResourceType(LiResourceModel model);
-
   /**
    * 根据站层id查询资源点数量
    *
@@ -68,11 +53,4 @@ public interface LiResourceService extends MyBaseService<LiResource> {
    * @return 资源点详情
    */
   LiResource queryByCode(String code);
-
-  /**
-   * 发送MQ信息
-   * @param message
-   * @param stationId
-   */
-  void initMq(String message,String stationId);
 }

microservice-admin/src/main/java/com/devplatform/admin/modules/liresource/service/impl/LiResourceServiceImpl.java

 package com.devplatform.admin.modules.liresource.service.impl;
 
-import com.devplatform.admin.common.utils.RabbitMqProvider;
 import com.devplatform.admin.modules.liresource.bean.LiResource;
 import com.devplatform.admin.modules.liresource.dao.LiResourceDao;
 import com.devplatform.admin.modules.liresource.model.LiResourceModel;
@@ -9,7 +8,6 @@ import com.devplatform.common.service.impl.MyBaseServiceImpl;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * 资源点管理表的service接口实现类 <br>
@@ -21,18 +19,6 @@ import java.util.Map;
 public class LiResourceServiceImpl extends MyBaseServiceImpl<LiResourceDao, LiResource>
     implements LiResourceService {
 
-//  @Value("${spring.rabbitmq.host}")
-//  private String host;
-//  @Value("${spring.rabbitmq.username}")
-//  private String username;
-//  @Value("${spring.rabbitmq.password}")
-//  private String password;
-//  @Value("${spring.rabbitmq.port}")
-//  private int port;
-//  @Value("${spring.rabbitmq.virtual-host}")
-//  private String virtualHost;
-
-
   @Override
   public List<LiResource> queryPageByList(LiResourceModel model) {
     Integer rowCount = baseMapper.queryPageByCount(model);
@@ -40,13 +26,6 @@ public class LiResourceServiceImpl extends MyBaseServiceImpl<LiResourceDao, LiRe
     return baseMapper.queryPageByList(model);
   }
 
-  @Override
-  public void deleteByIds(List<String> list, String sysSign) {
-    if (list != null && list.size() > 0) {
-      baseMapper.deleteByIds(list, sysSign);
-    }
-  }
-
   @Override
   public List<LiResource> getTreeList(LiResourceModel model) {
     return baseMapper.getTreeList(model);
@@ -57,11 +36,6 @@ public class LiResourceServiceImpl extends MyBaseServiceImpl<LiResourceDao, LiRe
     return baseMapper.getBeanById(id, stationId);
   }
 
-  @Override
-  public List<Map<String, Object>> queryResourceType(LiResourceModel model) {
-    return baseMapper.queryResourceType(model);
-  }
-
   @Override
   public Integer queryCountByTierId(String tierId) {
     return baseMapper.queryCountByTierId(tierId);
@@ -72,9 +46,4 @@ public class LiResourceServiceImpl extends MyBaseServiceImpl<LiResourceDao, LiRe
     return baseMapper.queryByCode(code);
   }
 
-  @Override
-  public void initMq(String message, String stationId) {
-    RabbitMqProvider mqProvider = new RabbitMqProvider();
-//    mqProvider.sendMsg(message,host,username,password,port,virtualHost,stationId);
-  }
 }

microservice-admin/src/main/java/com/devplatform/admin/modules/sys/controller/SysUserController.java

@@ -29,6 +29,7 @@ import org.apache.shiro.crypto.hash.Sha256Hash;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -326,4 +327,12 @@ public class SysUserController extends AbstractController {
         sysUserService.updatePw(split, pd, salt, getUserId(), getUser().getSysSystem().getCode());
         return R.ok();
     }
+
+    /** 获取民族 */
+    @ApiOperation(value = "获取民族列表", notes = "获取民族列表")
+    @GetMapping("/getAllNation")
+    public R getAllNation() {
+        List<HashMap<String, Object>> result = sysUserService.getAllNation();
+        return R.ok().put("result", result);
+    }
 }

microservice-admin/src/main/java/com/devplatform/admin/modules/sys/dao/SysUserDao.java

@@ -4,10 +4,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.devplatform.admin.modules.sys.bean.SysUserEntity;
 import com.devplatform.admin.modules.sys.model.SysUserModel;
 import com.devplatform.common.dao.MyBaseMapper;
-import java.util.HashMap;
-import java.util.List;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.HashMap;
+import java.util.List;
 
 /**
  * 系统用户
@@ -113,4 +115,11 @@ public interface SysUserDao extends MyBaseMapper<SysUserEntity> {
       @Param("salt") String salt,
       @Param("userId") String userId,
       @Param("sysSign") String sysSign);
+
+  /**
+   * 查询所有民族
+   * @return
+   */
+  @Select("select * from sys_nation")
+  List<HashMap<String, Object>> getAllNation();
 }

microservice-admin/src/main/java/com/devplatform/admin/modules/sys/service/SysUserService.java

@@ -5,9 +5,10 @@ import com.devplatform.admin.modules.sys.bean.SysUserEntity;
 import com.devplatform.admin.modules.sys.model.SysUserModel;
 import com.devplatform.common.service.MyBaseService;
 import com.devplatform.common.util.R;
+import org.apache.ibatis.annotations.Param;
+
 import java.util.HashMap;
 import java.util.List;
-import org.apache.ibatis.annotations.Param;
 
 /**
  * 系统用户
@@ -149,4 +150,10 @@ public interface SysUserService extends MyBaseService<SysUserEntity> {
    * @param sysSign
    */
   void updatePw(String[] split, String password, String salt, String userId, String sysSign);
+
+  /**
+   * 查询所有民族
+   * @return
+   */
+  List<HashMap<String, Object>> getAllNation();
 }

microservice-admin/src/main/java/com/devplatform/admin/modules/sys/service/impl/SysUserServiceImpl.java

@@ -214,4 +214,9 @@ public class SysUserServiceImpl extends MyBaseServiceImpl<SysUserDao, SysUserEnt
             String[] split, String password, String salt, String userId, String sysSign) {
         baseMapper.updatePw(split, password, salt, userId, sysSign);
     }
+
+    @Override
+    public List<HashMap<String, Object>> getAllNation() {
+        return baseMapper.getAllNation();
+    }
 }

microservice-admin/src/main/java/com/devplatform/admin/modules/sysdictionary/bean/SysDictionary.java

@@ -16,12 +16,8 @@ public class SysDictionary implements Serializable {
   /** */
   private static final long serialVersionUID = 1L;
 
-  @ApiModelProperty(value = "主键ID", name = "keyId")
-  @TableId
-	/** 主键id*/
-  private java.lang.String keyId; 
-
   @ApiModelProperty(value = "下拉框id", name = "id")
+  @TableId
 	/** 下拉框id*/
   private java.lang.String id;
 
@@ -92,14 +88,6 @@ public class SysDictionary implements Serializable {
   @TableField(exist = false)
   private List<SysDictionary> children;
 
-  public String getKeyId() {
-    return keyId;
-  }
-
-  public void setKeyId(String keyId) {
-    this.keyId = keyId;
-  }
-
   /** 主键id的getter方法 */
   public java.lang.String getId() {
     return id;

microservice-admin/src/main/java/com/devplatform/admin/modules/sysdictionary/controller/SysDictionaryController.java

@@ -17,19 +17,10 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.*;
 /**
  * @author Administrator
  */
@@ -103,9 +94,8 @@ public class SysDictionaryController extends AbstractController {
         return R.error("字典项名称已存在！");
       }
     }
-    String uuid = UUID.randomUUID().toString().replace("-", "");
-    bean.setId(uuid);
-    bean.setKeyId(uuid);
+//    String uuid = UUID.randomUUID().toString().replace("-", "");
+//    bean.setId(uuid);
     bean.setCreateUserId(getUserId());
     bean.setCreateTime(new Date());
     bean.setSysSign(getUser().getSysSystem().getCode());

microservice-admin/src/main/java/com/devplatform/admin/modules/sysdictionary/model/SysDictionaryModel.java

@@ -8,9 +8,6 @@ import com.devplatform.admin.common.model.BaseModel;
  * @author 代码生成器产生
  */
 public class SysDictionaryModel extends BaseModel {
-
-	/** 主键id*/
-  private java.lang.String keyId; 
 	/** 主键id*/
   private java.lang.String id; 
 	/** 字典项名称*/
@@ -54,14 +51,6 @@ public class SysDictionaryModel extends BaseModel {
     this.stationId = stationId;
   }
 
-  public String getKeyId() {
-    return keyId;
-  }
-
-  public void setKeyId(String keyId) {
-    this.keyId = keyId;
-  }
-
   /** 主键id的getter方法 */
   public java.lang.String getId() {
     return id;

microservice-admin/src/main/resources/mapper/sys/SysUserDao.xml

@@ -104,7 +104,8 @@
     </select>
 
     <select id="getAllUserByOrgIdPage" resultType="java.util.HashMap">
-        SELECT u.*,sd.name AS jobName ,sn.name AS nationName
+        SELECT u.*,sd.name AS jobName ,sn.name AS nationName,
+        (SELECT GROUP_CONCAT(sr.role_name) from sys_role sr where sr.role_id in (select sur.role_id from sys_user_role sur where sur.user_id = u.user_id)) AS roleNames
         FROM sys_user u
         LEFT JOIN sys_dictionary sd ON u.job = sd.id AND sd.deleted = 0 AND sd.station_id = u.station_id
         LEFT JOIN sys_nation sn ON u.nation = sn.id

microservice-admin/src/main/resources/mapper/sysDictionary/SysDictionaryMapper.xml

@@ -3,7 +3,6 @@
 <mapper namespace="com.devplatform.admin.modules.sysdictionary.dao.SysDictionaryDao">
   <!-- Result Map -->
   <resultMap id="BaseResultMap" type="com.devplatform.admin.modules.sysdictionary.bean.SysDictionary">
-    <result column="key_id" property="keyId"/>
     <result column="id" property="id"/>
     <result column="name" property="name"/>
     <result column="value" property="value"/>
@@ -25,7 +24,7 @@
 
   <!-- sys_dictionary table all fields -->
   <sql id="Base_Column_List">
-		key_id,id,name,value,parent_id,remark,status,deleted,create_user_id,create_time,update_user_id,update_time,byx1,byx2,byx3,sys_sign,sort_value,station_id
+		id,name,value,parent_id,remark,status,deleted,create_user_id,create_time,update_user_id,update_time,byx1,byx2,byx3,sys_sign,sort_value,station_id
 	</sql>
 
   <!-- 公共查询条件 -->