杜函宇 1 month ago
parent 1e3f5a682e
commit 4b528ea63b

@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import javax.validation.Valid;
import java.io.Serializable;
import java.util.List;
@ -46,7 +47,7 @@ public class BuildingInformationController extends BaseController {
*/
@GetMapping("/page")
@ApiOperation(value = "查询所有数据",response = BuildingInformation.class )
public AjaxResult selectAll(ZwIdPageReq zwIdPageReq) {
public AjaxResult selectAll(@Valid ZwIdPageReq zwIdPageReq) {
return success(buildingInformationService.selectAll(zwIdPageReq));
}

@ -24,6 +24,8 @@ import java.util.List;
@RestController
@RequestMapping("/gysl/mx")
public class MxController extends BaseController {
/**
*
*/
@ -31,15 +33,14 @@ public class MxController extends BaseController {
private MxService mxService;
/**
*
*
*
* @param page
* @return
*/
@GetMapping("/page")
@ApiOperation("分页查询所有数据")
public AjaxResult selectAll(Page<Mx> page) {
return success(mxService.page(page));
@ApiOperation("查询所有模型数据")
public AjaxResult selectAll() {
return success(mxService.list());
}
/**
@ -63,7 +64,7 @@ public class MxController extends BaseController {
@PostMapping("/add")
@ApiOperation("新增数据")
public AjaxResult insert(@RequestBody Mx mx) {
return success(mxService.save(mx));
return success(mxService.add(mx));
}
/**

@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.gysl.entity.Pjpz;
import com.ruoyi.gysl.entity.request.PjpzRequest;
import com.ruoyi.gysl.service.PjpzService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@ -40,8 +41,8 @@ public class PjpzController extends BaseController {
*/
@GetMapping("/page")
@ApiOperation("分页查询所有数据")
public AjaxResult selectAll(Page<Pjpz> page, Pjpz pjpz) {
return success(this.pjpzService.page(page, new QueryWrapper<>(pjpz)));
public AjaxResult selectAll(Page<Pjpz> page, PjpzRequest pjpz) {
return success(pjpzService.page(page, pjpz));
}
/**
@ -53,7 +54,7 @@ public class PjpzController extends BaseController {
@GetMapping("{id}")
@ApiOperation("通过主键查询单条数据")
public AjaxResult selectOne(@PathVariable Serializable id) {
return success(this.pjpzService.getById(id));
return success(pjpzService.getById(id));
}
/**
@ -65,7 +66,7 @@ public class PjpzController extends BaseController {
@PostMapping("/add")
@ApiOperation("新增数据")
public AjaxResult insert(@RequestBody Pjpz pjpz) {
return success(this.pjpzService.save(pjpz));
return success(pjpzService.save(pjpz));
}
/**
@ -77,7 +78,7 @@ public class PjpzController extends BaseController {
@PostMapping("/edit")
@ApiOperation("修改数据")
public AjaxResult update(@RequestBody Pjpz pjpz) {
return success(this.pjpzService.updateById(pjpz));
return success(pjpzService.updateById(pjpz));
}
/**
@ -89,7 +90,7 @@ public class PjpzController extends BaseController {
@ApiOperation("删除数据")
@DeleteMapping("/delete")
public AjaxResult delete(@RequestParam("idList") List<Long> idList) {
return success(this.pjpzService.removeByIds(idList));
return success(pjpzService.removeByIds(idList));
}
}

@ -13,6 +13,7 @@ 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;
@ -40,7 +41,7 @@ public class PlanInformationController extends BaseController {
*/
@GetMapping("/selectAll")
@ApiOperation("根据项目id查询规划信息")
public AjaxResult selectAll( ZwIdPageReq zwIdPageReq) {
public AjaxResult selectAll(@Valid ZwIdPageReq zwIdPageReq) {
return success(planInformationService.selectAll(zwIdPageReq));
}

@ -1,7 +1,6 @@
package com.ruoyi.gysl.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.gysl.entity.ProjectLegend;
@ -12,6 +11,7 @@ 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;
@ -32,16 +32,15 @@ public class ProjectLegendController extends BaseController {
private ProjectLegendService projectLegendService;
/**
*
* id
*
* @param page
* @param projectLegend
* @return
*/
@ApiOperation("分页查询所有数据")
@ApiOperation("根据项目id查询所有数据")
@GetMapping("/page")
public AjaxResult selectAll(Page<ProjectLegend> page, ZwIdPageReq projectLegend) {
return success(projectLegendService.page(page, projectLegend));
public AjaxResult selectAll(@Valid ZwIdPageReq projectLegend) {
return success(projectLegendService.page(projectLegend));
}
/**

@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.io.Serializable;
import java.util.List;
@ -42,7 +43,7 @@ public class ProjectMonthInfoController extends BaseController {
*/
@ApiOperation("分页查询所有数据")
@GetMapping("/page")
public AjaxResult selectAll(Page<ProjectMonthInfo> page, ZwIdPageReq zwIdPageReq) {
public AjaxResult selectAll(Page<ProjectMonthInfo> page,@Valid ZwIdPageReq zwIdPageReq) {
return success(projectMonthInfoService.page(page, zwIdPageReq));
}

@ -11,6 +11,7 @@ import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.validation.Valid;
import java.util.List;
/**
@ -37,7 +38,7 @@ public class ProjectOtherInfoController extends BaseController {
*/
@ApiOperation("根据项目id查询项目其他信息")
@GetMapping("/searchId")
public AjaxResult selectAll(ZwIdPageReq zwIdPageReq) {
public AjaxResult selectAll(@Valid ZwIdPageReq zwIdPageReq) {
return success(projectOtherInfoService.searchId(zwIdPageReq));
}

@ -13,6 +13,7 @@ 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;
@ -40,7 +41,7 @@ public class ProjectRemarkController extends BaseController {
*/
@ApiOperation("查询所有数据")
@GetMapping("/page")
public AjaxResult selectAll( RemarkPageReq projectRemark) {
public AjaxResult selectAll(@Valid RemarkPageReq projectRemark) {
return success(projectRemarkService.list(projectRemark));
}

@ -6,12 +6,14 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.gysl.entity.WysmxInformation;
import com.ruoyi.gysl.entity.request.ZwIdPageReq;
import com.ruoyi.gysl.service.WysmxInformationService;
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;
@ -21,7 +23,7 @@ import java.util.List;
* @author makejava
* @since 2025-02-24 14:29:58
*/
@Api(tags ="五要素模型信息" )
@Api(tags ="五要素模型信息" )
@RestController
@RequestMapping("/gysl/wysmxInformation")
public class WysmxInformationController extends BaseController {
@ -32,28 +34,15 @@ public class WysmxInformationController extends BaseController {
private WysmxInformationService wysmxInformationService;
/**
*
* id
*
* @param page
* @param wysmxInformation
* @param zwIdPageReq
* @return
*/
@GetMapping("/page")
@ApiOperation("分页查询所有数据")
public AjaxResult selectAll(Page<WysmxInformation> page, WysmxInformation wysmxInformation) {
return success(this.wysmxInformationService.page(page, new QueryWrapper<>(wysmxInformation)));
}
/**
*
*
* @param id
* @return
*/
@GetMapping("{id}")
@ApiOperation("通过主键查询单条数据")
public AjaxResult selectOne(@PathVariable Serializable id) {
return success(this.wysmxInformationService.getById(id));
@GetMapping("/selectOne")
@ApiOperation("根据项目id查询该项目的五要素模型信息")
public AjaxResult selectOne(@Valid ZwIdPageReq zwIdPageReq) {
return success(wysmxInformationService.selectOne(zwIdPageReq));
}
/**
@ -65,7 +54,7 @@ public class WysmxInformationController extends BaseController {
@PostMapping("/add")
@ApiOperation("新增数据")
public AjaxResult insert(@RequestBody WysmxInformation wysmxInformation) {
return success(this.wysmxInformationService.save(wysmxInformation));
return success(wysmxInformationService.save(wysmxInformation));
}
/**
@ -77,19 +66,7 @@ public class WysmxInformationController extends BaseController {
@PostMapping("/edit")
@ApiOperation("修改数据")
public AjaxResult update(@RequestBody WysmxInformation wysmxInformation) {
return success(this.wysmxInformationService.updateById(wysmxInformation));
}
/**
*
*
* @param idList
* @return
*/
@ApiOperation("删除数据")
@DeleteMapping("/delete")
public AjaxResult delete(@RequestParam("idList") List<Long> idList) {
return success(this.wysmxInformationService.removeByIds(idList));
return success(wysmxInformationService.updateById(wysmxInformation));
}
}

@ -1,7 +1,6 @@
package com.ruoyi.gysl.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.gysl.entity.Xmxl;
@ -12,6 +11,7 @@ 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;
@ -19,9 +19,9 @@ import java.util.List;
* (Xmxl)
*
* @author makejava
* @since 2025-03-19 14:19:21
* @since 2025-03-21 14:15:34
*/
@Api(tags = "项目巡礼")
@Api(tags ="项目巡礼" )
@RestController
@RequestMapping("/gysl/xmxl")
public class XmxlController extends BaseController {
@ -32,16 +32,15 @@ public class XmxlController extends BaseController {
private XmxlService xmxlService;
/**
*
* id
*
* @param page
* @param zwIdPageReq
* @return
*/
@ApiOperation("分页查询所有数据")
@GetMapping("/page")
public AjaxResult selectAll(Page<Xmxl> page, ZwIdPageReq zwIdPageReq) {
return success(xmxlService.page(page, zwIdPageReq));
@GetMapping("/list")
@ApiOperation("根据项目id查询所有数据")
public AjaxResult selectAll(@Valid ZwIdPageReq zwIdPageReq) {
return success(xmxlService.list(zwIdPageReq));
}
/**
@ -50,8 +49,8 @@ public class XmxlController extends BaseController {
* @param id
* @return
*/
@ApiOperation("通过主键查询单条数据")
@GetMapping("/{id}")
@ApiOperation("通过主键查询单条数据")
public AjaxResult selectOne(@PathVariable Serializable id) {
return success(xmxlService.getById(id));
}
@ -62,8 +61,8 @@ public class XmxlController extends BaseController {
* @param xmxl
* @return
*/
@ApiOperation("新增数据")
@PostMapping("/add")
@ApiOperation("新增数据")
public AjaxResult insert(@RequestBody Xmxl xmxl) {
return success(xmxlService.save(xmxl));
}
@ -74,8 +73,8 @@ public class XmxlController extends BaseController {
* @param xmxl
* @return
*/
@PostMapping("/edit")
@ApiOperation("修改数据")
@PutMapping("/edit")
public AjaxResult update(@RequestBody Xmxl xmxl) {
return success(xmxlService.updateById(xmxl));
}

@ -1,11 +1,11 @@
package com.ruoyi.gysl.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.gysl.entity.Xmzsk;
import com.ruoyi.gysl.entity.request.XmzskPageReq;
import com.ruoyi.gysl.service.XmzskService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@ -35,13 +35,12 @@ public class XmzskController extends BaseController {
*
*
* @param page
* @param xmzsk
* @return
*/
@GetMapping("/page")
@ApiOperation("分页查询所有数据")
public AjaxResult selectAll(Page<Xmzsk> page, Xmzsk xmzsk) {
return success(this.xmzskService.page(page, new QueryWrapper<>(xmzsk)));
public AjaxResult selectAll(Page<Xmzsk> page,XmzskPageReq req) {
return success(xmzskService.page(page,req));
}
/**
@ -53,7 +52,7 @@ public class XmzskController extends BaseController {
@GetMapping("{id}")
@ApiOperation("通过主键查询单条数据")
public AjaxResult selectOne(@PathVariable Serializable id) {
return success(this.xmzskService.getById(id));
return success(xmzskService.getById(id));
}
/**
@ -65,7 +64,7 @@ public class XmzskController extends BaseController {
@PostMapping("/add")
@ApiOperation("新增数据")
public AjaxResult insert(@RequestBody Xmzsk xmzsk) {
return success(this.xmzskService.save(xmzsk));
return success(xmzskService.save(xmzsk));
}
/**
@ -77,7 +76,7 @@ public class XmzskController extends BaseController {
@PostMapping("/edit")
@ApiOperation("修改数据")
public AjaxResult update(@RequestBody Xmzsk xmzsk) {
return success(this.xmzskService.updateById(xmzsk));
return success(xmzskService.updateById(xmzsk));
}
/**
@ -89,7 +88,7 @@ public class XmzskController extends BaseController {
@ApiOperation("删除数据")
@DeleteMapping("/delete")
public AjaxResult delete(@RequestParam("idList") List<Long> idList) {
return success(this.xmzskService.removeByIds(idList));
return success(xmzskService.removeByIds(idList));
}
}

@ -0,0 +1,40 @@
package com.ruoyi.gysl.entity.BaseModel;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import java.util.Date;
/**
*
* @author du
* @since 2025/3/21 13:48
*/
@Data
public class BaseModel {
@TableField(fill = FieldFill.INSERT)
private String createBy;
@TableField(fill = FieldFill.INSERT)
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
@TableField(fill = FieldFill.INSERT)
private Long createId;
@TableField(fill = FieldFill.INSERT_UPDATE)
private String updateBy;
@TableField(fill = FieldFill.INSERT_UPDATE)
private Long updateId;
@TableField(fill = FieldFill.INSERT_UPDATE)
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
}

@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.gysl.entity.BaseModel.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -26,7 +27,7 @@ import java.util.Date;
@Data
@ApiModel("基本信息")
@TableName(value = "basic_information")
public class BasicInformation extends Model<BasicInformation> {
public class BasicInformation extends BaseModel {
@ApiModelProperty("主键id")
@TableId(value = "id", type = IdType.AUTO)
@ -148,36 +149,11 @@ public class BasicInformation extends Model<BasicInformation> {
@ApiModelProperty("附件")
private String fj;
@ApiModelProperty("经度")
private String longitude;
//创建者id
@ApiModelProperty("创建者id")
private Integer createId;
//创建时间
@ApiModelProperty("创建时间")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
//创建者
@ApiModelProperty("创建者")
private String createBy;
//更新者ID
@ApiModelProperty("更新者ID")
private Long updateId;
//更新者
@ApiModelProperty("更新者")
private String updateBy;
//更新时间
@ApiModelProperty("更新时间")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
@ApiModelProperty("纬度")
private String latitude;
}

@ -149,7 +149,7 @@ public class BuildingInformation implements Serializable {
*
*/
@Excel(name = "是否为重要楼栋",readConverterExp="1=是,2=否")
@ApiModelProperty(value = "是否有汽车盘道 , 1是2否")
@ApiModelProperty(value = "是否为重要楼栋 , 1是2否")
@TableField("sfwzyld")
private Integer sfwzyld;

@ -4,9 +4,12 @@ import java.time.LocalDateTime;
import java.util.Date;
import java.io.Serializable;
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.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.gysl.entity.BaseModel.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -23,7 +26,7 @@ import org.springframework.format.annotation.DateTimeFormat;
@EqualsAndHashCode(callSuper = false)
@TableName("mx")
@ApiModel(value = "Mx", description = "模型管理")
public class Mx implements Serializable {
public class Mx extends BaseModel implements Serializable {
private static final long serialVersionUID = -78397958900753109L;
/**
@ -31,7 +34,8 @@ public class Mx implements Serializable {
*/
@ApiModelProperty(value = "主键id")
@TableField("id")
private Integer id;
@TableId(type = IdType.AUTO)
private Long id;
/**
* 1:2
@ -60,48 +64,4 @@ public class Mx implements Serializable {
@ApiModelProperty(value = "详细要求")
@TableField("xxyq")
private String xxyq;
/**
* id
*/
@ApiModelProperty(value = "创建者id")
@TableField("create_id")
private Integer createId;
/**
*
*/
@ApiModelProperty(value = "创建时间")
@TableField("create_time")
private Date createTime;
/**
*
*/
@ApiModelProperty(value = "创建者")
@TableField("create_by")
private String createBy;
/**
* ID
*/
@ApiModelProperty(value = "更新者ID")
@TableField("update_id")
private Long updateId;
/**
*
*/
@ApiModelProperty(value = "更新者")
@TableField("update_by")
private String updateBy;
/**
*
*/
@ApiModelProperty(value = "更新时间")
@TableField("update_time")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
}

@ -3,8 +3,11 @@ package com.ruoyi.gysl.entity;
import java.util.Date;
import java.io.Serializable;
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.gysl.entity.BaseModel.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -20,7 +23,7 @@ import lombok.EqualsAndHashCode;
@EqualsAndHashCode(callSuper = false)
@TableName("pjpz")
@ApiModel(value = "Pjpz", description = "项目评价配置")
public class Pjpz implements Serializable {
public class Pjpz extends BaseModel implements Serializable {
private static final long serialVersionUID = -25318153790915105L;
/**
@ -28,6 +31,7 @@ public class Pjpz implements Serializable {
*/
@ApiModelProperty(value = "主键id")
@TableField("id")
@TableId(type = IdType.AUTO)
private Integer id;
/**
@ -44,45 +48,5 @@ public class Pjpz implements Serializable {
@TableField("pfgz")
private String pfgz;
/**
* id
*/
@ApiModelProperty(value = "创建者id")
@TableField("create_id")
private Integer createId;
/**
*
*/
@ApiModelProperty(value = "创建时间")
@TableField("create_time")
private Date createTime;
/**
*
*/
@ApiModelProperty(value = "创建者")
@TableField("create_by")
private String createBy;
/**
* ID
*/
@ApiModelProperty(value = "更新者ID")
@TableField("update_id")
private Long updateId;
/**
*
*/
@ApiModelProperty(value = "更新者")
@TableField("update_by")
private String updateBy;
/**
*
*/
@ApiModelProperty(value = "更新时间")
@TableField("update_time")
private Date updateTime;
}

@ -4,9 +4,12 @@ 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.core.domain.BaseEntity;
import com.ruoyi.gysl.entity.BaseModel.BaseModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
@ -16,8 +19,10 @@ import java.io.Serializable;
* @author makejava
* @since 2025-03-19 10:12:35
*/
@EqualsAndHashCode(callSuper = true)
@Data
public class ProjectLegend extends BaseEntity implements Serializable {
@TableName(value = "project_legend")
public class ProjectLegend extends BaseModel implements Serializable {
@TableField("id")
@TableId(type = IdType.AUTO)
@ -26,7 +31,7 @@ public class ProjectLegend extends BaseEntity implements Serializable {
@ApiModelProperty("项目id")
private Long xmId;
@ApiModelProperty("图片类型")
@ApiModelProperty("图片类型 1外部 2内部")
private Integer imgType;
@ApiModelProperty("图片")

@ -4,7 +4,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.core.domain.BaseEntity;
import com.ruoyi.gysl.entity.BaseModel.BaseModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -16,8 +18,9 @@ import java.io.Serializable;
* @author makejava
* @since 2025-03-19 10:49:03
*/
@TableName("project_month_info")
@Data
public class ProjectMonthInfo extends BaseEntity implements Serializable {
public class ProjectMonthInfo extends BaseModel implements Serializable {
@TableField("id")
@TableId(type = IdType.AUTO)

@ -4,7 +4,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.core.domain.BaseEntity;
import com.ruoyi.gysl.entity.BaseModel.BaseModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -16,8 +18,10 @@ import java.io.Serializable;
* @author makejava
* @since 2025-03-19 10:49:22
*/
@TableName("project_other_info")
@Data
public class ProjectOtherInfo extends BaseEntity implements Serializable {
public class ProjectOtherInfo extends BaseModel implements Serializable {
@TableField("id")
@TableId(type = IdType.AUTO)
@ -26,8 +30,10 @@ public class ProjectOtherInfo extends BaseEntity implements Serializable {
@ApiModelProperty("项目id")
private Long xmId;
@ApiModelProperty("键")
private String zdname;
@ApiModelProperty("其他信息JSON")
private String otherJson;
@ApiModelProperty("")
private String zdinfor;
}

@ -4,9 +4,12 @@ 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.core.domain.BaseEntity;
import com.ruoyi.gysl.entity.BaseModel.BaseModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
@ -16,8 +19,10 @@ import java.io.Serializable;
* @author makejava
* @since 2025-03-19 10:49:35
*/
@EqualsAndHashCode(callSuper = true)
@Data
public class ProjectRemark extends BaseEntity implements Serializable {
@TableName("project_remark")
public class ProjectRemark extends BaseModel implements Serializable {
@TableField("id")
@TableId(type = IdType.AUTO)

@ -1,18 +1,16 @@
package com.ruoyi.gysl.entity;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.Date;
import java.io.Serializable;
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.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.gysl.entity.BaseModel.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
/**
* (WysmxInformation)
@ -24,11 +22,12 @@ import org.springframework.format.annotation.DateTimeFormat;
@EqualsAndHashCode(callSuper = false)
@TableName("wysmx_information")
@ApiModel(value = "WysmxInformation", description = "五要素模型信息")
public class WysmxInformation implements Serializable {
public class WysmxInformation extends BaseModel implements Serializable {
private static final long serialVersionUID = 285216252862855830L;
@ApiModelProperty(value = "${column.comment}")
@TableField("id")
@TableId(type = IdType.AUTO)
private Integer id;
/**
@ -38,105 +37,10 @@ public class WysmxInformation implements Serializable {
@TableField("xm_id")
private Integer xmId;
/**
*
*/
@ApiModelProperty(value = "环境保护")
@TableField("hjbh")
private String hjbh;
/**
*
*/
@ApiModelProperty(value = "设备载重")
@TableField("sbzz")
private BigDecimal sbzz;
/**
*
*/
@ApiModelProperty(value = "货梯要求")
@TableField("htyq")
private String htyq;
/**
*
*/
@ApiModelProperty(value = "员工密度")
@TableField("ygmd")
private BigDecimal ygmd;
@ApiModelProperty("键")
private String zdname;
/**
*
*/
@ApiModelProperty(value = "加工精度")
@TableField("jgjd")
private BigDecimal jgjd;
@ApiModelProperty("值")
private String zdinfor;
/**
*
*/
@ApiModelProperty(value = "减振措施")
@TableField("jzcs")
private String jzcs;
/**
*
*/
@ApiModelProperty(value = "生产类型")
@TableField("sclx")
private String sclx;
/**
*
*/
@ApiModelProperty(value = "层高要求")
@TableField("cgyq")
private String cgyq;
/**
* id
*/
@ApiModelProperty(value = "创建者id")
@TableField("create_id")
private Integer createId;
/**
*
*/
@ApiModelProperty(value = "创建时间")
@TableField("create_time")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
/**
*
*/
@ApiModelProperty(value = "创建者")
@TableField("create_by")
private String createBy;
/**
* ID
*/
@ApiModelProperty(value = "更新者ID")
@TableField("update_id")
private Long updateId;
/**
*
*/
@ApiModelProperty(value = "更新者")
@TableField("update_by")
private String updateBy;
/**
*
*/
@ApiModelProperty(value = "更新时间")
@TableField("update_time")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
}

@ -4,10 +4,12 @@ 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.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.gysl.entity.BaseModel.BaseModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
@ -17,26 +19,49 @@ import java.time.LocalDate;
* (Xmxl)
*
* @author makejava
* @since 2025-03-19 14:19:22
* @since 2025-03-21 14:15:38
*/
@EqualsAndHashCode(callSuper = true)
@Data
public class Xmxl extends BaseEntity implements Serializable {
@TableName("xmxl")
public class Xmxl extends BaseModel implements Serializable {
@TableField("id")
@TableId(type = IdType.AUTO)
private Long id;
@ApiModelProperty("监控名称")
private String jkmc;
@ApiModelProperty("项目id")
private Long xmId;
@ApiModelProperty(value = "时间 yyyy-MM-dd")
@ApiModelProperty("项目名称")
private String xmmc;
@ApiModelProperty("年度")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy")
private LocalDate year;
@ApiModelProperty("网页地址")
private String webUrl;
@ApiModelProperty("时间")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate sj;
@ApiModelProperty(value = "当前状态")
private Integer status;
@ApiModelProperty("图片上传")
private String img;
@ApiModelProperty("说明")
private String content;
@ApiModelProperty(value = "附件")
@ApiModelProperty("大事记")
private String bigEvent;
@ApiModelProperty("新闻事件")
private String newsEvent;
@ApiModelProperty("附件上传")
private String fj;
}

@ -4,9 +4,12 @@ import java.time.LocalDateTime;
import java.util.Date;
import java.io.Serializable;
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.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.gysl.entity.BaseModel.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -23,7 +26,7 @@ import org.springframework.format.annotation.DateTimeFormat;
@EqualsAndHashCode(callSuper = false)
@TableName("xmzsk")
@ApiModel(value = "Xmzsk", description = "$tableInfo.comment")
public class Xmzsk implements Serializable {
public class Xmzsk extends BaseModel implements Serializable {
private static final long serialVersionUID = 442554812871200496L;
/**
@ -31,6 +34,7 @@ public class Xmzsk implements Serializable {
*/
@ApiModelProperty(value = "主键id")
@TableField("id")
@TableId(type = IdType.AUTO)
private Integer id;
/**
@ -47,6 +51,13 @@ public class Xmzsk implements Serializable {
@TableField("lx")
private String lx;
/**
*
*/
@ApiModelProperty(value = "类型")
@TableField("wz")
private String wz;
/**
*
*/
@ -68,49 +79,4 @@ public class Xmzsk implements Serializable {
@TableField("scsj")
private Date scsj;
/**
* id
*/
@ApiModelProperty(value = "创建者id")
@TableField("create_id")
private Integer createId;
/**
*
*/
@ApiModelProperty(value = "创建时间")
@TableField("create_time")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
/**
*
*/
@ApiModelProperty(value = "创建者")
@TableField("create_by")
private String createBy;
/**
* ID
*/
@ApiModelProperty(value = "更新者ID")
@TableField("update_id")
private Long updateId;
/**
*
*/
@ApiModelProperty(value = "更新者")
@TableField("update_by")
private String updateBy;
/**
*
*/
@ApiModelProperty(value = "更新时间")
@TableField("update_time")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
}

@ -0,0 +1,20 @@
package com.ruoyi.gysl.entity.request;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
*
* @author du
* @since 2025/3/21 17:13
*/
@Data
public class PjpzRequest {
/**
*
*/
@ApiModelProperty(value = "评价要素")
private String pjys;
}

@ -0,0 +1,26 @@
package com.ruoyi.gysl.entity.request;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
*
* @author du
* @since 2025/3/21 14:37
*/
@Data
public class XmzskPageReq {
/**
*
*/
@ApiModelProperty(value = "文件名称")
private String name;
/**
*
*/
@ApiModelProperty(value = "类型")
private String lx;
}

@ -3,6 +3,8 @@ package com.ruoyi.gysl.entity.request;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotNull;
/**
*
* @author du
@ -10,6 +12,8 @@ import lombok.Data;
*/
@Data
public class ZwIdPageReq {
@NotNull
@ApiModelProperty("项目id")
private Long xmId;
}

@ -0,0 +1,18 @@
package com.ruoyi.gysl.entity.response.ImgResponse;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
*
* @author du
* @since 2025/3/21 16:03
*/
@Data
public class ImgResponse {
@ApiModelProperty("图片")
private String[] images;
}

@ -0,0 +1,24 @@
package com.ruoyi.gysl.entity.response;
import com.ruoyi.gysl.entity.response.ImgResponse.ImgResponse;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
*
* @author du
* @since 2025/3/21 15:52
*/
@Data
public class ProjectLegendResponse {
@ApiModelProperty("id")
private Long id;
@ApiModelProperty("图片类型1")
private ImgResponse type1;
@ApiModelProperty("图片类型2")
private ImgResponse type2;
}

@ -3,6 +3,7 @@ package com.ruoyi.gysl.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.gysl.entity.BuildingInformation;
import com.ruoyi.gysl.entity.request.ZwIdPageReq;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@ -20,6 +21,6 @@ public interface BuildingInformationMapper extends BaseMapper<BuildingInformatio
* @param zwIdPageReq
* @return
*/
List<BuildingInformation> selectAll(ZwIdPageReq zwIdPageReq);
List<BuildingInformation> selectAll(@Param("req") ZwIdPageReq zwIdPageReq);
}

@ -1,7 +1,10 @@
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.Pjpz;
import com.ruoyi.gysl.entity.request.PjpzRequest;
import org.apache.ibatis.annotations.Param;
/**
* (Pjpz)访
@ -11,5 +14,13 @@ import com.ruoyi.gysl.entity.Pjpz;
*/
public interface PjpzMapper extends BaseMapper<Pjpz> {
/**
*
*
* @param page
* @param pjpz
* @return
*/
Page<Pjpz> page(Page<Pjpz> page,@Param("req") PjpzRequest pjpz);
}

@ -4,8 +4,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.gysl.entity.ProjectLegend;
import com.ruoyi.gysl.entity.request.ZwIdPageReq;
import com.ruoyi.gysl.entity.response.ProjectLegendResponse;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* (ProjectLegend)访
*
@ -18,10 +21,9 @@ public interface ProjectLegendMapper extends BaseMapper<ProjectLegend> {
/**
*
*
* @param page
* @param projectLegend
* @return
*/
Page<ProjectLegend> page(Page<ProjectLegend> page,@Param("req") ZwIdPageReq projectLegend);
List<ProjectLegend> page(@Param("req") ZwIdPageReq projectLegend);
}

@ -2,6 +2,10 @@ package com.ruoyi.gysl.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.gysl.entity.WysmxInformation;
import com.ruoyi.gysl.entity.request.ZwIdPageReq;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* (WysmxInformation)访
@ -11,5 +15,13 @@ import com.ruoyi.gysl.entity.WysmxInformation;
*/
public interface WysmxInformationMapper extends BaseMapper<WysmxInformation> {
/**
* id
*
* @param zwIdPageReq
* @return
*/
List<WysmxInformation> selectOne(@Param("req") ZwIdPageReq zwIdPageReq);
}

@ -6,6 +6,8 @@ import com.ruoyi.gysl.entity.Xmxl;
import com.ruoyi.gysl.entity.request.ZwIdPageReq;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* (Xmxl)访
*
@ -18,10 +20,9 @@ public interface XmxlMapper extends BaseMapper<Xmxl> {
/**
*
*
* @param page
* @param zwIdPageReq
* @return
*/
Page<Xmxl> page(Page<Xmxl> page,@Param("req") ZwIdPageReq zwIdPageReq);
List<Xmxl> list( @Param("req") ZwIdPageReq zwIdPageReq);
}

@ -1,15 +0,0 @@
package com.ruoyi.gysl.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.gysl.entity.Xmzsk;
/**
* (Xmzsk)访
*
* @author makejava
* @since 2025-02-24 14:31:17
*/
public interface XmzskDao extends BaseMapper<Xmzsk> {
}

@ -0,0 +1,26 @@
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.Xmzsk;
import com.ruoyi.gysl.entity.request.XmzskPageReq;
import org.apache.ibatis.annotations.Param;
/**
* (Xmzsk)访
*
* @author makejava
* @since 2025-02-24 14:31:17
*/
public interface XmzskMapper extends BaseMapper<Xmzsk> {
/**
*
*
* @param page
* @return
*/
Page<Xmzsk> page(Page<Xmzsk> page,@Param("req") XmzskPageReq req);
}

@ -12,5 +12,12 @@ import com.ruoyi.gysl.entity.Mx;
*/
public interface MxService extends IService<Mx> {
/**
*
*
* @param mx
* @return
*/
int add(Mx mx);
}

@ -1,7 +1,9 @@
package com.ruoyi.gysl.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.gysl.entity.Pjpz;
import com.ruoyi.gysl.entity.request.PjpzRequest;
/**
* (Pjpz)
@ -11,5 +13,13 @@ import com.ruoyi.gysl.entity.Pjpz;
*/
public interface PjpzService extends IService<Pjpz> {
/**
*
*
* @param page
* @param pjpz
* @return
*/
Page<Pjpz> page (Page<Pjpz> page, PjpzRequest pjpz);
}

@ -1,9 +1,11 @@
package com.ruoyi.gysl.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.gysl.entity.ProjectLegend;
import com.ruoyi.gysl.entity.request.ZwIdPageReq;
import com.ruoyi.gysl.entity.response.ProjectLegendResponse;
import java.util.List;
/**
* (ProjectLegend)
@ -14,12 +16,11 @@ import com.ruoyi.gysl.entity.request.ZwIdPageReq;
public interface ProjectLegendService extends IService<ProjectLegend> {
/**
*
* id
*
* @param page
* @param projectLegend
* @return
*/
Page<ProjectLegend> page(Page<ProjectLegend> page, ZwIdPageReq projectLegend);
List<ProjectLegendResponse> page( ZwIdPageReq projectLegend);
}

@ -2,6 +2,9 @@ package com.ruoyi.gysl.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.gysl.entity.WysmxInformation;
import com.ruoyi.gysl.entity.request.ZwIdPageReq;
import java.util.List;
/**
* (WysmxInformation)
@ -11,5 +14,12 @@ import com.ruoyi.gysl.entity.WysmxInformation;
*/
public interface WysmxInformationService extends IService<WysmxInformation> {
/**
* id
*
* @param zwIdPageReq
* @return
*/
List<WysmxInformation> selectOne(ZwIdPageReq zwIdPageReq);
}

@ -1,25 +1,23 @@
package com.ruoyi.gysl.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.gysl.entity.Xmxl;
import com.ruoyi.gysl.entity.request.ZwIdPageReq;
import java.util.List;
/**
* (Xmxl)
*
* @author makejava
* @since 2025-03-19 14:19:22
* @since 2025-03-21 14:15:40
*/
public interface XmxlService extends IService<Xmxl> {
/**
*
*
* @param page
* @param zwIdPageReq
* @return
*
*/
Page<Xmxl> page(Page<Xmxl> page , ZwIdPageReq zwIdPageReq);
List<Xmxl> list(ZwIdPageReq projectRemark);
}

@ -1,7 +1,9 @@
package com.ruoyi.gysl.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.gysl.entity.Xmzsk;
import com.ruoyi.gysl.entity.request.XmzskPageReq;
/**
* (Xmzsk)
@ -11,5 +13,12 @@ import com.ruoyi.gysl.entity.Xmzsk;
*/
public interface XmzskService extends IService<Xmzsk> {
/**
*
*
* @param page
* @return
*/
Page<Xmzsk> page(Page<Xmzsk> page, XmzskPageReq req);
}

@ -4,8 +4,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.gysl.entity.Mx;
import com.ruoyi.gysl.mapper.MxMapper;
import com.ruoyi.gysl.service.MxService;
import com.ruoyi.gysl.service.WysmxInformationService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
/**
* (Mx)
*
@ -15,6 +18,13 @@ import org.springframework.stereotype.Service;
@Service("mxService")
public class MxServiceImpl extends ServiceImpl<MxMapper, Mx> implements MxService {
@Resource
private WysmxInformationService wysmxInformationService;
@Override
public int add(Mx mx) {
//新增一条模型信息,就要修改一次
return 0;
}
}

@ -1,6 +1,8 @@
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.request.PjpzRequest;
import com.ruoyi.gysl.mapper.PjpzMapper;
import com.ruoyi.gysl.entity.Pjpz;
import com.ruoyi.gysl.service.PjpzService;
@ -15,5 +17,16 @@ import org.springframework.stereotype.Service;
@Service("pjpzService")
public class PjpzServiceImpl extends ServiceImpl<PjpzMapper, Pjpz> implements PjpzService {
/**
*
*
* @param page
* @param pjpz
* @return
*/
@Override
public Page<Pjpz> page(Page<Pjpz> page, PjpzRequest pjpz) {
return baseMapper.page(page,pjpz);
}
}

@ -1,13 +1,17 @@
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.ProjectLegend;
import com.ruoyi.gysl.entity.request.ZwIdPageReq;
import com.ruoyi.gysl.entity.response.ImgResponse.ImgResponse;
import com.ruoyi.gysl.entity.response.ProjectLegendResponse;
import com.ruoyi.gysl.mapper.ProjectLegendMapper;
import com.ruoyi.gysl.entity.ProjectLegend;
import com.ruoyi.gysl.service.ProjectLegendService;
import org.springframework.stereotype.Service;
import java.util.*;
import java.util.stream.Collectors;
/**
* (ProjectLegend)
*
@ -20,13 +24,33 @@ public class ProjectLegendServiceImpl extends ServiceImpl<ProjectLegendMapper, P
/**
*
*
* @param page
* @param projectLegend
* @return
*/
@Override
public Page<ProjectLegend> page(Page<ProjectLegend> page, ZwIdPageReq projectLegend) {
return baseMapper.page(page,projectLegend);
public List<ProjectLegendResponse> page(ZwIdPageReq projectLegend) {
List<ProjectLegendResponse> a1 = new ArrayList<>();
List<ProjectLegend> page = baseMapper.page(projectLegend);
// 按 id 分组
Map<Long, List<ProjectLegend>> grouped = page.stream()
.collect(Collectors.groupingBy(ProjectLegend::getXmId));
for (Long id : grouped.keySet()) {
List<ProjectLegend> legends = grouped.get(id);
ProjectLegendResponse ps = new ProjectLegendResponse();
legends.forEach(x -> {
ImgResponse imgResponse = new ImgResponse();
imgResponse.setImages(x.getImg().split(","));
if(x.getImgType() == 1){
ps.setType1(imgResponse);
}else {
ps.setType2(imgResponse);
}
});
ps.setId(id);
a1.add(ps);
}
return a1;
}
}

@ -3,10 +3,13 @@ package com.ruoyi.gysl.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.gysl.entity.WysmxInformation;
import com.ruoyi.gysl.entity.request.ZwIdPageReq;
import com.ruoyi.gysl.mapper.WysmxInformationMapper;
import com.ruoyi.gysl.service.WysmxInformationService;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* (WysmxInformation)
*
@ -16,5 +19,15 @@ import org.springframework.stereotype.Service;
@Service("wysmxInformationService")
public class WysmxInformationServiceImpl extends ServiceImpl<WysmxInformationMapper, WysmxInformation> implements WysmxInformationService {
/**
* id
*
* @param zwIdPageReq
* @return
*/
@Override
public List<WysmxInformation> selectOne(ZwIdPageReq zwIdPageReq) {
return baseMapper.selectOne(zwIdPageReq);
}
}

@ -1,32 +1,29 @@
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.Xmxl;
import com.ruoyi.gysl.entity.request.ZwIdPageReq;
import com.ruoyi.gysl.mapper.XmxlMapper;
import com.ruoyi.gysl.entity.Xmxl;
import com.ruoyi.gysl.service.XmxlService;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* (Xmxl)
*
* @author makejava
* @since 2025-03-19 14:19:22
* @since 2025-03-21 14:15:41
*/
@Service("xmxlService")
public class XmxlServiceImpl extends ServiceImpl<XmxlMapper, Xmxl> implements XmxlService {
/**
*
*
* @param page
* @param zwIdPageReq
* @return
*
*/
@Override
public Page<Xmxl> page(Page<Xmxl> page, ZwIdPageReq zwIdPageReq) {
return baseMapper.page(page,zwIdPageReq);
public List<Xmxl> list(ZwIdPageReq projectRemark) {
return baseMapper.list(projectRemark);
}
}

@ -1,7 +1,9 @@
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.mapper.XmzskDao;
import com.ruoyi.gysl.entity.request.XmzskPageReq;
import com.ruoyi.gysl.mapper.XmzskMapper;
import com.ruoyi.gysl.entity.Xmzsk;
import com.ruoyi.gysl.service.XmzskService;
import org.springframework.stereotype.Service;
@ -13,7 +15,18 @@ import org.springframework.stereotype.Service;
* @since 2025-02-24 14:31:18
*/
@Service("xmzskService")
public class XmzskServiceImpl extends ServiceImpl<XmzskDao, Xmzsk> implements XmzskService {
public class XmzskServiceImpl extends ServiceImpl<XmzskMapper, Xmzsk> implements XmzskService {
/**
*
*
* @param page
* @return
*/
@Override
public Page<Xmzsk> page(Page<Xmzsk> page, XmzskPageReq req) {
return baseMapper.page(page,req);
}
}

@ -8,7 +8,7 @@ spring:
master:
url: jdbc:mysql://localhost:3306/gysl?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
password: adminadmin
password: root
# 从库数据源
slave:
# 从数据源开关/默认关闭

@ -64,7 +64,7 @@ spring:
devtools:
restart:
# 热部署开关
enabled: true
enabled: false
# redis 配置
redis:
# 地址

@ -0,0 +1,14 @@
<?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.PjpzMapper">
<select id="page" resultType="com.ruoyi.gysl.entity.Pjpz">
select * from pjpz
<where>
<if test="req.pjys != null and req.pjys != ''">
AND pjys like concat('%',#{req.pjys},'%')
</if>
</where>
</select>
</mapper>

@ -0,0 +1,14 @@
<?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.WysmxInformationMapper">
<select id="selectOne" resultType="com.ruoyi.gysl.entity.WysmxInformation">
select * from wysmx_information
<where>
<if test="req.xmId != null and req.xmId != ''">
AND xm_id = #{req.xmId}
</if>
</where>
</select>
</mapper>

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.gysl.mapper.XmxlMapper">
<select id="page" resultType="com.ruoyi.gysl.entity.Xmxl">
<select id="list" resultType="com.ruoyi.gysl.entity.Xmxl">
select * from xmxl
<where>
<if test="req.xmId != null and req.xmId != ''">

@ -0,0 +1,17 @@
<?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.XmzskMapper">
<select id="page" resultType="com.ruoyi.gysl.entity.Xmzsk">
select * from xmzsk
<where>
<if test="req.name != null and req.name != ''">
AND name like concat('%',#{req.name},'%')
</if>
<if test="req.lx != null and req.lx != ''">
AND lx = #{req.lx}
</if>
</where>
</select>
</mapper>

@ -4,6 +4,8 @@ import java.io.Serializable;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
@ -36,10 +38,12 @@ public class BaseEntity implements Serializable
private Date updateTime;
/** 备注 */
@TableField(exist = false)
private String remark;
/** 请求参数 */
@JsonInclude(JsonInclude.Include.NON_EMPTY)
@TableField(exist = false)
private Map<String, Object> params;
public String getSearchValue()

@ -1,132 +1,128 @@
//package com.ruoyi.framework.config;
//
//import java.io.IOException;
//import java.util.ArrayList;
//import java.util.Arrays;
//import java.util.HashSet;
//import java.util.List;
//import javax.sql.DataSource;
//import org.apache.ibatis.io.VFS;
//import org.apache.ibatis.session.SqlSessionFactory;
//import org.mybatis.spring.SqlSessionFactoryBean;
//import org.mybatis.spring.boot.autoconfigure.SpringBootVFS;
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.context.annotation.Bean;
//import org.springframework.context.annotation.Configuration;
//import org.springframework.core.env.Environment;
//import org.springframework.core.io.DefaultResourceLoader;
//import org.springframework.core.io.Resource;
//import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
//import org.springframework.core.io.support.ResourcePatternResolver;
//import org.springframework.core.type.classreading.CachingMetadataReaderFactory;
//import org.springframework.core.type.classreading.MetadataReader;
//import org.springframework.core.type.classreading.MetadataReaderFactory;
//import org.springframework.util.ClassUtils;
//import com.ruoyi.common.utils.StringUtils;
//
///**
// * Mybatis支持*匹配扫描包
// *
// * @author ruoyi
// */
//@Configuration
//public class MyBatisConfig
//{
// @Autowired
// private Environment env;
//
// static final String DEFAULT_RESOURCE_PATTERN = "**/*.class";
//
// public static String setTypeAliasesPackage(String typeAliasesPackage)
// {
// ResourcePatternResolver resolver = (ResourcePatternResolver) new PathMatchingResourcePatternResolver();
// MetadataReaderFactory metadataReaderFactory = new CachingMetadataReaderFactory(resolver);
// List<String> allResult = new ArrayList<String>();
// try
// {
// for (String aliasesPackage : typeAliasesPackage.split(","))
// {
// List<String> result = new ArrayList<String>();
// aliasesPackage = ResourcePatternResolver.CLASSPATH_ALL_URL_PREFIX
// + ClassUtils.convertClassNameToResourcePath(aliasesPackage.trim()) + "/" + DEFAULT_RESOURCE_PATTERN;
// Resource[] resources = resolver.getResources(aliasesPackage);
// if (resources != null && resources.length > 0)
// {
// MetadataReader metadataReader = null;
// for (Resource resource : resources)
// {
// if (resource.isReadable())
// {
// metadataReader = metadataReaderFactory.getMetadataReader(resource);
// try
// {
// result.add(Class.forName(metadataReader.getClassMetadata().getClassName()).getPackage().getName());
// }
// catch (ClassNotFoundException e)
// {
// e.printStackTrace();
// }
// }
// }
// }
// if (result.size() > 0)
// {
// HashSet<String> hashResult = new HashSet<String>(result);
// allResult.addAll(hashResult);
// }
// }
// if (allResult.size() > 0)
// {
// typeAliasesPackage = String.join(",", (String[]) allResult.toArray(new String[0]));
// }
// else
// {
// throw new RuntimeException("mybatis typeAliasesPackage 路径扫描错误,参数typeAliasesPackage:" + typeAliasesPackage + "未找到任何包");
// }
// }
// catch (IOException e)
// {
// e.printStackTrace();
// }
// return typeAliasesPackage;
// }
//
// public Resource[] resolveMapperLocations(String[] mapperLocations)
// {
// ResourcePatternResolver resourceResolver = new PathMatchingResourcePatternResolver();
// List<Resource> resources = new ArrayList<Resource>();
// if (mapperLocations != null)
// {
// for (String mapperLocation : mapperLocations)
// {
// try
// {
// Resource[] mappers = resourceResolver.getResources(mapperLocation);
// resources.addAll(Arrays.asList(mappers));
// }
// catch (IOException e)
// {
// // ignore
// }
// }
// }
// return resources.toArray(new Resource[resources.size()]);
// }
//
// @Bean
// public SqlSessionFactory sqlSessionFactory(DataSource dataSource) throws Exception
// {
// String typeAliasesPackage = env.getProperty("mybatis.typeAliasesPackage");
// String mapperLocations = env.getProperty("mybatis.mapperLocations");
// String configLocation = env.getProperty("mybatis.configLocation");
// typeAliasesPackage = setTypeAliasesPackage(typeAliasesPackage);
// VFS.addImplClass(SpringBootVFS.class);
//
// final SqlSessionFactoryBean sessionFactory = new SqlSessionFactoryBean();
// sessionFactory.setDataSource(dataSource);
// sessionFactory.setTypeAliasesPackage(typeAliasesPackage);
// sessionFactory.setMapperLocations(resolveMapperLocations(StringUtils.split(mapperLocations, ",")));
// sessionFactory.setConfigLocation(new DefaultResourceLoader().getResource(configLocation));
// return sessionFactory.getObject();
// }
//}
package com.ruoyi.framework.config;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import javax.sql.DataSource;
import com.baomidou.mybatisplus.annotation.DbType;
import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor;
import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
import org.apache.ibatis.io.VFS;
import org.apache.ibatis.session.SqlSessionFactory;
import org.mybatis.spring.SqlSessionFactoryBean;
import org.mybatis.spring.boot.autoconfigure.SpringBootVFS;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.env.Environment;
import org.springframework.core.io.DefaultResourceLoader;
import org.springframework.core.io.Resource;
import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
import org.springframework.core.io.support.ResourcePatternResolver;
import org.springframework.core.type.classreading.CachingMetadataReaderFactory;
import org.springframework.core.type.classreading.MetadataReader;
import org.springframework.core.type.classreading.MetadataReaderFactory;
import org.springframework.util.ClassUtils;
import com.ruoyi.common.utils.StringUtils;
/**
* Mybatis*
*
* @author ruoyi
*/
@Configuration
public class MyBatisConfig
{
@Autowired
private Environment env;
static final String DEFAULT_RESOURCE_PATTERN = "**/*.class";
public static String setTypeAliasesPackage(String typeAliasesPackage)
{
ResourcePatternResolver resolver = (ResourcePatternResolver) new PathMatchingResourcePatternResolver();
MetadataReaderFactory metadataReaderFactory = new CachingMetadataReaderFactory(resolver);
List<String> allResult = new ArrayList<String>();
try
{
for (String aliasesPackage : typeAliasesPackage.split(","))
{
List<String> result = new ArrayList<String>();
aliasesPackage = ResourcePatternResolver.CLASSPATH_ALL_URL_PREFIX
+ ClassUtils.convertClassNameToResourcePath(aliasesPackage.trim()) + "/" + DEFAULT_RESOURCE_PATTERN;
Resource[] resources = resolver.getResources(aliasesPackage);
if (resources != null && resources.length > 0)
{
MetadataReader metadataReader = null;
for (Resource resource : resources)
{
if (resource.isReadable())
{
metadataReader = metadataReaderFactory.getMetadataReader(resource);
try
{
result.add(Class.forName(metadataReader.getClassMetadata().getClassName()).getPackage().getName());
}
catch (ClassNotFoundException e)
{
e.printStackTrace();
}
}
}
}
if (result.size() > 0)
{
HashSet<String> hashResult = new HashSet<String>(result);
allResult.addAll(hashResult);
}
}
if (allResult.size() > 0)
{
typeAliasesPackage = String.join(",", (String[]) allResult.toArray(new String[0]));
}
else
{
throw new RuntimeException("mybatis typeAliasesPackage 路径扫描错误,参数typeAliasesPackage:" + typeAliasesPackage + "未找到任何包");
}
}
catch (IOException e)
{
e.printStackTrace();
}
return typeAliasesPackage;
}
public Resource[] resolveMapperLocations(String[] mapperLocations)
{
ResourcePatternResolver resourceResolver = new PathMatchingResourcePatternResolver();
List<Resource> resources = new ArrayList<Resource>();
if (mapperLocations != null)
{
for (String mapperLocation : mapperLocations)
{
try
{
Resource[] mappers = resourceResolver.getResources(mapperLocation);
resources.addAll(Arrays.asList(mappers));
}
catch (IOException e)
{
// ignore
}
}
}
return resources.toArray(new Resource[resources.size()]);
}
@Bean
public MybatisPlusInterceptor mybatisPlusInterceptor() {
MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
interceptor.addInnerInterceptor(new OptimisticLockerInnerInterceptor());
return interceptor;
}
}

@ -7,6 +7,7 @@ import com.ruoyi.common.utils.SecurityUtils;
import org.apache.ibatis.reflection.MetaObject;
import org.springframework.stereotype.Component;
import java.time.LocalDateTime;
import java.util.Date;
import java.util.Objects;
@ -39,8 +40,8 @@ public class MyMetaObjectHandler implements MetaObjectHandler {
this.strictInsertFill(metaObject, "createId", Long.class, userId);
this.strictInsertFill(metaObject, "updateId", Long.class, userId);
}
this.strictInsertFill(metaObject, "createTime", Date.class, new Date());
this.strictInsertFill(metaObject, "updateTime", Date.class, new Date());
this.strictInsertFill(metaObject, "createTime", LocalDateTime.class, LocalDateTime.now());
this.strictInsertFill(metaObject, "updateTime", LocalDateTime.class, LocalDateTime.now());
}
@Override
@ -60,6 +61,6 @@ public class MyMetaObjectHandler implements MetaObjectHandler {
if (!Objects.equals(userName, "")) {
this.strictUpdateFill(metaObject, "updateBy", String.class, userName);
}
this.strictUpdateFill(metaObject, "updateTime", Date.class, new Date());
this.strictUpdateFill(metaObject, "updateTime", LocalDateTime.class, LocalDateTime.now());
}
}

@ -1,63 +1,63 @@
package com.ruoyi.framework.config;
import com.baomidou.mybatisplus.annotation.DbType;
import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
import com.baomidou.mybatisplus.extension.plugins.inner.BlockAttackInnerInterceptor;
import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor;
import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.transaction.annotation.EnableTransactionManagement;
/**
* Mybatis Plus
*
* @author ruoyi
*/
@EnableTransactionManagement(proxyTargetClass = true)
@Configuration
public class MybatisPlusConfig
{
@Bean
public MybatisPlusInterceptor mybatisPlusInterceptor()
{
MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
// 分页插件
interceptor.addInnerInterceptor(paginationInnerInterceptor());
// 乐观锁插件
interceptor.addInnerInterceptor(optimisticLockerInnerInterceptor());
// 阻断插件
interceptor.addInnerInterceptor(blockAttackInnerInterceptor());
return interceptor;
}
/**
* https://baomidou.com/guide/interceptor-pagination.html
*/
public PaginationInnerInterceptor paginationInnerInterceptor()
{
PaginationInnerInterceptor paginationInnerInterceptor = new PaginationInnerInterceptor();
// 设置数据库类型为mysql
paginationInnerInterceptor.setDbType(DbType.MYSQL);
// 设置最大单页限制数量,默认 500 条,-1 不受限制
paginationInnerInterceptor.setMaxLimit(-1L);
return paginationInnerInterceptor;
}
/**
* https://baomidou.com/guide/interceptor-optimistic-locker.html
*/
public OptimisticLockerInnerInterceptor optimisticLockerInnerInterceptor()
{
return new OptimisticLockerInnerInterceptor();
}
/**
* https://baomidou.com/guide/interceptor-block-attack.html
*/
public BlockAttackInnerInterceptor blockAttackInnerInterceptor()
{
return new BlockAttackInnerInterceptor();
}
}
//package com.ruoyi.framework.config;
//
//
//import com.baomidou.mybatisplus.annotation.DbType;
//import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
//import com.baomidou.mybatisplus.extension.plugins.inner.BlockAttackInnerInterceptor;
//import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor;
//import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
//import org.springframework.context.annotation.Bean;
//import org.springframework.context.annotation.Configuration;
//import org.springframework.transaction.annotation.EnableTransactionManagement;
//
///**
// * Mybatis Plus 配置
// *
// * @author ruoyi
// */
//@EnableTransactionManagement(proxyTargetClass = true)
//@Configuration
//public class MybatisPlusConfig
//{
// @Bean
// public MybatisPlusInterceptor mybatisPlusInterceptor()
// {
// MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
// // 分页插件
// interceptor.addInnerInterceptor(paginationInnerInterceptor());
// // 乐观锁插件
// interceptor.addInnerInterceptor(optimisticLockerInnerInterceptor());
// // 阻断插件
// interceptor.addInnerInterceptor(blockAttackInnerInterceptor());
// return interceptor;
// }
//
// /**
// * 分页插件,自动识别数据库类型 https://baomidou.com/guide/interceptor-pagination.html
// */
// public PaginationInnerInterceptor paginationInnerInterceptor()
// {
// PaginationInnerInterceptor paginationInnerInterceptor = new PaginationInnerInterceptor();
// // 设置数据库类型为mysql
// paginationInnerInterceptor.setDbType(DbType.MYSQL);
// // 设置最大单页限制数量,默认 500 条,-1 不受限制
// paginationInnerInterceptor.setMaxLimit(-1L);
// return paginationInnerInterceptor;
// }
//
// /**
// * 乐观锁插件 https://baomidou.com/guide/interceptor-optimistic-locker.html
// */
// public OptimisticLockerInnerInterceptor optimisticLockerInnerInterceptor()
// {
// return new OptimisticLockerInnerInterceptor();
// }
//
// /**
// * 如果是对全表的删除或更新操作,就会终止该操作 https://baomidou.com/guide/interceptor-block-attack.html
// */
// public BlockAttackInnerInterceptor blockAttackInnerInterceptor()
// {
// return new BlockAttackInnerInterceptor();
// }
//}
Loading…
Cancel
Save