suzhou-jichuang-lanhai
/
gysl
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bugfix

Browse Source
master
杜函宇 1 day ago
parent 3a8e659198
commit d14e71b071
37 changed files with 999 additions and 166 deletions
Show Stats Download Patch File Download Diff File

4
pom.xml
Unescape View File

@ -9,8 +9,8 @@
<version>3.8.9</version>
<name>ruoyi</name>
<url>http://www.ruoyi.vip</url>
<description>若依管理系统</description>
<url></url>
<description>管理系统</description>
<properties>
<ruoyi.version>3.8.9</ruoyi.version>

2
ruoyi-admin/pom.xml
Unescape View File

@ -9,7 +9,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
<artifactId>ruoyi-admin</artifactId>
<artifactId>gysl</artifactId>
<description>
web服务入口

2
ruoyi-admin/src/main/java/com/ruoyi/docking/controller/SmartRemindersController.java
Unescape View File

@ -92,7 +92,7 @@ public class SmartRemindersController extends BaseController {
*/
// @PreAuthorize("@ss.hasAnyRoles('admin,common')")
@ApiOperation(value = "已读智能提醒")
@GetMapping("/isRead{id}")
@GetMapping("/isRead/{id}")
public AjaxResult isRead(@PathVariable Serializable id) {
return success(smartRemindersService.isRead(id));
}

4
ruoyi-admin/src/main/java/com/ruoyi/docking/service/impl/UserServiceImpl.java
Unescape View File

@ -43,7 +43,9 @@ public class UserServiceImpl implements UserService {
smartDeclaration.setZwId(x.getUserId());
smartDeclaration.setContent(content);
smartDeclaration.setProjectId(id);
smartDeclaration.setAlertTime(LocalDateTime.parse(time));
if(time!=null&& !time.isEmpty()){
smartDeclaration.setAlertTime(LocalDateTime.parse(time));
}
smartDeclaration.setSmartRemindersId(smartRemindersId);
list.add(smartDeclaration);
});

34
ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/BasicInformationController.java
Unescape View File

