From b5c2c4808683635edc2532227862a13176a05a48 Mon Sep 17 00:00:00 2001 From: songhuangfeng123 <shf18767906695@163.com> Date: 星期二, 09 八月 2022 11:08:52 +0800 Subject: [PATCH] 删除不要的文件 --- /dev/null | 111 ------------------------------------------------------- 1 files changed, 0 insertions(+), 111 deletions(-) diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/config/MetaHandler.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/config/MetaHandler.java deleted file mode 100644 index 4628b06..0000000 --- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/config/MetaHandler.java +++ /dev/null @@ -1,83 +0,0 @@ -/** - * Copyright (C) 2018-2022 - * All rights reserved, Designed By www.yixiang.co - * 注意: - * 本软件为www.yixiang.co开发研制 - */ -package com.gkhy.safePlatform.equipment.config; - -/** - * @date :Created in 2020-04-10 15:47 - * @description:自动注入时间处理 - * @modified By: - * @version: - */ - -import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; -import org.apache.ibatis.reflection.MetaObject; - -import java.sql.Timestamp; - -/** - * 处理新增和更新的基础数据填充,配合BaseEntity和MyBatisPlusConfig使用 - */ -//@Component -public class MetaHandler implements MetaObjectHandler { - - - /** - * 新增数据执行 - * - * @param metaObject - */ - @Override - public void insertFill(MetaObject metaObject) { - try { - Timestamp time = new Timestamp(System.currentTimeMillis()); - if (metaObject.hasSetter("createTime")) { - this.setFieldValByName("createTime", time, metaObject); - } - if (metaObject.hasSetter("updateTime")) { - this.setFieldValByName("updateTime", time, metaObject); - } - if (metaObject.hasSetter("createDate")) { - this.setFieldValByName("createDate", time, metaObject); - } - if (metaObject.hasSetter("updateDate")) { - this.setFieldValByName("updateDate", time, metaObject); - } - if (metaObject.hasSetter("delFlag")) { - this.setFieldValByName("delFlag", false, metaObject); - } - } catch (Exception e) { - System.out.println("自动注入失败:"+e.getMessage()); - } - } - - /** - * 更新数据执行 - * - * @param metaObject - */ - @Override - public void updateFill(MetaObject metaObject) { - try { - Timestamp time = new Timestamp(System.currentTimeMillis()); - if (metaObject.hasSetter("updateTime")) { - this.setFieldValByName("updateTime", time, metaObject); - } - if (metaObject.hasSetter("updateDate")) { - this.setFieldValByName("updateDate", time, metaObject); - } - if (metaObject.hasSetter("delFlag")) { - this.setFieldValByName("delFlag", null, metaObject); - } - if (metaObject.hasSetter("createTime")) { - this.setFieldValByName("createTime", null, metaObject); - } - } catch (Exception e) { - System.out.println("自动注入失败:"+e.getMessage()); - } - } - -} diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/config/PublicFileUrlConfig.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/config/PublicFileUrlConfig.java deleted file mode 100644 index 5365aaa..0000000 --- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/config/PublicFileUrlConfig.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.gkhy.safePlatform.equipment.config; - -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.context.annotation.Configuration; - -/** - * 公共文件的配置 - */ - -@Configuration -@ConfigurationProperties(prefix = "public-file") -public class PublicFileUrlConfig { - - /** - * 上传的地址 - */ - private static String uploadUrl; - - public void setUploadUrl(String uploadUrl) { - PublicFileUrlConfig.uploadUrl = uploadUrl; - } - - public static String getUploadUrl() { - return uploadUrl; - } - - /** - * 资源的域名 - */ - private static String domain; - - public void setDomain(String domain) { - PublicFileUrlConfig.domain = domain; - } - - public static String getDomain() { - return domain; - } -} diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/config/MetaHandler.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/config/MetaHandler.java deleted file mode 100644 index 2d0174e..0000000 --- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/config/MetaHandler.java +++ /dev/null @@ -1,83 +0,0 @@ -/** - * Copyright (C) 2018-2022 - * All rights reserved, Designed By www.yixiang.co - * 注意: - * 本软件为www.yixiang.co开发研制 - */ -package com.gkhy.safePlatform.targetDuty.config; - -/** - * @date :Created in 2020-04-10 15:47 - * @description:自动注入时间处理 - * @modified By: - * @version: - */ - -import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; -import org.apache.ibatis.reflection.MetaObject; - -import java.sql.Timestamp; - -/** - * 处理新增和更新的基础数据填充,配合BaseEntity和MyBatisPlusConfig使用 - */ -//@Component -public class MetaHandler implements MetaObjectHandler { - - - /** - * 新增数据执行 - * - * @param metaObject - */ - @Override - public void insertFill(MetaObject metaObject) { - try { - Timestamp time = new Timestamp(System.currentTimeMillis()); - if (metaObject.hasSetter("createTime")) { - this.setFieldValByName("createTime", time, metaObject); - } - if (metaObject.hasSetter("updateTime")) { - this.setFieldValByName("updateTime", time, metaObject); - } - if (metaObject.hasSetter("createDate")) { - this.setFieldValByName("createDate", time, metaObject); - } - if (metaObject.hasSetter("updateDate")) { - this.setFieldValByName("updateDate", time, metaObject); - } - if (metaObject.hasSetter("delFlag")) { - this.setFieldValByName("delFlag", false, metaObject); - } - } catch (Exception e) { - System.out.println("自动注入失败:"+e.getMessage()); - } - } - - /** - * 更新数据执行 - * - * @param metaObject - */ - @Override - public void updateFill(MetaObject metaObject) { - try { - Timestamp time = new Timestamp(System.currentTimeMillis()); - if (metaObject.hasSetter("updateTime")) { - this.setFieldValByName("updateTime", time, metaObject); - } - if (metaObject.hasSetter("updateDate")) { - this.setFieldValByName("updateDate", time, metaObject); - } - if (metaObject.hasSetter("delFlag")) { - this.setFieldValByName("delFlag", null, metaObject); - } - if (metaObject.hasSetter("createTime")) { - this.setFieldValByName("createTime", null, metaObject); - } - } catch (Exception e) { - System.out.println("自动注入失败:"+e.getMessage()); - } - } - -} diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/config/PublicFileUrlConfig.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/config/PublicFileUrlConfig.java deleted file mode 100644 index 77d402d..0000000 --- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/config/PublicFileUrlConfig.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.gkhy.safePlatform.targetDuty.config; - -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.context.annotation.Configuration; - -/** - * 公共文件的配置 - */ - -@Configuration("sss") -@ConfigurationProperties(prefix = "public-file") -public class PublicFileUrlConfig { - - /** - * 上传的地址 - */ - private static String uploadUrl; - - public void setUploadUrl(String uploadUrl) { - PublicFileUrlConfig.uploadUrl = uploadUrl; - } - - public static String getUploadUrl() { - return uploadUrl; - } - - /** - * 资源的域名 - */ - private static String domain; - - public void setDomain(String domain) { - PublicFileUrlConfig.domain = domain; - } - - public static String getDomain() { - return domain; - } -} diff --git a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/controller/AccidentWorkApproveController.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/controller/AccidentWorkApproveController.java deleted file mode 100644 index 4d6698a..0000000 --- a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/controller/AccidentWorkApproveController.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.gkhy.safePlatform.incidentManage.controller; - -import com.gkhy.safePlatform.commons.co.ContextCacheUser; -import com.gkhy.safePlatform.commons.query.PageQuery; -import com.gkhy.safePlatform.commons.utils.PageUtils; -import com.gkhy.safePlatform.commons.vo.ResultVO; -import com.gkhy.safePlatform.incidentManage.model.dto.req.AccidentWorkApproveReqDTO; -import com.gkhy.safePlatform.incidentManage.model.dto.resp.AccidentWorkApproveDetailRespDTO; -import com.gkhy.safePlatform.incidentManage.model.dto.resp.AccidentWorkApprovePageRespDTO; -import com.gkhy.safePlatform.incidentManage.query.AccidentWorkApproveQuery; -import com.gkhy.safePlatform.incidentManage.service.AccidentWorkApproveService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.core.Authentication; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -@RestController -@RequestMapping("/accidentWorkApprove") -public class AccidentWorkApproveController { - - @Autowired - private AccidentWorkApproveService workApproveService; - - /** - * 应急预案列表 - */ - @RequestMapping(value = "/page/list" ,method = RequestMethod.POST) - private ResultVO<List<AccidentWorkApprovePageRespDTO>> list (@RequestBody PageQuery<AccidentWorkApproveQuery> pageQuery){ - PageUtils.checkCheck(pageQuery); - return workApproveService.selectWorkApproveList(pageQuery); - } - - /** - * 应急预案新增 - */ - @RequestMapping(value = "/add",method = RequestMethod.POST) - public ResultVO addWorkApprove(Authentication authentication, @RequestBody AccidentWorkApproveReqDTO AccidentWorkApproveReqDTO) { - ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal(); - return workApproveService.addWorkApprove(currentUser.getUid(), AccidentWorkApproveReqDTO); - } - - /** - * 应急预案详情 - */ - @RequestMapping(value = "/info/{id}",method = RequestMethod.GET) - public ResultVO<AccidentWorkApproveDetailRespDTO> getWorkApproveById(@PathVariable("id")Long id){ - return workApproveService.getWorkApproveById(id); - } - - /** - * 应急预案修改 - */ - @RequestMapping(value = "/update",method = RequestMethod.POST) - public ResultVO updateWorkApprove(Authentication authentication, @RequestBody AccidentWorkApproveReqDTO AccidentWorkApproveReqDTO) { - ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal(); - return workApproveService.updateWorkApprove(currentUser.getUid(), AccidentWorkApproveReqDTO); - } - - /** - * 应急预案删除/批量删除 - */ - @RequestMapping(value = "/batchDelete/{ids}",method = RequestMethod.GET) - public ResultVO batchDeleteWorkApprove(@PathVariable("ids")String ids){ - return workApproveService.batchDeleteWorkApprove(ids); - } -} diff --git a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/entity/AccidentWorkApproveInfo.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/entity/AccidentWorkApproveInfo.java deleted file mode 100644 index f4f7752..0000000 --- a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/entity/AccidentWorkApproveInfo.java +++ /dev/null @@ -1,173 +0,0 @@ -package com.gkhy.safePlatform.incidentManage.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; - -import java.util.Date; - -@TableName("work_approve") -public class AccidentWorkApproveInfo { - - @TableId(type = IdType.AUTO) - private Long id; - - private Boolean delFlag; - - private Date gmtCreate; - - private Date gmtModitify; - - private Long createUid; - - private Long updateUid; - - //流程名称 - private String workName; - //流程标题 - private String title; - //提交人ID/外键 - private Long submitPersonId; - //审批人ID/外键 - private Long approvePersonId; - //审批状态 1:未审批 2:审批中 3:审批完成 - private Integer approveStatus; - //审批意见 - private Boolean approveResult; - //审批意见 - private String approveMemo; - //关联业务类型 1:目标检查 2:目标上报 - private Integer relateType; - //关联的审批对象表ID - private Long relateId; - //关联业务说明 - private String relateDesc; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Boolean getDelFlag() { - return delFlag; - } - - public void setDelFlag(Boolean delFlag) { - this.delFlag = delFlag; - } - - public Date getGmtCreate() { - return gmtCreate; - } - - public void setGmtCreate(Date gmtCreate) { - this.gmtCreate = gmtCreate; - } - - public Date getGmtModitify() { - return gmtModitify; - } - - public void setGmtModitify(Date gmtModitify) { - this.gmtModitify = gmtModitify; - } - - public Long getCreateUid() { - return createUid; - } - - public void setCreateUid(Long createUid) { - this.createUid = createUid; - } - - public Long getUpdateUid() { - return updateUid; - } - - public void setUpdateUid(Long updateUid) { - this.updateUid = updateUid; - } - - public String getWorkName() { - return workName; - } - - public void setWorkName(String workName) { - this.workName = workName; - } - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public Long getSubmitPersonId() { - return submitPersonId; - } - - public void setSubmitPersonId(Long submitPersonId) { - this.submitPersonId = submitPersonId; - } - - public Long getApprovePersonId() { - return approvePersonId; - } - - public void setApprovePersonId(Long approvePersonId) { - this.approvePersonId = approvePersonId; - } - - public Integer getApproveStatus() { - return approveStatus; - } - - public void setApproveStatus(Integer approveStatus) { - this.approveStatus = approveStatus; - } - - public Boolean getApproveResult() { - return approveResult; - } - - public void setApproveResult(Boolean approveResult) { - this.approveResult = approveResult; - } - - public String getApproveMemo() { - return approveMemo; - } - - public void setApproveMemo(String approveMemo) { - this.approveMemo = approveMemo; - } - - public Integer getRelateType() { - return relateType; - } - - public void setRelateType(Integer relateType) { - this.relateType = relateType; - } - - public Long getRelateId() { - return relateId; - } - - public void setRelateId(Long relateId) { - this.relateId = relateId; - } - - public String getRelateDesc() { - return relateDesc; - } - - public void setRelateDesc(String relateDesc) { - this.relateDesc = relateDesc; - } -} diff --git a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/entity/AccidentWorkApproveInfoDetailDO.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/entity/AccidentWorkApproveInfoDetailDO.java deleted file mode 100644 index f6a4c3f..0000000 --- a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/entity/AccidentWorkApproveInfoDetailDO.java +++ /dev/null @@ -1,133 +0,0 @@ -package com.gkhy.safePlatform.incidentManage.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; - -import java.util.Date; - -@TableName("work_approve") -public class AccidentWorkApproveInfoDetailDO { - - @TableId(type = IdType.AUTO) - private Long id; - - private Date gmtCreate; - - //流程名称 - private String workName; - //流程标题 - private String title; - //提交人ID/外键 - private Long submitPersonId; - //审批人ID/外键 - private Long approvePersonId; - //审批状态 1:未审批 2:审批中 3:审批完成 - private Integer approveStatus; - //审批意见 - private Boolean approveResult; - //审批意见 - private String approveMemo; - //关联业务类型 1:目标检查 2:目标上报 - private Integer relateType; - //关联的审批对象表ID - private Long relateId; - //关联业务说明 - private String relateDesc; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Date getGmtCreate() { - return gmtCreate; - } - - public void setGmtCreate(Date gmtCreate) { - this.gmtCreate = gmtCreate; - } - - public String getWorkName() { - return workName; - } - - public void setWorkName(String workName) { - this.workName = workName; - } - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public Long getSubmitPersonId() { - return submitPersonId; - } - - public void setSubmitPersonId(Long submitPersonId) { - this.submitPersonId = submitPersonId; - } - - public Long getApprovePersonId() { - return approvePersonId; - } - - public void setApprovePersonId(Long approvePersonId) { - this.approvePersonId = approvePersonId; - } - - public Integer getApproveStatus() { - return approveStatus; - } - - public void setApproveStatus(Integer approveStatus) { - this.approveStatus = approveStatus; - } - - public Boolean getApproveResult() { - return approveResult; - } - - public void setApproveResult(Boolean approveResult) { - this.approveResult = approveResult; - } - - public String getApproveMemo() { - return approveMemo; - } - - public void setApproveMemo(String approveMemo) { - this.approveMemo = approveMemo; - } - - public Integer getRelateType() { - return relateType; - } - - public void setRelateType(Integer relateType) { - this.relateType = relateType; - } - - public Long getRelateId() { - return relateId; - } - - public void setRelateId(Long relateId) { - this.relateId = relateId; - } - - public String getRelateDesc() { - return relateDesc; - } - - public void setRelateDesc(String relateDesc) { - this.relateDesc = relateDesc; - } -} diff --git a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/entity/AccidentWorkApproveInfoPageDO.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/entity/AccidentWorkApproveInfoPageDO.java deleted file mode 100644 index 8d1e60a..0000000 --- a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/entity/AccidentWorkApproveInfoPageDO.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.gkhy.safePlatform.incidentManage.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; - -import java.util.Date; - -@TableName("work_approve") -public class AccidentWorkApproveInfoPageDO { - - @TableId(type = IdType.AUTO) - private Long id; - - private Date gmtCreate; - - //流程名称 - private String workName; - //流程标题 - private String title; - //提交人ID/外键 - private Long submitPersonId; - //审批状态 1:未审批 2:审批中 3:审批完成 - private Integer approveStatus; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Date getGmtCreate() { - return gmtCreate; - } - - public void setGmtCreate(Date gmtCreate) { - this.gmtCreate = gmtCreate; - } - - public String getWorkName() { - return workName; - } - - public void setWorkName(String workName) { - this.workName = workName; - } - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public Long getSubmitPersonId() { - return submitPersonId; - } - - public void setSubmitPersonId(Long submitPersonId) { - this.submitPersonId = submitPersonId; - } - - - public Integer getApproveStatus() { - return approveStatus; - } - - public void setApproveStatus(Integer approveStatus) { - this.approveStatus = approveStatus; - } - -} diff --git a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/enums/ApproveStatus.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/enums/ApproveStatus.java deleted file mode 100644 index 346a08b..0000000 --- a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/enums/ApproveStatus.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.gkhy.safePlatform.incidentManage.enums; - -public enum ApproveStatus { - - NOT_APPROVE(1), - UNDER_APPROVE(2), - COMPLETED_APPROVE(3); - - private Integer status; - - - public Integer getStatus() { - return status; - } - - public void setStatus(Integer status) { - this.status = status; - } - - - ApproveStatus(Integer status) { - this.status = status; - } -} diff --git a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/req/AccidentWorkApproveReqDTO.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/req/AccidentWorkApproveReqDTO.java deleted file mode 100644 index bec284e..0000000 --- a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/req/AccidentWorkApproveReqDTO.java +++ /dev/null @@ -1,116 +0,0 @@ -package com.gkhy.safePlatform.incidentManage.model.dto.req; - -public class AccidentWorkApproveReqDTO { - - private Long id; - - //流程名称 - private String workName; - //流程标题 - private String title; - //提交人ID/外键 - private Long submitPersonId; - //审批人ID/外键 - private Long approvePersonId; - //审批状态 1:未审批 2:审批中 3:审批完成 - private Integer approveStatus; - //审批意见 - private Boolean approveResult; - //审批意见 - private String approveMemo; - //关联业务类型 1:目标检查 2:目标上报 - private Integer relateType; - //关联的审批对象表ID - private Long relateId; - //关联业务说明 - private String relateDesc; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - - public String getWorkName() { - return workName; - } - - public void setWorkName(String workName) { - this.workName = workName; - } - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public Long getSubmitPersonId() { - return submitPersonId; - } - - public void setSubmitPersonId(Long submitPersonId) { - this.submitPersonId = submitPersonId; - } - - public Long getApprovePersonId() { - return approvePersonId; - } - - public void setApprovePersonId(Long approvePersonId) { - this.approvePersonId = approvePersonId; - } - - public Integer getApproveStatus() { - return approveStatus; - } - - public void setApproveStatus(Integer approveStatus) { - this.approveStatus = approveStatus; - } - - public Boolean getApproveResult() { - return approveResult; - } - - public void setApproveResult(Boolean approveResult) { - this.approveResult = approveResult; - } - - public String getApproveMemo() { - return approveMemo; - } - - public void setApproveMemo(String approveMemo) { - this.approveMemo = approveMemo; - } - - public Integer getRelateType() { - return relateType; - } - - public void setRelateType(Integer relateType) { - this.relateType = relateType; - } - - public Long getRelateId() { - return relateId; - } - - public void setRelateId(Long relateId) { - this.relateId = relateId; - } - - public String getRelateDesc() { - return relateDesc; - } - - public void setRelateDesc(String relateDesc) { - this.relateDesc = relateDesc; - } -} diff --git a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/resp/AccidentWorkApproveDetailRespDTO.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/resp/AccidentWorkApproveDetailRespDTO.java deleted file mode 100644 index 7c155f2..0000000 --- a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/resp/AccidentWorkApproveDetailRespDTO.java +++ /dev/null @@ -1,132 +0,0 @@ -package com.gkhy.safePlatform.incidentManage.model.dto.resp; - -import com.fasterxml.jackson.annotation.JsonFormat; - -import java.util.Date; - -public class AccidentWorkApproveDetailRespDTO { - - private Long id; - - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date gmtCreate; - - - //流程名称 - private String workName; - //流程标题 - private String title; - //提交人ID/外键 - private Long submitPersonId; - //审批人ID/外键 - private Long approvePersonId; - //审批状态 1:未审批 2:审批中 3:审批完成 - private Integer approveStatus; - //审批意见 - private Boolean approveResult; - //审批意见 - private String approveMemo; - //关联业务类型 1:目标检查 2:目标上报 - private Integer relateType; - //关联的审批对象表ID - private Long relateId; - //关联业务说明 - private String relateDesc; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - - public String getWorkName() { - return workName; - } - - public void setWorkName(String workName) { - this.workName = workName; - } - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public Long getSubmitPersonId() { - return submitPersonId; - } - - public void setSubmitPersonId(Long submitPersonId) { - this.submitPersonId = submitPersonId; - } - - public Long getApprovePersonId() { - return approvePersonId; - } - - public void setApprovePersonId(Long approvePersonId) { - this.approvePersonId = approvePersonId; - } - - public Integer getApproveStatus() { - return approveStatus; - } - - public void setApproveStatus(Integer approveStatus) { - this.approveStatus = approveStatus; - } - - public Boolean getApproveResult() { - return approveResult; - } - - public void setApproveResult(Boolean approveResult) { - this.approveResult = approveResult; - } - - public String getApproveMemo() { - return approveMemo; - } - - public void setApproveMemo(String approveMemo) { - this.approveMemo = approveMemo; - } - - public Integer getRelateType() { - return relateType; - } - - public void setRelateType(Integer relateType) { - this.relateType = relateType; - } - - public Long getRelateId() { - return relateId; - } - - public void setRelateId(Long relateId) { - this.relateId = relateId; - } - - public String getRelateDesc() { - return relateDesc; - } - - public void setRelateDesc(String relateDesc) { - this.relateDesc = relateDesc; - } - - public Date getGmtCreate() { - return gmtCreate; - } - - public void setGmtCreate(Date gmtCreate) { - this.gmtCreate = gmtCreate; - } -} diff --git a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/resp/AccidentWorkApprovePageRespDTO.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/resp/AccidentWorkApprovePageRespDTO.java deleted file mode 100644 index b94f503..0000000 --- a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/resp/AccidentWorkApprovePageRespDTO.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.gkhy.safePlatform.incidentManage.model.dto.resp; - -import com.fasterxml.jackson.annotation.JsonFormat; - -import java.util.Date; - -public class AccidentWorkApprovePageRespDTO { - - private Long id; - - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date gmtCreate; - - //流程名称 - private String workName; - //流程标题 - private String title; - //提交人ID/外键 - private Long submitPersonId; - //审批状态 1:未审批 2:审批中 3:审批完成 - private Integer approveStatus; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Date getGmtCreate() { - return gmtCreate; - } - - public void setGmtCreate(Date gmtCreate) { - this.gmtCreate = gmtCreate; - } - - public String getWorkName() { - return workName; - } - - public void setWorkName(String workName) { - this.workName = workName; - } - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public Long getSubmitPersonId() { - return submitPersonId; - } - - public void setSubmitPersonId(Long submitPersonId) { - this.submitPersonId = submitPersonId; - } - - - public Integer getApproveStatus() { - return approveStatus; - } - - public void setApproveStatus(Integer approveStatus) { - this.approveStatus = approveStatus; - } -} diff --git a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/query/AccidentWorkApproveQuery.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/query/AccidentWorkApproveQuery.java deleted file mode 100644 index 83ba9e0..0000000 --- a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/query/AccidentWorkApproveQuery.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.gkhy.safePlatform.incidentManage.query; - -import com.fasterxml.jackson.annotation.JsonFormat; - -import java.util.Date; - -public class AccidentWorkApproveQuery { - - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date startTime; - - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date endTime; - - public Date getStartTime() { - return startTime; - } - - public void setStartTime(Date startTime) { - this.startTime = startTime; - } - - public Date getEndTime() { - return endTime; - } - - public void setEndTime(Date endTime) { - this.endTime = endTime; - } -} diff --git a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/query/db/AccidentWorkApproveDBQuery.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/query/db/AccidentWorkApproveDBQuery.java deleted file mode 100644 index 64440d6..0000000 --- a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/query/db/AccidentWorkApproveDBQuery.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.gkhy.safePlatform.incidentManage.query.db; - -import com.fasterxml.jackson.annotation.JsonFormat; - -import java.util.Date; - -public class AccidentWorkApproveDBQuery { - - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date startTime; - - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date endTime; - - public Date getStartTime() { - return startTime; - } - - public void setStartTime(Date startTime) { - this.startTime = startTime; - } - - public Date getEndTime() { - return endTime; - } - - public void setEndTime(Date endTime) { - this.endTime = endTime; - } -} diff --git a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/repository/AccidentWorkApproveInfoRepository.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/repository/AccidentWorkApproveInfoRepository.java deleted file mode 100644 index 965481b..0000000 --- a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/repository/AccidentWorkApproveInfoRepository.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.gkhy.safePlatform.incidentManage.repository; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.gkhy.safePlatform.incidentManage.entity.AccidentWorkApproveInfo; -import com.gkhy.safePlatform.incidentManage.entity.AccidentWorkApproveInfoDetailDO; -import com.gkhy.safePlatform.incidentManage.entity.AccidentWorkApproveInfoPageDO; -import com.gkhy.safePlatform.incidentManage.query.db.AccidentWorkApproveDBQuery; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - -import java.util.List; - -@Repository -public interface AccidentWorkApproveInfoRepository extends BaseMapper<AccidentWorkApproveInfo> { - - List<AccidentWorkApproveInfoPageDO> selectWorkApproveList(Page<AccidentWorkApproveInfoPageDO> page, @Param("query") AccidentWorkApproveDBQuery AccidentWorkApproveDBQuery); - - void addWorkApprove(AccidentWorkApproveInfo AccidentWorkApproveInfo); - - AccidentWorkApproveInfoDetailDO selectWorkApproveById(@Param("id") Long id); - - void updateWorkApprove(AccidentWorkApproveInfo AccidentWorkApproveInfo); - - void deleteWorkApproveById(@Param("id") Long id); - -} diff --git a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/AccidentWorkApproveService.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/AccidentWorkApproveService.java deleted file mode 100644 index 6e10ac8..0000000 --- a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/AccidentWorkApproveService.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.gkhy.safePlatform.incidentManage.service; - -import com.gkhy.safePlatform.commons.query.PageQuery; -import com.gkhy.safePlatform.commons.vo.ResultVO; -import com.gkhy.safePlatform.commons.vo.SearchResultVO; -import com.gkhy.safePlatform.incidentManage.model.dto.req.AccidentWorkApproveReqDTO; -import com.gkhy.safePlatform.incidentManage.model.dto.resp.AccidentWorkApproveDetailRespDTO; -import com.gkhy.safePlatform.incidentManage.model.dto.resp.AccidentWorkApprovePageRespDTO; -import com.gkhy.safePlatform.incidentManage.query.AccidentWorkApproveQuery; - -import java.util.List; - -public interface AccidentWorkApproveService { - - SearchResultVO<List<AccidentWorkApprovePageRespDTO>> selectWorkApproveList(PageQuery<AccidentWorkApproveQuery> query); - - ResultVO addWorkApprove(Long valueOf, AccidentWorkApproveReqDTO AccidentWorkApproveReqDTO); - - ResultVO<AccidentWorkApproveDetailRespDTO> getWorkApproveById(Long id); - - ResultVO updateWorkApprove(Long uid, AccidentWorkApproveReqDTO AccidentWorkApproveReqDTO); - - ResultVO batchDeleteWorkApprove(String ids); - -} diff --git a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/baseService/AccidentWorkApproveInfoService.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/baseService/AccidentWorkApproveInfoService.java deleted file mode 100644 index fb8a35e..0000000 --- a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/baseService/AccidentWorkApproveInfoService.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.gkhy.safePlatform.incidentManage.service.baseService; - -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.IService; -import com.gkhy.safePlatform.incidentManage.entity.AccidentWorkApproveInfo; -import com.gkhy.safePlatform.incidentManage.entity.AccidentWorkApproveInfoDetailDO; -import com.gkhy.safePlatform.incidentManage.entity.AccidentWorkApproveInfoPageDO; -import com.gkhy.safePlatform.incidentManage.query.db.AccidentWorkApproveDBQuery; - -import java.util.List; - - -public interface AccidentWorkApproveInfoService extends IService<AccidentWorkApproveInfo> { - - List<AccidentWorkApproveInfoPageDO> selectWorkApproveList(Page<AccidentWorkApproveInfoPageDO> page, AccidentWorkApproveDBQuery AccidentWorkApproveDBQuery); - - void addWorkApprove(AccidentWorkApproveInfo AccidentWorkApproveInfo); - - AccidentWorkApproveInfoDetailDO selectWorkApproveById(Long id); - - void updateWorkApprove(AccidentWorkApproveInfo AccidentWorkApproveInfo); - - void deleteWorkApproveById(Long teamId); -} diff --git a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/baseService/impl/AccidentWorkApproveServiceImpl.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/baseService/impl/AccidentWorkApproveServiceImpl.java deleted file mode 100644 index b63645d..0000000 --- a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/baseService/impl/AccidentWorkApproveServiceImpl.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.gkhy.safePlatform.incidentManage.service.baseService.impl; - -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gkhy.safePlatform.incidentManage.entity.AccidentWorkApproveInfo; -import com.gkhy.safePlatform.incidentManage.entity.AccidentWorkApproveInfoDetailDO; -import com.gkhy.safePlatform.incidentManage.entity.AccidentWorkApproveInfoPageDO; -import com.gkhy.safePlatform.incidentManage.query.db.AccidentWorkApproveDBQuery; -import com.gkhy.safePlatform.incidentManage.repository.AccidentWorkApproveInfoRepository; -import com.gkhy.safePlatform.incidentManage.service.baseService.AccidentWorkApproveInfoService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -@Service("AccidentWorkApproveInfoService") -public class AccidentWorkApproveServiceImpl extends ServiceImpl<AccidentWorkApproveInfoRepository, AccidentWorkApproveInfo> implements AccidentWorkApproveInfoService { - - @Autowired - private AccidentWorkApproveInfoRepository AccidentWorkApproveInfoRepository; - - @Override - public List<AccidentWorkApproveInfoPageDO> selectWorkApproveList(Page<AccidentWorkApproveInfoPageDO> page, AccidentWorkApproveDBQuery AccidentWorkApproveDBQuery) { - return AccidentWorkApproveInfoRepository.selectWorkApproveList(page, AccidentWorkApproveDBQuery); - } - - @Override - public void addWorkApprove(AccidentWorkApproveInfo AccidentWorkApproveInfo) { - AccidentWorkApproveInfoRepository.addWorkApprove(AccidentWorkApproveInfo); - } - - @Override - public AccidentWorkApproveInfoDetailDO selectWorkApproveById(Long id) { - return AccidentWorkApproveInfoRepository.selectWorkApproveById(id); - } - - @Override - public void updateWorkApprove(AccidentWorkApproveInfo AccidentWorkApproveInfo) { - AccidentWorkApproveInfoRepository.updateWorkApprove(AccidentWorkApproveInfo); - } - - @Override - public void deleteWorkApproveById(Long teamId) { - AccidentWorkApproveInfoRepository.deleteWorkApproveById(teamId); - } - - -} diff --git a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/impl/AccidentWorkApproveServiceImpl.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/impl/AccidentWorkApproveServiceImpl.java deleted file mode 100644 index 38ab581..0000000 --- a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/impl/AccidentWorkApproveServiceImpl.java +++ /dev/null @@ -1,111 +0,0 @@ -package com.gkhy.safePlatform.incidentManage.service.impl; - -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.gkhy.safePlatform.commons.enums.ResultCodes; -import com.gkhy.safePlatform.commons.query.PageQuery; -import com.gkhy.safePlatform.commons.utils.BeanCopyUtils; -import com.gkhy.safePlatform.commons.utils.StringUtils; -import com.gkhy.safePlatform.commons.vo.ResultVO; -import com.gkhy.safePlatform.commons.vo.SearchResultVO; -import com.gkhy.safePlatform.incidentManage.entity.AccidentWorkApproveInfo; -import com.gkhy.safePlatform.incidentManage.entity.AccidentWorkApproveInfoDetailDO; -import com.gkhy.safePlatform.incidentManage.entity.AccidentWorkApproveInfoPageDO; -import com.gkhy.safePlatform.incidentManage.enums.ApproveStatus; -import com.gkhy.safePlatform.incidentManage.model.dto.req.AccidentWorkApproveReqDTO; -import com.gkhy.safePlatform.incidentManage.model.dto.resp.AccidentWorkApproveDetailRespDTO; -import com.gkhy.safePlatform.incidentManage.model.dto.resp.AccidentWorkApprovePageRespDTO; -import com.gkhy.safePlatform.incidentManage.query.AccidentWorkApproveQuery; -import com.gkhy.safePlatform.incidentManage.query.db.AccidentWorkApproveDBQuery; -import com.gkhy.safePlatform.incidentManage.service.AccidentWorkApproveService; -import com.gkhy.safePlatform.incidentManage.service.baseService.AccidentWorkApproveInfoService; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.Date; -import java.util.List; - -@Service("AccidentWorkApproveService") -public class AccidentWorkApproveServiceImpl implements AccidentWorkApproveService { - - @Autowired - private AccidentWorkApproveInfoService workApproveInfoService; - - @Override - public SearchResultVO<List<AccidentWorkApprovePageRespDTO>> selectWorkApproveList(PageQuery<AccidentWorkApproveQuery> query) { - Long pageIndex = query.getPageIndex(); - Long pageSize = query.getPageSize(); - Page<AccidentWorkApproveInfoPageDO> page = new Page<>(pageIndex, pageSize); - - AccidentWorkApproveDBQuery AccidentWorkApproveDBQuery = new AccidentWorkApproveDBQuery(); - if (query.getSearchParams() != null) { - BeanUtils.copyProperties(query.getSearchParams(), AccidentWorkApproveDBQuery); - } - - List<AccidentWorkApproveInfoPageDO> AccidentWorkApproveInfoPageDOList = workApproveInfoService.selectWorkApproveList(page, AccidentWorkApproveDBQuery); - List<AccidentWorkApprovePageRespDTO> respList = BeanCopyUtils.copyBeanList(AccidentWorkApproveInfoPageDOList, AccidentWorkApprovePageRespDTO.class); - - return new SearchResultVO<>( - true, - pageIndex, - pageSize,page.getPages(), - page.getTotal(), - respList, - ResultCodes.OK - ); - } - - @Override - public ResultVO addWorkApprove(Long uid, AccidentWorkApproveReqDTO AccidentWorkApproveReqDTO) { - - Date nowDate = new Date(); - //1.新增应急队伍 - AccidentWorkApproveInfo AccidentWorkApproveInfo = new AccidentWorkApproveInfo(); - BeanUtils.copyProperties(AccidentWorkApproveReqDTO, AccidentWorkApproveInfo); - AccidentWorkApproveInfo.setDelFlag(false); - AccidentWorkApproveInfo.setCreateUid(uid); - AccidentWorkApproveInfo.setGmtCreate(nowDate); - AccidentWorkApproveInfo.setApproveStatus(ApproveStatus.NOT_APPROVE.getStatus()); - workApproveInfoService.addWorkApprove(AccidentWorkApproveInfo); - return new ResultVO(ResultCodes.OK); - } - - @Override - public ResultVO<AccidentWorkApproveDetailRespDTO> getWorkApproveById(Long id) { - - AccidentWorkApproveInfoDetailDO AccidentWorkApproveInfoDetailDO = workApproveInfoService.selectWorkApproveById(id); - AccidentWorkApproveDetailRespDTO AccidentWorkApproveDetailRespDTO = new AccidentWorkApproveDetailRespDTO(); - BeanUtils.copyProperties(AccidentWorkApproveInfoDetailDO, AccidentWorkApproveDetailRespDTO); - - return new ResultVO<>(ResultCodes.OK, AccidentWorkApproveDetailRespDTO); - } - - @Override - public ResultVO updateWorkApprove(Long uid, AccidentWorkApproveReqDTO AccidentWorkApproveReqDTO) { - Date nowDate = new Date(); - AccidentWorkApproveInfo AccidentWorkApproveInfo = new AccidentWorkApproveInfo(); - BeanUtils.copyProperties(AccidentWorkApproveReqDTO, AccidentWorkApproveInfo); - AccidentWorkApproveInfo.setUpdateUid(uid); - AccidentWorkApproveInfo.setGmtModitify(nowDate); - workApproveInfoService.updateWorkApprove(AccidentWorkApproveInfo); - return new ResultVO(ResultCodes.OK); - } - - @Override - public ResultVO batchDeleteWorkApprove(String ids) { - if (!StringUtils.isBlank(ids)) { - String[] idArr = ids.split(","); - for (String id : idArr) { - deleteWorkApprove(Long.valueOf(id)); - } - } - return new ResultVO(ResultCodes.OK); - } - - - private void deleteWorkApprove(Long id) { - workApproveInfoService.deleteWorkApproveById(id); - } - - -} -- Gitblit v1.9.2