yaoxin-jiangpeng
/
jiangpeng-Vehicle_networking_service_system
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

master
Jiang Peng 2024-06-18 09:49:05 +08:00
parent 78b3204656 2914d640f2
commit f88a2ec153
69 changed files with 985 additions and 938 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
muyu-modules/cloud-modules-many-datasource/src/main/java/com/muyu/cloud/many/datasource/config/ManyDataSource.java
View File

@ -53,7 +53,7 @@ public class ManyDataSource {
List<EnterPriseInfo> list = new ArrayList<>();
list.add(
EnterPriseInfo.builder()
.entCode("jiang_0606")
.entCode("jiang_0612")
.ip("101.34.248.9")
.port(3309)
.build()

12
muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/req/FenceEditReq.java
View File

@ -1,12 +1,12 @@
package com.muyu.customer.business.domain.req;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.AllArgsConstructor;
import lombok.experimental.SuperBuilder;
import io.swagger.annotations.*;
import com.muyu.common.core.web.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
/**
* 电子围栏对象 fence

12
muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/req/FenceQueryReq.java
View File

@ -1,12 +1,12 @@
package com.muyu.customer.business.domain.req;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.AllArgsConstructor;
import lombok.experimental.SuperBuilder;
import io.swagger.annotations.*;
import com.muyu.common.core.web.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
/**
* 电子围栏对象 fence

12
muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/req/FenceSaveReq.java
View File

@ -1,12 +1,12 @@
package com.muyu.customer.business.domain.req;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.AllArgsConstructor;
import lombok.experimental.SuperBuilder;
import io.swagger.annotations.*;
import com.muyu.common.core.web.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
/**
* 电子围栏对象 fence

17
muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/req/VehicleEditReq.java
View File

@ -1,15 +1,16 @@
package com.muyu.customer.business.domain.req;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.muyu.common.core.web.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.AllArgsConstructor;
import lombok.experimental.SuperBuilder;
import io.swagger.annotations.*;
import com.muyu.common.core.web.domain.BaseEntity;
/**
* 车辆录入对象 vehicle

17
muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/req/VehicleQueryReq.java
View File

@ -1,15 +1,16 @@
package com.muyu.customer.business.domain.req;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.muyu.common.core.web.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.AllArgsConstructor;
import lombok.experimental.SuperBuilder;
import io.swagger.annotations.*;
import com.muyu.common.core.web.domain.BaseEntity;
/**
* 车辆录入对象 vehicle

17
muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/req/VehicleSaveReq.java
View File

@ -1,15 +1,16 @@
package com.muyu.customer.business.domain.req;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.muyu.common.core.web.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.AllArgsConstructor;
import lombok.experimental.SuperBuilder;
import io.swagger.annotations.*;
import com.muyu.common.core.web.domain.BaseEntity;
/**
* 车辆录入对象 vehicle

1
muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/controller/FenceController.java
View File

@ -109,3 +109,4 @@ public class FenceController extends BaseController {
return toAjax(fenceService.removeBatchByIds(ids));
}
}

10
muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/controller/VehicleController.java
View File

@ -3,6 +3,8 @@ package com.muyu.customer.business.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.muyu.customer.business.mapper.VehicleMapper;
import io.swagger.annotations.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@ -36,9 +38,12 @@ import com.muyu.common.core.web.page.TableDataInfo;
@RestController
@RequestMapping("/vehicle")
public class VehicleController extends BaseController {
@Autowired
private VehicleService vehicleService;
@Autowired
private VehicleMapper vehicleMapper;
/**
* 查询车辆录入列表
*/
@ -108,4 +113,9 @@ public class VehicleController extends BaseController {
public Result<String> remove(@PathVariable List<Long> ids) {
return toAjax(vehicleService.removeBatchByIds(ids));
}
@GetMapping("/list/all")
public Result<List<Vehicle>> findAll () {
return Result.success(vehicleMapper.selectList(new QueryWrapper<>()));
}
}

77
muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/resources/mapper/customerBusiness/GroupMapper.xml
View File

@ -1,77 +0,0 @@
<?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.muyu.customer.business.mapper.GroupMapper">
<resultMap type="com.muyu.customer.business.domain.Group" id="GroupResult">
<result property="id" column="id" />
<result property="groupName" column="group_name" />
<result property="remark" column="remark" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
</resultMap>
<sql id="selectGroupVo">
select id, group_name, remark, create_by, create_time, update_by, update_time from `group`
</sql>
<select id="selectGroupList" parameterType="com.muyu.customer.business.domain.Group" resultMap="GroupResult">
<include refid="selectGroupVo"/>
<where>
<if test="groupName != null and groupName != ''"> and group_name like concat('%', #{groupName}, '%')</if>
<if test="updateTime != null "> and update_time = #{updateTime}</if>
</where>
</select>
<select id="selectGroupById" parameterType="Long" resultMap="GroupResult">
<include refid="selectGroupVo"/>
where id = #{id}
</select>
<insert id="insertGroup" parameterType="com.muyu.customer.business.domain.Group" useGeneratedKeys="true" keyProperty="id">
insert into `group`
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="groupName != null">group_name,</if>
<if test="remark != null">remark,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="groupName != null">#{groupName},</if>
<if test="remark != null">#{remark},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
</trim>
</insert>
<update id="updateGroup" parameterType="com.muyu.customer.business.domain.Group">
update `group`
<trim prefix="SET" suffixOverrides=",">
<if test="groupName != null">group_name = #{groupName},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteGroupById" parameterType="Long">
delete from `group` where id = #{id}
</delete>
<delete id="deleteGroupByIds" parameterType="String">
delete from `group` where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>

5
muyu-modules/muyu-net-working/muyu-net-working-common/pom.xml
View File

@ -22,6 +22,11 @@
<groupId>com.muyu</groupId>
<artifactId>muyu-common-core</artifactId>
</dependency>
<dependency>
<groupId>com.muyu</groupId>
<artifactId>muyu-common-security</artifactId>
</dependency>
</dependencies>
</project>

24
muyu-modules/muyu-net-working/muyu-net-working-common/src/main/java/com/muyu/net/working/domain/Enterprise.java
View File

@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.muyu.common.security.utils.SecurityUtils;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
@ -29,7 +30,7 @@ import com.muyu.common.core.web.domain.BaseEntity;
@AllArgsConstructor
@TableName("enterprise")
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "Enterprise", description = "企业信息")
@ApiModel(value = "Enterprise", description = "车辆运营平台")
public class Enterprise extends BaseEntity {
private static final long serialVersionUID = 1L;
@ -37,7 +38,7 @@ public class Enterprise extends BaseEntity {
/** 主键 */
@TableId(value = "id",type = IdType.AUTO)
@ApiModelProperty(name = "主键", value = "主键")
private String id;
private Integer id;
/** 企业名称 */
@Excel(name = "企业名称")
@ -83,7 +84,7 @@ public class Enterprise extends BaseEntity {
/** 企业当前状态 */
@Excel(name = "企业当前状态")
@ApiModelProperty(name = "企业当前状态", value = "企业当前状态")
private String status;
private String enterpriseStatus;
/** 企业入驻平台时期 */
@JsonFormat(pattern = "yyyy-MM-dd")
@ -130,7 +131,7 @@ public class Enterprise extends BaseEntity {
.address(enterpriseQueryReq.getAddress())
.contactPhone(enterpriseQueryReq.getContactPhone())
.email(enterpriseQueryReq.getEmail())
.status(enterpriseQueryReq.getStatus())
.enterpriseStatus(enterpriseQueryReq.getEnterpriseStatus())
.registrationDate(enterpriseQueryReq.getRegistrationDate())
.certificationId(enterpriseQueryReq.getCertificationId())
.authenticationDate(enterpriseQueryReq.getAuthenticationDate())
@ -153,43 +154,40 @@ public class Enterprise extends BaseEntity {
.address(enterpriseSaveReq.getAddress())
.contactPhone(enterpriseSaveReq.getContactPhone())
.email(enterpriseSaveReq.getEmail())
.status(enterpriseSaveReq.getStatus())
.enterpriseStatus(enterpriseSaveReq.getEnterpriseStatus())
.registrationDate(enterpriseSaveReq.getRegistrationDate())
.certificationId(enterpriseSaveReq.getCertificationId())
.authenticationDate(enterpriseSaveReq.getAuthenticationDate())
.serviceLevel(enterpriseSaveReq.getServiceLevel())
.openServerId(enterpriseSaveReq.getOpenServerId())
.addServerId(enterpriseSaveReq.getAddServerId())
.createBy(enterpriseSaveReq.getCreateBy())
.createBy(SecurityUtils.getUsername())
.createTime(new Date())
.remark(enterpriseSaveReq.getRemark())
.build();
}
/**
* 修改构造器
*/
public static Enterprise editBuild(String id, EnterpriseEditReq enterpriseEditReq){
public static Enterprise editBuild(Integer id, EnterpriseEditReq enterpriseEditReq){
return Enterprise.builder()
.id(id)
.ebterpriseName(enterpriseEditReq.getEbterpriseName())
.legalPerson(enterpriseEditReq.getLegalPerson())
.ebterpriseName(enterpriseEditReq.getEbterpriseName()) .legalPerson(enterpriseEditReq.getLegalPerson())
.businessLincenseNumber(enterpriseEditReq.getBusinessLincenseNumber())
.estabinessDate(enterpriseEditReq.getEstabinessDate())
.businessScope(enterpriseEditReq.getBusinessScope())
.address(enterpriseEditReq.getAddress())
.contactPhone(enterpriseEditReq.getContactPhone())
.email(enterpriseEditReq.getEmail())
.status(enterpriseEditReq.getStatus())
.enterpriseStatus(enterpriseEditReq.getEnterpriseStatus())
.registrationDate(enterpriseEditReq.getRegistrationDate())
.certificationId(enterpriseEditReq.getCertificationId())
.authenticationDate(enterpriseEditReq.getAuthenticationDate())
.serviceLevel(enterpriseEditReq.getServiceLevel())
.openServerId(enterpriseEditReq.getOpenServerId())
.addServerId(enterpriseEditReq.getAddServerId())
.updateBy(enterpriseEditReq.getUpdateBy())
.updateBy(SecurityUtils.getUsername())
.updateTime(new Date())
.remark(enterpriseEditReq.getRemark())
.build();
}

9
muyu-modules/muyu-net-working/muyu-net-working-common/src/main/java/com/muyu/net/working/domain/req/EnterpriseEditReq.java
View File

@ -9,18 +9,19 @@ import lombok.AllArgsConstructor;
import lombok.experimental.SuperBuilder;
import io.swagger.annotations.*;
import com.muyu.common.core.web.domain.BaseEntity;
import org.springframework.format.annotation.DateTimeFormat;
/**
* 企业信息对象 enterprise
* 车辆运营平台对象 enterprise
*
* @author muyu
* @date 2024-05-27
* @date 2024-06-05
*/
@Data
@SuperBuilder
@NoArgsConstructor
@AllArgsConstructor
@ApiModel(value = "EnterpriseEditReq", description = "企业信息")
@ApiModel(value = "EnterpriseEditReq", description = "车辆运营平台")
public class EnterpriseEditReq extends BaseEntity {
private static final long serialVersionUID = 1L;
@ -60,7 +61,7 @@ public class EnterpriseEditReq extends BaseEntity {
/** 企业当前状态 */
@ApiModelProperty(name = "企业当前状态", value = "企业当前状态")
private String status;
private String enterpriseStatus;
/** 企业入驻平台时期 */
@JsonFormat(pattern = "yyyy-MM-dd")

8
muyu-modules/muyu-net-working/muyu-net-working-common/src/main/java/com/muyu/net/working/domain/req/EnterpriseQueryReq.java
View File

@ -11,16 +11,16 @@ import io.swagger.annotations.*;
import com.muyu.common.core.web.domain.BaseEntity;
/**
* 企业信息对象 enterprise
* 车辆运营平台对象 enterprise
*
* @author muyu
* @date 2024-05-27
* @date 2024-06-05
*/
@Data
@SuperBuilder
@NoArgsConstructor
@AllArgsConstructor
@ApiModel(value = "EnterpriseQueryReq", description = "企业信息")
@ApiModel(value = "EnterpriseQueryReq", description = "车辆运营平台")
public class EnterpriseQueryReq extends BaseEntity {
private static final long serialVersionUID = 1L;
@ -60,7 +60,7 @@ public class EnterpriseQueryReq extends BaseEntity {
/** 企业当前状态 */
@ApiModelProperty(name = "企业当前状态", value = "企业当前状态")
private String status;
private String enterpriseStatus;
/** 企业入驻平台时期 */
@JsonFormat(pattern = "yyyy-MM-dd")

8
muyu-modules/muyu-net-working/muyu-net-working-common/src/main/java/com/muyu/net/working/domain/req/EnterpriseSaveReq.java
View File

@ -11,16 +11,16 @@ import io.swagger.annotations.*;
import com.muyu.common.core.web.domain.BaseEntity;
/**
* 企业信息对象 enterprise
* 车辆运营平台对象 enterprise
*
* @author muyu
* @date 2024-05-27
* @date 2024-06-05
*/
@Data
@SuperBuilder
@NoArgsConstructor
@AllArgsConstructor
@ApiModel(value = "EnterpriseSaveReq", description = "企业信息")
@ApiModel(value = "EnterpriseSaveReq", description = "车辆运营平台")
public class EnterpriseSaveReq extends BaseEntity {
private static final long serialVersionUID = 1L;
@ -74,7 +74,7 @@ public class EnterpriseSaveReq extends BaseEntity {
/** 企业当前状态 */
@ApiModelProperty(name = "企业当前状态", value = "企业当前状态")
private String status;
private String enterpriseStatus;
/** 企业入驻平台时期 */
@JsonFormat(pattern = "yyyy-MM-dd")

51
muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/controller/EnterpriseController.java
View File

@ -10,17 +10,12 @@ import com.muyu.common.system.domain.SysDept;
import com.muyu.common.system.domain.SysUser;
import com.muyu.system.remote.RemoteSysDeptService;
import com.muyu.system.remote.RemoteSysUserService;
import com.muyu.system.remote.factory.RemoteSysDeptFactory;
import io.swagger.annotations.*;
import io.swagger.models.auth.In;
import lombok.extern.log4j.Log4j2;
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.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import com.muyu.common.core.domain.Result;
import com.muyu.common.core.utils.poi.ExcelUtil;
import com.muyu.common.core.web.controller.BaseController;
@ -35,23 +30,21 @@ import com.muyu.net.working.service.EnterpriseService;
import com.muyu.common.core.web.page.TableDataInfo;
/**
* 企业信息Controller
* 车辆运营平台Controller
*
* @author muyu
* @date 2024-05-27
* @date 2024-06-05
*/
@Api(tags = "车辆运营平台")
@Log4j2
@RestController
@RequestMapping("/car")
public class EnterpriseController extends BaseController {
@Autowired
private EnterpriseService enterpriseService;
@Autowired
private RemoteSysDeptService remoteSysDeptService;
@Autowired
private RemoteSysUserService remoteSysUserService;
@ -164,10 +157,21 @@ public class EnterpriseController extends BaseController {
@Log(title = "车辆运营平台", businessType = BusinessType.UPDATE)
@PutMapping("/{id}")
@ApiOperation("修改车辆运营平台")
public Result<String> edit(@PathVariable String id, @RequestBody EnterpriseEditReq enterpriseEditReq) {
public Result<String> edit(@PathVariable Integer id, @RequestBody EnterpriseEditReq enterpriseEditReq) {
String username = SecurityUtils.getUsername();
return toAjax(enterpriseService.updateById(Enterprise.editBuild(id,enterpriseEditReq)));
}
/**
* 查询运营平台列表
*/
@GetMapping("/selectByName")
public Result<Enterprise> selectByName() {
String username = SecurityUtils.getLoginUser().getUsername();
Enterprise enterprise = enterpriseService.selectByName(username);
return Result.success(enterprise);
}
/**
* 删除车辆运营平台
*/
@ -177,7 +181,26 @@ public class EnterpriseController extends BaseController {
@ApiOperation("删除车辆运营平台")
@ApiImplicitParam(name = "id", value = "id", required = true, dataType = "String", paramType = "path", dataTypeClass = String.class, example = "1,2,3,4")
public Result<String> remove(@PathVariable List<String> ids) {
return toAjax(enterpriseService.removeBatchByIds(ids));
}
/**
* 完善企业信息
* @param id
* @param enterpriseEditReq
* @return
*/
@PostMapping("/updateEnterprise/{id}")
public Result<String> updateEnterprise(@PathVariable Integer id, @RequestBody EnterpriseEditReq enterpriseEditReq) {
return toAjax(enterpriseService.updateById(Enterprise.editBuild(id,enterpriseEditReq)));
}
/**
* 企业认证
*/
@PostMapping("/authentication")
public Result<String> authentication(@RequestBody Enterprise enterprise ) {
enterpriseService.authentication(enterprise);
return Result.success();
}
}

5
muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/mapper/EnterpriseMapper.java
View File

@ -3,6 +3,7 @@ package com.muyu.net.working.mapper;
import java.util.List;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.muyu.net.working.domain.Enterprise;
import org.apache.ibatis.annotations.Param;
/**
* 企业信息Mapper接口
@ -12,4 +13,8 @@ import com.muyu.net.working.domain.Enterprise;
*/
public interface EnterpriseMapper extends BaseMapper<Enterprise> {
Enterprise selectByName(@Param("name") String name);
void authentication(Enterprise enterprise);
}

6
muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/service/EnterpriseService.java
View File

@ -17,6 +17,10 @@ public interface EnterpriseService extends IService<Enterprise> {
* @param enterprise 企业信息
* @return 企业信息集合
*/
public List<Enterprise> list(Enterprise enterprise);
List<Enterprise> list(Enterprise enterprise);
Enterprise selectByName(String name);
void authentication(Enterprise enterprise);
}

78
muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/service/impl/EnterpriseServiceImpl.java
View File

@ -1,9 +1,18 @@
package com.muyu.net.working.service.impl;
import java.io.BufferedReader;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.net.HttpURLConnection;
import java.net.URL;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.alibaba.fastjson.JSON;
import com.muyu.common.core.utils.ObjUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.muyu.net.working.mapper.EnterpriseMapper;
import com.muyu.net.working.domain.Enterprise;
@ -21,11 +30,13 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@Service
public class EnterpriseServiceImpl extends ServiceImpl<EnterpriseMapper, Enterprise> implements EnterpriseService {
@Autowired
private EnterpriseMapper enterpriseMapper;
/**
* 查询企业信息列表
* 查询车辆运营平台列表
*
* @param enterprise 企业信息
* @return 企业信息
* @param enterprise 车辆运营平台
* @return 车辆运营平台
*/
@Override
public List<Enterprise> list(Enterprise enterprise) {
@ -64,8 +75,8 @@ public class EnterpriseServiceImpl extends ServiceImpl<EnterpriseMapper, Enterpr
queryWrapper.eq(Enterprise::getEmail, enterprise.getEmail());
}
if (ObjUtils.notNull(enterprise.getStatus())){
queryWrapper.eq(Enterprise::getStatus, enterprise.getStatus());
if (ObjUtils.notNull(enterprise.getEnterpriseStatus())){
queryWrapper.eq(Enterprise::getEnterpriseStatus, enterprise.getEnterpriseStatus());
}
if (ObjUtils.notNull(enterprise.getRegistrationDate())){
@ -92,10 +103,59 @@ public class EnterpriseServiceImpl extends ServiceImpl<EnterpriseMapper, Enterpr
queryWrapper.eq(Enterprise::getAddServerId, enterprise.getAddServerId());
}
return list(queryWrapper);
}
@Override
public Enterprise selectByName(String name) {
return enterpriseMapper.selectByName(name);
}
@Override
public void authentication(Enterprise enterprise) {
enterpriseMapper.authentication(enterprise);
try {
postTest(enterprise);
} catch (Exception e) {
throw new RuntimeException(e);
}
}
public static void postTest(Enterprise enterprise) throws Exception {
// 1.请求URL
String postUrl = "http://101.34.248.9:10006/webhook/%E6%96%B0%E5%BB%BA%E4%BC%81%E4%B8%9A%E6%95%B0%E6%8D%AE%E5%BA%93";
// 2.请求参数JSON格式
Integer id = enterprise.getId();
Map<String, String> parammap = new HashMap<>();
parammap.put("entId", "jiang-"+id);
parammap.put("mysqlPort", String.valueOf(3306+enterprise.getId()));
String json = JSON.toJSONString(parammap);
// 3.创建连接与设置连接参数
URL urlObj = new URL(postUrl);
HttpURLConnection httpConn = (HttpURLConnection) urlObj.openConnection();
httpConn.setRequestMethod("POST");
httpConn.setRequestProperty("Charset", "UTF-8");
// POST请求且JSON数据,必须设置
httpConn.setRequestProperty("Content-Type", "application/json");
// 打开输出流,默认是false
httpConn.setDoOutput(true);
// 打开输入流,默认是true,可省略
httpConn.setDoInput(true);
// 4.从HttpURLConnection获取输出流和写数据
OutputStream oStream = httpConn.getOutputStream();
oStream.write(json.getBytes());
oStream.flush();
// 5.发起http调用(getInputStream触发http请求)
if (httpConn.getResponseCode() != 200) {
throw new Exception("调用服务端异常.");
}
// 6.从HttpURLConnection获取输入流和读数据
BufferedReader br = new BufferedReader(
new InputStreamReader(httpConn.getInputStream()));
String resultData = br.readLine();
System.out.println("从服务端返回结果: " + resultData);
// 7.关闭HttpURLConnection连接
httpConn.disconnect();
}
}

14
muyu-modules/muyu-net-working/muyu-net-working-server/src/main/resources/mapper/netWorking/EnterpriseMapper.xml
View File

@ -1,7 +1,7 @@
<?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">
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.muyu.net.working.mapper.EnterpriseMapper">
<resultMap type="com.muyu.net.working.domain.Enterprise" id="EnterpriseResult">
@ -14,7 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="address" column="address" />
<result property="contactPhone" column="contact_phone" />
<result property="email" column="email" />
<result property="status" column="status" />
<result property="enterpriseStatus" column="enterprise_status" />
<result property="registrationDate" column="registration_date" />
<result property="certificationId" column="certification_id" />
<result property="authenticationDate" column="authentication_date" />
@ -29,6 +29,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectEnterpriseVo">
select id, ebterprise_name, legal_person, business_lincense_number, estabiness_date, business_scope, address, contact_phone, email, status, registration_date, certification_id, authentication_date, service_level, open_server_id, add_server_id, create_by, create_time, update_by, update_time, remark from enterprise
select id, ebterprise_name, legal_person, business_lincense_number, estabiness_date, business_scope, address, contact_phone, email, enterprise_status, registration_date, certification_id, authentication_date, service_level, open_server_id, add_server_id, create_by, create_time, update_by, update_time, remark from enterprise
</sql>
<update id="authentication">
update enterprise set enterprise_status = 'N' where id = #{id}
</update>
<select id="selectByName" resultType="com.muyu.net.working.domain.Enterprise">
select * from enterprise where ebterprise_name = #{name}
</select>
</mapper>

2
muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysDeptController.java
View File

@ -1,9 +1,9 @@
package com.muyu.system.controller;
import com.muyu.common.core.constant.UserConstants;
import com.muyu.common.core.domain.Result;
import com.muyu.common.core.utils.StringUtils;
import com.muyu.common.core.web.controller.BaseController;
import com.muyu.common.core.domain.Result;
import com.muyu.common.log.annotation.Log;
import com.muyu.common.log.enums.BusinessType;
import com.muyu.common.security.annotation.RequiresPermissions;

2
muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysDictDataController.java
View File

@ -1,9 +1,9 @@
package com.muyu.system.controller;
import com.muyu.common.core.domain.Result;
import com.muyu.common.core.utils.StringUtils;
import com.muyu.common.core.utils.poi.ExcelUtil;
import com.muyu.common.core.web.controller.BaseController;
import com.muyu.common.core.domain.Result;
import com.muyu.common.core.web.page.TableDataInfo;
import com.muyu.common.log.annotation.Log;
import com.muyu.common.log.enums.BusinessType;

2
muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysDictTypeController.java
View File

@ -1,8 +1,8 @@
package com.muyu.system.controller;
import com.muyu.common.core.domain.Result;
import com.muyu.common.core.utils.poi.ExcelUtil;
import com.muyu.common.core.web.controller.BaseController;
import com.muyu.common.core.domain.Result;
import com.muyu.common.core.web.page.TableDataInfo;
import com.muyu.common.log.annotation.Log;
import com.muyu.common.log.enums.BusinessType;

2
muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysLogininforController.java
View File

@ -1,9 +1,9 @@
package com.muyu.system.controller;
import com.muyu.common.core.constant.CacheConstants;
import com.muyu.common.core.domain.Result;
import com.muyu.common.core.utils.poi.ExcelUtil;
import com.muyu.common.core.web.controller.BaseController;
import com.muyu.common.core.domain.Result;
import com.muyu.common.core.web.page.TableDataInfo;
import com.muyu.common.log.annotation.Log;
import com.muyu.common.log.enums.BusinessType;

2
muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysMenuController.java
View File

@ -1,9 +1,9 @@
package com.muyu.system.controller;
import com.muyu.common.core.constant.UserConstants;
import com.muyu.common.core.domain.Result;
import com.muyu.common.core.utils.StringUtils;
import com.muyu.common.core.web.controller.BaseController;
import com.muyu.common.core.domain.Result;
import com.muyu.common.log.annotation.Log;
import com.muyu.common.log.enums.BusinessType;
import com.muyu.common.security.annotation.RequiresPermissions;

2
muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysNoticeController.java
View File

@ -1,7 +1,7 @@
package com.muyu.system.controller;
import com.muyu.common.core.web.controller.BaseController;
import com.muyu.common.core.domain.Result;
import com.muyu.common.core.web.controller.BaseController;
import com.muyu.common.core.web.page.TableDataInfo;
import com.muyu.common.log.annotation.Log;
import com.muyu.common.log.enums.BusinessType;

2
muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysOperlogController.java
View File

@ -1,8 +1,8 @@
package com.muyu.system.controller;
import com.muyu.common.core.domain.Result;
import com.muyu.common.core.utils.poi.ExcelUtil;
import com.muyu.common.core.web.controller.BaseController;
import com.muyu.common.core.domain.Result;
import com.muyu.common.core.web.page.TableDataInfo;
import com.muyu.common.log.annotation.Log;
import com.muyu.common.log.enums.BusinessType;

2
muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysPostController.java
View File

@ -1,8 +1,8 @@
package com.muyu.system.controller;
import com.muyu.common.core.domain.Result;
import com.muyu.common.core.utils.poi.ExcelUtil;
import com.muyu.common.core.web.controller.BaseController;
import com.muyu.common.core.domain.Result;
import com.muyu.common.core.web.page.TableDataInfo;
import com.muyu.common.log.annotation.Log;
import com.muyu.common.log.enums.BusinessType;

4
muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysProfileController.java
View File

@ -9,10 +9,10 @@ import com.muyu.common.log.annotation.Log;
import com.muyu.common.log.enums.BusinessType;
import com.muyu.common.security.service.TokenService;
import com.muyu.common.security.utils.SecurityUtils;
import com.muyu.common.system.remote.RemoteFileService;
import com.muyu.common.system.domain.LoginUser;
import com.muyu.common.system.domain.SysFile;
import com.muyu.common.system.domain.SysUser;
import com.muyu.common.system.domain.LoginUser;
import com.muyu.common.system.remote.RemoteFileService;
import com.muyu.system.domain.resp.ProfileResp;
import com.muyu.system.service.SysUserService;
import org.springframework.beans.factory.annotation.Autowired;

2
muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysRoleController.java
View File

@ -1,8 +1,8 @@
package com.muyu.system.controller;
import com.muyu.common.core.domain.Result;
import com.muyu.common.core.utils.poi.ExcelUtil;
import com.muyu.common.core.web.controller.BaseController;
import com.muyu.common.core.domain.Result;
import com.muyu.common.core.web.page.TableDataInfo;
import com.muyu.common.log.annotation.Log;
import com.muyu.common.log.enums.BusinessType;

2
muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysUserController.java
View File

@ -10,10 +10,10 @@ import com.muyu.common.log.enums.BusinessType;
import com.muyu.common.security.annotation.InnerAuth;
import com.muyu.common.security.annotation.RequiresPermissions;
import com.muyu.common.security.utils.SecurityUtils;
import com.muyu.common.system.domain.LoginUser;
import com.muyu.common.system.domain.SysDept;
import com.muyu.common.system.domain.SysRole;
import com.muyu.common.system.domain.SysUser;
import com.muyu.common.system.domain.LoginUser;
import com.muyu.system.domain.resp.AuthRoleResp;
import com.muyu.system.domain.resp.UserDetailInfoResp;
import com.muyu.system.domain.resp.UserInfoResp;

2
muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysUserOnlineController.java
View File

@ -1,9 +1,9 @@
package com.muyu.system.controller;
import com.muyu.common.core.constant.CacheConstants;
import com.muyu.common.core.domain.Result;
import com.muyu.common.core.utils.StringUtils;
import com.muyu.common.core.web.controller.BaseController;
import com.muyu.common.core.domain.Result;
import com.muyu.common.core.web.page.TableDataInfo;
import com.muyu.common.log.annotation.Log;
import com.muyu.common.log.enums.BusinessType;

2
muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/SysUserOnline.java
View File

@ -1,5 +1,7 @@
package com.muyu.system.domain;
/**
* 当前在线会话
*

27
muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysDeptMapper.java
View File

@ -19,7 +19,7 @@ public interface SysDeptMapper extends BaseMapper<SysDept> {
*
* @return 部门信息集合
*/
public List<SysDept> selectDeptList (SysDept dept);
List<SysDept> selectDeptList(SysDept dept);
/**
* 根据角色ID查询部门树信息
@ -29,7 +29,7 @@ public interface SysDeptMapper extends BaseMapper<SysDept> {
*
* @return 选中部门列表
*/
public List<Long> selectDeptListByRoleId (@Param("roleId") Long roleId, @Param("deptCheckStrictly") boolean deptCheckStrictly);
List<Long> selectDeptListByRoleId(@Param("roleId") Long roleId, @Param("deptCheckStrictly") boolean deptCheckStrictly);
/**
* 根据部门ID查询信息
@ -38,7 +38,7 @@ public interface SysDeptMapper extends BaseMapper<SysDept> {
*
* @return 部门信息
*/
public SysDept selectDeptById (Long deptId);
SysDept selectDeptById(Long deptId);
/**
* 根据ID查询所有子部门
@ -47,7 +47,7 @@ public interface SysDeptMapper extends BaseMapper<SysDept> {
*
* @return 部门列表
*/
public List<SysDept> selectChildrenDeptById (Long deptId);
List<SysDept> selectChildrenDeptById(Long deptId);
/**
* 根据ID查询所有子部门（正常状态）
@ -56,7 +56,7 @@ public interface SysDeptMapper extends BaseMapper<SysDept> {
*
* @return 子部门数
*/
public int selectNormalChildrenDeptById (Long deptId);
int selectNormalChildrenDeptById(Long deptId);
/**
* 是否存在子节点
@ -65,7 +65,7 @@ public interface SysDeptMapper extends BaseMapper<SysDept> {
*
* @return 结果
*/
public int hasChildByDeptId (Long deptId);
int hasChildByDeptId(Long deptId);
/**
* 查询部门是否存在用户
@ -74,7 +74,7 @@ public interface SysDeptMapper extends BaseMapper<SysDept> {
*
* @return 结果
*/
public int checkDeptExistUser (Long deptId);
int checkDeptExistUser(Long deptId);
/**
* 校验部门名称是否唯一
@ -84,7 +84,7 @@ public interface SysDeptMapper extends BaseMapper<SysDept> {
*
* @return 结果
*/
public SysDept checkDeptNameUnique (@Param("deptName") String deptName, @Param("parentId") Long parentId);
SysDept checkDeptNameUnique(@Param("deptName") String deptName, @Param("parentId") Long parentId);
/**
* 新增部门信息
@ -93,7 +93,7 @@ public interface SysDeptMapper extends BaseMapper<SysDept> {
*
* @return 结果
*/
public int insertDept (SysDept dept);
int insertDept(SysDept dept);
/**
* 修改部门信息
@ -102,14 +102,14 @@ public interface SysDeptMapper extends BaseMapper<SysDept> {
*
* @return 结果
*/
public int updateDept (SysDept dept);
int updateDept(SysDept dept);
/**
* 修改所在部门正常状态
*
* @param deptIds 部门ID组
*/
public void updateDeptStatusNormal (Long[] deptIds);
void updateDeptStatusNormal(Long[] deptIds);
/**
* 修改子元素关系
@ -118,7 +118,7 @@ public interface SysDeptMapper extends BaseMapper<SysDept> {
*
* @return 结果
*/
public int updateDeptChildren (@Param("depts") List<SysDept> depts);
int updateDeptChildren(@Param("depts") List<SysDept> depts);
/**
* 删除部门管理信息
@ -127,8 +127,7 @@ public interface SysDeptMapper extends BaseMapper<SysDept> {
*
* @return 结果
*/
public int deleteDeptById (Long deptId);
int deleteDeptById(Long deptId);
SysDept selectDeptByName(@Param("name") String name);
}

20
muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysDictDataMapper.java
View File

@ -19,7 +19,7 @@ public interface SysDictDataMapper extends BaseMapper<SysDictData> {
*
* @return 字典数据集合信息
*/
public List<SysDictData> selectDictDataList (SysDictData dictData);
List<SysDictData> selectDictDataList(SysDictData dictData);
/**
* 根据字典类型查询字典数据
@ -28,7 +28,7 @@ public interface SysDictDataMapper extends BaseMapper<SysDictData> {
*
* @return 字典数据集合信息
*/
public List<SysDictData> selectDictDataByType (String dictType);
List<SysDictData> selectDictDataByType(String dictType);
/**
* 根据字典类型和字典键值查询字典数据信息
@ -38,7 +38,7 @@ public interface SysDictDataMapper extends BaseMapper<SysDictData> {
*
* @return 字典标签
*/
public String selectDictLabel (@Param("dictType") String dictType, @Param("dictValue") String dictValue);
String selectDictLabel(@Param("dictType") String dictType, @Param("dictValue") String dictValue);
/**
* 根据字典数据ID查询信息
@ -47,7 +47,7 @@ public interface SysDictDataMapper extends BaseMapper<SysDictData> {
*
* @return 字典数据
*/
public SysDictData selectDictDataById (Long dictCode);
SysDictData selectDictDataById(Long dictCode);
/**
* 查询字典数据
@ -56,7 +56,7 @@ public interface SysDictDataMapper extends BaseMapper<SysDictData> {
*
* @return 字典数据
*/
public int countDictDataByType (String dictType);
int countDictDataByType(String dictType);
/**
* 通过字典ID删除字典数据信息
@ -65,7 +65,7 @@ public interface SysDictDataMapper extends BaseMapper<SysDictData> {
*
* @return 结果
*/
public int deleteDictDataById (Long dictCode);
int deleteDictDataById(Long dictCode);
/**
* 批量删除字典数据信息
@ -74,7 +74,7 @@ public interface SysDictDataMapper extends BaseMapper<SysDictData> {
*
* @return 结果
*/
public int deleteDictDataByIds (Long[] dictCodes);
int deleteDictDataByIds(Long[] dictCodes);
/**
* 新增字典数据信息
@ -83,7 +83,7 @@ public interface SysDictDataMapper extends BaseMapper<SysDictData> {
*
* @return 结果
*/
public int insertDictData (SysDictData dictData);
int insertDictData(SysDictData dictData);
/**
* 修改字典数据信息
@ -92,7 +92,7 @@ public interface SysDictDataMapper extends BaseMapper<SysDictData> {
*
* @return 结果
*/
public int updateDictData (SysDictData dictData);
int updateDictData(SysDictData dictData);
/**
* 同步修改字典类型
@ -102,5 +102,5 @@ public interface SysDictDataMapper extends BaseMapper<SysDictData> {
*
* @return 结果
*/
public int updateDictDataType (@Param("oldDictType") String oldDictType, @Param("newDictType") String newDictType);
int updateDictDataType(@Param("oldDictType") String oldDictType, @Param("newDictType") String newDictType);
}

18
muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysDictTypeMapper.java
View File

@ -18,14 +18,14 @@ public interface SysDictTypeMapper extends BaseMapper<SysDictType> {
*
* @return 字典类型集合信息
*/
public List<SysDictType> selectDictTypeList (SysDictType dictType);
List<SysDictType> selectDictTypeList(SysDictType dictType);
/**
* 根据所有字典类型
*
* @return 字典类型集合信息
*/
public List<SysDictType> selectDictTypeAll ();
List<SysDictType> selectDictTypeAll();
/**
* 根据字典类型ID查询信息
@ -34,7 +34,7 @@ public interface SysDictTypeMapper extends BaseMapper<SysDictType> {
*
* @return 字典类型
*/
public SysDictType selectDictTypeById (Long dictId);
SysDictType selectDictTypeById(Long dictId);
/**
* 根据字典类型查询信息
@ -43,7 +43,7 @@ public interface SysDictTypeMapper extends BaseMapper<SysDictType> {
*
* @return 字典类型
*/
public SysDictType selectDictTypeByType (String dictType);
SysDictType selectDictTypeByType(String dictType);
/**
* 通过字典ID删除字典信息
@ -52,7 +52,7 @@ public interface SysDictTypeMapper extends BaseMapper<SysDictType> {
*
* @return 结果
*/
public int deleteDictTypeById (Long dictId);
int deleteDictTypeById(Long dictId);
/**
* 批量删除字典类型信息
@ -61,7 +61,7 @@ public interface SysDictTypeMapper extends BaseMapper<SysDictType> {
*
* @return 结果
*/
public int deleteDictTypeByIds (Long[] dictIds);
int deleteDictTypeByIds(Long[] dictIds);
/**
* 新增字典类型信息
@ -70,7 +70,7 @@ public interface SysDictTypeMapper extends BaseMapper<SysDictType> {
*
* @return 结果
*/
public int insertDictType (SysDictType dictType);
int insertDictType(SysDictType dictType);
/**
* 修改字典类型信息
@ -79,7 +79,7 @@ public interface SysDictTypeMapper extends BaseMapper<SysDictType> {
*
* @return 结果
*/
public int updateDictType (SysDictType dictType);
int updateDictType(SysDictType dictType);
/**
* 校验字典类型称是否唯一
@ -88,5 +88,5 @@ public interface SysDictTypeMapper extends BaseMapper<SysDictType> {
*
* @return 结果
*/
public SysDictType checkDictTypeUnique (String dictType);
SysDictType checkDictTypeUnique(String dictType);
}

8
muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysLogininforMapper.java
View File

@ -16,7 +16,7 @@ public interface SysLogininforMapper extends BaseMapper<SysLogininfor> {
*
* @param logininfor 访问日志对象
*/
public int insertLogininfor (SysLogininfor logininfor);
int insertLogininfor(SysLogininfor logininfor);
/**
* 查询系统登录日志集合
@ -25,7 +25,7 @@ public interface SysLogininforMapper extends BaseMapper<SysLogininfor> {
*
* @return 登录记录集合
*/
public List<SysLogininfor> selectLogininforList (SysLogininfor logininfor);
List<SysLogininfor> selectLogininforList(SysLogininfor logininfor);
/**
* 批量删除系统登录日志
@ -34,12 +34,12 @@ public interface SysLogininforMapper extends BaseMapper<SysLogininfor> {
*
* @return 结果
*/
public int deleteLogininforByIds (Long[] infoIds);
int deleteLogininforByIds(Long[] infoIds);
/**
* 清空系统登录日志
*
* @return 结果
*/
public int cleanLogininfor ();
int cleanLogininfor();
}

28
muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysMenuMapper.java
View File

@ -19,14 +19,14 @@ public interface SysMenuMapper extends BaseMapper<SysMenu> {
*
* @return 菜单列表
*/
public List<SysMenu> selectMenuList (SysMenu menu);
List<SysMenu> selectMenuList(SysMenu menu);
/**
* 根据用户所有权限
*
* @return 权限列表
*/
public List<String> selectMenuPerms ();
List<String> selectMenuPerms();
/**
* 根据用户查询系统菜单列表
@ -35,7 +35,7 @@ public interface SysMenuMapper extends BaseMapper<SysMenu> {
*
* @return 菜单列表
*/
public List<SysMenu> selectMenuListByUserId (SysMenu menu);
List<SysMenu> selectMenuListByUserId(SysMenu menu);
/**
* 根据角色ID查询权限
@ -44,7 +44,7 @@ public interface SysMenuMapper extends BaseMapper<SysMenu> {
*
* @return 权限列表
*/
public List<String> selectMenuPermsByRoleId (Long roleId);
List<String> selectMenuPermsByRoleId(Long roleId);
/**
* 根据用户ID查询权限
@ -53,14 +53,14 @@ public interface SysMenuMapper extends BaseMapper<SysMenu> {
*
* @return 权限列表
*/
public List<String> selectMenuPermsByUserId (Long userId);
List<String> selectMenuPermsByUserId(Long userId);
/**
* 根据用户ID查询菜单
*
* @return 菜单列表
*/
public List<SysMenu> selectMenuTreeAll ();
List<SysMenu> selectMenuTreeAll();
/**
* 根据用户ID查询菜单
@ -69,7 +69,7 @@ public interface SysMenuMapper extends BaseMapper<SysMenu> {
*
* @return 菜单列表
*/
public List<SysMenu> selectMenuTreeByUserId (Long userId);
List<SysMenu> selectMenuTreeByUserId(Long userId);
/**
* 根据角色ID查询菜单树信息
@ -79,7 +79,7 @@ public interface SysMenuMapper extends BaseMapper<SysMenu> {
*
* @return 选中菜单列表
*/
public List<Long> selectMenuListByRoleId (@Param("roleId") Long roleId, @Param("menuCheckStrictly") boolean menuCheckStrictly);
List<Long> selectMenuListByRoleId(@Param("roleId") Long roleId, @Param("menuCheckStrictly") boolean menuCheckStrictly);
/**
* 根据菜单ID查询信息
@ -88,7 +88,7 @@ public interface SysMenuMapper extends BaseMapper<SysMenu> {
*
* @return 菜单信息
*/
public SysMenu selectMenuById (Long menuId);
SysMenu selectMenuById(Long menuId);
/**
* 是否存在菜单子节点
@ -97,7 +97,7 @@ public interface SysMenuMapper extends BaseMapper<SysMenu> {
*
* @return 结果
*/
public int hasChildByMenuId (Long menuId);
int hasChildByMenuId(Long menuId);
/**
* 新增菜单信息
@ -106,7 +106,7 @@ public interface SysMenuMapper extends BaseMapper<SysMenu> {
*
* @return 结果
*/
public int insertMenu (SysMenu menu);
int insertMenu(SysMenu menu);
/**
* 修改菜单信息
@ -115,7 +115,7 @@ public interface SysMenuMapper extends BaseMapper<SysMenu> {
*
* @return 结果
*/
public int updateMenu (SysMenu menu);
int updateMenu(SysMenu menu);
/**
* 删除菜单管理信息
@ -124,7 +124,7 @@ public interface SysMenuMapper extends BaseMapper<SysMenu> {
*
* @return 结果
*/
public int deleteMenuById (Long menuId);
int deleteMenuById(Long menuId);
/**
* 校验菜单名称是否唯一
@ -134,5 +134,5 @@ public interface SysMenuMapper extends BaseMapper<SysMenu> {
*
* @return 结果
*/
public SysMenu checkMenuNameUnique (@Param("menuName") String menuName, @Param("parentId") Long parentId);
SysMenu checkMenuNameUnique(@Param("menuName") String menuName, @Param("parentId") Long parentId);
}

12
muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysNoticeMapper.java
View File

@ -18,7 +18,7 @@ public interface SysNoticeMapper extends BaseMapper<SysNotice> {
*
* @return 公告信息
*/
public SysNotice selectNoticeById (Long noticeId);
SysNotice selectNoticeById(Long noticeId);
/**
* 查询公告列表
@ -27,7 +27,7 @@ public interface SysNoticeMapper extends BaseMapper<SysNotice> {
*
* @return 公告集合
*/
public List<SysNotice> selectNoticeList (SysNotice notice);
List<SysNotice> selectNoticeList(SysNotice notice);
/**
* 新增公告
@ -36,7 +36,7 @@ public interface SysNoticeMapper extends BaseMapper<SysNotice> {
*
* @return 结果
*/
public int insertNotice (SysNotice notice);
int insertNotice(SysNotice notice);
/**
* 修改公告
@ -45,7 +45,7 @@ public interface SysNoticeMapper extends BaseMapper<SysNotice> {
*
* @return 结果
*/
public int updateNotice (SysNotice notice);
int updateNotice(SysNotice notice);
/**
* 批量删除公告
@ -54,7 +54,7 @@ public interface SysNoticeMapper extends BaseMapper<SysNotice> {
*
* @return 结果
*/
public int deleteNoticeById (Long noticeId);
int deleteNoticeById(Long noticeId);
/**
* 批量删除公告信息
@ -63,5 +63,5 @@ public interface SysNoticeMapper extends BaseMapper<SysNotice> {
*
* @return 结果
*/
public int deleteNoticeByIds (Long[] noticeIds);
int deleteNoticeByIds(Long[] noticeIds);
}

10
muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysOperLogMapper.java
View File

@ -16,7 +16,7 @@ public interface SysOperLogMapper extends BaseMapper<SysOperLog> {
*
* @param operLog 操作日志对象
*/
public int insertOperlog (SysOperLog operLog);
int insertOperlog(SysOperLog operLog);
/**
* 查询系统操作日志集合
@ -25,7 +25,7 @@ public interface SysOperLogMapper extends BaseMapper<SysOperLog> {
*
* @return 操作日志集合
*/
public List<SysOperLog> selectOperLogList (SysOperLog operLog);
List<SysOperLog> selectOperLogList(SysOperLog operLog);
/**
* 批量删除系统操作日志
@ -34,7 +34,7 @@ public interface SysOperLogMapper extends BaseMapper<SysOperLog> {
*
* @return 结果
*/
public int deleteOperLogByIds (Long[] operIds);
int deleteOperLogByIds(Long[] operIds);
/**
* 查询操作日志详细
@ -43,10 +43,10 @@ public interface SysOperLogMapper extends BaseMapper<SysOperLog> {
*
* @return 操作日志对象
*/
public SysOperLog selectOperLogById (Long operId);
SysOperLog selectOperLogById(Long operId);
/**
* 清空操作日志
*/
public void cleanOperLog ();
void cleanOperLog();
}

22
muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysPostMapper.java
View File

@ -18,14 +18,14 @@ public interface SysPostMapper extends BaseMapper<SysPost> {
*
* @return 岗位数据集合
*/
public List<SysPost> selectPostList (SysPost post);
List<SysPost> selectPostList(SysPost post);
/**
* 查询所有岗位
*
* @return 岗位列表
*/
public List<SysPost> selectPostAll ();
List<SysPost> selectPostAll();
/**
* 通过岗位ID查询岗位信息
@ -34,7 +34,7 @@ public interface SysPostMapper extends BaseMapper<SysPost> {
*
* @return 角色对象信息
*/
public SysPost selectPostById (Long postId);
SysPost selectPostById(Long postId);
/**
* 根据用户ID获取岗位选择框列表
@ -43,7 +43,7 @@ public interface SysPostMapper extends BaseMapper<SysPost> {
*
* @return 选中岗位ID列表
*/
public List<Long> selectPostListByUserId (Long userId);
List<Long> selectPostListByUserId(Long userId);
/**
* 查询用户所属岗位组
@ -52,7 +52,7 @@ public interface SysPostMapper extends BaseMapper<SysPost> {
*
* @return 结果
*/
public List<SysPost> selectPostsByUserName (String userName);
List<SysPost> selectPostsByUserName(String userName);
/**
* 删除岗位信息
@ -61,7 +61,7 @@ public interface SysPostMapper extends BaseMapper<SysPost> {
*
* @return 结果
*/
public int deletePostById (Long postId);
int deletePostById(Long postId);
/**
* 批量删除岗位信息
@ -70,7 +70,7 @@ public interface SysPostMapper extends BaseMapper<SysPost> {
*
* @return 结果
*/
public int deletePostByIds (Long[] postIds);
int deletePostByIds(Long[] postIds);
/**
* 修改岗位信息
@ -79,7 +79,7 @@ public interface SysPostMapper extends BaseMapper<SysPost> {
*
* @return 结果
*/
public int updatePost (SysPost post);
int updatePost(SysPost post);
/**
* 新增岗位信息
@ -88,7 +88,7 @@ public interface SysPostMapper extends BaseMapper<SysPost> {
*
* @return 结果
*/
public int insertPost (SysPost post);
int insertPost(SysPost post);
/**
* 校验岗位名称
@ -97,7 +97,7 @@ public interface SysPostMapper extends BaseMapper<SysPost> {
*
* @return 结果
*/
public SysPost checkPostNameUnique (String postName);
SysPost checkPostNameUnique(String postName);
/**
* 校验岗位编码
@ -106,5 +106,5 @@ public interface SysPostMapper extends BaseMapper<SysPost> {
*
* @return 结果
*/
public SysPost checkPostCodeUnique (String postCode);
SysPost checkPostCodeUnique(String postCode);
}

8
muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysRoleDeptMapper.java
View File

@ -19,7 +19,7 @@ public interface SysRoleDeptMapper extends BaseMapper<SysRoleDept> {
*
* @return 结果
*/
public int deleteRoleDeptByRoleId (Long roleId);
int deleteRoleDeptByRoleId(Long roleId);
/**
* 批量删除角色部门关联信息
@ -28,7 +28,7 @@ public interface SysRoleDeptMapper extends BaseMapper<SysRoleDept> {
*
* @return 结果
*/
public int deleteRoleDept (Long[] ids);
int deleteRoleDept(Long[] ids);
/**
* 查询部门使用数量
@ -37,7 +37,7 @@ public interface SysRoleDeptMapper extends BaseMapper<SysRoleDept> {
*
* @return 结果
*/
public int selectCountRoleDeptByDeptId (Long deptId);
int selectCountRoleDeptByDeptId(Long deptId);
/**
* 批量新增角色部门信息
@ -46,5 +46,5 @@ public interface SysRoleDeptMapper extends BaseMapper<SysRoleDept> {
*
* @return 结果
*/
public int batchRoleDept (List<SysRoleDept> roleDeptList);
int batchRoleDept(List<SysRoleDept> roleDeptList);
}

24
muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysRoleMapper.java
View File

@ -18,7 +18,7 @@ public interface SysRoleMapper extends BaseMapper<SysRole> {
*
* @return 角色数据集合信息
*/
public List<SysRole> selectRoleList (SysRole role);
List<SysRole> selectRoleList(SysRole role);
/**
* 根据用户ID查询角色
@ -27,14 +27,14 @@ public interface SysRoleMapper extends BaseMapper<SysRole> {
*
* @return 角色列表
*/
public List<SysRole> selectRolePermissionByUserId (Long userId);
List<SysRole> selectRolePermissionByUserId(Long userId);
/**
* 查询所有角色
*
* @return 角色列表
*/
public List<SysRole> selectRoleAll ();
List<SysRole> selectRoleAll();
/**
* 根据用户ID获取角色选择框列表
@ -43,7 +43,7 @@ public interface SysRoleMapper extends BaseMapper<SysRole> {
*
* @return 选中角色ID列表
*/
public List<Long> selectRoleListByUserId (Long userId);
List<Long> selectRoleListByUserId(Long userId);
/**
* 通过角色ID查询角色
@ -52,7 +52,7 @@ public interface SysRoleMapper extends BaseMapper<SysRole> {
*
* @return 角色对象信息
*/
public SysRole selectRoleById (Long roleId);
SysRole selectRoleById(Long roleId);
/**
* 根据用户ID查询角色
@ -61,7 +61,7 @@ public interface SysRoleMapper extends BaseMapper<SysRole> {
*
* @return 角色列表
*/
public List<SysRole> selectRolesByUserName (String userName);
List<SysRole> selectRolesByUserName(String userName);
/**
* 校验角色名称是否唯一
@ -70,7 +70,7 @@ public interface SysRoleMapper extends BaseMapper<SysRole> {
*
* @return 角色信息
*/
public SysRole checkRoleNameUnique (String roleName);
SysRole checkRoleNameUnique(String roleName);
/**
* 校验角色权限是否唯一
@ -79,7 +79,7 @@ public interface SysRoleMapper extends BaseMapper<SysRole> {
*
* @return 角色信息
*/
public SysRole checkRoleKeyUnique (String roleKey);
SysRole checkRoleKeyUnique(String roleKey);
/**
* 修改角色信息
@ -88,7 +88,7 @@ public interface SysRoleMapper extends BaseMapper<SysRole> {
*
* @return 结果
*/
public int updateRole (SysRole role);
int updateRole(SysRole role);
/**
* 新增角色信息
@ -97,7 +97,7 @@ public interface SysRoleMapper extends BaseMapper<SysRole> {
*
* @return 结果
*/
public int insertRole (SysRole role);
int insertRole(SysRole role);
/**
* 通过角色ID删除角色
@ -106,7 +106,7 @@ public interface SysRoleMapper extends BaseMapper<SysRole> {
*
* @return 结果
*/
public int deleteRoleById (Long roleId);
int deleteRoleById(Long roleId);
/**
* 批量删除角色信息
@ -115,5 +115,5 @@ public interface SysRoleMapper extends BaseMapper<SysRole> {
*
* @return 结果
*/
public int deleteRoleByIds (Long[] roleIds);
int deleteRoleByIds(Long[] roleIds);
}

8
muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysRoleMenuMapper.java
View File

@ -19,7 +19,7 @@ public interface SysRoleMenuMapper extends BaseMapper<SysRoleMenu> {
*
* @return 结果
*/
public int checkMenuExistRole (Long menuId);
int checkMenuExistRole(Long menuId);
/**
* 通过角色ID删除角色和菜单关联
@ -28,7 +28,7 @@ public interface SysRoleMenuMapper extends BaseMapper<SysRoleMenu> {
*
* @return 结果
*/
public int deleteRoleMenuByRoleId (Long roleId);
int deleteRoleMenuByRoleId(Long roleId);
/**
* 批量删除角色菜单关联信息
@ -37,7 +37,7 @@ public interface SysRoleMenuMapper extends BaseMapper<SysRoleMenu> {
*
* @return 结果
*/
public int deleteRoleMenu (Long[] ids);
int deleteRoleMenu(Long[] ids);
/**
* 批量新增角色菜单信息
@ -46,5 +46,5 @@ public interface SysRoleMenuMapper extends BaseMapper<SysRoleMenu> {
*
* @return 结果
*/
public int batchRoleMenu (List<SysRoleMenu> roleMenuList);
int batchRoleMenu(List<SysRoleMenu> roleMenuList);
}

28
muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysUserMapper.java
View File

@ -19,7 +19,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
*
* @return 用户信息集合信息
*/
public List<SysUser> selectUserList (SysUser sysUser);
List<SysUser> selectUserList(SysUser sysUser);
/**
* 根据条件分页查询已配用户角色列表
@ -28,7 +28,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
*
* @return 用户信息集合信息
*/
public List<SysUser> selectAllocatedList (SysUser user);
List<SysUser> selectAllocatedList(SysUser user);
/**
* 根据条件分页查询未分配用户角色列表
@ -37,7 +37,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
*
* @return 用户信息集合信息
*/
public List<SysUser> selectUnallocatedList (SysUser user);
List<SysUser> selectUnallocatedList(SysUser user);
/**
* 通过用户名查询用户
@ -46,7 +46,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
*
* @return 用户对象信息
*/
public SysUser selectUserByUserName (String userName);
SysUser selectUserByUserName(String userName);
/**
* 通过用户ID查询用户
@ -55,7 +55,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
*
* @return 用户对象信息
*/
public SysUser selectUserById (Long userId);
SysUser selectUserById(Long userId);
/**
* 新增用户信息
@ -64,7 +64,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
*
* @return 结果
*/
public int insertUser (SysUser user);
int insertUser(SysUser user);
/**
* 修改用户信息
@ -73,7 +73,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
*
* @return 结果
*/
public int updateUser (SysUser user);
int updateUser(SysUser user);
/**
* 修改用户头像
@ -83,7 +83,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
*
* @return 结果
*/
public int updateUserAvatar (@Param("userName") String userName, @Param("avatar") String avatar);
int updateUserAvatar(@Param("userName") String userName, @Param("avatar") String avatar);
/**
* 重置用户密码
@ -93,7 +93,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
*
* @return 结果
*/
public int resetUserPwd (@Param("userName") String userName, @Param("password") String password);
int resetUserPwd(@Param("userName") String userName, @Param("password") String password);
/**
* 通过用户ID删除用户
@ -102,7 +102,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
*
* @return 结果
*/
public int deleteUserById (Long userId);
int deleteUserById(Long userId);
/**
* 批量删除用户信息
@ -111,7 +111,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
*
* @return 结果
*/
public int deleteUserByIds (Long[] userIds);
int deleteUserByIds(Long[] userIds);
/**
* 校验用户名称是否唯一
@ -120,7 +120,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
*
* @return 结果
*/
public SysUser checkUserNameUnique (String userName);
SysUser checkUserNameUnique(String userName);
/**
* 校验手机号码是否唯一
@ -129,7 +129,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
*
* @return 结果
*/
public SysUser checkPhoneUnique (String phonenumber);
SysUser checkPhoneUnique(String phonenumber);
/**
* 校验email是否唯一
@ -138,5 +138,5 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
*
* @return 结果
*/
public SysUser checkEmailUnique (String email);
SysUser checkEmailUnique(String email);
}

8
muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysUserPostMapper.java
View File

@ -18,7 +18,7 @@ public interface SysUserPostMapper extends BaseMapper<SysUserPost> {
*
* @return 结果
*/
public int deleteUserPostByUserId (Long userId);
int deleteUserPostByUserId(Long userId);
/**
* 通过岗位ID查询岗位使用数量
@ -27,7 +27,7 @@ public interface SysUserPostMapper extends BaseMapper<SysUserPost> {
*
* @return 结果
*/
public int countUserPostById (Long postId);
int countUserPostById(Long postId);
/**
* 批量删除用户和岗位关联
@ -36,7 +36,7 @@ public interface SysUserPostMapper extends BaseMapper<SysUserPost> {
*
* @return 结果
*/
public int deleteUserPost (Long[] ids);
int deleteUserPost(Long[] ids);
/**
* 批量新增用户岗位信息
@ -45,5 +45,5 @@ public interface SysUserPostMapper extends BaseMapper<SysUserPost> {
*
* @return 结果
*/
public int batchUserPost (List<SysUserPost> userPostList);
int batchUserPost(List<SysUserPost> userPostList);
}

12
muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysUserRoleMapper.java
View File

@ -19,7 +19,7 @@ public interface SysUserRoleMapper extends BaseMapper<SysUserRole> {
*
* @return 结果
*/
public int deleteUserRoleByUserId (Long userId);
int deleteUserRoleByUserId(Long userId);
/**
* 批量删除用户和角色关联
@ -28,7 +28,7 @@ public interface SysUserRoleMapper extends BaseMapper<SysUserRole> {
*
* @return 结果
*/
public int deleteUserRole (Long[] ids);
int deleteUserRole(Long[] ids);
/**
* 通过角色ID查询角色使用数量
@ -37,7 +37,7 @@ public interface SysUserRoleMapper extends BaseMapper<SysUserRole> {
*
* @return 结果
*/
public int countUserRoleByRoleId (Long roleId);
int countUserRoleByRoleId(Long roleId);
/**
* 批量新增用户角色信息
@ -46,7 +46,7 @@ public interface SysUserRoleMapper extends BaseMapper<SysUserRole> {
*
* @return 结果
*/
public int batchUserRole (List<SysUserRole> userRoleList);
int batchUserRole(List<SysUserRole> userRoleList);
/**
* 删除用户和角色关联信息
@ -55,7 +55,7 @@ public interface SysUserRoleMapper extends BaseMapper<SysUserRole> {
*
* @return 结果
*/
public int deleteUserRoleInfo (SysUserRole userRole);
int deleteUserRoleInfo(SysUserRole userRole);
/**
* 批量取消授权用户角色
@ -65,5 +65,5 @@ public interface SysUserRoleMapper extends BaseMapper<SysUserRole> {
*
* @return 结果
*/
public int deleteUserRoleInfos (@Param("roleId") Long roleId, @Param("userIds") Long[] userIds);
int deleteUserRoleInfos(@Param("roleId") Long roleId, @Param("userIds") Long[] userIds);
}

12
muyu-modules/muyu-system/src/main/java/com/muyu/system/remote/RemoteSysDeptService.java
View File

@ -11,6 +11,12 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
/**
* 远程调用部门接口 RemoteSysDeptService
*
* @author PengJiang
* Date 2024/6/7 09:00
*/
@FeignClient(
contextId = "remoteSysDeptService",
value = ServiceNameConstants.SYSTEM_SERVICE,
@ -18,11 +24,9 @@ import org.springframework.web.bind.annotation.RequestParam;
path = "/dept"
)
public interface RemoteSysDeptService {
@GetMapping("/selectDeptByName")
public Result<SysDept> selectDeptByName (@RequestParam("name") String name);
Result<SysDept> selectDeptByName(@RequestParam("name") String name);
@PostMapping
public Result add (@Validated @RequestBody SysDept dept);
Result add(@Validated @RequestBody SysDept dept);
}

8
muyu-modules/muyu-system/src/main/java/com/muyu/system/remote/RemoteSysUserService.java
View File

@ -10,6 +10,12 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
/**
* 远程调用用户 RemoteSysUserService
*
* @author PengJiang
* Date 2024/6/7 08:51
*/
@FeignClient(
contextId = "remoteSysUserService",
value = ServiceNameConstants.SYSTEM_SERVICE,
@ -24,5 +30,5 @@ public interface RemoteSysUserService {
*/
@RequiresPermissions("system:user:add")
@PostMapping
public Result add (@Validated @RequestBody SysUser user);
Result add(@Validated @RequestBody SysUser user);
}

4
muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysConfigService.java
View File

@ -35,10 +35,10 @@ public interface SysConfigService extends IService<SysConfig> {
/**
* 清空参数缓存数据
*/
public void clearConfigCache ();
void clearConfigCache();
/**
* 加载参数缓存数据
*/
public void loadingConfigCache ();
void loadingConfigCache();
}

29
muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysDeptService.java
View File

@ -19,7 +19,7 @@ public interface SysDeptService extends IService<SysDept> {
*
* @return 部门信息集合
*/
public List<SysDept> selectDeptList (SysDept dept);
List<SysDept> selectDeptList(SysDept dept);
/**
* 查询部门树结构信息
@ -28,7 +28,7 @@ public interface SysDeptService extends IService<SysDept> {
*
* @return 部门树信息集合
*/
public List<TreeSelect> selectDeptTreeList (SysDept dept);
List<TreeSelect> selectDeptTreeList(SysDept dept);
/**
* 构建前端所需要树结构
@ -37,7 +37,7 @@ public interface SysDeptService extends IService<SysDept> {
*
* @return 树结构列表
*/
public List<SysDept> buildDeptTree (List<SysDept> depts);
List<SysDept> buildDeptTree(List<SysDept> depts);
/**
* 构建前端所需要下拉树结构
@ -46,7 +46,7 @@ public interface SysDeptService extends IService<SysDept> {
*
* @return 下拉树结构列表
*/
public List<TreeSelect> buildDeptTreeSelect (List<SysDept> depts);
List<TreeSelect> buildDeptTreeSelect(List<SysDept> depts);
/**
* 根据角色ID查询部门树信息
@ -55,7 +55,7 @@ public interface SysDeptService extends IService<SysDept> {
*
* @return 选中部门列表
*/
public List<Long> selectDeptListByRoleId (Long roleId);
List<Long> selectDeptListByRoleId(Long roleId);
/**
* 根据部门ID查询信息
@ -64,7 +64,7 @@ public interface SysDeptService extends IService<SysDept> {
*
* @return 部门信息
*/
public SysDept selectDeptById (Long deptId);
SysDept selectDeptById(Long deptId);
/**
* 根据ID查询所有子部门（正常状态）
@ -73,7 +73,7 @@ public interface SysDeptService extends IService<SysDept> {
*
* @return 子部门数
*/
public int selectNormalChildrenDeptById (Long deptId);
int selectNormalChildrenDeptById(Long deptId);
/**
* 是否存在部门子节点
@ -82,7 +82,7 @@ public interface SysDeptService extends IService<SysDept> {
*
* @return 结果
*/
public boolean hasChildByDeptId (Long deptId);
boolean hasChildByDeptId(Long deptId);
/**
* 查询部门是否存在用户
@ -91,7 +91,7 @@ public interface SysDeptService extends IService<SysDept> {
*
* @return 结果 true 存在 false 不存在
*/
public boolean checkDeptExistUser (Long deptId);
boolean checkDeptExistUser(Long deptId);
/**
* 校验部门名称是否唯一
@ -100,14 +100,14 @@ public interface SysDeptService extends IService<SysDept> {
*
* @return 结果
*/
public boolean checkDeptNameUnique (SysDept dept);
boolean checkDeptNameUnique(SysDept dept);
/**
* 校验部门是否有数据权限
*
* @param deptId 部门id
*/
public void checkDeptDataScope (Long deptId);
void checkDeptDataScope(Long deptId);
/**
* 新增保存部门信息
@ -116,7 +116,7 @@ public interface SysDeptService extends IService<SysDept> {
*
* @return 结果
*/
public int insertDept (SysDept dept);
int insertDept(SysDept dept);
/**
* 修改保存部门信息
@ -125,7 +125,7 @@ public interface SysDeptService extends IService<SysDept> {
*
* @return 结果
*/
public int updateDept (SysDept dept);
int updateDept(SysDept dept);
/**
* 删除部门管理信息
@ -134,8 +134,7 @@ public interface SysDeptService extends IService<SysDept> {
*
* @return 结果
*/
public int deleteDeptById (Long deptId);
int deleteDeptById(Long deptId);
SysDept selectDeptByName(String name);
}

12
muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysDictDataService.java
View File

@ -18,7 +18,7 @@ public interface SysDictDataService extends IService<SysDictData> {
*
* @return 字典数据集合信息
*/
public List<SysDictData> selectDictDataList (SysDictData dictData);
List<SysDictData> selectDictDataList(SysDictData dictData);
/**
* 根据字典类型和字典键值查询字典数据信息
@ -28,7 +28,7 @@ public interface SysDictDataService extends IService<SysDictData> {
*
* @return 字典标签
*/
public String selectDictLabel (String dictType, String dictValue);
String selectDictLabel(String dictType, String dictValue);
/**
* 根据字典数据ID查询信息
@ -37,14 +37,14 @@ public interface SysDictDataService extends IService<SysDictData> {
*
* @return 字典数据
*/
public SysDictData selectDictDataById (Long dictCode);
SysDictData selectDictDataById(Long dictCode);
/**
* 批量删除字典数据信息
*
* @param dictCodes 需要删除的字典数据ID
*/
public void deleteDictDataByIds (Long[] dictCodes);
void deleteDictDataByIds(Long[] dictCodes);
/**
* 新增保存字典数据信息
@ -53,7 +53,7 @@ public interface SysDictDataService extends IService<SysDictData> {
*
* @return 结果
*/
public int insertDictData (SysDictData dictData);
int insertDictData(SysDictData dictData);
/**
* 修改保存字典数据信息
@ -62,5 +62,5 @@ public interface SysDictDataService extends IService<SysDictData> {
*
* @return 结果
*/
public int updateDictData (SysDictData dictData);
int updateDictData(SysDictData dictData);
}

24
muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysDictTypeService.java
View File

@ -19,14 +19,14 @@ public interface SysDictTypeService extends IService<SysDictType> {
*
* @return 字典类型集合信息
*/
public List<SysDictType> selectDictTypeList (SysDictType dictType);
List<SysDictType> selectDictTypeList(SysDictType dictType);
/**
* 根据所有字典类型
*
* @return 字典类型集合信息
*/
public List<SysDictType> selectDictTypeAll ();
List<SysDictType> selectDictTypeAll();
/**
* 根据字典类型查询字典数据
@ -35,7 +35,7 @@ public interface SysDictTypeService extends IService<SysDictType> {
*
* @return 字典数据集合信息
*/
public List<SysDictData> selectDictDataByType (String dictType);
List<SysDictData> selectDictDataByType(String dictType);
/**
* 根据字典类型ID查询信息
@ -44,7 +44,7 @@ public interface SysDictTypeService extends IService<SysDictType> {
*
* @return 字典类型
*/
public SysDictType selectDictTypeById (Long dictId);
SysDictType selectDictTypeById(Long dictId);
/**
* 根据字典类型查询信息
@ -53,29 +53,29 @@ public interface SysDictTypeService extends IService<SysDictType> {
*
* @return 字典类型
*/
public SysDictType selectDictTypeByType (String dictType);
SysDictType selectDictTypeByType(String dictType);
/**
* 批量删除字典信息
*
* @param dictIds 需要删除的字典ID
*/
public void deleteDictTypeByIds (Long[] dictIds);
void deleteDictTypeByIds(Long[] dictIds);
/**
* 加载字典缓存数据
*/
public void loadingDictCache ();
void loadingDictCache();
/**
* 清空字典缓存数据
*/
public void clearDictCache ();
void clearDictCache();
/**
* 重置字典缓存数据
*/
public void resetDictCache ();
void resetDictCache();
/**
* 新增保存字典类型信息
@ -84,7 +84,7 @@ public interface SysDictTypeService extends IService<SysDictType> {
*
* @return 结果
*/
public int insertDictType (SysDictType dictType);
int insertDictType(SysDictType dictType);
/**
* 修改保存字典类型信息
@ -93,7 +93,7 @@ public interface SysDictTypeService extends IService<SysDictType> {
*
* @return 结果
*/
public int updateDictType (SysDictType dictType);
int updateDictType(SysDictType dictType);
/**
* 校验字典类型称是否唯一
@ -102,5 +102,5 @@ public interface SysDictTypeService extends IService<SysDictType> {
*
* @return 结果
*/
public boolean checkDictTypeUnique (SysDictType dictType);
boolean checkDictTypeUnique(SysDictType dictType);
}

8
muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysLogininforService.java
View File

@ -16,7 +16,7 @@ public interface SysLogininforService extends IService<SysLogininfor> {
*
* @param logininfor 访问日志对象
*/
public int insertLogininfor (SysLogininfor logininfor);
int insertLogininfor(SysLogininfor logininfor);
/**
* 查询系统登录日志集合
@ -25,7 +25,7 @@ public interface SysLogininforService extends IService<SysLogininfor> {
*
* @return 登录记录集合
*/
public List<SysLogininfor> selectLogininforList (SysLogininfor logininfor);
List<SysLogininfor> selectLogininforList(SysLogininfor logininfor);
/**
* 批量删除系统登录日志
@ -34,10 +34,10 @@ public interface SysLogininforService extends IService<SysLogininfor> {
*
* @return 结果
*/
public int deleteLogininforByIds (Long[] infoIds);
int deleteLogininforByIds(Long[] infoIds);
/**
* 清空系统登录日志
*/
public void cleanLogininfor ();
void cleanLogininfor();
}

32
muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysMenuService.java
View File

@ -21,7 +21,7 @@ public interface SysMenuService extends IService<SysMenu> {
*
* @return 菜单列表
*/
public List<SysMenu> selectMenuList (Long userId);
List<SysMenu> selectMenuList(Long userId);
/**
* 根据用户查询系统菜单列表
@ -31,7 +31,7 @@ public interface SysMenuService extends IService<SysMenu> {
*
* @return 菜单列表
*/
public List<SysMenu> selectMenuList (SysMenu menu, Long userId);
List<SysMenu> selectMenuList(SysMenu menu, Long userId);
/**
* 根据用户ID查询权限
@ -40,7 +40,7 @@ public interface SysMenuService extends IService<SysMenu> {
*
* @return 权限列表
*/
public Set<String> selectMenuPermsByUserId (Long userId);
Set<String> selectMenuPermsByUserId(Long userId);
/**
* 根据角色ID查询权限
@ -49,7 +49,7 @@ public interface SysMenuService extends IService<SysMenu> {
*
* @return 权限列表
*/
public Set<String> selectMenuPermsByRoleId (Long roleId);
Set<String> selectMenuPermsByRoleId(Long roleId);
/**
* 根据用户ID查询菜单树信息
@ -58,7 +58,7 @@ public interface SysMenuService extends IService<SysMenu> {
*
* @return 菜单列表
*/
public List<SysMenu> selectMenuTreeByUserId (Long userId);
List<SysMenu> selectMenuTreeByUserId(Long userId);
/**
* 根据角色ID查询菜单树信息
@ -67,7 +67,7 @@ public interface SysMenuService extends IService<SysMenu> {
*
* @return 选中菜单列表
*/
public List<Long> selectMenuListByRoleId (Long roleId);
List<Long> selectMenuListByRoleId(Long roleId);
/**
* 构建前端路由所需要的菜单
@ -76,7 +76,7 @@ public interface SysMenuService extends IService<SysMenu> {
*
* @return 路由列表
*/
public List<RouterVo> buildMenus (List<SysMenu> menus);
List<RouterVo> buildMenus(List<SysMenu> menus);
/**
* 构建前端所需要树结构
@ -85,7 +85,7 @@ public interface SysMenuService extends IService<SysMenu> {
*
* @return 树结构列表
*/
public List<SysMenu> buildMenuTree (List<SysMenu> menus);
List<SysMenu> buildMenuTree(List<SysMenu> menus);
/**
* 构建前端所需要下拉树结构
@ -94,7 +94,7 @@ public interface SysMenuService extends IService<SysMenu> {
*
* @return 下拉树结构列表
*/
public List<TreeSelect> buildMenuTreeSelect (List<SysMenu> menus);
List<TreeSelect> buildMenuTreeSelect(List<SysMenu> menus);
/**
* 根据菜单ID查询信息
@ -103,7 +103,7 @@ public interface SysMenuService extends IService<SysMenu> {
*
* @return 菜单信息
*/
public SysMenu selectMenuById (Long menuId);
SysMenu selectMenuById(Long menuId);
/**
* 是否存在菜单子节点
@ -112,7 +112,7 @@ public interface SysMenuService extends IService<SysMenu> {
*
* @return 结果 true 存在 false 不存在
*/
public boolean hasChildByMenuId (Long menuId);
boolean hasChildByMenuId(Long menuId);
/**
* 查询菜单是否存在角色
@ -121,7 +121,7 @@ public interface SysMenuService extends IService<SysMenu> {
*
* @return 结果 true 存在 false 不存在
*/
public boolean checkMenuExistRole (Long menuId);
boolean checkMenuExistRole(Long menuId);
/**
* 新增保存菜单信息
@ -130,7 +130,7 @@ public interface SysMenuService extends IService<SysMenu> {
*
* @return 结果
*/
public int insertMenu (SysMenu menu);
int insertMenu(SysMenu menu);
/**
* 修改保存菜单信息
@ -139,7 +139,7 @@ public interface SysMenuService extends IService<SysMenu> {
*
* @return 结果
*/
public int updateMenu (SysMenu menu);
int updateMenu(SysMenu menu);
/**
* 删除菜单管理信息
@ -148,7 +148,7 @@ public interface SysMenuService extends IService<SysMenu> {
*
* @return 结果
*/
public int deleteMenuById (Long menuId);
int deleteMenuById(Long menuId);
/**
* 校验菜单名称是否唯一
@ -157,5 +157,5 @@ public interface SysMenuService extends IService<SysMenu> {
*
* @return 结果
*/
public boolean checkMenuNameUnique (SysMenu menu);
boolean checkMenuNameUnique(SysMenu menu);
}

12
muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysNoticeService.java
View File

@ -18,7 +18,7 @@ public interface SysNoticeService extends IService<SysNotice> {
*
* @return 公告信息
*/
public SysNotice selectNoticeById (Long noticeId);
SysNotice selectNoticeById(Long noticeId);
/**
* 查询公告列表
@ -27,7 +27,7 @@ public interface SysNoticeService extends IService<SysNotice> {
*
* @return 公告集合
*/
public List<SysNotice> selectNoticeList (SysNotice notice);
List<SysNotice> selectNoticeList(SysNotice notice);
/**
* 新增公告
@ -36,7 +36,7 @@ public interface SysNoticeService extends IService<SysNotice> {
*
* @return 结果
*/
public int insertNotice (SysNotice notice);
int insertNotice(SysNotice notice);
/**
* 修改公告
@ -45,7 +45,7 @@ public interface SysNoticeService extends IService<SysNotice> {
*
* @return 结果
*/
public int updateNotice (SysNotice notice);
int updateNotice(SysNotice notice);
/**
* 删除公告信息
@ -54,7 +54,7 @@ public interface SysNoticeService extends IService<SysNotice> {
*
* @return 结果
*/
public int deleteNoticeById (Long noticeId);
int deleteNoticeById(Long noticeId);
/**
* 批量删除公告信息
@ -63,5 +63,5 @@ public interface SysNoticeService extends IService<SysNotice> {
*
* @return 结果
*/
public int deleteNoticeByIds (Long[] noticeIds);
int deleteNoticeByIds(Long[] noticeIds);
}

10
muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysOperLogService.java
View File

@ -18,7 +18,7 @@ public interface SysOperLogService extends IService<SysOperLog> {
*
* @return 结果
*/
public int insertOperlog (SysOperLog operLog);
int insertOperlog(SysOperLog operLog);
/**
* 查询系统操作日志集合
@ -27,7 +27,7 @@ public interface SysOperLogService extends IService<SysOperLog> {
*
* @return 操作日志集合
*/
public List<SysOperLog> selectOperLogList (SysOperLog operLog);
List<SysOperLog> selectOperLogList(SysOperLog operLog);
/**
* 批量删除系统操作日志
@ -36,7 +36,7 @@ public interface SysOperLogService extends IService<SysOperLog> {
*
* @return 结果
*/
public int deleteOperLogByIds (Long[] operIds);
int deleteOperLogByIds(Long[] operIds);
/**
* 查询操作日志详细
@ -45,10 +45,10 @@ public interface SysOperLogService extends IService<SysOperLog> {
*
* @return 操作日志对象
*/
public SysOperLog selectOperLogById (Long operId);
SysOperLog selectOperLogById(Long operId);
/**
* 清空操作日志
*/
public void cleanOperLog ();
void cleanOperLog();
}

4
muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysPermissionService.java
View File

@ -17,7 +17,7 @@ public interface SysPermissionService {
*
* @return 角色权限信息
*/
public Set<String> getRolePermission (SysUser user);
Set<String> getRolePermission(SysUser user);
/**
* 获取菜单数据权限
@ -26,5 +26,5 @@ public interface SysPermissionService {
*
* @return 菜单权限信息
*/
public Set<String> getMenuPermission (SysUser user);
Set<String> getMenuPermission(SysUser user);
}

22
muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysPostService.java
View File

@ -18,14 +18,14 @@ public interface SysPostService extends IService<SysPost> {
*
* @return 岗位列表
*/
public List<SysPost> selectPostList (SysPost post);
List<SysPost> selectPostList(SysPost post);
/**
* 查询所有岗位
*
* @return 岗位列表
*/
public List<SysPost> selectPostAll ();
List<SysPost> selectPostAll();
/**
* 通过岗位ID查询岗位信息
@ -34,7 +34,7 @@ public interface SysPostService extends IService<SysPost> {
*
* @return 角色对象信息
*/
public SysPost selectPostById (Long postId);
SysPost selectPostById(Long postId);
/**
* 根据用户ID获取岗位选择框列表
@ -43,7 +43,7 @@ public interface SysPostService extends IService<SysPost> {
*
* @return 选中岗位ID列表
*/
public List<Long> selectPostListByUserId (Long userId);
List<Long> selectPostListByUserId(Long userId);
/**
* 校验岗位名称
@ -52,7 +52,7 @@ public interface SysPostService extends IService<SysPost> {
*
* @return 结果
*/
public boolean checkPostNameUnique (SysPost post);
boolean checkPostNameUnique(SysPost post);
/**
* 校验岗位编码
@ -61,7 +61,7 @@ public interface SysPostService extends IService<SysPost> {
*
* @return 结果
*/
public boolean checkPostCodeUnique (SysPost post);
boolean checkPostCodeUnique(SysPost post);
/**
* 通过岗位ID查询岗位使用数量
@ -70,7 +70,7 @@ public interface SysPostService extends IService<SysPost> {
*
* @return 结果
*/
public int countUserPostById (Long postId);
int countUserPostById(Long postId);
/**
* 删除岗位信息
@ -79,7 +79,7 @@ public interface SysPostService extends IService<SysPost> {
*
* @return 结果
*/
public int deletePostById (Long postId);
int deletePostById(Long postId);
/**
* 批量删除岗位信息
@ -88,7 +88,7 @@ public interface SysPostService extends IService<SysPost> {
*
* @return 结果
*/
public int deletePostByIds (Long[] postIds);
int deletePostByIds(Long[] postIds);
/**
* 新增保存岗位信息
@ -97,7 +97,7 @@ public interface SysPostService extends IService<SysPost> {
*
* @return 结果
*/
public int insertPost (SysPost post);
int insertPost(SysPost post);
/**
* 修改保存岗位信息
@ -106,5 +106,5 @@ public interface SysPostService extends IService<SysPost> {
*
* @return 结果
*/
public int updatePost (SysPost post);
int updatePost(SysPost post);
}

40
muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysRoleService.java
View File

@ -20,7 +20,7 @@ public interface SysRoleService extends IService<SysRole> {
*
* @return 角色数据集合信息
*/
public List<SysRole> selectRoleList (SysRole role);
List<SysRole> selectRoleList(SysRole role);
/**
* 根据用户ID查询角色列表
@ -29,7 +29,7 @@ public interface SysRoleService extends IService<SysRole> {
*
* @return 角色列表
*/
public List<SysRole> selectRolesByUserId (Long userId);
List<SysRole> selectRolesByUserId(Long userId);
/**
* 根据用户ID查询角色权限
@ -38,14 +38,14 @@ public interface SysRoleService extends IService<SysRole> {
*
* @return 权限列表
*/
public Set<String> selectRolePermissionByUserId (Long userId);
Set<String> selectRolePermissionByUserId(Long userId);
/**
* 查询所有角色
*
* @return 角色列表
*/
public List<SysRole> selectRoleAll ();
List<SysRole> selectRoleAll();
/**
* 根据用户ID获取角色选择框列表
@ -54,7 +54,7 @@ public interface SysRoleService extends IService<SysRole> {
*
* @return 选中角色ID列表
*/
public List<Long> selectRoleListByUserId (Long userId);
List<Long> selectRoleListByUserId(Long userId);
/**
* 通过角色ID查询角色
@ -63,7 +63,7 @@ public interface SysRoleService extends IService<SysRole> {
*
* @return 角色对象信息
*/
public SysRole selectRoleById (Long roleId);
SysRole selectRoleById(Long roleId);
/**
* 校验角色名称是否唯一
@ -72,7 +72,7 @@ public interface SysRoleService extends IService<SysRole> {
*
* @return 结果
*/
public boolean checkRoleNameUnique (SysRole role);
boolean checkRoleNameUnique(SysRole role);
/**
* 校验角色权限是否唯一
@ -81,21 +81,21 @@ public interface SysRoleService extends IService<SysRole> {
*
* @return 结果
*/
public boolean checkRoleKeyUnique (SysRole role);
boolean checkRoleKeyUnique(SysRole role);
/**
* 校验角色是否允许操作
*
* @param role 角色信息
*/
public void checkRoleAllowed (SysRole role);
void checkRoleAllowed(SysRole role);
/**
* 校验角色是否有数据权限
*
* @param roleId 角色id
*/
public void checkRoleDataScope (Long roleId);
void checkRoleDataScope(Long roleId);
/**
* 通过角色ID查询角色使用数量
@ -104,7 +104,7 @@ public interface SysRoleService extends IService<SysRole> {
*
* @return 结果
*/
public int countUserRoleByRoleId (Long roleId);
int countUserRoleByRoleId(Long roleId);
/**
* 新增保存角色信息
@ -113,7 +113,7 @@ public interface SysRoleService extends IService<SysRole> {
*
* @return 结果
*/
public int insertRole (SysRole role);
int insertRole(SysRole role);
/**
* 修改保存角色信息
@ -122,7 +122,7 @@ public interface SysRoleService extends IService<SysRole> {
*
* @return 结果
*/
public int updateRole (SysRole role);
int updateRole(SysRole role);
/**
* 修改角色状态
@ -131,7 +131,7 @@ public interface SysRoleService extends IService<SysRole> {
*
* @return 结果
*/
public int updateRoleStatus (SysRole role);
int updateRoleStatus(SysRole role);
/**
* 修改数据权限信息
@ -140,7 +140,7 @@ public interface SysRoleService extends IService<SysRole> {
*
* @return 结果
*/
public int authDataScope (SysRole role);
int authDataScope(SysRole role);
/**
* 通过角色ID删除角色
@ -149,7 +149,7 @@ public interface SysRoleService extends IService<SysRole> {
*
* @return 结果
*/
public int deleteRoleById (Long roleId);
int deleteRoleById(Long roleId);
/**
* 批量删除角色信息
@ -158,7 +158,7 @@ public interface SysRoleService extends IService<SysRole> {
*
* @return 结果
*/
public int deleteRoleByIds (Long[] roleIds);
int deleteRoleByIds(Long[] roleIds);
/**
* 取消授权用户角色
@ -167,7 +167,7 @@ public interface SysRoleService extends IService<SysRole> {
*
* @return 结果
*/
public int deleteAuthUser (SysUserRole userRole);
int deleteAuthUser(SysUserRole userRole);
/**
* 批量取消授权用户角色
@ -177,7 +177,7 @@ public interface SysRoleService extends IService<SysRole> {
*
* @return 结果
*/
public int deleteAuthUsers (Long roleId, Long[] userIds);
int deleteAuthUsers(Long roleId, Long[] userIds);
/**
* 批量选择授权用户角色
@ -187,5 +187,5 @@ public interface SysRoleService extends IService<SysRole> {
*
* @return 结果
*/
public int insertAuthUsers (Long roleId, Long[] userIds);
int insertAuthUsers(Long roleId, Long[] userIds);
}

9
muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysUserOnlineService.java
View File

@ -1,6 +1,5 @@
package com.muyu.system.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.muyu.common.system.domain.LoginUser;
import com.muyu.system.domain.SysUserOnline;
@ -18,7 +17,7 @@ public interface SysUserOnlineService {
*
* @return 在线用户信息
*/
public SysUserOnline selectOnlineByIpaddr (String ipaddr, LoginUser user);
SysUserOnline selectOnlineByIpaddr(String ipaddr, LoginUser user);
/**
* 通过用户名称查询信息
@ -28,7 +27,7 @@ public interface SysUserOnlineService {
*
* @return 在线用户信息
*/
public SysUserOnline selectOnlineByUserName (String userName, LoginUser user);
SysUserOnline selectOnlineByUserName(String userName, LoginUser user);
/**
* 通过登录地址/用户名称查询信息
@ -39,7 +38,7 @@ public interface SysUserOnlineService {
*
* @return 在线用户信息
*/
public SysUserOnline selectOnlineByInfo (String ipaddr, String userName, LoginUser user);
SysUserOnline selectOnlineByInfo(String ipaddr, String userName, LoginUser user);
/**
* 设置在线用户信息
@ -48,5 +47,5 @@ public interface SysUserOnlineService {
*
* @return 在线用户
*/
public SysUserOnline loginUserToUserOnline (LoginUser user);
SysUserOnline loginUserToUserOnline(LoginUser user);
}

48
muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysUserService.java
View File

@ -18,7 +18,7 @@ public interface SysUserService extends IService<SysUser> {
*
* @return 用户信息集合信息
*/
public List<SysUser> selectUserList (SysUser user);
List<SysUser> selectUserList(SysUser user);
/**
* 根据条件分页查询已分配用户角色列表
@ -27,7 +27,7 @@ public interface SysUserService extends IService<SysUser> {
*
* @return 用户信息集合信息
*/
public List<SysUser> selectAllocatedList (SysUser user);
List<SysUser> selectAllocatedList(SysUser user);
/**
* 根据条件分页查询未分配用户角色列表
@ -36,7 +36,7 @@ public interface SysUserService extends IService<SysUser> {
*
* @return 用户信息集合信息
*/
public List<SysUser> selectUnallocatedList (SysUser user);
List<SysUser> selectUnallocatedList(SysUser user);
/**
* 通过用户名查询用户
@ -45,7 +45,7 @@ public interface SysUserService extends IService<SysUser> {
*
* @return 用户对象信息
*/
public SysUser selectUserByUserName (String userName);
SysUser selectUserByUserName(String userName);
/**
* 通过用户ID查询用户
@ -54,7 +54,7 @@ public interface SysUserService extends IService<SysUser> {
*
* @return 用户对象信息
*/
public SysUser selectUserById (Long userId);
SysUser selectUserById(Long userId);
/**
* 根据用户ID查询用户所属角色组
@ -63,7 +63,7 @@ public interface SysUserService extends IService<SysUser> {
*
* @return 结果
*/
public String selectUserRoleGroup (String userName);
String selectUserRoleGroup(String userName);
/**
* 根据用户ID查询用户所属岗位组
@ -72,7 +72,7 @@ public interface SysUserService extends IService<SysUser> {
*
* @return 结果
*/
public String selectUserPostGroup (String userName);
String selectUserPostGroup(String userName);
/**
* 校验用户名称是否唯一
@ -81,7 +81,7 @@ public interface SysUserService extends IService<SysUser> {
*
* @return 结果
*/
public boolean checkUserNameUnique (SysUser user);
boolean checkUserNameUnique(SysUser user);
/**
* 校验手机号码是否唯一
@ -90,7 +90,7 @@ public interface SysUserService extends IService<SysUser> {
*
* @return 结果
*/
public boolean checkPhoneUnique (SysUser user);
boolean checkPhoneUnique(SysUser user);
/**
* 校验email是否唯一
@ -99,21 +99,21 @@ public interface SysUserService extends IService<SysUser> {
*
* @return 结果
*/
public boolean checkEmailUnique (SysUser user);
boolean checkEmailUnique(SysUser user);
/**
* 校验用户是否允许操作
*
* @param user 用户信息
*/
public void checkUserAllowed (SysUser user);
void checkUserAllowed(SysUser user);
/**
* 校验用户是否有数据权限
*
* @param userId 用户id
*/
public void checkUserDataScope (Long userId);
void checkUserDataScope(Long userId);
/**
* 新增用户信息
@ -122,7 +122,7 @@ public interface SysUserService extends IService<SysUser> {
*
* @return 结果
*/
public int insertUser (SysUser user);
int insertUser(SysUser user);
/**
* 注册用户信息
@ -131,7 +131,7 @@ public interface SysUserService extends IService<SysUser> {
*
* @return 结果
*/
public boolean registerUser (SysUser user);
boolean registerUser(SysUser user);
/**
* 修改用户信息
@ -140,7 +140,7 @@ public interface SysUserService extends IService<SysUser> {
*
* @return 结果
*/
public int updateUser (SysUser user);
int updateUser(SysUser user);
/**
* 用户授权角色
@ -148,7 +148,7 @@ public interface SysUserService extends IService<SysUser> {
* @param userId 用户ID
* @param roleIds 角色组
*/
public void insertUserAuth (Long userId, Long[] roleIds);
void insertUserAuth(Long userId, Long[] roleIds);
/**
* 修改用户状态
@ -157,7 +157,7 @@ public interface SysUserService extends IService<SysUser> {
*
* @return 结果
*/
public int updateUserStatus (SysUser user);
int updateUserStatus(SysUser user);
/**
* 修改用户基本信息
@ -166,7 +166,7 @@ public interface SysUserService extends IService<SysUser> {
*
* @return 结果
*/
public int updateUserProfile (SysUser user);
int updateUserProfile(SysUser user);
/**
* 修改用户头像
@ -176,7 +176,7 @@ public interface SysUserService extends IService<SysUser> {
*
* @return 结果
*/
public boolean updateUserAvatar (String userName, String avatar);
boolean updateUserAvatar(String userName, String avatar);
/**
* 重置用户密码
@ -185,7 +185,7 @@ public interface SysUserService extends IService<SysUser> {
*
* @return 结果
*/
public int resetPwd (SysUser user);
int resetPwd(SysUser user);
/**
* 重置用户密码
@ -195,7 +195,7 @@ public interface SysUserService extends IService<SysUser> {
*
* @return 结果
*/
public int resetUserPwd (String userName, String password);
int resetUserPwd(String userName, String password);
/**
* 通过用户ID删除用户
@ -204,7 +204,7 @@ public interface SysUserService extends IService<SysUser> {
*
* @return 结果
*/
public int deleteUserById (Long userId);
int deleteUserById(Long userId);
/**
* 批量删除用户信息
@ -213,7 +213,7 @@ public interface SysUserService extends IService<SysUser> {
*
* @return 结果
*/
public int deleteUserByIds (Long[] userIds);
int deleteUserByIds(Long[] userIds);
/**
* 导入用户数据
@ -224,5 +224,5 @@ public interface SysUserService extends IService<SysUser> {
*
* @return 结果
*/
public String importUser (List<SysUser> userList, Boolean isUpdateSupport, String operName);
String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName);
}

4
muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysDeptServiceImpl.java
View File

@ -306,7 +306,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
List<SysDept> tlist = new ArrayList<SysDept>();
Iterator<SysDept> it = list.iterator();
while (it.hasNext()) {
SysDept n = (SysDept) it.next();
SysDept n = it.next();
if (StringUtils.isNotNull(n.getParentId()) && n.getParentId().longValue() == t.getDeptId().longValue()) {
tlist.add(n);
}
@ -318,6 +318,6 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
* 判断是否有子节点
*/
private boolean hasChild (List<SysDept> list, SysDept t) {
return getChildList(list, t).size() > 0 ? true : false;
return getChildList(list, t).size() > 0;
}
}

6
muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java
View File

@ -204,7 +204,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
List<SysMenu> returnList = new ArrayList<SysMenu>();
List<Long> tempList = menus.stream().map(SysMenu::getMenuId).collect(Collectors.toList());
for (Iterator<SysMenu> iterator = menus.iterator() ; iterator.hasNext() ; ) {
SysMenu menu = (SysMenu) iterator.next();
SysMenu menu = iterator.next();
// 如果是顶级节点, 遍历该父节点的所有子节点
if (!tempList.contains(menu.getParentId())) {
recursionFn(menus, menu);
@ -426,7 +426,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
public List<SysMenu> getChildPerms (List<SysMenu> list, int parentId) {
List<SysMenu> returnList = new ArrayList<SysMenu>();
for (Iterator<SysMenu> iterator = list.iterator() ; iterator.hasNext() ; ) {
SysMenu t = (SysMenu) iterator.next();
SysMenu t = iterator.next();
// 一、根据传入的某个父节点ID,遍历该父节点的所有子节点
if (t.getParentId() == parentId) {
recursionFn(list, t);
@ -460,7 +460,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
List<SysMenu> tlist = new ArrayList<SysMenu>();
Iterator<SysMenu> it = list.iterator();
while (it.hasNext()) {
SysMenu n = (SysMenu) it.next();
SysMenu n = it.next();
if (n.getParentId().longValue() == t.getMenuId().longValue()) {
tlist.add(n);
}

1
muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysPermissionServiceImpl.java
View File

@ -1,6 +1,5 @@
package com.muyu.system.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.muyu.common.system.domain.SysRole;
import com.muyu.common.system.domain.SysUser;
import com.muyu.system.service.SysMenuService;

1
muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysUserOnlineServiceImpl.java
View File

@ -1,6 +1,5 @@
package com.muyu.system.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.muyu.common.core.utils.StringUtils;
import com.muyu.common.system.domain.LoginUser;
import com.muyu.system.domain.SysUserOnline;

5
muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java
View File

@ -14,8 +14,8 @@ import com.muyu.system.domain.SysPost;
import com.muyu.system.domain.SysUserPost;
import com.muyu.system.domain.SysUserRole;
import com.muyu.system.mapper.*;
import com.muyu.system.service.SysUserService;
import com.muyu.system.service.SysConfigService;
import com.muyu.system.service.SysUserService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@ -238,6 +238,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
public int insertUser (SysUser user) {
// 新增用户信息
int rows = userMapper.insertUser(user);
//赋值userId
// user.setUserId((long) rows);
// 新增用户岗位关联
insertUserPost(user);
// 新增用户与角色管理

8
muyu-modules/muyu-system/src/main/resources/mapper/system/SysDeptMapper.xml
View File

@ -108,6 +108,9 @@
<include refid="selectDeptVo"/>
where dept_name=#{deptName} and parent_id = #{parentId} and del_flag = '0' limit 1
</select>
<select id="selectDeptByName" resultType="com.muyu.common.system.domain.SysDept">
select * from sys_dept where dept_name=#{name}
</select>
<insert id="insertDept" parameterType="com.muyu.common.system.domain.SysDept">
insert into sys_dept(
@ -180,9 +183,4 @@
where dept_id = #{deptId}
</delete>
<select id="selectDeptByName" resultType="com.muyu.common.system.domain.SysDept">
select * from sys_dept where dept_name=#{name}
</select>
</mapper>