@ -108,6 +108,20 @@ public class BasicInformationController extends BaseController {
return success(basicInformationService.page(page, basicInformationPageReq));
}
/**
* 企业端暂存
*/
@PreAuthorize("@ss.hasAnyRoles('company')")
@ApiOperation(value = "企业端暂存")
@PostMapping("/staging")
public AjaxResult staging(@RequestBody AuditRequest req) {
BasicInformation byId = basicInformationService.getById(req.getBasicInformation().getId());
if (byId.getStatus() != 1) {
throw new ServiceException("不能暂存!");
}
return success(basicInformationService.staging(req));
}
/**
* 企业端提交填报
*/
@ -136,14 +150,28 @@ public class BasicInformationController extends BaseController {
return success(basicInformationService.audit(req, 3));
}
/**
* 通过主键查询单条项目所有数据(企业端)
*
* @param id 主键
* @return 单条数据
*/
@PreAuthorize("@ss.hasAnyRoles('company')")
@ApiOperation(value = "通过主键查询单条项目所有数据(企业端)", response = BasicInformationResponse.class)
@GetMapping("/stagingInfo/{id}")
public AjaxResult stagingInfo(@PathVariable Long id) {
return success(basicInformationService.stagingInfo(id));
}
/**
* 通过主键查询单条项目所有数据
* 通过主键查询单条项目所有数据(政务端)
*
* @param id 主键
* @return 单条数据
*/
@ApiOperation(value = "通过主键查询单条项目所有数据", response = BasicInformationResponse.class)
@PreAuthorize("@ss.hasAnyRoles('admin,common')")
@ApiOperation(value = "通过主键查询单条项目所有数据(政务端)", response = BasicInformationResponse.class)
@GetMapping("/{id}")
public AjaxResult selectOne(@PathVariable Long id) {
return success(basicInformationService.selectOne(id));
@ -190,7 +218,7 @@ public class BasicInformationController extends BaseController {
list.forEach(y -> {
WysmxInformation wysmxInformation = new WysmxInformation();
wysmxInformation.setYsmc(y.getName());
wysmxInformation.setZdname(y.getName());
wysmxInformation.setZdname(y.getJtzb());
wysmxInformation.setXmId(x.getId());
wys.add(wysmxInformation);
});

35
ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/MxController.java
Unescape View File

@ -5,12 +5,15 @@ import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.gysl.entity.Mx;
import com.ruoyi.gysl.entity.request.MxRequest;
import com.ruoyi.gysl.entity.request.XmzskPageReq;
import com.ruoyi.gysl.entity.request.YsUpdateReq;
import com.ruoyi.gysl.service.MxService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.validation.Valid;
import java.io.Serializable;
import java.util.List;
@ -61,34 +64,56 @@ public class MxController extends BaseController {
* @param mx 实体对象
* @return 新增结果
*/
@PostMapping("/addZb")
@PostMapping("/add")
@ApiOperation("新增指标数据")
public AjaxResult insertZb(@RequestBody Mx mx) {
return success(mxService.add(mx));
}
/**
* 修改要素
*
* @param mx 实体对象
* @return 修改结果
*/
@PostMapping("/updateYs")
@ApiOperation("修改要素")
public AjaxResult updateYs(@RequestBody YsUpdateReq mx) {
return success(mxService.updateYs(mx));
}
/**
* 修改数据
* 修改指标
*
* @param mx 实体对象
* @return 修改结果
*/
@PostMapping("/edit")
@ApiOperation("修改数据")
@ApiOperation("修改指标")
public AjaxResult update(@RequestBody Mx mx) {
return success(mxService.updateById(mx));
}
/**
* 删除数据
* 删除指标
*
* @param idList 主键结合
* @return 删除结果
*/
@ApiOperation("删除数据")
@ApiOperation("删除指标")
@DeleteMapping("/delete")
public AjaxResult delete(@RequestParam("idList") List<Long> idList) {
return success(mxService.removeByIds(idList));
}
/**
* 删除要素
*/
@ApiOperation("删除要素")
@DeleteMapping("/deleteYs")
public AjaxResult deleteYs(@Valid XmzskPageReq req) {
return success(mxService.deleteYs(req));
}
}

2
ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/XfcyglController.java
Unescape View File

@ -104,7 +104,7 @@ public class XfcyglController extends BaseController {
*/
@ApiOperation(value = "根据条件导出所有细分产业")
@PostMapping(value = "/exportXfcy")
public void exportXfcy(HttpServletResponse response, XfcyglPageReq req) throws Exception {
public void exportXfcy(HttpServletResponse response, XfcyglPageReq req) {
List<Xfcygl> filteredList = xfcyglService.page(req);
ExcelUtil<Xfcygl> util = new ExcelUtil<>(Xfcygl.class);
util.exportExcel(response, filteredList, "细分产业数据");

8
ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/XmpjqdController.java
Unescape View File

@ -37,12 +37,14 @@ public class XmpjqdController extends BaseController {
/**
* 分页查询所有项目评价清单
*
* @param page 分页对象
* @return 所有数据
*/
@ApiOperation("分页查询所有项目评价清单")
@GetMapping("/page")
public AjaxResult selectAll(Page<Xmpjqd> page, XmpjqdPageReq req) {
public AjaxResult selectAll( XmpjqdPageReq req) {
Page<Xmpjqd> page = new Page<>();
page.setSize(req.getSize());
page.setCurrent(req.getCurrent());
return success(xmpjqdService.page(page, req));
}
@ -54,7 +56,7 @@ public class XmpjqdController extends BaseController {
*/
@ApiOperation(value = "通过主键查询单条项目评价清单",response = XmpjqdOneResponse.class)
@GetMapping("/{id}")
public AjaxResult selectOne(@PathVariable Serializable id) {
public AjaxResult selectOne(@PathVariable Long id) {
return success(xmpjqdService.selectOnePj(id));
}

5
ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Ml.java
Unescape View File

@ -2,7 +2,6 @@ package com.ruoyi.gysl.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.annotation.Excel;
@ -22,13 +21,13 @@ import java.io.Serializable;
@EqualsAndHashCode(callSuper = true)
@Data
@TableName("gysl_ml")
public class Ml extends BaseModel implements Serializable{
public class Ml extends BaseModel implements Serializable {
@ApiModelProperty(value = "主键id")
@TableId(type = IdType.AUTO)
private Long id;
@Excel(name = "上楼目录类别")
@Excel(name = "上楼目录类别", dictType = "shangloumulu", comboReadDict = true)
@ApiModelProperty("上楼目录类别")
private Integer slmllb;

6
ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xfcygl.java
Unescape View File

@ -2,9 +2,9 @@ package com.ruoyi.gysl.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.gysl.entity.baseModel.BaseModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -28,15 +28,19 @@ public class Xfcygl extends BaseModel implements Serializable {
private Long id;
@ApiModelProperty(value = "产业类别")
@Excel(name = "产业类别", dictType = "cylb", comboReadDict = true)
private String cylb;
@ApiModelProperty(value = "产业细分")
@Excel(name = "产业细分")
private String cyxf;
@ApiModelProperty(value = "原材料及生产环节")
@Excel(name = "原材料及生产环节")
private String ycljschj;
@ApiModelProperty(value = "上楼适应性")
@Excel(name = "上楼适应性", dictType = "slsyx", comboReadDict = true)
private Integer slsyx;
}

43
ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xmpjqd.java
Unescape View File

@ -6,13 +6,13 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.gysl.entity.baseModel.BaseModel;
import com.ruoyi.common.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDate;
/**
@ -22,11 +22,11 @@ import java.time.LocalDate;
* @since 2025-03-22 09:22:33
*/
@Data
@TableName("gysl_xmpjqd")
//@TableName("gysl_xmpjqd")
public class Xmpjqd implements Serializable {
@ApiModelProperty(value = "主键id")
@TableId(type = IdType.AUTO)
// @TableId(type = IdType.AUTO)
private Long id;
@ApiModelProperty(value = "项目名称")
@ -53,5 +53,40 @@ public class Xmpjqd implements Serializable {
@ApiModelProperty(value = "项目法人单位")
private String xmfrdwxz;
/**
* 层数
*/
@TableField(exist = false)
@ApiModelProperty(value = "层数")
private Integer floor;
/**
* 首层高度
*/
@Excel(name = "首层高度")
@TableField(exist = false)
private BigDecimal scgd;
/**
* 2至4层高
*/
@ApiModelProperty(value = "2至4层高")
@TableField(exist = false)
private BigDecimal twoAndFourCg;
/**
* 首层地面荷载
*/
@ApiModelProperty(value = "首层地面荷载")
@TableField(exist = false)
private BigDecimal scdmhz;
/**
* 二至三层楼面荷载
*/
@ApiModelProperty(value = "二至三层楼面荷载")
@TableField(exist = false)
private BigDecimal twoAndThreeLmhz;
}

9
ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/XmpjqdPageReq.java
Unescape View File

@ -9,6 +9,7 @@ import java.time.LocalDate;
/**
* 项目评价清单分页参数
*
* @author du
* @since 2025/3/22 10:10
*/
@ -21,6 +22,9 @@ public class XmpjqdPageReq {
@ApiModelProperty(value = "评价等级")
private Integer pjdj;
@ApiModelProperty(value = "1正序 2倒序")
private String sort;
@ApiModelProperty(value = "项目名称")
private String name;
@ -34,4 +38,9 @@ public class XmpjqdPageReq {
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
private LocalDate endTime;
private Integer current = 1;
private Integer size = 10;
}

9
ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/XmzskPageReq.java
Unescape View File

@ -1,9 +1,10 @@
package com.ruoyi.gysl.entity.request;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
/**
* 项目知识库分页请求类
* @author du
@ -15,12 +16,14 @@ public class XmzskPageReq {
/**
* 文件名称
*/
@ApiModelProperty(value = "文件名称")
@NotBlank
@ApiModelProperty(value = "文件名称 / 要素名称")
private String name;
/**
* 类型
*/
@ApiModelProperty(value = "类型")
@NotBlank
@ApiModelProperty(value = "类型 / 要素类别")
private String lx;
}

34
ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/YsUpdateReq.java
Unescape View File

@ -0,0 +1,34 @@
package com.ruoyi.gysl.entity.request;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
/**
* 要素修改实体类
* @author du
* @since 2025/4/3 16:31
*/
@Data
public class YsUpdateReq {
@ApiModelProperty(value = "旧 1:关键要素；2：重要要素")
@NotBlank
private String oldType;
@ApiModelProperty(value = "旧 要素名称")
@NotBlank
private String oldName;
@ApiModelProperty(value = "新 1:关键要素；2：重要要素")
@NotBlank
private String newType;
@ApiModelProperty(value = "新 要素名称")
@NotBlank
private String newName;
}

11
ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/response/MxPageDetailedInfo/MxPageDetailedInfo.java
Unescape View File

@ -1,6 +1,7 @@
package com.ruoyi.gysl.entity.response.MxPageDetailedInfo;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -12,6 +13,14 @@ import lombok.Data;
@Data
public class MxPageDetailedInfo {
/**
* 主键id
*/
@ApiModelProperty(value = "主键id")
private Long id;
/**
* 具体指标
*/

30
ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/BasicInformationMapper.java
Unescape View File

@ -2,7 +2,7 @@ package com.ruoyi.gysl.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.gysl.entity.BasicInformation;
import com.ruoyi.gysl.entity.*;
import com.ruoyi.gysl.entity.request.BasicInformationPageReq;
import com.ruoyi.gysl.entity.response.ProjectExcelInfo;
import org.apache.ibatis.annotations.Param;
@ -35,5 +35,33 @@ public interface BasicInformationMapper extends BaseMapper<BasicInformation> {
* 有经纬度的项目列表
*/
Page<BasicInformation> projectList(Page<BasicInformation> page);
/**
* copy表的新增
*/
int insert1( BasicInformation basicInformation);
int insert2(PlanInformation planInformation);
int insert3(WysmxInformation wysmxInformations);
int insert4(QyrzInformation qyrzInformation);
int insert5(ProjectOtherInfo projectOtherInfos);
/**
* copy表的删除
*/
int delete1(@Param("id") Long id);
int delete2(@Param("id") Long id);
int delete3(@Param("id") Long id);
int delete4(@Param("id") Long id);
int delete5(@Param("id") Long id);
/**
* copy表查询
*/
BasicInformation select1(@Param("id") Long id);
PlanInformation select2(@Param("id") Long id);
List<WysmxInformation> select3(@Param("id") Long id);
QyrzInformation select4(@Param("id") Long id);
List<ProjectOtherInfo> select5(@Param("id") Long id);
}

14
ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/MxMapper.java
Unescape View File

@ -3,6 +3,8 @@ package com.ruoyi.gysl.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.gysl.entity.Mx;
import com.ruoyi.gysl.entity.request.MxRequest;
import com.ruoyi.gysl.entity.request.XmzskPageReq;
import com.ruoyi.gysl.entity.request.YsUpdateReq;
import com.ruoyi.gysl.entity.response.MxPageResponse;
import org.apache.ibatis.annotations.Param;
@ -24,5 +26,17 @@ public interface MxMapper extends BaseMapper<Mx> {
* @return 所有数据
*/
List<Mx> selectAll(@Param("req") MxRequest mxRequest);
/**
* 修改要素
* @param mx
* @return
*/
Boolean updateYs(YsUpdateReq mx);
/**
* 删除要素
*/
Boolean deleteYs(@Param("req")XmzskPageReq req);
}

15
ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/XmpjqdMapper.java
Unescape View File

@ -2,6 +2,7 @@ package com.ruoyi.gysl.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.gysl.entity.BuildingInformation;
import com.ruoyi.gysl.entity.Xmpjqd;
import com.ruoyi.gysl.entity.request.XmpjqdPageReq;
import com.ruoyi.gysl.entity.response.XmhxDetail.XmhxDetail;
@ -29,12 +30,18 @@ public interface XmpjqdMapper extends BaseMapper<Xmpjqd> {
Page<Xmpjqd> page(Page<Xmpjqd> page, @Param("req") XmpjqdPageReq req);
/**
* 通过主键查询单条项目评价清单
* 通过主键查询项目的总投资额排名
*
* @param id 主键
* @return 单条数据
*/
List<XmpjqdOneResponse> selectOnePj(@Param("id") Serializable id);
List<XmpjqdOneResponse> selectOnePj(@Param("id") Long id);
/**
* 查询所有的建筑信息,只保留是重要楼栋的第一条
*/
List<BuildingInformation> getImportantBuildings();
/**
* 通过主键查询单条项目画像
@ -45,13 +52,15 @@ public interface XmpjqdMapper extends BaseMapper<Xmpjqd> {
List<XmhxDetail> oneXmhx(@Param("id") Serializable id);
/**
* 中位数
* 总投资额中位数
*/
List<BigDecimal> zwsXmhx();
/**
* 最大值
*/
List<XmhxDetail> maxXmhx();
}

15
ruoyi-admin/src/main/java/com/ruoyi/gysl/service/BasicInformationService.java
Unescape View File

@ -68,7 +68,7 @@ public interface BasicInformationService extends IService<BasicInformation> {
*/
Long audit(AuditRequest req,int status);
/**
* 通过主键查询单条项目所有数据
* 通过主键查询单条项目所有数据(政务端)
*
* @param id 主键
* @return 单条数据
@ -80,5 +80,18 @@ public interface BasicInformationService extends IService<BasicInformation> {
* 删除项目id对应的所有数据
*/
void removeByXmIds(List<Long> idList);
/**
* 企业端暂存
*/
Long staging(AuditRequest req);
/**
* 通过主键查询单条项目所有数据(企业端)
*
* @param id 主键
* @return 单条数据
*/
BasicInformationResponse stagingInfo(Long id);
}

14
ruoyi-admin/src/main/java/com/ruoyi/gysl/service/MxService.java
Unescape View File

@ -3,6 +3,8 @@ package com.ruoyi.gysl.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.gysl.entity.Mx;
import com.ruoyi.gysl.entity.request.MxRequest;
import com.ruoyi.gysl.entity.request.XmzskPageReq;
import com.ruoyi.gysl.entity.request.YsUpdateReq;
import com.ruoyi.gysl.entity.response.MxPageResponse;
import java.util.List;
@ -30,5 +32,17 @@ public interface MxService extends IService<Mx> {
* @return 新增结果
*/
int add(Mx mx);
/**
* 修改要素
* @param mx
* @return
*/
Boolean updateYs(YsUpdateReq mx);
/**
* 删除要素
*/
Boolean deleteYs(XmzskPageReq req);
}

6
ruoyi-admin/src/main/java/com/ruoyi/gysl/service/WysmxInformationService.java
Unescape View File

@ -34,5 +34,11 @@ public interface WysmxInformationService extends IService<WysmxInformation> {
boolean canGoUpstairs(String materialLevel,
String fireRiskLevel,
String environmentalProtection);
/**
* 通过逻辑获取最终五要素数据
*/
List<WysmxResponse> getWysFinal(List<WysmxInformation> a1);
}

2
ruoyi-admin/src/main/java/com/ruoyi/gysl/service/XmpjqdService.java
Unescape View File

@ -32,7 +32,7 @@ public interface XmpjqdService extends IService<Xmpjqd> {
* @param id 主键
* @return 单条数据
*/
List<XmpjqdOneResponse> selectOnePj(Serializable id);
List<XmpjqdOneResponse> selectOnePj(Long id);
/**
* 通过主键查询单条项目画像

84
ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/BasicInformationServiceImpl.java
Unescape View File

@ -295,7 +295,7 @@ public class BasicInformationServiceImpl extends ServiceImpl<BasicInformationMap
List<WysmxInformation> collect3 = req.getWysmxInformations().stream().filter(x ->
"环境保护".equals(x.getZdname()))
.collect(Collectors.toList());
if(!collect1.isEmpty() && !collect2.isEmpty() && !collect3.isEmpty()){
if (!collect1.isEmpty() && !collect2.isEmpty() && !collect3.isEmpty()) {
req.getBasicInformation().setIsFmqd(wysmxInformationService.canGoUpstairs(
collect1.get(0).getZdinfor(),
collect2.get(0).getZdinfor(),
@ -327,7 +327,7 @@ public class BasicInformationServiceImpl extends ServiceImpl<BasicInformationMap
}
/**
* 通过主键查询单条项目所有数据
* 通过主键查询单条项目所有数据(政务端)
*
* @param id 主键
* @return 单条数据
@ -390,4 +390,84 @@ public class BasicInformationServiceImpl extends ServiceImpl<BasicInformationMap
otherInfoService.lambdaUpdate().eq(ProjectOtherInfo::getXmId, x).remove();
});
}
/**
* 企业端暂存
*/
@Override
public Long staging(AuditRequest req) {
//先删再暂存，因为可能会多次暂存
baseMapper.delete1(req.getBasicInformation().getId());
baseMapper.delete2(req.getBasicInformation().getId());
baseMapper.delete3(req.getBasicInformation().getId());
baseMapper.delete4(req.getBasicInformation().getId());
baseMapper.delete5(req.getBasicInformation().getId());
baseMapper.insert1(req.getBasicInformation());
baseMapper.insert2(req.getPlanInformation());
req.getWysmxInformations().forEach(x -> baseMapper.insert3(x));
baseMapper.insert4(req.getQyrzInformation());
req.getProjectOtherInfos().forEach(x -> baseMapper.insert5(x));
return req.getBasicInformation().getId();
}
/**
* 通过主键查询单条项目所有数据(企业端)
*
* @param id 主键
* @return 单条数据
*/
@Override
public BasicInformationResponse stagingInfo(Long id) {
BasicInformationResponse basicInformationResponse = new BasicInformationResponse();
//项目基本信息
BasicInformation bs = baseMapper.select1(id);
if (bs != null) {
basicInformationResponse.setBasicInformation(bs);
} else {
basicInformationResponse.setBasicInformation(getById(id));
}
//项目规划信息
PlanInformation pl = baseMapper.select2(id);
if (pl != null) {
basicInformationResponse.setPlanInformation(pl);
} else {
basicInformationResponse.setPlanInformation(planInformationService.lambdaQuery().eq(PlanInformation::getXmId, id).one());
}
//项目建筑信息
basicInformationResponse.setBuildingInformation(buildingInformationService.lambdaQuery().eq(BuildingInformation::getXmId, id).list());
//五要素模型信息
ZwIdPageReq zwIdPageReq = new ZwIdPageReq();
zwIdPageReq.setXmId(id);
List<WysmxInformation> wm = baseMapper.select3(id);
if (!wm.isEmpty()) {
basicInformationResponse.setWysmxResponses(wysmxInformationService.getWysFinal(wm));
} else {
basicInformationResponse.setWysmxResponses(wysmxInformationService.list(zwIdPageReq));
}
//企业入驻信息
QyrzInformation qi = baseMapper.select4(id);
if (qi != null) {
basicInformationResponse.setQyrzInformation(qi);
} else {
basicInformationResponse.setQyrzInformation(qyrzInformationService.selectAll(zwIdPageReq));
}
//项目图例
basicInformationResponse.setProjectLegendResponses(projectLegendService.page(zwIdPageReq));
//项目巡礼
basicInformationResponse.setXmxl(xmxlService.list(zwIdPageReq));
RemarkPageReq remarkPageReq = new RemarkPageReq();
remarkPageReq.setXmId(id);
//项目备忘录
basicInformationResponse.setProjectRemarks(projectRemarkService.list(remarkPageReq));
//其他信息
List<ProjectOtherInfo> po = baseMapper.select5(id);
if (!po.isEmpty()) {
basicInformationResponse.setProjectOtherInfos(po);
} else {
basicInformationResponse.setProjectOtherInfos(otherInfoService.searchId(zwIdPageReq));
}
return basicInformationResponse;
}
}

28
ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/MxServiceImpl.java
Unescape View File

@ -3,6 +3,8 @@ package com.ruoyi.gysl.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.gysl.entity.Mx;
import com.ruoyi.gysl.entity.request.MxRequest;
import com.ruoyi.gysl.entity.request.XmzskPageReq;
import com.ruoyi.gysl.entity.request.YsUpdateReq;
import com.ruoyi.gysl.entity.response.MxPageDetailedInfo.MxPageDetailedInfo;
import com.ruoyi.gysl.entity.response.MxPageResponse;
import com.ruoyi.gysl.mapper.MxMapper;
@ -32,13 +34,16 @@ public class MxServiceImpl extends ServiceImpl<MxMapper, Mx> implements MxServic
public List<MxPageResponse> selectAll(MxRequest mxRequest) {
List<Mx> allList = baseMapper.selectAll(mxRequest);
// // 按 name 分组，并转换为 GroupedData
Map<String, MxPageResponse> groupedMap = allList.stream().collect(Collectors.groupingBy(Mx::getName, Collectors.collectingAndThen(Collectors.toList(), list -> {
Map<String, MxPageResponse> groupedMap = allList.stream().collect(
Collectors.groupingBy(
Mx::getName, Collectors.collectingAndThen(Collectors.toList(), list -> {
if (list.isEmpty()) return null;
Mx firstItem = list.get(0);
String name = firstItem.getName();
String type = firstItem.getType();
if (name == null && type == null) return null;
MxPageResponse data = new MxPageResponse();
@ -54,10 +59,10 @@ public class MxServiceImpl extends ServiceImpl<MxMapper, Mx> implements MxServic
MxPageDetailedInfo item = new MxPageDetailedInfo();
item.setJtzb(e.getJtzb());
item.setXxyq(e.getXxyq());
item.setId(e.getId());
return item;
}).filter(Objects::nonNull) // 过滤掉 null
.collect(Collectors.toList());
data.setList(itemList);
return data;
}))).entrySet().stream().filter(entry -> entry.getValue() != null).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
@ -85,5 +90,24 @@ public class MxServiceImpl extends ServiceImpl<MxMapper, Mx> implements MxServic
}
return 0;
}
/**
* 修改要素
* @param mx
* @return
*/
@Override
public Boolean updateYs(YsUpdateReq mx) {
return baseMapper.updateYs(mx);
}
/**
* 删除要素
*/
@Override
public Boolean deleteYs(XmzskPageReq req) {
return baseMapper.deleteYs(req);
}
}

13
ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/WysmxInformationServiceImpl.java
Unescape View File

@ -44,6 +44,8 @@ public class WysmxInformationServiceImpl extends ServiceImpl<WysmxInformationMap
}
/**
* 根据项目id查询该项目的五要素模型信息
*
@ -53,9 +55,16 @@ public class WysmxInformationServiceImpl extends ServiceImpl<WysmxInformationMap
@Override
public List<WysmxResponse> list(ZwIdPageReq zwIdPageReq) {
List<WysmxInformation> allList = baseMapper.list(zwIdPageReq);
// 按 name 分组，并转换为 GroupedData
return getWysFinal(allList);
}
/**
* 通过逻辑获取最终五要素数据
*/
@Override
public List<WysmxResponse> getWysFinal(List<WysmxInformation> a1) {
Map<String, WysmxResponse> groupedMap =
allList.stream().collect(Collectors.groupingBy(WysmxInformation::getYsmc,
a1.stream().collect(Collectors.groupingBy(WysmxInformation::getYsmc,
Collectors.collectingAndThen(Collectors.toList(), list -> {
WysmxResponse data = new WysmxResponse();
data.setId(list.get(0).getId());

159
ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/XmpjqdServiceImpl.java
Unescape View File

@ -2,14 +2,14 @@ package com.ruoyi.gysl.service.impl;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.gysl.entity.Pjpz;
import com.ruoyi.gysl.entity.BuildingInformation;
import com.ruoyi.gysl.entity.Xmpjqd;
import com.ruoyi.gysl.entity.request.XmpjqdPageReq;
import com.ruoyi.gysl.entity.response.XmhxDetail.XmhxDetail;
import com.ruoyi.gysl.entity.response.XmhxResponse;
import com.ruoyi.gysl.entity.response.XmpjqdOneResponse;
import com.ruoyi.gysl.mapper.XmpjqdMapper;
import com.ruoyi.gysl.service.PjpzService;
import com.ruoyi.gysl.service.BuildingInformationService;
import com.ruoyi.gysl.service.XmpjqdService;
import org.springframework.stereotype.Service;
@ -18,7 +18,10 @@ import java.io.Serializable;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
/**
* 项目评价清单(Xmpjqd)表服务实现类
@ -33,7 +36,7 @@ public class XmpjqdServiceImpl extends ServiceImpl<XmpjqdMapper, Xmpjqd> impleme
private XmpjqdMapper xmpjqdMapper;
@Resource
private PjpzService pjpzService;
private BuildingInformationService buildingInformationService;
/**
* 分页查询所有目录
@ -43,7 +46,11 @@ public class XmpjqdServiceImpl extends ServiceImpl<XmpjqdMapper, Xmpjqd> impleme
*/
@Override
public Page<Xmpjqd> page(Page<Xmpjqd> page, XmpjqdPageReq req) {
return xmpjqdMapper.page(page, req);
Page<Xmpjqd> page1 = xmpjqdMapper.page(page, req);
for (int i = 0; i < page1.getRecords().size(); i++) {
page1.getRecords().get(i).setPjdj(i + 1);
}
return page1;
}
/**
@ -53,16 +60,68 @@ public class XmpjqdServiceImpl extends ServiceImpl<XmpjqdMapper, Xmpjqd> impleme
* @return 单条数据
*/
@Override
public List<XmpjqdOneResponse> selectOnePj(Serializable id) {
public List<XmpjqdOneResponse> selectOnePj(Long id) {
List<XmpjqdOneResponse> xmpjqdOneResponses = xmpjqdMapper.selectOnePj(id);
List<Pjpz> list = pjpzService.list();
list.forEach(x -> {
if (!"总投资额".equals(x.getPjys())) {
XmpjqdOneResponse xmpjqdOneResponse = new XmpjqdOneResponse();
xmpjqdOneResponse.setYsmc(x.getPjys());
xmpjqdOneResponses.add(xmpjqdOneResponse);
//查询所有的建筑信息,只保留是重要楼栋的随机一条
List<BuildingInformation> list = xmpjqdMapper.getImportantBuildings();
//层数
list.sort(Comparator.comparing(BuildingInformation::getFloor).reversed());
XmpjqdOneResponse a1 = new XmpjqdOneResponse();
a1.setYsmc("层数");
for (int i = 0; i < list.size(); i++) {
if (Objects.equals(list.get(i).getXmId(), id)) {
a1.setPjpm(i + 1);
}
}
a1.setCount(String.valueOf(list.size()));
xmpjqdOneResponses.add(a1);
//首层层高
XmpjqdOneResponse a2 = new XmpjqdOneResponse();
list.sort(Comparator.comparing(BuildingInformation::getScgd).reversed());
a2.setYsmc("首层层高");
for (int i = 0; i < list.size(); i++) {
if (Objects.equals(list.get(i).getXmId(), id)) {
a2.setPjpm(i + 1);
}
}
a2.setCount(String.valueOf(list.size()));
xmpjqdOneResponses.add(a2);
//二层及以上层高
XmpjqdOneResponse a3 = new XmpjqdOneResponse();
list.sort(Comparator.comparing(BuildingInformation::getTwoAndFourCg).reversed());
a3.setYsmc("二层及以上层高");
for (int i = 0; i < list.size(); i++) {
if (Objects.equals(list.get(i).getXmId(), id)) {
a3.setPjpm(i + 1);
}
}
a3.setCount(String.valueOf(list.size()));
xmpjqdOneResponses.add(a3);
//首层地面载荷
XmpjqdOneResponse a4 = new XmpjqdOneResponse();
list.sort(Comparator.comparing(BuildingInformation::getScdmhz).reversed());
a4.setYsmc("首层地面载荷");
for (int i = 0; i < list.size(); i++) {
if (Objects.equals(list.get(i).getXmId(), id)) {
a4.setPjpm(i + 1);
}
});
}
a4.setCount(String.valueOf(list.size()));
xmpjqdOneResponses.add(a4);
//二层及以上楼面荷载
XmpjqdOneResponse a5 = new XmpjqdOneResponse();
list.sort(Comparator.comparing(BuildingInformation::getTwoAndThreeLmhz).reversed());
a5.setYsmc("二层及以上楼面荷载");
for (int i = 0; i < list.size(); i++) {
if (Objects.equals(list.get(i).getXmId(), id)) {
a5.setPjpm(i + 1);
}
}
a5.setCount(String.valueOf(list.size()));
xmpjqdOneResponses.add(a5);
return xmpjqdOneResponses;
}
@ -80,23 +139,86 @@ public class XmpjqdServiceImpl extends ServiceImpl<XmpjqdMapper, Xmpjqd> impleme
xr.setList(xmpjqdMapper.maxXmhx());
XmhxResponse xr1 = new XmhxResponse();
List<XmhxDetail> xmhxDetails = xmpjqdMapper.oneXmhx(id);
BuildingInformation one = buildingInformationService.lambdaQuery()
.eq(BuildingInformation::getXmId, id)
.eq(BuildingInformation::getSfwzyld, 1)
.groupBy(BuildingInformation::getXmId).one();
XmhxDetail a1 = new XmhxDetail();
a1.setYsmc("层数");
a1.setPjpm(String.valueOf(one.getFloor()));
XmhxDetail a2 = new XmhxDetail();
a2.setYsmc("首层层高");
a2.setPjpm(String.valueOf(one.getScgd()));
XmhxDetail a3 = new XmhxDetail();
a3.setYsmc("二层及以上层高");
a3.setPjpm(String.valueOf(one.getTwoAndFourCg()));
XmhxDetail a4 = new XmhxDetail();
a4.setYsmc("二层及以上楼面荷载");
a4.setPjpm(String.valueOf(one.getTwoAndThreeLmhz()));
xr1.setType(2);
xr1.setList(xmpjqdMapper.oneXmhx(id));
xmhxDetails.add(a1);
xmhxDetails.add(a2);
xmhxDetails.add(a3);
xmhxDetails.add(a4);
xr1.setList(xmhxDetails);
XmhxResponse xr2 = new XmhxResponse();
xr2.setType(3);
List<XmhxDetail> zws = new ArrayList<>();
//总投资额
List<BigDecimal> bigDecimals = xmpjqdMapper.zwsXmhx();
List<XmhxDetail> a1 = getXmhxDetails(bigDecimals,"总投资额");
xr2.setList(a1);
XmhxDetail z1 = getXmhxDetails(bigDecimals, "总投资额");
zws.add(z1);
//获取建筑信息表
List<BuildingInformation> ib = xmpjqdMapper.getImportantBuildings();
//层数拿出来
List<Integer> floor = ib.stream()
.map(BuildingInformation::getFloor)
.filter(Objects::nonNull)
.sorted()
.collect(Collectors.toList());
XmhxDetail xmhxDetail = new XmhxDetail();
xmhxDetail.setYsmc("层数");
if (floor.size() % 2 == 1) {
xmhxDetail.setPjpm(String.valueOf(floor.get(floor.size() / 2)));
} else {
Integer lower = floor.get(floor.size() / 2 - 1);
Integer upper = floor.get(floor.size() / 2);
xmhxDetail.setPjpm(String.valueOf((lower + upper) / 2));
}
zws.add(xmhxDetail);
//首层层高
List<BigDecimal> sccg = ib.stream()
.map(BuildingInformation::getScgd)
.filter(Objects::nonNull)
.sorted()
.collect(Collectors.toList());
zws.add(getXmhxDetails(sccg, "首层层高"));
//二层及以上层高
List<BigDecimal> ec = ib.stream()
.map(BuildingInformation::getTwoAndFourCg)
.filter(Objects::nonNull)
.sorted()
.collect(Collectors.toList());
zws.add(getXmhxDetails(ec, "二层及以上层高"));
//二层及以上楼载荷
List<BigDecimal> zh = ib.stream()
.map(BuildingInformation::getTwoAndThreeLmhz)
.filter(Objects::nonNull)
.sorted()
.collect(Collectors.toList());
zws.add(getXmhxDetails(zh, "二层及以上楼载荷"));
xr2.setList(zws);
obj.add(xr);
obj.add(xr1);
obj.add(xr2);
return obj;
}
private static List<XmhxDetail> getXmhxDetails(List<BigDecimal> bigDecimals,String content) {
List<XmhxDetail> a1 = new ArrayList<>();
private static XmhxDetail getXmhxDetails(List<BigDecimal> bigDecimals, String content) {
XmhxDetail xmhxDetail = new XmhxDetail();
xmhxDetail.setYsmc(content);
int length = bigDecimals.size();
@ -114,8 +236,7 @@ public class XmpjqdServiceImpl extends ServiceImpl<XmpjqdMapper, Xmpjqd> impleme
)
);
}
a1.add(xmhxDetail);
return a1;
return xmhxDetail;
}
}

45
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
Unescape View File

@ -1,32 +1,35 @@
package com.ruoyi.web.controller.system;
import java.util.List;
import java.util.Set;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysMenu;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginBody;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.framework.web.service.SysLoginService;
import com.ruoyi.framework.web.service.SysPermissionService;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.mapper.SysUserMapper;
import com.ruoyi.system.service.ISysMenuService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
import java.util.Set;
/**
* 登录验证
*
*
* @author ruoyi
*/
@RestController
public class SysLoginController
{
public class SysLoginController {
@Autowired
private SysLoginService loginService;
@ -39,39 +42,38 @@ public class SysLoginController
@Autowired
private TokenService tokenService;
/**
* 登录方法
*
*
* @param loginBody 登录信息
* @return 结果
*/
@PostMapping("/login")
public AjaxResult login(@RequestBody LoginBody loginBody)
{
public AjaxResult login(@RequestBody LoginBody loginBody) {
AjaxResult ajax = AjaxResult.success();
// 生成令牌
String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
loginBody.getUuid());
loginBody.getUuid(),loginBody.getLoginRole());
ajax.put(Constants.TOKEN, token);
return ajax;
}
/**
* 获取用户信息
*
*
* @return 用户信息
*/
@GetMapping("getInfo")
public AjaxResult getInfo()
{
public AjaxResult getInfo() {
LoginUser loginUser = SecurityUtils.getLoginUser();
SysUser user = loginUser.getUser();
// 角色集合
Set<String> roles = permissionService.getRolePermission(user);
// 权限集合
Set<String> permissions = permissionService.getMenuPermission(user);
if (!loginUser.getPermissions().equals(permissions))
{
if (!loginUser.getPermissions().equals(permissions)) {
loginUser.setPermissions(permissions);
tokenService.refreshToken(loginUser);
}
@ -84,12 +86,11 @@ public class SysLoginController
/**
* 获取路由信息
*
*
* @return 路由信息
*/
@GetMapping("getRouters")
public AjaxResult getRouters()
{
public AjaxResult getRouters() {
Long userId = SecurityUtils.getUserId();
List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId);
return AjaxResult.success(menuService.buildMenus(menus));

7
ruoyi-admin/src/main/resources/application.yml
Unescape View File

@ -127,10 +127,3 @@ xss:
excludes: /system/notice
# 匹配链接
urlPatterns: /system/*,/monitor/*,/tool/*
# Swagger配置
knife4j:
# production: true
enable: true

265
ruoyi-admin/src/main/resources/mapper/BasicInformationMapper.xml
Unescape View File

@ -29,8 +29,268 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="fourYscg" column="four_yscg"/>
</collection>
</resultMap>
<select id="selectList" resultMap="ProjectExcelInfoResult">
<insert id="insert1" parameterType="BasicInformation">
insert into copy_gysl_basic_information
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="name != null">name,</if>
<if test="xmfrdwxz != null">xmfrdwxz,</if>
<if test="nature != null">nature,</if>
<if test="sgdw != null">sgdw,</if>
<if test="ztze != null">ztze,</if>
<if test="ssgnq != null">ssgnq,</if>
<if test="begainTime != null">begain_time,</if>
<if test="xzfl != null">xzfl,</if>
<if test="jsdd != null">jsdd,</if>
<if test="prioritize != null">prioritize,</if>
<if test="jsms != null">jsms,</if>
<if test="label != null">label,</if>
<if test="projectLeader != null">project_leader,</if>
<if test="phone != null">phone,</if>
<if test="issuingTime != null">Issuing_time,</if>
<if test="acceptanceTime != null">acceptance_time,</if>
<if test="unitIntroduction != null">unit_introduction,</if>
<if test="introduction != null">introduction,</if>
<if test="createId != null">create_id,</if>
<if test="createTime != null">create_time,</if>
<if test="createBy != null">create_by,</if>
<if test="updateId != null">update_id,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="sjdw != null">sjdw,</if>
<if test="fj != null">fj,</if>
<if test="endTime != null">end_time,</if>
<if test="jsjd != null">jsjd,</if>
<if test="longitude != null">longitude,</if>
<if test="latitude != null">latitude,</if>
<if test="tyshxydm != null">tyshxydm,</if>
<if test="status != null">status,</if>
<if test="isFmqd != null">is_fmqd,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
<if test="name != null">#{name},</if>
<if test="xmfrdwxz != null">#{xmfrdwxz},</if>
<if test="nature != null">#{nature},</if>
<if test="sgdw != null">#{sgdw},</if>
<if test="ztze != null">#{ztze},</if>
<if test="ssgnq != null">#{ssgnq},</if>
<if test="begainTime != null">#{begainTime},</if>
<if test="xzfl != null">#{xzfl},</if>
<if test="jsdd != null">#{jsdd},</if>
<if test="prioritize != null">#{prioritize},</if>
<if test="jsms != null">#{jsms},</if>
<if test="label != null">#{label},</if>
<if test="projectLeader != null">#{projectLeader},</if>
<if test="phone != null">#{phone},</if>
<if test="issuingTime != null">#{issuingTime},</if>
<if test="acceptanceTime != null">#{acceptanceTime},</if>
<if test="unitIntroduction != null">#{unitIntroduction},</if>
<if test="introduction != null">#{introduction},</if>
<if test="createId != null">#{createId},</if>
<if test="createTime != null">#{createTime},</if>
<if test="createBy != null">#{createBy},</if>
<if test="updateId != null">#{updateId},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="sjdw != null">#{sjdw},</if>
<if test="fj != null">#{fj},</if>
<if test="endTime != null">#{endTime},</if>
<if test="jsjd != null">#{jsjd},</if>
<if test="longitude != null">#{longitude},</if>
<if test="latitude != null">#{latitude},</if>
<if test="tyshxydm != null">#{tyshxydm},</if>
<if test="status != null">#{status},</if>
<if test="isFmqd != null">#{isFmqd},</if>
</trim>
</insert>
<insert id="insert2" parameterType="PlanInformation">
insert into copy_gysl_plan_information
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="xmId != null">xm_id,</if>
<if test="zydmj != null">zydmj,</if>
<if test="rjl != null">rjl,</if>
<if test="zjzmj != null">zjzmj,</if>
<if test="bzcjzmj != null">bzcjzmj,</if>
<if test="jrjljzmj != null">jrjljzmj,</if>
<if test="jzmd != null">jzmd,</if>
<if test="ldl != null">ldl,</if>
<if test="jzds != null">jzds,</if>
<if test="dsjzmj != null">dsjzmj,</if>
<if test="dxjzmj != null">dxjzmj,</if>
<if test="zgjzcs != null">zgjzcs,</if>
<if test="zgjzgd != null">zgjzgd,</if>
<if test="jdctcw != null">jdctcw,</if>
<if test="fjdctcw != null">fjdctcw,</if>
<if test="ghwj != null">ghwj,</if>
<if test="fhdj != null">fhdj,</if>
<if test="createId != null">create_id,</if>
<if test="createTime != null">create_time,</if>
<if test="createBy != null">create_by,</if>
<if test="updateId != null">update_id,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
<if test="xmId != null">#{xmId},</if>
<if test="zydmj != null">#{zydmj},</if>
<if test="rjl != null">#{rjl},</if>
<if test="zjzmj != null">#{zjzmj},</if>
<if test="bzcjzmj != null">#{bzcjzmj},</if>
<if test="jrjljzmj != null">#{jrjljzmj},</if>
<if test="jzmd != null">#{jzmd},</if>
<if test="ldl != null">#{ldl},</if>
<if test="jzds != null">#{jzds},</if>
<if test="dsjzmj != null">#{dsjzmj},</if>
<if test="dxjzmj != null">#{dxjzmj},</if>
<if test="zgjzcs != null">#{zgjzcs},</if>
<if test="zgjzgd != null">#{zgjzgd},</if>
<if test="jdctcw != null">#{jdctcw},</if>
<if test="fjdctcw != null">#{fjdctcw},</if>
<if test="ghwj != null">#{ghwj},</if>
<if test="fhdj != null">#{fhdj},</if>
<if test="createId != null">#{createId},</if>
<if test="createTime != null">#{createTime},</if>
<if test="createBy != null">#{createBy},</if>
<if test="updateId != null">#{updateId},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
</trim>
</insert>
<insert id="insert3" parameterType="WysmxInformation">
insert into copy_gysl_wysmx_information
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="xmId != null">xm_id,</if>
<if test="ysmc != null">ysmc,</if>
<if test="zdname != null">zdname,</if>
<if test="zdinfor != null">zdinfor,</if>
<if test="createId != null">create_id,</if>
<if test="createTime != null">create_time,</if>
<if test="createBy != null">create_by,</if>
<if test="updateId != null">update_id,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
<if test="xmId != null">#{xmId},</if>
<if test="ysmc != null">#{ysmc},</if>
<if test="zdname != null">#{zdname},</if>
<if test="zdinfor != null">#{zdinfor},</if>
<if test="createId != null">#{createId},</if>
<if test="createTime != null">#{createTime},</if>
<if test="createBy != null">#{createBy},</if>
<if test="updateId != null">#{updateId},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
</trim>
</insert>
<insert id="insert4" parameterType="QyrzInformation">
insert into copy_gysl_qyrz_information
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="xmId != null">xm_id,</if>
<if test="rzqys != null">rzqys,</if>
<if test="rzqyhylx != null">rzqyhylx,</if>
<if test="rysl != null">rysl,</if>
<if test="rzl != null">rzl,</if>
<if test="yczmj != null">yczmj,</if>
<if test="kzczmj != null">kzczmj,</if>
<if test="gycfpjzj != null">gycfpjzj,</if>
<if test="gycfpjwyf != null">gycfpjwyf,</if>
<if test="createId != null">create_id,</if>
<if test="createTime != null">create_time,</if>
<if test="createBy != null">create_by,</if>
<if test="updateId != null">update_id,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
<if test="xmId != null">#{xmId},</if>
<if test="rzqys != null">#{rzqys},</if>
<if test="rzqyhylx != null">#{rzqyhylx},</if>
<if test="rysl != null">#{rysl},</if>
<if test="rzl != null">#{rzl},</if>
<if test="yczmj != null">#{yczmj},</if>
<if test="kzczmj != null">#{kzczmj},</if>
<if test="gycfpjzj != null">#{gycfpjzj},</if>
<if test="gycfpjwyf != null">#{gycfpjwyf},</if>
<if test="createId != null">#{createId},</if>
<if test="createTime != null">#{createTime},</if>
<if test="createBy != null">#{createBy},</if>
<if test="updateId != null">#{updateId},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
</trim>
</insert>
<insert id="insert5" parameterType="ProjectOtherInfo">
insert into copy_gysl_project_other_info
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="xmId != null">xm_id,</if>
<if test="zdname != null">zdname,</if>
<if test="createId != null">create_id,</if>
<if test="createTime != null">create_time,</if>
<if test="createBy != null">create_by,</if>
<if test="updateId != null">update_id,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="zdinfor != null">zdinfor,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
<if test="xmId != null">#{xmId},</if>
<if test="zdname != null">#{zdname},</if>
<if test="createId != null">#{createId},</if>
<if test="createTime != null">#{createTime},</if>
<if test="createBy != null">#{createBy},</if>
<if test="updateId != null">#{updateId},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="zdinfor != null">#{zdinfor},</if>
</trim>
</insert>
<delete id="delete1">
delete from copy_gysl_basic_information where id = #{id}
</delete>
<delete id="delete2">
from copy_gysl_plan_information
where xm_id = #{id}
</delete>
<delete id="delete3">
delete
from copy_gysl_wysmx_information
where xm_id = #{id}
</delete>
<delete id="delete4">
delete
from copy_gysl_qyrz_information
where xm_id = #{id}
</delete>
<delete id="delete5">
from copy_gysl_project_other_info
where xm_id = #{id}
</delete>
<select id="select1" resultType="com.ruoyi.gysl.entity.BasicInformation">
select * from copy_gysl_basic_information where id =#{id}
</select>
<select id="select2" resultType="com.ruoyi.gysl.entity.PlanInformation">
select * from copy_gysl_plan_information where xm_id =#{id}
</select>
<select id="select3" resultType="com.ruoyi.gysl.entity.WysmxInformation">
select * from copy_gysl_wysmx_information where xm_id =#{id}
</select>
<select id="select4" resultType="com.ruoyi.gysl.entity.QyrzInformation">
select * from copy_gysl_qyrz_information where xm_id =#{id}
</select>
<select id="select5" resultType="com.ruoyi.gysl.entity.ProjectOtherInfo">
select * from copy_gysl_project_other_info where xm_id =#{id}
</select>
<select id="selectList" resultMap="ProjectExcelInfoResult">
SELECT
a.id,
a.name,
@ -89,4 +349,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
FROM gysl_basic_information a left join gysl_plan_information b on a.id = b.xm_id
where a.longitude is not null and a.latitude is not null
</select>
</mapper>

12
ruoyi-admin/src/main/resources/mapper/MxMapper.xml
Unescape View File

@ -1,8 +1,16 @@
<?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.ruoyi.gysl.mapper.MxMapper">
<update id="updateYs">
update gysl_mx
set type = #{newType},
name = #{newName}
where type = #{oldType} and name = #{oldName}
</update>
<delete id="deleteYs">
delete from gysl_mx
where type = #{req.lx} and name = #{req.name}
</delete>
<select id="selectAll" resultType="com.ruoyi.gysl.entity.Mx">
select * from gysl_mx
<where>

6
ruoyi-admin/src/main/resources/mapper/SmartRemindersMapper.xml
Unescape View File

@ -18,12 +18,12 @@
order by a.create_time desc
</select>
<insert id="addJobSmart">
insert into job_smart (smart_id,job_id) values (#{req.smartId},#{req.jobId})
insert into gysl_job_smart (smart_id,job_id) values (#{req.smartId},#{req.jobId})
</insert>
<select id="selectJobSmart" resultType="com.ruoyi.docking.entity.request.JAddJobSmart">
select * from job_smart where smart_id = #{id}
select * from gysl_job_smart where smart_id = #{id}
</select>
<update id="isRead">
update smart_declaration set is_read = 2 where id = #{id}
update gysl_smart_declaration set is_read = 2 where id = #{id}
</update>
</mapper>

76
ruoyi-admin/src/main/resources/mapper/XmpjqdMapper.xml
Unescape View File

@ -3,7 +3,6 @@
<mapper namespace="com.ruoyi.gysl.mapper.XmpjqdMapper">
<select id="page" resultType="com.ruoyi.gysl.entity.Xmpjqd">
SELECT
ROW_NUMBER() OVER (ORDER BY ztze DESC) AS pjdj,
a.id,
a.NAME,
a.begain_time,
@ -11,15 +10,19 @@
a.xzfl,
a.xmfrdwxz,
a.ztze,
COUNT(*) OVER () AS count
COUNT(*) AS count,
b.floor,
b.scgd,
b.two_and_four_cg as twoAndFourCg,
b.scdmhz,
b.two_and_three_lmhz as twoAndThreeLmhz
FROM gysl_basic_information a
left join gysl_building_information b on a.id = b.xm_id
<where>
b.sfwzyld = 1
<if test="req.xzfl != null">
AND xzfl = #{req.xzfl}
</if>
<if test="req.pjdj != null">
AND pjdj = #{req.pjdj}
</if>
<if test="req.name != null and req.name != '' ">
AND name like concat('%',#{req.name},'%')
</if>
@ -31,6 +34,42 @@
</if>
</where>
group by a.id
<if test="req.pjdj == 2 and req.sort == 1">
order by a.ztze asc
</if>
<if test="req.pjdj == 2 and req.sort == 2">
order by a.ztze desc
</if>
<if test="req.pjdj == 3 and req.sort == 1">
order by b.floor asc
</if>
<if test="req.pjdj == 3 and req.sort == 2">
order by b.floor desc
</if>
<if test="req.pjdj == 4 and req.sort == 1">
order by b.scgd asc
</if>
<if test="req.pjdj == 4 and req.sort == 2">
order by b.scgd desc
</if>
<if test="req.pjdj == 5 and req.sort == 1">
order by b.two_and_four_cg asc
</if>
<if test="req.pjdj == 5 and req.sort == 2">
order by b.two_and_four_cg desc
</if>
<if test="req.pjdj == 6 and req.sort == 1">
order by b.scdmhz asc
</if>
<if test="req.pjdj == 6 and req.sort == 2">
order by b.scdmhz desc
</if>
<if test="req.pjdj == 7 and req.sort == 1">
order by b.two_and_three_lmhz asc
</if>
<if test="req.pjdj == 7 and req.sort == 2">
order by b.two_and_three_lmhz desc
</if>
</select>
<select id="selectOnePj" resultType="com.ruoyi.gysl.entity.response.XmpjqdOneResponse">
SELECT
@ -57,12 +96,35 @@
WHERE
c.id = #{id}
</select>
<select id="getImportantBuildings" resultType="com.ruoyi.gysl.entity.BuildingInformation">
/**
随机取一条
*/
SELECT
xm_id,
floor,
scgd,
scdmhz,
two_and_four_cg,
two_and_three_lmhz
FROM
gysl_building_information
WHERE
sfwzyld = 1
GROUP BY
xm_id,
floor,
scgd,
scdmhz,
two_and_four_cg,
two_and_three_lmhz
</select>
<select id="oneXmhx" resultType="com.ruoyi.gysl.entity.response.XmhxDetail.XmhxDetail">
select IFNULL(ztze,0) as pjpm,
'总投资额' as ysmc
from gysl_basic_information
where id = #{id}
</select>
<select id="maxXmhx" resultType="com.ruoyi.gysl.entity.response.XmhxDetail.XmhxDetail">
SELECT
@ -86,7 +148,7 @@
FROM
gysl_building_information UNION
SELECT
MAX( four_yslmhz ) AS pjpm,
MAX( two_and_three_lmhz ) AS pjpm,
'二层及以上楼面荷载' AS ysmc
FROM
gysl_building_information

4
ruoyi-admin/src/main/resources/mapper/ZwStatsMapper.xml
Unescape View File

@ -54,11 +54,11 @@
</select>
<select id="zwNotice" resultType="com.ruoyi.docking.entity.SmartDeclaration">
select * from gysl_smart_declaration
where zw_id = #{userId} and is_read = 1
where zw_id = #{userId} and is_read = 1
</select>
<select id="zwNoticeCount" resultType="java.lang.Integer">
select count(*) from gysl_smart_declaration
where zw_id = #{userId} and is_read = 1
where zw_id = #{userId} and is_read = 1
</select>
<select id="xfcyfx" resultType="com.ruoyi.gysl.entity.stats.RibbonResponse">
SELECT COUNT(a.cylb) AS count,-- 统计左表实际存在的记录数

13
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java
Unescape View File

@ -7,6 +7,19 @@ package com.ruoyi.common.core.domain.model;
*/
public class LoginBody
{
/**
* 1政务 2企业
*/
private Integer loginRole;
public Integer getLoginRole() {
return loginRole;
}
public void setLoginRole(Integer loginRole) {
this.loginRole = loginRole;
}
/**
* 用户名
*/

128
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
Unescape View File

@ -1,12 +1,5 @@
package com.ruoyi.framework.web.service;
import javax.annotation.Resource;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.authentication.BadCredentialsException;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.Authentication;
import org.springframework.stereotype.Component;
import com.ruoyi.common.constant.CacheConstants;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.constant.UserConstants;
@ -14,11 +7,7 @@ import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.exception.user.BlackListException;
import com.ruoyi.common.exception.user.CaptchaException;
import com.ruoyi.common.exception.user.CaptchaExpireException;
import com.ruoyi.common.exception.user.UserNotExistsException;
import com.ruoyi.common.exception.user.UserPasswordNotMatchException;
import com.ruoyi.common.exception.user.*;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.MessageUtils;
import com.ruoyi.common.utils.StringUtils;
@ -26,17 +15,29 @@ import com.ruoyi.common.utils.ip.IpUtils;
import com.ruoyi.framework.manager.AsyncManager;
import com.ruoyi.framework.manager.factory.AsyncFactory;
import com.ruoyi.framework.security.context.AuthenticationContextHolder;
import com.ruoyi.system.mapper.SysUserMapper;
import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.system.service.ISysUserService;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.authentication.BadCredentialsException;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.Authentication;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
/**
* 登录校验方法
*
*
* @author ruoyi
*/
@Component
public class SysLoginService
{
public class SysLoginService {
@Autowired
private TokenService tokenService;
@ -45,52 +46,70 @@ public class SysLoginService
@Autowired
private RedisCache redisCache;
@Autowired
private ISysUserService userService;
@Autowired
private ISysConfigService configService;
@Autowired
private SysUserMapper sysUserMapper;
// 政务角色
private static final List<String> ZW_ROLES = Arrays.asList("admin", "common");
//企业角色
private static final List<String> QY_ROLES = Collections.singletonList("company");
/**
* 登录验证
*
* @param username 用户名
* @param password 密码
* @param code 验证码
* @param uuid 唯一标识
*
* @param username 用户名
* @param password 密码
* @param code 验证码
* @param uuid 唯一标识
* @param loginRole
* @return 结果
*/
public String login(String username, String password, String code, String uuid)
{
public String login(String username, String password, String code, String uuid, Integer loginRole) {
// 验证码校验
validateCaptcha(username, code, uuid);
// 登录前置校验
loginPreCheck(username, password);
//判断当前登录用户名是否符合loginRole
List<String> role = sysUserMapper.selectRoleByUserName(username);
if (!role.isEmpty()) {
if (loginRole == null) {
throw new ServiceException("无法登录!");
} else {
if (loginRole == 1) {
if (!CollectionUtils.containsAny(role, ZW_ROLES)) {
throw new ServiceException("请登录企业用户!");
}
} else if (loginRole == 2) {
if (!CollectionUtils.containsAny(role, QY_ROLES)) {
throw new ServiceException("请登录政务用户!");
}
}
}
} else {
throw new ServiceException("暂无该用户!");
}
// 用户验证
Authentication authentication = null;
try
{
try {
UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(username, password);
AuthenticationContextHolder.setContext(authenticationToken);
// 该方法会去调用UserDetailsServiceImpl.loadUserByUsername
authentication = authenticationManager.authenticate(authenticationToken);
}
catch (Exception e)
{
if (e instanceof BadCredentialsException)
{
} catch (Exception e) {
if (e instanceof BadCredentialsException) {
AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.password.not.match")));
throw new UserPasswordNotMatchException();
}
else
{
} else {
AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, e.getMessage()));
throw new ServiceException(e.getMessage());
}
}
finally
{
} finally {
AuthenticationContextHolder.clearContext();
}
AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")));
@ -102,27 +121,23 @@ public class SysLoginService
/**
* 校验验证码
*
*
* @param username 用户名
* @param code 验证码
* @param uuid 唯一标识
* @param code 验证码
* @param uuid 唯一标识
* @return 结果
*/
public void validateCaptcha(String username, String code, String uuid)
{
public void validateCaptcha(String username, String code, String uuid) {
boolean captchaEnabled = configService.selectCaptchaEnabled();
if (captchaEnabled)
{
if (captchaEnabled) {
String verifyKey = CacheConstants.CAPTCHA_CODE_KEY + StringUtils.nvl(uuid, "");
String captcha = redisCache.getCacheObject(verifyKey);
if (captcha == null)
{
if (captcha == null) {
AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.expire")));
throw new CaptchaExpireException();
}
redisCache.deleteObject(verifyKey);
if (!code.equalsIgnoreCase(captcha))
{
if (!code.equalsIgnoreCase(captcha)) {
AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.error")));
throw new CaptchaException();
}
@ -131,35 +146,31 @@ public class SysLoginService
/**
* 登录前置校验
*
* @param username 用户名
* @param password 用户密码
*/
public void loginPreCheck(String username, String password)
{
public void loginPreCheck(String username, String password) {
// 用户名或密码为空 错误
if (StringUtils.isEmpty(username) || StringUtils.isEmpty(password))
{
if (StringUtils.isEmpty(username) || StringUtils.isEmpty(password)) {
AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("not.null")));
throw new UserNotExistsException();
}
// 密码如果不在指定范围内 错误
if (password.length() < UserConstants.PASSWORD_MIN_LENGTH
|| password.length() > UserConstants.PASSWORD_MAX_LENGTH)
{
|| password.length() > UserConstants.PASSWORD_MAX_LENGTH) {
AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.password.not.match")));
throw new UserPasswordNotMatchException();
}
// 用户名不在指定范围内 错误
if (username.length() < UserConstants.USERNAME_MIN_LENGTH
|| username.length() > UserConstants.USERNAME_MAX_LENGTH)
{
|| username.length() > UserConstants.USERNAME_MAX_LENGTH) {
AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.password.not.match")));
throw new UserPasswordNotMatchException();
}
// IP黑名单校验
String blackStr = configService.selectConfigByKey("sys.login.blackIPList");
if (IpUtils.isMatchedIp(blackStr, IpUtils.getIpAddr()))
{
if (IpUtils.isMatchedIp(blackStr, IpUtils.getIpAddr())) {
AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("login.blocked")));
throw new BlackListException();
}
@ -170,8 +181,7 @@ public class SysLoginService
*
* @param userId 用户ID
*/
public void recordLoginInfo(Long userId)
{
public void recordLoginInfo(Long userId) {
SysUser sysUser = new SysUser();
sysUser.setUserId(userId);
sysUser.setLoginIp(IpUtils.getIpAddr());

10
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
Unescape View File

@ -1,6 +1,8 @@
package com.ruoyi.system.mapper;
import java.util.List;
import com.ruoyi.common.core.domain.entity.SysRole;
import org.apache.ibatis.annotations.Param;
import com.ruoyi.common.core.domain.entity.SysUser;
@ -124,4 +126,12 @@ public interface SysUserMapper
* @return 结果
*/
public SysUser checkEmailUnique(String email);
/**
* 通过用户名查询用户角色信息
*
* @param userName 用户名
* @return 用户对象信息
*/
List<String> selectRoleByUserName(@Param("userName") String userName);
}

11
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
Unescape View File

@ -141,7 +141,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult">
select user_id, email from sys_user where email = #{email} and del_flag = '0' limit 1
</select>
<insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">
insert into sys_user(
<if test="userId != null and userId != 0">user_id,</if>
@ -217,5 +218,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{userId}
</foreach>
</delete>
<select id="selectRoleByUserName" resultType="java.lang.String">
SELECT c.role_key
FROM `sys_user` a
LEFT JOIN sys_user_role b ON a.user_id = b.user_id
LEFT JOIN sys_role c ON b.role_id = c.role_id
WHERE a.user_name = #{userName}
</select>
</mapper>
Write Preview
Loading…
Cancel
Save