From 24b28c40758e03e9ef372502fa29d9072b7c909b Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期五, 16 九月 2022 15:43:39 +0800
Subject: [PATCH] Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into master
---
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetMng.java | 36 ++++++------
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/enums/TargetDutyResultCodes.java | 3 +
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetMngServiceImpl.java | 4 +
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetMngController.java | 13 +++-
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/enums/TargetMngLevelEnum.java | 49 ++++++++++++++++
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/TargetMngDto.java | 50 ++++++++--------
6 files changed, 109 insertions(+), 46 deletions(-)
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetMngController.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetMngController.java
index e8904ce..a3f24ba 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetMngController.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetMngController.java
@@ -11,6 +11,9 @@
import com.gkhy.safePlatform.commons.vo.ResultVO;
import com.gkhy.safePlatform.targetDuty.entity.TargetDivideDetail;
import com.gkhy.safePlatform.targetDuty.entity.TargetMng;
+import com.gkhy.safePlatform.targetDuty.enums.TargetDutyResultCodes;
+import com.gkhy.safePlatform.targetDuty.enums.TargetMngLevelEnum;
+import com.gkhy.safePlatform.targetDuty.excepiton.TargetDutyException;
import com.gkhy.safePlatform.targetDuty.model.dto.req.TargetCheckAndSubmitQueryCriteria;
import com.gkhy.safePlatform.targetDuty.model.dto.req.TargetMngImportExcel;
import com.gkhy.safePlatform.targetDuty.model.dto.req.TargetMngQueryCriteria;
@@ -72,7 +75,7 @@
return this.targetMngService.queryAll(pageQuery);
}
-
+
/**
* 通过主键查询单条数据
@@ -93,6 +96,10 @@
*/
@PostMapping(value = "/addOrUpdate")
public ResultVO update(@RequestBody TargetMng targetMng) {
+
+ if (TargetMngLevelEnum.getByCode(targetMng.getLevel())==null){
+ throw new TargetDutyException(TargetDutyResultCodes.TARGET_MNG_ENUM_LEVEL_NOT_EXIST);
+ }
if( !StringUtils.hasText(targetMng.getqName()) || !StringUtils.hasText(targetMng.getIndexNum())
|| !StringUtils.hasText(targetMng.getYear()) || !StringUtils.hasText(targetMng.getValue())
@@ -182,7 +189,7 @@
mng.setIndexNum("3");
mng.setYear("2021");
mng.setValue("312");
- mng.setLevel(1);
+ mng.setLevel((byte)1);
mng.setCompleteDate(new Timestamp(new java.util.Date().getTime()));
mng.setMemo("发发发");
mng.setTargetType(0);
@@ -190,4 +197,4 @@
System.out.println(JSONObject.toJSONString(mng));
}
-}
\ No newline at end of file
+}
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetMng.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetMng.java
index 1f678ee..1788346 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetMng.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetMng.java
@@ -16,8 +16,8 @@
@SuppressWarnings("serial")
@TableName("target_mng")
public class TargetMng extends BaseDomain {
-
-
+
+
@TableId(type = IdType.AUTO)
private Long id;
public Long getId() {
@@ -41,7 +41,7 @@
//目标指标编号
private String indexNum;
-
+
public String getIndexNum() {
return indexNum;
}
@@ -51,7 +51,7 @@
}
//年度
private String year;
-
+
public String getYear() {
return year;
}
@@ -61,7 +61,7 @@
}
//指标值
private String value;
-
+
public String getValue() {
return value;
}
@@ -71,7 +71,7 @@
}
//1:大于 2：等于 3：小于
private Integer valueSign;
-
+
public Integer getValueSign() {
return valueSign;
}
@@ -80,19 +80,19 @@
this.valueSign = valueSign;
}
//指标级别 1:公司级 2:部门分厂级 3:工段班组级
- private Integer level;
-
- public Integer getLevel() {
+ private Byte level;
+
+ public Byte getLevel() {
return level;
}
- public void setLevel(Integer level) {
+ public void setLevel(Byte level) {
this.level = level;
}
//完成期限
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp completeDate;
-
+
public Timestamp getCompleteDate() {
return completeDate;
}
@@ -102,7 +102,7 @@
}
//备注信息
private String memo;
-
+
public String getMemo() {
return memo;
}
@@ -112,7 +112,7 @@
}
//指标类型 1:年指标 2:月指标 3:半年 4:季度
private Integer targetType;
-
+
public Integer getTargetType() {
return targetType;
}
@@ -122,7 +122,7 @@
}
//分解状态 1:已分解 2:未分解
private Integer divideStatus;
-
+
public Integer getDivideStatus() {
return divideStatus;
}
@@ -132,7 +132,7 @@
}
//目标制定部门
private Long makerDepartmentId;
-
+
public Long getMakerDepartmentId() {
return makerDepartmentId;
}
@@ -142,7 +142,7 @@
}
//是否删除 0:未删除 1:删除
private Integer delFlag;
-
+
public Integer getDelFlag() {
return delFlag;
}
@@ -150,5 +150,5 @@
public void setDelFlag(Integer delFlag) {
this.delFlag = delFlag;
}
-
-}
\ No newline at end of file
+
+}
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/enums/TargetDutyResultCodes.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/enums/TargetDutyResultCodes.java
index e268017..2f09e43 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/enums/TargetDutyResultCodes.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/enums/TargetDutyResultCodes.java
@@ -14,6 +14,9 @@
APPROVE_NOT_EXIST("A1005" , "审批记录不存在"),
+ TARGET_MNG_ENUM_LEVEL_NOT_EXIST("T1000","目标设置指标级别类型异常"),
+
+
ERROR("A3000", "未知错误");
private String code;
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/enums/TargetMngLevelEnum.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/enums/TargetMngLevelEnum.java
new file mode 100644
index 0000000..cc29aee
--- /dev/null
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/enums/TargetMngLevelEnum.java
@@ -0,0 +1,49 @@
+package com.gkhy.safePlatform.targetDuty.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum TargetMngLevelEnum {
+
+
+ Level_ONE((byte) 1, "公司级"),
+ Level_TWO((byte) 2, "部门分厂级"),
+ Level_THREE((byte) 3, "工段班组级");
+
+
+ private Byte code;
+ private String value;
+
+ TargetMngLevelEnum(Byte code, String value) {
+ this.code = code;
+ this.value = value;
+ }
+
+ public Byte getCode() {
+ return code;
+ }
+
+ public void setCode(Byte code) {
+ this.code = code;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+ // 转换成为 MAP<Byte, String>, 对外提供查询和遍历功能
+ public static Map<Byte, TargetMngLevelEnum> toMap() {
+ Map<Byte, TargetMngLevelEnum> map = new HashMap();
+ for (TargetMngLevelEnum accidentExpressEnum : TargetMngLevelEnum.values()) {
+ map.put(accidentExpressEnum.getCode(), accidentExpressEnum);
+ }
+ return map;
+ }
+ public static TargetMngLevelEnum getByCode(Byte code){
+ return toMap().get(code);
+ }
+}
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/TargetMngDto.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/TargetMngDto.java
index 9f172e8..61e6c6b 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/TargetMngDto.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/TargetMngDto.java
@@ -8,29 +8,29 @@
import java.util.List;
public class TargetMngDto implements Serializable {
-
+
private Long id;
- //安全目标指标
+ //安全目标指标
private String qName;
- //目标指标编号
+ //目标指标编号
private String indexNum;
- //年度
+ //年度
private String year;
- //指标值
+ //指标值
private String value;
- //指标级别 1:公司级 2:部门分厂级 3:工段班组级
- private Integer level;
- //完成期限
+ //指标级别 1:公司级 2:部门分厂级 3:工段班组级
+ private Byte level;
+ //完成期限
private Timestamp completeDate;
- //备注信息
+ //备注信息
private String memo;
- //指标类型 1:年指标 2:月指标
+ //指标类型 1:年指标 2:月指标
private Integer targetType;
- //分解状态 1:已分解 2:未分解
+ //分解状态 1:已分解 2:未分解
private Integer divideStatus;
-
+
private Timestamp createTime;
-
+
private Timestamp updateTime;
//目标指标分解列表
@@ -68,7 +68,7 @@
public void setIndexNum(String indexNum) {
this.indexNum = indexNum;
}
- //年度
+ //年度
public String getYear() {
return year;
}
@@ -76,7 +76,7 @@
public void setYear(String year) {
this.year = year;
}
- //指标值
+ //指标值
public String getValue() {
return value;
}
@@ -84,15 +84,15 @@
public void setValue(String value) {
this.value = value;
}
- //指标级别 1:公司级 2:部门分厂级 3:工段班组级
- public Integer getLevel() {
+ //指标级别 1:公司级 2:部门分厂级 3:工段班组级
+ public Byte getLevel() {
return level;
}
- public void setLevel(Integer level) {
+ public void setLevel(Byte level) {
this.level = level;
}
- //完成期限
+ //完成期限
public Timestamp getCompleteDate() {
return completeDate;
}
@@ -100,7 +100,7 @@
public void setCompleteDate(Timestamp completeDate) {
this.completeDate = completeDate;
}
- //备注信息
+ //备注信息
public String getMemo() {
return memo;
}
@@ -108,7 +108,7 @@
public void setMemo(String memo) {
this.memo = memo;
}
- //指标类型 1:年指标 2:月指标
+ //指标类型 1:年指标 2:月指标
public Integer getTargetType() {
return targetType;
}
@@ -116,7 +116,7 @@
public void setTargetType(Integer targetType) {
this.targetType = targetType;
}
- //分解状态 1:已分解 2:未分解
+ //分解状态 1:已分解 2:未分解
public Integer getDivideStatus() {
return divideStatus;
}
@@ -124,7 +124,7 @@
public void setDivideStatus(Integer divideStatus) {
this.divideStatus = divideStatus;
}
-
+
public Timestamp getCreateTime() {
return createTime;
}
@@ -132,7 +132,7 @@
public void setCreateTime(Timestamp createTime) {
this.createTime = createTime;
}
-
+
public Timestamp getUpdateTime() {
return updateTime;
}
@@ -174,4 +174,4 @@
public void setValueSign(Integer valueSign) {
this.valueSign = valueSign;
}
-}
\ No newline at end of file
+}
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetMngServiceImpl.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetMngServiceImpl.java
index 5e23054..19ecf01 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetMngServiceImpl.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetMngServiceImpl.java
@@ -386,5 +386,9 @@
response.getOutputStream().close();
}
+ public void checkEnum(){
+
+ }
+
}
--
Gitblit v1.9.2