From d14e71b07130d8c9d7b2096b36cc2a00bfc88052 Mon Sep 17 00:00:00 2001 From: du <1725534722@qq.com> Date: Thu, 3 Apr 2025 16:53:29 +0800 Subject: [PATCH] bugfix --- pom.xml | 4 +- ruoyi-admin/pom.xml | 2 +- .../controller/SmartRemindersController.java | 2 +- .../docking/service/impl/UserServiceImpl.java | 4 +- .../BasicInformationController.java | 34 ++- .../ruoyi/gysl/controller/MxController.java | 35 ++- .../gysl/controller/XfcyglController.java | 2 +- .../gysl/controller/XmpjqdController.java | 8 +- .../main/java/com/ruoyi/gysl/entity/Ml.java | 5 +- .../java/com/ruoyi/gysl/entity/Xfcygl.java | 6 +- .../java/com/ruoyi/gysl/entity/Xmpjqd.java | 43 ++- .../gysl/entity/request/XmpjqdPageReq.java | 9 + .../gysl/entity/request/XmzskPageReq.java | 9 +- .../gysl/entity/request/YsUpdateReq.java | 34 +++ .../MxPageDetailedInfo.java | 11 +- .../gysl/mapper/BasicInformationMapper.java | 30 +- .../java/com/ruoyi/gysl/mapper/MxMapper.java | 14 + .../com/ruoyi/gysl/mapper/XmpjqdMapper.java | 15 +- .../gysl/service/BasicInformationService.java | 15 +- .../com/ruoyi/gysl/service/MxService.java | 14 + .../gysl/service/WysmxInformationService.java | 6 + .../com/ruoyi/gysl/service/XmpjqdService.java | 2 +- .../impl/BasicInformationServiceImpl.java | 84 +++++- .../gysl/service/impl/MxServiceImpl.java | 28 +- .../impl/WysmxInformationServiceImpl.java | 13 +- .../gysl/service/impl/XmpjqdServiceImpl.java | 159 +++++++++-- .../controller/system/SysLoginController.java | 45 +-- .../src/main/resources/application.yml | 7 - .../mapper/BasicInformationMapper.xml | 265 +++++++++++++++++- .../src/main/resources/mapper/MxMapper.xml | 12 +- .../resources/mapper/SmartRemindersMapper.xml | 6 +- .../main/resources/mapper/XmpjqdMapper.xml | 76 ++++- .../main/resources/mapper/ZwStatsMapper.xml | 4 +- .../common/core/domain/model/LoginBody.java | 13 + .../web/service/SysLoginService.java | 128 +++++---- .../ruoyi/system/mapper/SysUserMapper.java | 10 + .../resources/mapper/system/SysUserMapper.xml | 11 +- 37 files changed, 999 insertions(+), 166 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/YsUpdateReq.java diff --git a/pom.xml b/pom.xml index dd2063b..d16a494 100644 --- a/pom.xml +++ b/pom.xml @@ -9,8 +9,8 @@ 3.8.9 ruoyi - http://www.ruoyi.vip - 若依管理系统 + + 管理系统 3.8.9 diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index adf2ac0..b77def4 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -9,7 +9,7 @@ 4.0.0 jar - ruoyi-admin + gysl web服务入口 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/docking/controller/SmartRemindersController.java b/ruoyi-admin/src/main/java/com/ruoyi/docking/controller/SmartRemindersController.java index 0992779..78b7b4d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/docking/controller/SmartRemindersController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/docking/controller/SmartRemindersController.java @@ -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)); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/docking/service/impl/UserServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/docking/service/impl/UserServiceImpl.java index b748000..78e182f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/docking/service/impl/UserServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/docking/service/impl/UserServiceImpl.java @@ -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); }); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/BasicInformationController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/BasicInformationController.java index 42f07e5..e4bdd3b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/BasicInformationController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/BasicInformationController.java @@ -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); }); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/MxController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/MxController.java index 7a94566..abf7d9f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/MxController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/MxController.java @@ -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 idList) { return success(mxService.removeByIds(idList)); } + + /** + * 删除要素 + */ + @ApiOperation("删除要素") + @DeleteMapping("/deleteYs") + public AjaxResult deleteYs(@Valid XmzskPageReq req) { + return success(mxService.deleteYs(req)); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/XfcyglController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/XfcyglController.java index 44b8e87..8daab10 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/XfcyglController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/XfcyglController.java @@ -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 filteredList = xfcyglService.page(req); ExcelUtil util = new ExcelUtil<>(Xfcygl.class); util.exportExcel(response, filteredList, "细分产业数据"); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/XmpjqdController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/XmpjqdController.java index 8d92a44..342c20b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/XmpjqdController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/XmpjqdController.java @@ -37,12 +37,14 @@ public class XmpjqdController extends BaseController { /** * 分页查询所有项目评价清单 * - * @param page 分页对象 * @return 所有数据 */ @ApiOperation("分页查询所有项目评价清单") @GetMapping("/page") - public AjaxResult selectAll(Page page, XmpjqdPageReq req) { + public AjaxResult selectAll( XmpjqdPageReq req) { + Page 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)); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Ml.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Ml.java index e54bb5e..89f736c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Ml.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Ml.java @@ -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; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xfcygl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xfcygl.java index f7621bb..a89c275 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xfcygl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xfcygl.java @@ -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; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xmpjqd.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xmpjqd.java index f53fabd..d34a6c2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xmpjqd.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xmpjqd.java @@ -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; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/XmpjqdPageReq.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/XmpjqdPageReq.java index 7c8d759..cee1c5f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/XmpjqdPageReq.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/XmpjqdPageReq.java @@ -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; + + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/XmzskPageReq.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/XmzskPageReq.java index 0210313..4d728d0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/XmzskPageReq.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/XmzskPageReq.java @@ -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; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/YsUpdateReq.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/YsUpdateReq.java new file mode 100644 index 0000000..b0bb5aa --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/YsUpdateReq.java @@ -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; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/response/MxPageDetailedInfo/MxPageDetailedInfo.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/response/MxPageDetailedInfo/MxPageDetailedInfo.java index 4a6e089..af64fea 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/response/MxPageDetailedInfo/MxPageDetailedInfo.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/response/MxPageDetailedInfo/MxPageDetailedInfo.java @@ -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; + + + /** * 具体指标 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/BasicInformationMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/BasicInformationMapper.java index b3437a0..f548c61 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/BasicInformationMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/BasicInformationMapper.java @@ -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 { * 有经纬度的项目列表 */ Page projectList(Page 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 select3(@Param("id") Long id); + QyrzInformation select4(@Param("id") Long id); + List select5(@Param("id") Long id); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/MxMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/MxMapper.java index 3b99aaa..a501019 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/MxMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/MxMapper.java @@ -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 { * @return 所有数据 */ List selectAll(@Param("req") MxRequest mxRequest); + + /** + * 修改要素 + * @param mx + * @return + */ + Boolean updateYs(YsUpdateReq mx); + + /** + * 删除要素 + */ + Boolean deleteYs(@Param("req")XmzskPageReq req); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/XmpjqdMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/XmpjqdMapper.java index 409725b..fc3c340 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/XmpjqdMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/XmpjqdMapper.java @@ -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 { Page page(Page page, @Param("req") XmpjqdPageReq req); /** - * 通过主键查询单条项目评价清单 + * 通过主键查询项目的总投资额排名 * * @param id 主键 * @return 单条数据 */ - List selectOnePj(@Param("id") Serializable id); + List selectOnePj(@Param("id") Long id); + + /** + * 查询所有的建筑信息,只保留是重要楼栋的第一条 + */ + List getImportantBuildings(); + /** * 通过主键查询单条项目画像 @@ -45,13 +52,15 @@ public interface XmpjqdMapper extends BaseMapper { List oneXmhx(@Param("id") Serializable id); /** - * 中位数 + * 总投资额中位数 */ List zwsXmhx(); + /** * 最大值 */ List maxXmhx(); + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/BasicInformationService.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/BasicInformationService.java index 160fbae..316b0b7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/BasicInformationService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/BasicInformationService.java @@ -68,7 +68,7 @@ public interface BasicInformationService extends IService { */ Long audit(AuditRequest req,int status); /** - * 通过主键查询单条项目所有数据 + * 通过主键查询单条项目所有数据(政务端) * * @param id 主键 * @return 单条数据 @@ -80,5 +80,18 @@ public interface BasicInformationService extends IService { * 删除项目id对应的所有数据 */ void removeByXmIds(List idList); + + /** + * 企业端暂存 + */ + Long staging(AuditRequest req); + + /** + * 通过主键查询单条项目所有数据(企业端) + * + * @param id 主键 + * @return 单条数据 + */ + BasicInformationResponse stagingInfo(Long id); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/MxService.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/MxService.java index 8167d27..9ed3268 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/MxService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/MxService.java @@ -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 { * @return 新增结果 */ int add(Mx mx); + + /** + * 修改要素 + * @param mx + * @return + */ + Boolean updateYs(YsUpdateReq mx); + + /** + * 删除要素 + */ + Boolean deleteYs(XmzskPageReq req); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/WysmxInformationService.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/WysmxInformationService.java index b5a3c76..afdaeaf 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/WysmxInformationService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/WysmxInformationService.java @@ -34,5 +34,11 @@ public interface WysmxInformationService extends IService { boolean canGoUpstairs(String materialLevel, String fireRiskLevel, String environmentalProtection); + + + /** + * 通过逻辑获取最终五要素数据 + */ + List getWysFinal(List a1); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/XmpjqdService.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/XmpjqdService.java index 03960ca..5a85514 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/XmpjqdService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/XmpjqdService.java @@ -32,7 +32,7 @@ public interface XmpjqdService extends IService { * @param id 主键 * @return 单条数据 */ - List selectOnePj(Serializable id); + List selectOnePj(Long id); /** * 通过主键查询单条项目画像 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/BasicInformationServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/BasicInformationServiceImpl.java index 091a681..9def357 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/BasicInformationServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/BasicInformationServiceImpl.java @@ -295,7 +295,7 @@ public class BasicInformationServiceImpl extends ServiceImpl 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 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 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 po = baseMapper.select5(id); + if (!po.isEmpty()) { + basicInformationResponse.setProjectOtherInfos(po); + } else { + basicInformationResponse.setProjectOtherInfos(otherInfoService.searchId(zwIdPageReq)); + } + return basicInformationResponse; + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/MxServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/MxServiceImpl.java index ce17c6e..ed36ee9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/MxServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/MxServiceImpl.java @@ -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 implements MxServic public List selectAll(MxRequest mxRequest) { List allList = baseMapper.selectAll(mxRequest); // // 按 name 分组，并转换为 GroupedData - Map groupedMap = allList.stream().collect(Collectors.groupingBy(Mx::getName, Collectors.collectingAndThen(Collectors.toList(), list -> { + Map 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 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 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); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/WysmxInformationServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/WysmxInformationServiceImpl.java index bb43f07..7606dcc 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/WysmxInformationServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/WysmxInformationServiceImpl.java @@ -44,6 +44,8 @@ public class WysmxInformationServiceImpl extends ServiceImpl list(ZwIdPageReq zwIdPageReq) { List allList = baseMapper.list(zwIdPageReq); - // 按 name 分组，并转换为 GroupedData + return getWysFinal(allList); + } + + /** + * 通过逻辑获取最终五要素数据 + */ + @Override + public List getWysFinal(List a1) { Map 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()); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/XmpjqdServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/XmpjqdServiceImpl.java index e0c3f33..a8f0323 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/XmpjqdServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/XmpjqdServiceImpl.java @@ -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 impleme private XmpjqdMapper xmpjqdMapper; @Resource - private PjpzService pjpzService; + private BuildingInformationService buildingInformationService; /** * 分页查询所有目录 @@ -43,7 +46,11 @@ public class XmpjqdServiceImpl extends ServiceImpl impleme */ @Override public Page page(Page page, XmpjqdPageReq req) { - return xmpjqdMapper.page(page, req); + Page 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 impleme * @return 单条数据 */ @Override - public List selectOnePj(Serializable id) { + public List selectOnePj(Long id) { List xmpjqdOneResponses = xmpjqdMapper.selectOnePj(id); - List list = pjpzService.list(); - list.forEach(x -> { - if (!"总投资额".equals(x.getPjys())) { - XmpjqdOneResponse xmpjqdOneResponse = new XmpjqdOneResponse(); - xmpjqdOneResponse.setYsmc(x.getPjys()); - xmpjqdOneResponses.add(xmpjqdOneResponse); + //查询所有的建筑信息,只保留是重要楼栋的随机一条 + List 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 impleme xr.setList(xmpjqdMapper.maxXmhx()); XmhxResponse xr1 = new XmhxResponse(); + List 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 zws = new ArrayList<>(); + //总投资额 List bigDecimals = xmpjqdMapper.zwsXmhx(); - List a1 = getXmhxDetails(bigDecimals,"总投资额"); - xr2.setList(a1); + XmhxDetail z1 = getXmhxDetails(bigDecimals, "总投资额"); + zws.add(z1); + //获取建筑信息表 + List ib = xmpjqdMapper.getImportantBuildings(); + //层数拿出来 + List 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 sccg = ib.stream() + .map(BuildingInformation::getScgd) + .filter(Objects::nonNull) + .sorted() + .collect(Collectors.toList()); + zws.add(getXmhxDetails(sccg, "首层层高")); + //二层及以上层高 + List ec = ib.stream() + .map(BuildingInformation::getTwoAndFourCg) + .filter(Objects::nonNull) + .sorted() + .collect(Collectors.toList()); + zws.add(getXmhxDetails(ec, "二层及以上层高")); + //二层及以上楼载荷 + List 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 getXmhxDetails(List bigDecimals,String content) { - List a1 = new ArrayList<>(); + private static XmhxDetail getXmhxDetails(List bigDecimals, String content) { XmhxDetail xmhxDetail = new XmhxDetail(); xmhxDetail.setYsmc(content); int length = bigDecimals.size(); @@ -114,8 +236,7 @@ public class XmpjqdServiceImpl extends ServiceImpl impleme ) ); } - a1.add(xmhxDetail); - return a1; + return xmhxDetail; } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java index c0d4981..52d6237 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java @@ -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 roles = permissionService.getRolePermission(user); // 权限集合 Set 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 menus = menuService.selectMenuTreeByUserId(userId); return AjaxResult.success(menuService.buildMenus(menus)); diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 35a6a96..c4af7dc 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -127,10 +127,3 @@ xss: excludes: /system/notice # 匹配链接 urlPatterns: /system/*,/monitor/*,/tool/* - - - -# Swagger配置 -knife4j: - # production: true - enable: true \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/BasicInformationMapper.xml b/ruoyi-admin/src/main/resources/mapper/BasicInformationMapper.xml index e49d60b..cd88557 100644 --- a/ruoyi-admin/src/main/resources/mapper/BasicInformationMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/BasicInformationMapper.xml @@ -29,8 +29,268 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - + select * from copy_gysl_basic_information where id =#{id} + + + + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/MxMapper.xml b/ruoyi-admin/src/main/resources/mapper/MxMapper.xml index 1e17ecb..df524dd 100644 --- a/ruoyi-admin/src/main/resources/mapper/MxMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/MxMapper.xml @@ -1,8 +1,16 @@ - - + + update gysl_mx + set type = #{newType}, + name = #{newName} + where type = #{oldType} and name = #{oldName} + + + delete from gysl_mx + where type = #{req.lx} and name = #{req.name} + - 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}) - update smart_declaration set is_read = 2 where id = #{id} + update gysl_smart_declaration set is_read = 2 where id = #{id} diff --git a/ruoyi-admin/src/main/resources/mapper/XmpjqdMapper.xml b/ruoyi-admin/src/main/resources/mapper/XmpjqdMapper.xml index eb6cc63..7d1d11f 100644 --- a/ruoyi-admin/src/main/resources/mapper/XmpjqdMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/XmpjqdMapper.xml @@ -3,7 +3,6 @@ + select user_id, email from sys_user where email = #{email} and del_flag = '0' limit 1 - + + insert into sys_user( user_id, @@ -217,5 +218,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{userId} - + \ No newline at end of file