From 001f58f286252fa70e731b03157cf61eda163a28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E8=83=9C=E8=B6=85?= <504565038@qq.com> Date: Thu, 8 May 2025 17:35:15 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E4=BA=BA=E5=92=8C=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../boot/framework/config/SecurityConfig.java | 2 +- .../IConstructionReportController.java | 8 +++++- .../controller/IEngineerLogController.java | 9 ++++--- .../controller/IManpowerController.java | 8 +++--- .../controller/IMaterialsController.java | 8 +++--- .../controller/IProductionPlanController.java | 8 +++--- .../controller/IProgressController.java | 6 ++++- .../IResourceScheduleController.java | 8 +++++- .../controller/ISafeController.java | 8 +++--- .../controller/IUserController.java | 6 ++++- .../controller/IWarnController.java | 6 ++++- .../entity/IConstructionReport.java | 7 ++--- .../intelligencesite/entity/IEngineerLog.java | 5 ++-- .../intelligencesite/entity/IManpower.java | 5 ++-- .../intelligencesite/entity/IMaterials.java | 7 ++--- .../entity/IProductionPlan.java | 2 +- .../intelligencesite/entity/IProgress.java | 3 ++- .../entity/IResourceSchedule.java | 9 ++++--- .../boot/intelligencesite/entity/ISafe.java | 5 ++-- .../boot/intelligencesite/entity/IUser.java | 3 ++- .../boot/intelligencesite/entity/IWarn.java | 3 ++- .../mappers/IConstructionReportMapper.xml | 26 +++++++++---------- .../resources/mappers/IEngineerLogMapper.xml | 15 ++++++----- .../resources/mappers/IManpowerMapper.xml | 24 +++++------------ .../resources/mappers/IMaterialsMapper.xml | 15 ++++++----- .../mappers/IProductionPlanMapper.xml | 16 +++++------- .../resources/mappers/IProgressMapper.xml | 16 +++--------- .../mappers/IResourceScheduleMapper.xml | 11 ++++---- src/main/resources/mappers/ISafeMapper.xml | 7 +++-- src/main/resources/mappers/IUserMapper.xml | 11 ++++---- src/main/resources/mappers/IWarnMapper.xml | 13 +++++----- 31 files changed, 151 insertions(+), 129 deletions(-) diff --git a/src/main/java/com/zilber/boot/framework/config/SecurityConfig.java b/src/main/java/com/zilber/boot/framework/config/SecurityConfig.java index e580ee0..7dcad5f 100644 --- a/src/main/java/com/zilber/boot/framework/config/SecurityConfig.java +++ b/src/main/java/com/zilber/boot/framework/config/SecurityConfig.java @@ -109,7 +109,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter // 过滤请求 .authorizeRequests() // 对于登录login 注册register 验证码captchaImage 允许匿名访问 - .antMatchers("/login", "/register", "/captchaImage","/iconstructionreport/**","/iproductionplan/**").anonymous() + .antMatchers("/login", "/register", "/captchaImage").anonymous() // 静态资源，可匿名访问 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js","/**/*.jpg","/**/*.png","/zilbervue/admin/", "/profile/**" // , "/vehicle/**" diff --git a/src/main/java/com/zilber/boot/intelligencesite/controller/IConstructionReportController.java b/src/main/java/com/zilber/boot/intelligencesite/controller/IConstructionReportController.java index 33b8cf3..18e494a 100644 --- a/src/main/java/com/zilber/boot/intelligencesite/controller/IConstructionReportController.java +++ b/src/main/java/com/zilber/boot/intelligencesite/controller/IConstructionReportController.java @@ -3,6 +3,8 @@ package com.zilber.boot.intelligencesite.controller; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.zilber.boot.annotation.Anonymous; +import com.zilber.boot.commoncontroller.BaseController; import com.zilber.boot.intelligencesite.entity.IConstructionReport; import com.zilber.boot.intelligencesite.service.IIConstructionReportService; import com.zilber.boot.utils.AjaxResult; @@ -12,6 +14,7 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.util.Date; import java.util.List; /** @@ -25,7 +28,7 @@ import java.util.List; @RestController @RequestMapping("/iconstructionreport") @Api(tags = "施工报告") -public class IConstructionReportController { +public class IConstructionReportController extends BaseController { @Resource @@ -56,12 +59,15 @@ public class IConstructionReportController { @PostMapping("/add") @ApiOperation("增加") public AjaxResult add(@RequestBody IConstructionReport iConstructionReport) { + iConstructionReport.setCreateTime(new Date()); + iConstructionReport.setCreator(getUsername()); return AjaxResult.success(iiConstructionReportService.save(iConstructionReport)); } @PutMapping("/update") @ApiOperation("修改") + @Anonymous public AjaxResult update(@RequestBody @Validated IConstructionReport iConstructionReport) { iiConstructionReportService.updateById(iConstructionReport); return AjaxResult.success(); diff --git a/src/main/java/com/zilber/boot/intelligencesite/controller/IEngineerLogController.java b/src/main/java/com/zilber/boot/intelligencesite/controller/IEngineerLogController.java index c1ebcb7..581015e 100644 --- a/src/main/java/com/zilber/boot/intelligencesite/controller/IEngineerLogController.java +++ b/src/main/java/com/zilber/boot/intelligencesite/controller/IEngineerLogController.java @@ -3,9 +3,9 @@ package com.zilber.boot.intelligencesite.controller; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.zilber.boot.intelligencesite.entity.IConstructionReport; +import com.zilber.boot.annotation.Anonymous; +import com.zilber.boot.commoncontroller.BaseController; import com.zilber.boot.intelligencesite.entity.IEngineerLog; -import com.zilber.boot.intelligencesite.service.IIConstructionReportService; import com.zilber.boot.intelligencesite.service.IIEngineerLogService; import com.zilber.boot.utils.AjaxResult; import io.swagger.annotations.Api; @@ -14,6 +14,7 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.util.Date; import java.util.List; /** @@ -27,7 +28,7 @@ import java.util.List; @RestController @RequestMapping("/iengineerlog") @Api(tags = "工程日志") -public class IEngineerLogController { +public class IEngineerLogController extends BaseController { @Resource private IIEngineerLogService iiEngineerLogService; @@ -57,6 +58,8 @@ public class IEngineerLogController { @PostMapping("/add") @ApiOperation("增加") public AjaxResult add(@RequestBody IEngineerLog iEngineerLog) { + iEngineerLog.setCreateTime(new Date()); + iEngineerLog.setCreator(getUsername()); return AjaxResult.success(iiEngineerLogService.save(iEngineerLog)); } diff --git a/src/main/java/com/zilber/boot/intelligencesite/controller/IManpowerController.java b/src/main/java/com/zilber/boot/intelligencesite/controller/IManpowerController.java index 344b803..846242a 100644 --- a/src/main/java/com/zilber/boot/intelligencesite/controller/IManpowerController.java +++ b/src/main/java/com/zilber/boot/intelligencesite/controller/IManpowerController.java @@ -3,9 +3,8 @@ package com.zilber.boot.intelligencesite.controller; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.zilber.boot.intelligencesite.entity.IEngineerLog; +import com.zilber.boot.commoncontroller.BaseController; import com.zilber.boot.intelligencesite.entity.IManpower; -import com.zilber.boot.intelligencesite.service.IIEngineerLogService; import com.zilber.boot.intelligencesite.service.IIManpowerService; import com.zilber.boot.utils.AjaxResult; import io.swagger.annotations.Api; @@ -14,6 +13,7 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.util.Date; import java.util.List; /** @@ -27,7 +27,7 @@ import java.util.List; @RestController @RequestMapping("/imanpower") @Api(tags = "人力信息") -public class IManpowerController { +public class IManpowerController extends BaseController { @Resource private IIManpowerService iiManpowerService; @@ -56,6 +56,8 @@ public class IManpowerController { @PostMapping("/add") @ApiOperation("增加") public AjaxResult add(@RequestBody IManpower iManpower) { + iManpower.setCreateTime(new Date()); + iManpower.setCreator(getUsername()); return AjaxResult.success(iiManpowerService.save(iManpower)); } diff --git a/src/main/java/com/zilber/boot/intelligencesite/controller/IMaterialsController.java b/src/main/java/com/zilber/boot/intelligencesite/controller/IMaterialsController.java index 24ae664..8b202c0 100644 --- a/src/main/java/com/zilber/boot/intelligencesite/controller/IMaterialsController.java +++ b/src/main/java/com/zilber/boot/intelligencesite/controller/IMaterialsController.java @@ -3,9 +3,8 @@ package com.zilber.boot.intelligencesite.controller; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.zilber.boot.intelligencesite.entity.IManpower; +import com.zilber.boot.commoncontroller.BaseController; import com.zilber.boot.intelligencesite.entity.IMaterials; -import com.zilber.boot.intelligencesite.service.IIManpowerService; import com.zilber.boot.intelligencesite.service.IIMaterialsService; import com.zilber.boot.utils.AjaxResult; import io.swagger.annotations.Api; @@ -14,6 +13,7 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.util.Date; import java.util.List; /** @@ -27,7 +27,7 @@ import java.util.List; @RestController @RequestMapping("/imaterials") @Api(tags = "材料信息") -public class IMaterialsController { +public class IMaterialsController extends BaseController { @Resource private IIMaterialsService iiMaterialsService; @@ -56,6 +56,8 @@ public class IMaterialsController { @PostMapping("/add") @ApiOperation("增加") public AjaxResult add(@RequestBody IMaterials iMaterials) { + iMaterials.setCreateTime(new Date()); + iMaterials.setCreator(getUsername()); return AjaxResult.success(iiMaterialsService.save(iMaterials)); } diff --git a/src/main/java/com/zilber/boot/intelligencesite/controller/IProductionPlanController.java b/src/main/java/com/zilber/boot/intelligencesite/controller/IProductionPlanController.java index 70986ad..3833ac1 100644 --- a/src/main/java/com/zilber/boot/intelligencesite/controller/IProductionPlanController.java +++ b/src/main/java/com/zilber/boot/intelligencesite/controller/IProductionPlanController.java @@ -3,9 +3,8 @@ package com.zilber.boot.intelligencesite.controller; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.zilber.boot.intelligencesite.entity.IMaterials; +import com.zilber.boot.commoncontroller.BaseController; import com.zilber.boot.intelligencesite.entity.IProductionPlan; -import com.zilber.boot.intelligencesite.service.IIMaterialsService; import com.zilber.boot.intelligencesite.service.IIProductionPlanService; import com.zilber.boot.utils.AjaxResult; import io.swagger.annotations.Api; @@ -14,6 +13,7 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.util.Date; import java.util.List; /** @@ -27,7 +27,7 @@ import java.util.List; @RestController @RequestMapping("/iproductionplan") @Api(tags = "生产计划") -public class IProductionPlanController { +public class IProductionPlanController extends BaseController { @Resource private IIProductionPlanService iiProductionPlanService; @@ -57,6 +57,8 @@ public class IProductionPlanController { @PostMapping("/add") @ApiOperation("增加") public AjaxResult add(@RequestBody IProductionPlan iProductionPlan) { + iProductionPlan.setCreateTime(new Date()); + iProductionPlan.setCreator(getUsername()); return AjaxResult.success(iiProductionPlanService.save(iProductionPlan)); } diff --git a/src/main/java/com/zilber/boot/intelligencesite/controller/IProgressController.java b/src/main/java/com/zilber/boot/intelligencesite/controller/IProgressController.java index 53dd5ba..8252a10 100644 --- a/src/main/java/com/zilber/boot/intelligencesite/controller/IProgressController.java +++ b/src/main/java/com/zilber/boot/intelligencesite/controller/IProgressController.java @@ -3,6 +3,7 @@ package com.zilber.boot.intelligencesite.controller; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.zilber.boot.commoncontroller.BaseController; import com.zilber.boot.intelligencesite.entity.IProgress; import com.zilber.boot.intelligencesite.service.IIProgressService; import com.zilber.boot.utils.AjaxResult; @@ -12,6 +13,7 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.util.Date; import java.util.List; /** @@ -25,7 +27,7 @@ import java.util.List; @RestController @RequestMapping("/iprogress") @Api(tags = "进度跟踪") -public class IProgressController { +public class IProgressController extends BaseController { @Resource private IIProgressService iiProgressService; @@ -55,6 +57,8 @@ public class IProgressController { @PostMapping("/add") @ApiOperation("增加") public AjaxResult add(@RequestBody IProgress iProgress) { + iProgress.setCreateTime(new Date()); + iProgress.setCreator(getUsername()); return AjaxResult.success(iiProgressService.add(iProgress)); } diff --git a/src/main/java/com/zilber/boot/intelligencesite/controller/IResourceScheduleController.java b/src/main/java/com/zilber/boot/intelligencesite/controller/IResourceScheduleController.java index 458a746..504e66e 100644 --- a/src/main/java/com/zilber/boot/intelligencesite/controller/IResourceScheduleController.java +++ b/src/main/java/com/zilber/boot/intelligencesite/controller/IResourceScheduleController.java @@ -3,6 +3,8 @@ package com.zilber.boot.intelligencesite.controller; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.zilber.boot.annotation.Anonymous; +import com.zilber.boot.commoncontroller.BaseController; import com.zilber.boot.intelligencesite.entity.IResourceSchedule; import com.zilber.boot.intelligencesite.service.IIResourceScheduleService; import com.zilber.boot.utils.AjaxResult; @@ -12,6 +14,7 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.util.Date; import java.util.List; /** @@ -25,7 +28,7 @@ import java.util.List; @RestController @RequestMapping("/iresourceschedule") @Api(tags = "资源调度") -public class IResourceScheduleController { +public class IResourceScheduleController extends BaseController { @Resource private IIResourceScheduleService iiResourceScheduleService; @@ -54,12 +57,15 @@ public class IResourceScheduleController { @PostMapping("/add") @ApiOperation("增加") public AjaxResult add(@RequestBody IResourceSchedule iResourceSchedule) { + iResourceSchedule.setCreateTime(new Date()); + iResourceSchedule.setCreator(getUsername()); return AjaxResult.success(iiResourceScheduleService.save(iResourceSchedule)); } @PutMapping("/update") @ApiOperation("修改") + @Anonymous public AjaxResult update(@RequestBody @Validated IResourceSchedule iResourceSchedule) { iiResourceScheduleService.updateById(iResourceSchedule); return AjaxResult.success(); diff --git a/src/main/java/com/zilber/boot/intelligencesite/controller/ISafeController.java b/src/main/java/com/zilber/boot/intelligencesite/controller/ISafeController.java index ae69326..31d59ee 100644 --- a/src/main/java/com/zilber/boot/intelligencesite/controller/ISafeController.java +++ b/src/main/java/com/zilber/boot/intelligencesite/controller/ISafeController.java @@ -3,9 +3,8 @@ package com.zilber.boot.intelligencesite.controller; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.zilber.boot.intelligencesite.entity.IResourceSchedule; +import com.zilber.boot.commoncontroller.BaseController; import com.zilber.boot.intelligencesite.entity.ISafe; -import com.zilber.boot.intelligencesite.service.IIResourceScheduleService; import com.zilber.boot.intelligencesite.service.IISafeService; import com.zilber.boot.utils.AjaxResult; import io.swagger.annotations.Api; @@ -14,6 +13,7 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.util.Date; import java.util.List; /** @@ -27,7 +27,7 @@ import java.util.List; @RestController @RequestMapping("/isafe") @Api(tags = "安全教育") -public class ISafeController { +public class ISafeController extends BaseController { @Resource private IISafeService IISafeService; @@ -57,6 +57,8 @@ public class ISafeController { @PostMapping("/add") @ApiOperation("增加") public AjaxResult add(@RequestBody ISafe iSafe) { + iSafe.setCreateTime(new Date()); + iSafe.setCreator(getUsername()); return AjaxResult.success(IISafeService.save(iSafe)); } diff --git a/src/main/java/com/zilber/boot/intelligencesite/controller/IUserController.java b/src/main/java/com/zilber/boot/intelligencesite/controller/IUserController.java index 06ae267..b50340a 100644 --- a/src/main/java/com/zilber/boot/intelligencesite/controller/IUserController.java +++ b/src/main/java/com/zilber/boot/intelligencesite/controller/IUserController.java @@ -3,6 +3,7 @@ package com.zilber.boot.intelligencesite.controller; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.zilber.boot.commoncontroller.BaseController; import com.zilber.boot.intelligencesite.entity.ISafe; import com.zilber.boot.intelligencesite.entity.IUser; import com.zilber.boot.intelligencesite.service.IISafeService; @@ -14,6 +15,7 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.util.Date; import java.util.List; /** @@ -27,7 +29,7 @@ import java.util.List; @RestController @RequestMapping("/iuser") @Api(tags = "实名制与信息管理") -public class IUserController { +public class IUserController extends BaseController { @Resource private IIUserService iiUserService; @@ -57,6 +59,8 @@ public class IUserController { @PostMapping("/add") @ApiOperation("增加") public AjaxResult add(@RequestBody IUser iUser) { + iUser.setCreateTime(new Date()); + iUser.setCreator(getUsername()); return AjaxResult.success(iiUserService.save(iUser)); } diff --git a/src/main/java/com/zilber/boot/intelligencesite/controller/IWarnController.java b/src/main/java/com/zilber/boot/intelligencesite/controller/IWarnController.java index 1ef1080..bd9a3a7 100644 --- a/src/main/java/com/zilber/boot/intelligencesite/controller/IWarnController.java +++ b/src/main/java/com/zilber/boot/intelligencesite/controller/IWarnController.java @@ -3,6 +3,7 @@ package com.zilber.boot.intelligencesite.controller; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.zilber.boot.commoncontroller.BaseController; import com.zilber.boot.intelligencesite.entity.IUser; import com.zilber.boot.intelligencesite.entity.IWarn; import com.zilber.boot.intelligencesite.service.IIUserService; @@ -14,6 +15,7 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.util.Date; import java.util.List; /** @@ -27,7 +29,7 @@ import java.util.List; @RestController @RequestMapping("/iwarn") @Api(tags = "预警") -public class IWarnController { +public class IWarnController extends BaseController { @Resource private IIWarnService iiWarnService; @@ -57,6 +59,8 @@ public class IWarnController { @PostMapping("/add") @ApiOperation("增加") public AjaxResult add(@RequestBody IWarn iWarn) { + iWarn.setCreateTime(new Date()); + iWarn.setCreator(getUsername()); return AjaxResult.success(iiWarnService.save(iWarn)); } diff --git a/src/main/java/com/zilber/boot/intelligencesite/entity/IConstructionReport.java b/src/main/java/com/zilber/boot/intelligencesite/entity/IConstructionReport.java index 2d15f63..7c79245 100644 --- a/src/main/java/com/zilber/boot/intelligencesite/entity/IConstructionReport.java +++ b/src/main/java/com/zilber/boot/intelligencesite/entity/IConstructionReport.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import java.time.LocalDateTime; import java.io.Serializable; +import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; @@ -37,7 +38,7 @@ public class IConstructionReport implements Serializable { @ApiModelProperty(value = "报告日期") @DateTimeFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDateTime date; + private Date date; @ApiModelProperty(value = "报告周期") private String cycle; @@ -64,12 +65,12 @@ public class IConstructionReport implements Serializable { private String qs; @ApiModelProperty(value = "建议") - private String advise; + private String advises; @ApiModelProperty(value = "创建时间") @DateTimeFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDateTime createTime; + private Date createTime; @ApiModelProperty(value = "创建人") private String creator; diff --git a/src/main/java/com/zilber/boot/intelligencesite/entity/IEngineerLog.java b/src/main/java/com/zilber/boot/intelligencesite/entity/IEngineerLog.java index 6a882f4..b1333a7 100644 --- a/src/main/java/com/zilber/boot/intelligencesite/entity/IEngineerLog.java +++ b/src/main/java/com/zilber/boot/intelligencesite/entity/IEngineerLog.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import java.time.LocalDateTime; import java.io.Serializable; +import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; @@ -37,7 +38,7 @@ public class IEngineerLog implements Serializable { @ApiModelProperty(value = "日期") @DateTimeFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDateTime date; + private Date date; @ApiModelProperty(value = "天气") private String weather; @@ -66,7 +67,7 @@ public class IEngineerLog implements Serializable { @ApiModelProperty(value = "创建时间") @DateTimeFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDateTime createTime; + private Date createTime; @ApiModelProperty(value = "创建人") private String creator; diff --git a/src/main/java/com/zilber/boot/intelligencesite/entity/IManpower.java b/src/main/java/com/zilber/boot/intelligencesite/entity/IManpower.java index c3ec382..3ceb45f 100644 --- a/src/main/java/com/zilber/boot/intelligencesite/entity/IManpower.java +++ b/src/main/java/com/zilber/boot/intelligencesite/entity/IManpower.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import java.time.LocalDateTime; import java.io.Serializable; +import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; @@ -53,12 +54,12 @@ public class IManpower implements Serializable { @ApiModelProperty(value = "预计离场时间") @DateTimeFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDateTime leaveTime; + private Date leaveTime; @ApiModelProperty(value = "创建时间") @DateTimeFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDateTime createTime; + private Date createTime; @ApiModelProperty(value = "创建人") private String creator; diff --git a/src/main/java/com/zilber/boot/intelligencesite/entity/IMaterials.java b/src/main/java/com/zilber/boot/intelligencesite/entity/IMaterials.java index 2c1d6cb..1ae1343 100644 --- a/src/main/java/com/zilber/boot/intelligencesite/entity/IMaterials.java +++ b/src/main/java/com/zilber/boot/intelligencesite/entity/IMaterials.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import java.time.LocalDateTime; import java.io.Serializable; +import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; @@ -58,17 +59,17 @@ public class IMaterials implements Serializable { @ApiModelProperty(value = "采购时间") @DateTimeFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDateTime purchaseTime; + private Date purchaseTime; @ApiModelProperty(value = "预计使用时间") @DateTimeFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDateTime planUseTime; + private Date planUseTime; @ApiModelProperty(value = "创建时间") @DateTimeFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDateTime createTime; + private Date createTime; @ApiModelProperty(value = "创建人") private String creator; diff --git a/src/main/java/com/zilber/boot/intelligencesite/entity/IProductionPlan.java b/src/main/java/com/zilber/boot/intelligencesite/entity/IProductionPlan.java index 42abb85..0216e64 100644 --- a/src/main/java/com/zilber/boot/intelligencesite/entity/IProductionPlan.java +++ b/src/main/java/com/zilber/boot/intelligencesite/entity/IProductionPlan.java @@ -68,7 +68,7 @@ public class IProductionPlan implements Serializable { @ApiModelProperty(value = "关键节点时间") @DateTimeFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDateTime keystageTime; + private Date keystageTime; @ApiModelProperty(value = "计划负责人") private String principal; diff --git a/src/main/java/com/zilber/boot/intelligencesite/entity/IProgress.java b/src/main/java/com/zilber/boot/intelligencesite/entity/IProgress.java index 32938b3..e1d8989 100644 --- a/src/main/java/com/zilber/boot/intelligencesite/entity/IProgress.java +++ b/src/main/java/com/zilber/boot/intelligencesite/entity/IProgress.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import java.time.LocalDateTime; import java.io.Serializable; +import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; @@ -49,7 +50,7 @@ public class IProgress implements Serializable { @ApiModelProperty(value = "创建时间") @DateTimeFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDateTime createTime; + private Date createTime; @ApiModelProperty(value = "创建人") private String creator; diff --git a/src/main/java/com/zilber/boot/intelligencesite/entity/IResourceSchedule.java b/src/main/java/com/zilber/boot/intelligencesite/entity/IResourceSchedule.java index 88f5294..fcab612 100644 --- a/src/main/java/com/zilber/boot/intelligencesite/entity/IResourceSchedule.java +++ b/src/main/java/com/zilber/boot/intelligencesite/entity/IResourceSchedule.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import java.time.LocalDateTime; import java.io.Serializable; +import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; @@ -43,17 +44,17 @@ public class IResourceSchedule implements Serializable { @ApiModelProperty(value = "计划开始时间") @DateTimeFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDateTime startTime; + private Date startTime; @ApiModelProperty(value = "计划结束时间") @DateTimeFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDateTime endTime; + private Date endTime; @ApiModelProperty(value = "创建时间") @DateTimeFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDateTime createTime; + private Date createTime; @ApiModelProperty(value = "创建人") private String creator; @@ -62,7 +63,7 @@ public class IResourceSchedule implements Serializable { private Integer currentProgress; @ApiModelProperty(value = "建议") - private String advise; + private String advises; } diff --git a/src/main/java/com/zilber/boot/intelligencesite/entity/ISafe.java b/src/main/java/com/zilber/boot/intelligencesite/entity/ISafe.java index e7def42..f7ca4f4 100644 --- a/src/main/java/com/zilber/boot/intelligencesite/entity/ISafe.java +++ b/src/main/java/com/zilber/boot/intelligencesite/entity/ISafe.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.TableId; import java.io.Serializable; +import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; @@ -40,12 +41,12 @@ public class ISafe implements Serializable { @ApiModelProperty(value = "进项安全教育啥时间") @DateTimeFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDateTime date; + private Date date; @ApiModelProperty(value = "创建时间") @DateTimeFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDateTime createTime; + private Date createTime; @ApiModelProperty(value = "创建人") private String creator; diff --git a/src/main/java/com/zilber/boot/intelligencesite/entity/IUser.java b/src/main/java/com/zilber/boot/intelligencesite/entity/IUser.java index 5e41f41..abba4f6 100644 --- a/src/main/java/com/zilber/boot/intelligencesite/entity/IUser.java +++ b/src/main/java/com/zilber/boot/intelligencesite/entity/IUser.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import java.time.LocalDateTime; import java.io.Serializable; +import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; @@ -49,7 +50,7 @@ public class IUser implements Serializable { @ApiModelProperty(value = "创建时间") @DateTimeFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDateTime createTime; + private Date createTime; @ApiModelProperty(value = "创建人") private String creator; diff --git a/src/main/java/com/zilber/boot/intelligencesite/entity/IWarn.java b/src/main/java/com/zilber/boot/intelligencesite/entity/IWarn.java index a9fe2f5..7ed432e 100644 --- a/src/main/java/com/zilber/boot/intelligencesite/entity/IWarn.java +++ b/src/main/java/com/zilber/boot/intelligencesite/entity/IWarn.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import java.time.LocalDateTime; import java.io.Serializable; +import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; @@ -52,7 +53,7 @@ public class IWarn implements Serializable { @ApiModelProperty(value = "创建时间") @DateTimeFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDateTime createTime; + private Date createTime; @ApiModelProperty(value = "创建人") private String creator; diff --git a/src/main/resources/mappers/IConstructionReportMapper.xml b/src/main/resources/mappers/IConstructionReportMapper.xml index 36f55d1..ca355c8 100644 --- a/src/main/resources/mappers/IConstructionReportMapper.xml +++ b/src/main/resources/mappers/IConstructionReportMapper.xml @@ -15,14 +15,14 @@ - + select -id, date, cycle, plan_id, plan_name, total_progress, manpower, materials_use, equipment_operation, qs, advise, create_time, creator from i_construction_report +id, date, cycle, plan_id, plan_name, total_progress, manpower, materials_use, equipment_operation, qs, advises, create_time, creator from i_construction_report @@ -30,21 +30,19 @@ id, date, cycle, plan_id, plan_name, total_progress, manpower, materials_use, eq and date=#{date} - and cycle=#{cycle} + and cycle like concat('%', #{cycle}, '%') and plan_id=#{planId} - and plan_name=#{planName} - and total_progress=#{totalProgress} - and manpower=#{manpower} - and materials_use=#{materialsUse} - and equipment_operation=#{equipmentOperation} - and qs=#{qs} - and advise=#{advise} + and plan_name like concat('%', #{planName}, '%') + and total_progress like concat('%', #{totalProgress}, '%') + and manpower like concat('%', #{manpower}, '%') + and materials_use like concat('%', #{materialsUse}, '%') + and equipment_operation like concat('%', #{equipmentOperation}, '%') + and qs like concat('%', #{qs}, '%') + and advises like concat('%', #{advises}, '%') and create_time=#{createTime} - and creator=#{creator} + and creator like concat('%', #{creator}, '%') + order by create_time desc - - - diff --git a/src/main/resources/mappers/IEngineerLogMapper.xml b/src/main/resources/mappers/IEngineerLogMapper.xml index baf0ae6..01c7c4b 100644 --- a/src/main/resources/mappers/IEngineerLogMapper.xml +++ b/src/main/resources/mappers/IEngineerLogMapper.xml @@ -31,16 +31,17 @@ principal_tel, construction_situation, other_business, create_time, creator and date=#{date} - and weather=#{weather} + and weather like concat('%', #{weather}, '%') and temperature=#{temperature} - and wind=#{wind} - and principal_name=#{principalName} - and principal_tel=#{principalTel} - and construction_situation=#{constructionSituation} - and other_business=#{otherBusiness} + and wind like concat('%', #{wind}, '%') + and principal_name like concat('%', #{principalName}, '%') + and principal_tel like concat('%', #{principalTel}, '%') + and construction_situation like concat('%', #{constructionSituation}, '%') + and other_business like concat('%', #{otherBusiness}, '%') and create_time=#{createTime} - and creator=#{creator} + and creator like concat('%', #{creator}, '%') + order by create_time desc diff --git a/src/main/resources/mappers/IManpowerMapper.xml b/src/main/resources/mappers/IManpowerMapper.xml index b40628b..676b7a4 100644 --- a/src/main/resources/mappers/IManpowerMapper.xml +++ b/src/main/resources/mappers/IManpowerMapper.xml @@ -24,30 +24,20 @@ id, name, work_type, quantity, plan_devote_time, actual_devote_time, leave_time, create_time, creator from i_manpower - - - - - diff --git a/src/main/resources/mappers/IMaterialsMapper.xml b/src/main/resources/mappers/IMaterialsMapper.xml index a30b91b..b484c84 100644 --- a/src/main/resources/mappers/IMaterialsMapper.xml +++ b/src/main/resources/mappers/IMaterialsMapper.xml @@ -28,18 +28,19 @@ id, name, specification, unit, plan_need, actual_in, surplus, supplier_name, pur diff --git a/src/main/resources/mappers/IProductionPlanMapper.xml b/src/main/resources/mappers/IProductionPlanMapper.xml index 6dc8f61..0f39fb8 100644 --- a/src/main/resources/mappers/IProductionPlanMapper.xml +++ b/src/main/resources/mappers/IProductionPlanMapper.xml @@ -28,20 +28,18 @@ id, plan_name, project_stage, description, start_time, end_time, create_time, cr - - - diff --git a/src/main/resources/mappers/IProgressMapper.xml b/src/main/resources/mappers/IProgressMapper.xml index 94de22b..4299271 100644 --- a/src/main/resources/mappers/IProgressMapper.xml +++ b/src/main/resources/mappers/IProgressMapper.xml @@ -19,25 +19,17 @@ id, plan_id, plan_name, day_progress, accumulative_progress, create_time, creator from i_progress - - - - - - diff --git a/src/main/resources/mappers/IResourceScheduleMapper.xml b/src/main/resources/mappers/IResourceScheduleMapper.xml index a78d37e..e32aa7d 100644 --- a/src/main/resources/mappers/IResourceScheduleMapper.xml +++ b/src/main/resources/mappers/IResourceScheduleMapper.xml @@ -13,28 +13,27 @@ - + select -id, plan_id, plan_name, start_time, end_time, create_time, creator, current_progress, advise from i_resource_schedule +id, plan_id, plan_name, start_time, end_time, create_time, creator, current_progress, advises from i_resource_schedule - - diff --git a/src/main/resources/mappers/ISafeMapper.xml b/src/main/resources/mappers/ISafeMapper.xml index 3875dd5..f3e08d3 100644 --- a/src/main/resources/mappers/ISafeMapper.xml +++ b/src/main/resources/mappers/ISafeMapper.xml @@ -21,13 +21,12 @@ id, name, date, create_time, creator from i_safe - - diff --git a/src/main/resources/mappers/IUserMapper.xml b/src/main/resources/mappers/IUserMapper.xml index 8353d5e..d732d2e 100644 --- a/src/main/resources/mappers/IUserMapper.xml +++ b/src/main/resources/mappers/IUserMapper.xml @@ -23,13 +23,14 @@ id, name, tel, id_card, work_type, create_time, creator from i_user diff --git a/src/main/resources/mappers/IWarnMapper.xml b/src/main/resources/mappers/IWarnMapper.xml index 510cd0c..b55650a 100644 --- a/src/main/resources/mappers/IWarnMapper.xml +++ b/src/main/resources/mappers/IWarnMapper.xml @@ -25,15 +25,14 @@ id, plan_id, plan_name, deviation_type, deviation_days, warn_info, create_time, and plan_id=#{planId} - and plan_name=#{planName} - and deviation_type=#{deviationType} - and deviation_days=#{deviationDays} - and warn_info=#{warnInfo} + and plan_name like concat('%', #{planName}, '%') + and deviation_type like concat('%', #{deviationType}, '%') + and deviation_days like concat('%', #{deviationDays}, '%') + and warn_info like concat('%', #{warnInfo}, '%') and create_time=#{createTime} - and creator=#{creator} + and creator like concat('%', #{creator}, '%') + order by create_time desc - - From 292b7097e838a34c157c4ff32a61add68bdabd96 Mon Sep 17 00:00:00 2001 From: liuao <1150003126@qq.com> Date: Mon, 12 May 2025 09:28:49 +0800 Subject: [PATCH 2/2] =?UTF-8?q?2025=E5=B9=B45=E6=9C=8812=E6=97=A509:28:42?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../boot/intelligencesite/entity/IConstructionReport.java | 2 +- src/main/resources/mappers/IConstructionReportMapper.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/zilber/boot/intelligencesite/entity/IConstructionReport.java b/src/main/java/com/zilber/boot/intelligencesite/entity/IConstructionReport.java index 7c79245..6ab0bf3 100644 --- a/src/main/java/com/zilber/boot/intelligencesite/entity/IConstructionReport.java +++ b/src/main/java/com/zilber/boot/intelligencesite/entity/IConstructionReport.java @@ -44,7 +44,7 @@ public class IConstructionReport implements Serializable { private String cycle; @ApiModelProperty(value = "计划id") - private Long planId; + private String planId; @ApiModelProperty(value = "计划名称") private String planName; diff --git a/src/main/resources/mappers/IConstructionReportMapper.xml b/src/main/resources/mappers/IConstructionReportMapper.xml index ca355c8..35e195c 100644 --- a/src/main/resources/mappers/IConstructionReportMapper.xml +++ b/src/main/resources/mappers/IConstructionReportMapper.xml @@ -8,7 +8,7 @@ - + @@ -31,7 +31,7 @@ id, date, cycle, plan_id, plan_name, total_progress, manpower, materials_use, eq and date=#{date} and cycle like concat('%', #{cycle}, '%') - and plan_id=#{planId} + and plan_id=#{planId} and plan_name like concat('%', #{planName}, '%') and total_progress like concat('%', #{totalProgress}, '%') and manpower like concat('%', #{manpower}, '%')