From e62220744c66d842110cb9a80f34bb9c05cede2c Mon Sep 17 00:00:00 2001 From: haha Date: Tue, 16 Apr 2024 00:22:29 +0800 Subject: [PATCH] update code --- .../src/main/resources/application-druid.yml | 5 +- .../mapper/system/SysOperLogMapper.xml | 9 + .../project/surProjectSchedule/index.vue | 333 ++++-------------- .../controller/ProjectScheduleController.java | 53 +++ .../jh/project/domain/SurProjectSchedule.java | 29 ++ .../impl/SurProjectScheduleServiceImpl.java | 3 + .../service/impl/SurProjectServiceImpl.java | 2 + .../project/SurProjectScheduleMapper.xml | 11 +- .../trouble/SmzSspProblemmodifyMapper.xml | 6 +- 9 files changed, 173 insertions(+), 278 deletions(-) diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index 96aa2a2e..bc755ef7 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -49,9 +49,12 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://cd-cynosdbmysql-grp-9rqrhxsm.sql.tencentcdb.com:27981/yanzhu_jh_test?useSSL=false&characterEncoding=UTF-8&serverTimezone=GMT%2B8 + url: jdbc:mysql://cd-cynosdbmysql-grp-9rqrhxsm.sql.tencentcdb.com:27981/yanzhu_jh_test_2024?useSSL=false&characterEncoding=UTF-8&serverTimezone=GMT%2B8 username: root password: Sxyanzhu@cf + #url: jdbc:mysql://192.168.126.19:3306/yanzhu_jh?useSSL=false&characterEncoding=UTF-8&serverTimezone=GMT%2B8 + #username: root + #password: hadoopspring123 # 从库数据源 slave: # 从数据源开关/默认关闭 diff --git a/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml index 96bc6218..6f13ab17 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml @@ -40,6 +40,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND title like concat('%', #{title}, '%') + + AND oper_url like concat('%', #{operUrl}, '%') + + + AND oper_param like concat('%', #{operParam}, '%') + + + AND request_method like concat('%', #{requestMethod}, '%') + AND business_type = #{businessType} diff --git a/ruoyi-ui/src/views/project/surProjectSchedule/index.vue b/ruoyi-ui/src/views/project/surProjectSchedule/index.vue index 178d5825..94ac9198 100644 --- a/ruoyi-ui/src/views/project/surProjectSchedule/index.vue +++ b/ruoyi-ui/src/views/project/surProjectSchedule/index.vue @@ -2,331 +2,124 @@
- + - + - - - + + + - + - 搜索 - 重置 + 搜索 + 重置 - 新增 + 新增 - 修改 + 修改 - 删除 + 删除 - 导出 + 导出 - + - + - + - - - - - - - - - + + + + + + + + + + - + - + - + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + @@ -530,7 +323,7 @@ export default { this.getList(); this.$modal.msgSuccess("删除成功"); }) - .catch(() => {}); + .catch(() => { }); }, /** 导出按钮操作 */ handleExport() { diff --git a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectScheduleController.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectScheduleController.java index 45d83096..18e7a368 100644 --- a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectScheduleController.java +++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectScheduleController.java @@ -1,5 +1,6 @@ package com.yanzhu.jh.bigscreen.web.controller; +import cn.hutool.core.util.StrUtil; import com.ruoyi.common.constant.Constants; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; @@ -7,6 +8,8 @@ import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.sign.Md5Utils; +import com.ruoyi.system.domain.SysOperLog; +import com.ruoyi.system.service.ISysOperLogService; import com.yanzhu.jh.project.domain.SurProjectSchedule; import com.yanzhu.jh.project.domain.vo.SurProjectScheduleWhere; import com.yanzhu.jh.project.service.ISurProjectScheduleService; @@ -28,6 +31,9 @@ public class ProjectScheduleController extends BaseController { @Autowired private ISurProjectScheduleService isurProjectScheduleService; + @Autowired + ISysOperLogService logService; + @GetMapping("/projectConstructionProgress") public AjaxResult getProjectConstructionProgress(Long projectId){ SurProjectSchedule surProjectSchedule= isurProjectScheduleService.getProjectConstructionProgress(projectId); @@ -71,4 +77,51 @@ public class ProjectScheduleController extends BaseController { redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); return AjaxResult.success(list); } + +/* + @GetMapping("/up") + public AjaxResult upData(){ + SysOperLog where=new SysOperLog(); + where.setOperUrl("schedule"); + where.setRequestMethod("POST"); + where.setOperParam("acceptance"); + List list=logService.selectOperLogList(where); + SurProjectSchedule schWhere=new SurProjectSchedule(); + List slist=isurProjectScheduleService.selectSurProjectScheduleList(schWhere); + for(int i=0;i list) { + String findStr=it.getImage(); + if(StrUtil.isEmpty(findStr)){ + findStr=it.getPlannedNode(); + if(StrUtil.isEmpty(findStr) || findStr.length()<10){ + findStr=it.getDesignProgress(); + if(StrUtil.isEmpty(findStr) || findStr.length()<10){ + findStr=it.getExistingProblem(); + } + } + } + if(StrUtil.isEmpty(findStr)){ + return null; + } + for(SysOperLog log :list){ + + if(log.getOperParam().contains(findStr)){ + return log.getOperName(); + } + + } + return null; + } +*/ } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectSchedule.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectSchedule.java index cb675768..d8006f00 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectSchedule.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectSchedule.java @@ -1,10 +1,13 @@ package com.yanzhu.jh.project.domain; +import com.fasterxml.jackson.annotation.JsonFormat; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; +import java.util.Date; + /** * 形象进度对象 sur_project_schedule * @@ -18,6 +21,26 @@ public class SurProjectSchedule extends BaseEntity /** 编号 */ private Long id; + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + + + public Date getCreateDate() { + return createDate; + } + + public void setCreateDate(Date createDate) { + this.createDate = createDate; + } + + + /** 项目主键 */ @Excel(name = "项目主键") private Long projectId; @@ -80,6 +103,12 @@ public class SurProjectSchedule extends BaseEntity @Excel(name = "数据状态") private Long isDel; + @Excel(name = "提交人") + private String createUser; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "提交时间",dateFormat = "YYYY-MM-dd HH:mm:ss") + private Date createDate; private String mainImage; private SurProject surProject; diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectScheduleServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectScheduleServiceImpl.java index b2f01b84..dd442b61 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectScheduleServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectScheduleServiceImpl.java @@ -2,6 +2,7 @@ package com.yanzhu.jh.project.service.impl; import java.util.List; import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.StringUtils; import com.yanzhu.jh.project.domain.SurProject; import com.yanzhu.jh.project.domain.vo.SurProjectScheduleWhere; @@ -71,6 +72,7 @@ public class SurProjectScheduleServiceImpl implements ISurProjectScheduleService SurProject surProject = surProjectMapper.selectSurProjectById(surProjectSchedule.getProjectId()); surProjectSchedule.setDataTemplate(surProject.getProjectType()); } + surProjectSchedule.setCreateBy(SecurityUtils.getUsername()); surProjectSchedule.setCreateTime(DateUtils.getNowDate()); surProjectSchedule.setIsDel(0l); return surProjectScheduleMapper.insertSurProjectSchedule(surProjectSchedule); @@ -86,6 +88,7 @@ public class SurProjectScheduleServiceImpl implements ISurProjectScheduleService public int updateSurProjectSchedule(SurProjectSchedule surProjectSchedule) { surProjectSchedule.setUpdateTime(DateUtils.getNowDate()); + surProjectSchedule.setUpdateBy(SecurityUtils.getUsername()); return surProjectScheduleMapper.updateSurProjectSchedule(surProjectSchedule); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectServiceImpl.java index 304156b8..121781e8 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectServiceImpl.java @@ -3,6 +3,7 @@ package com.yanzhu.jh.project.service.impl; import java.util.List; import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.yanzhu.jh.project.mapper.SurProjectMapper; @@ -69,6 +70,7 @@ public class SurProjectServiceImpl implements ISurProjectService public int updateSurProject(SurProject surProject) { surProject.setUpdateTime(DateUtils.getNowDate()); + surProject.setUpdateBy(SecurityUtils.getUsername()); return surProjectMapper.updateSurProject(surProject); } diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectScheduleMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectScheduleMapper.xml index dd0a828a..34152892 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectScheduleMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectScheduleMapper.xml @@ -27,6 +27,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -36,14 +38,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT * from ( - SELECT s.*,p.projectType,p.projectName - FROM sur_project_schedule AS s LEFT JOIN sur_project AS p ON s.project_id=p.id ) as a + SELECT s.*,p.projectType,p.projectName,u.nick_name createUser,s.create_time createDate + FROM sur_project_schedule AS s LEFT JOIN sur_project AS p ON s.project_id=p.id left join sys_user u on s.create_by=u.phonenumber ) as a +