点火维护修改

陈威
1 parent c5003b7d
Showing 4 changed files with 103 additions and 23 deletions Show diff stats
zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McIgnitionController.java
zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/vo/McIgnitionMaintenanceVo.java
zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/IMcIgnitionService.java
zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McIgnitionServiceImpl.java
@@ -9,6 +9,7 @@ import com.chinagas.common.log.annotation.Log;
 import com.chinagas.common.log.enums.BusinessType;
 import com.chinagas.common.security.annotation.RequirePermission;
 import com.chinagas.modules.schsf.domain.McIgnition;
+import com.chinagas.modules.schsf.domain.vo.McIgnitionMaintenanceVo;
 import com.chinagas.modules.schsf.enums.YesNoEnums;
 import com.chinagas.modules.schsf.service.IMcIgnitionService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -48,19 +49,10 @@ public class McIgnitionController extends BaseController
     @RequirePermission("schsf:mcIgnition:maintenance")
     @Log(title = "点火维护", businessType = BusinessType.UPDATE)
     @PostMapping("/maintenance")
-    public AjaxResult maintenance(@RequestBody McIgnition mcIgnition) throws CloneNotSupportedException {
-        if (BeanUtil.isEmpty(mcIgnition)){
-            throw new RuntimeException("参数不可为空");
+    public AjaxResult maintenance(@RequestBody McIgnitionMaintenanceVo mcIgnitionMaintenanceVo) throws CloneNotSupportedException {
+        if (mcIgnitionMaintenanceVo.equals(YesNoEnums.N.getName()) && StringUtils.isEmpty(mcIgnitionMaintenanceVo.getnIgnRsn())){
+            throw new RuntimeException("未点火原因不可为空");
         }
-        if (mcIgnition.getId()==null){
-            throw new RuntimeException("id不可为空");
-        }
-        if (StringUtils.isEmpty(mcIgnition.getIgnCnfStatusCode())){
-            throw new RuntimeException("确认状态不可为空");
-        }
-        if ( mcIgnition.getIgnCnfStatusCode().equals(YesNoEnums.Y.getName()) && mcIgnition.getIgnTime()==null){
-            throw new RuntimeException("点火时间不可为空");
-        }
-        return toAjax(mcIgnitionService.updateMcIgnitionMaintenance(mcIgnition));
+        return toAjax(mcIgnitionService.updateMcIgnitionMaintenance(mcIgnitionMaintenanceVo));
     }
 }
@@ -0,0 +1,82 @@
+package com.chinagas.modules.schsf.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.time.LocalDateTime;
+
+public class McIgnitionMaintenanceVo {
+
+    /**
+     * 主键id
+     */
+    @NotNull(message = "ID不能为空")
+    private Long id;
+
+    /**
+     * 点火确认状态代码(NULL：未确认，Y：是，N：否)
+     */
+    @NotBlank(message = "状态不能为空")
+    private String ignCnfStatusCode;
+
+
+    /**
+     * 点火时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime ignTime;
+
+    /**
+     * 客户-用户编号
+     */
+    @NotBlank(message = "用户编号为空")
+    private String userCode;
+
+    /**
+     * 未点火原因
+     */
+    private String nIgnRsn;
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getIgnCnfStatusCode() {
+        return ignCnfStatusCode;
+    }
+
+    public void setIgnCnfStatusCode(String ignCnfStatusCode) {
+        this.ignCnfStatusCode = ignCnfStatusCode;
+    }
+
+    public LocalDateTime getIgnTime() {
+        return ignTime;
+    }
+
+    public void setIgnTime(LocalDateTime ignTime) {
+        this.ignTime = ignTime;
+    }
+
+    public String getUserCode() {
+        return userCode;
+    }
+
+    public void setUserCode(String userCode) {
+        this.userCode = userCode;
+    }
+
+
+    public String getnIgnRsn() {
+        return nIgnRsn;
+    }
+
+    public void setnIgnRsn(String nIgnRsn) {
+        this.nIgnRsn = nIgnRsn;
+    }
+}
@@ -2,6 +2,7 @@ package com.chinagas.modules.schsf.service;
  
 import com.chinagas.modules.schsf.domain.McIgnition;
 import com.chinagas.modules.schsf.domain.McVisit;
+import com.chinagas.modules.schsf.domain.vo.McIgnitionMaintenanceVo;
  
 import java.util.List;
  
@@ -71,10 +72,10 @@ public interface IMcIgnitionService
  
     /**
      * 点火确认
-     * @param mcIgnition
+     * @param mcIgnitionMaintenanceVo
      * @return
      */
-    int updateMcIgnitionMaintenance(McIgnition mcIgnition) throws CloneNotSupportedException;
+    int updateMcIgnitionMaintenance(McIgnitionMaintenanceVo mcIgnitionMaintenanceVo) throws CloneNotSupportedException;
  
     void updateMcIgnitionCancel(Long visitId) throws CloneNotSupportedException;
 }
@@ -7,6 +7,7 @@ import com.chinagas.common.datascope.annotation.DataScope;
 import com.chinagas.common.security.utils.SecurityUtils;
 import com.chinagas.modules.schsf.domain.McIgnition;
 import com.chinagas.modules.schsf.domain.McVisit;
+import com.chinagas.modules.schsf.domain.vo.McIgnitionMaintenanceVo;
 import com.chinagas.modules.schsf.enums.IgnitionStatusEnums;
 import com.chinagas.modules.schsf.enums.YesNoEnums;
 import com.chinagas.modules.schsf.mapper.McIgnitionMapper;
@@ -167,28 +168,32 @@ public class McIgnitionServiceImpl implements IMcIgnitionService {
      * @return
      */
     @Override
-    public int updateMcIgnitionMaintenance(McIgnition mcIgnitionVo) throws CloneNotSupportedException {
+    public int updateMcIgnitionMaintenance(McIgnitionMaintenanceVo mcIgnitionMaintenanceVo) throws CloneNotSupportedException {
         LocalDateTime time = DateUtils.getNowLocal();
         Long userId = SecurityUtils.getUserId();
         String userAccount = SecurityUtils.getUsername();
         String userName = SecurityUtils.getLoginUser().getSysUser().getNickName();
         //老数据
-        McIgnition mcIgnition_old = mcIgnitionMapper.selectMcIgnitionById(mcIgnitionVo.getId());
+        McIgnition mcIgnition_old = mcIgnitionMapper.selectMcIgnitionById(mcIgnitionMaintenanceVo.getId());
+        if (mcIgnition_old==null){
+            throw new RuntimeException("被审核信息不存在！");
+        }
         //新数据
         McIgnition mcIgnition_new = mcIgnition_old.clone();
-        mcIgnition_new.setIgnCnfStatusCode(mcIgnitionVo.getIgnCnfStatusCode());
-        mcIgnition_new.setIgnTime(mcIgnitionVo.getIgnTime());
-        mcIgnition_new.setnIgnRsn(mcIgnitionVo.getnIgnRsn());
+        mcIgnition_new.setIgnCnfStatusCode(mcIgnitionMaintenanceVo.getIgnCnfStatusCode());
+        mcIgnition_new.setIgnTime(mcIgnitionMaintenanceVo.getIgnTime());
+        mcIgnition_new.setnIgnRsn(mcIgnitionMaintenanceVo.getnIgnRsn());
         mcIgnition_new.setUpdateBy(userId.toString());
         mcIgnition_new.setUpdateTime(time);
-        mcIgnition_new.setStatusCode(mcIgnitionVo.getIgnCnfStatusCode().equals("Y")?IgnitionStatusEnums.MAINTENANCE_YES.getCode():IgnitionStatusEnums.MAINTENANCE_NO.getCode());
-        mcIgnition_new.setStatusName(mcIgnitionVo.getIgnCnfStatusCode().equals("Y")?IgnitionStatusEnums.MAINTENANCE_YES.getInfo():IgnitionStatusEnums.MAINTENANCE_NO.getInfo());
+        mcIgnition_new.setStatusCode(mcIgnitionMaintenanceVo.getIgnCnfStatusCode().equals("Y")?IgnitionStatusEnums.MAINTENANCE_YES.getCode():IgnitionStatusEnums.MAINTENANCE_NO.getCode());
+        mcIgnition_new.setStatusName(mcIgnitionMaintenanceVo.getIgnCnfStatusCode().equals("Y")?IgnitionStatusEnums.MAINTENANCE_YES.getInfo():IgnitionStatusEnums.MAINTENANCE_NO.getInfo());
         mcIgnition_new.setCnfPersonId(userId);
         mcIgnition_new.setCnfPersonAccount(userAccount);
         mcIgnition_new.setCnfPersonName(userName);
+        mcIgnition_new.setUserCode(StringUtils.isEmpty(mcIgnition_old.getUserCity())?mcIgnitionMaintenanceVo.getUserCode():mcIgnition_old.getUserCity());
         int i = mcIgnitionMapper.updateMcIgnition(mcIgnition_new);
         //1:添加记录
-        iMcOperationLogService.insertMcOperationLog("mc_ignition", mcIgnitionVo.getId(), "schsf:mcIgnition:maintenance",
+        iMcOperationLogService.insertMcOperationLog("mc_ignition", mcIgnitionMaintenanceVo.getId(), "schsf:mcIgnition:maintenance",
                 "维护", "1", null, JSON.toJSONString(mcIgnition_old), JSON.toJSONString(mcIgnition_new));
         return i;
     }
...	...	@@ -9,6 +9,7 @@ import com.chinagas.common.log.annotation.Log;
9	9	import com.chinagas.common.log.enums.BusinessType;
10	10	import com.chinagas.common.security.annotation.RequirePermission;
11	11	import com.chinagas.modules.schsf.domain.McIgnition;
	12	+import com.chinagas.modules.schsf.domain.vo.McIgnitionMaintenanceVo;
12	13	import com.chinagas.modules.schsf.enums.YesNoEnums;
13	14	import com.chinagas.modules.schsf.service.IMcIgnitionService;
14	15	import org.springframework.beans.factory.annotation.Autowired;
...	...	@@ -48,19 +49,10 @@ public class McIgnitionController extends BaseController
48	49	@RequirePermission("schsf:mcIgnition:maintenance")
49	50	@Log(title = "点火维护", businessType = BusinessType.UPDATE)
50	51	@PostMapping("/maintenance")
51		- public AjaxResult maintenance(@RequestBody McIgnition mcIgnition) throws CloneNotSupportedException {
52		- if (BeanUtil.isEmpty(mcIgnition)){
53		- throw new RuntimeException("参数不可为空");
	52	+ public AjaxResult maintenance(@RequestBody McIgnitionMaintenanceVo mcIgnitionMaintenanceVo) throws CloneNotSupportedException {
	53	+ if (mcIgnitionMaintenanceVo.equals(YesNoEnums.N.getName()) && StringUtils.isEmpty(mcIgnitionMaintenanceVo.getnIgnRsn())){
	54	+ throw new RuntimeException("未点火原因不可为空");
54	55	}
55		- if (mcIgnition.getId()==null){
56		- throw new RuntimeException("id不可为空");
57		- }
58		- if (StringUtils.isEmpty(mcIgnition.getIgnCnfStatusCode())){
59		- throw new RuntimeException("确认状态不可为空");
60		- }
61		- if ( mcIgnition.getIgnCnfStatusCode().equals(YesNoEnums.Y.getName()) && mcIgnition.getIgnTime()==null){
62		- throw new RuntimeException("点火时间不可为空");
63		- }
64		- return toAjax(mcIgnitionService.updateMcIgnitionMaintenance(mcIgnition));
	56	+ return toAjax(mcIgnitionService.updateMcIgnitionMaintenance(mcIgnitionMaintenanceVo));
65	57	}
66	58	}
...	...
...	...	@@ -0,0 +1,82 @@
	1	+package com.chinagas.modules.schsf.domain.vo;
	2	+
	3	+import com.fasterxml.jackson.annotation.JsonFormat;
	4	+
	5	+import javax.validation.constraints.NotBlank;
	6	+import javax.validation.constraints.NotNull;
	7	+import java.time.LocalDateTime;
	8	+
	9	+public class McIgnitionMaintenanceVo {
	10	+
	11	+ /**
	12	+ * 主键id
	13	+ */
	14	+ @NotNull(message = "ID不能为空")
	15	+ private Long id;
	16	+
	17	+ /**
	18	+ * 点火确认状态代码(NULL：未确认，Y：是，N：否)
	19	+ */
	20	+ @NotBlank(message = "状态不能为空")
	21	+ private String ignCnfStatusCode;
	22	+
	23	+
	24	+ /**
	25	+ * 点火时间
	26	+ */
	27	+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
	28	+ private LocalDateTime ignTime;
	29	+
	30	+ /**
	31	+ * 客户-用户编号
	32	+ */
	33	+ @NotBlank(message = "用户编号为空")
	34	+ private String userCode;
	35	+
	36	+ /**
	37	+ * 未点火原因
	38	+ */
	39	+ private String nIgnRsn;
	40	+
	41	+
	42	+ public Long getId() {
	43	+ return id;
	44	+ }
	45	+
	46	+ public void setId(Long id) {
	47	+ this.id = id;
	48	+ }
	49	+
	50	+ public String getIgnCnfStatusCode() {
	51	+ return ignCnfStatusCode;
	52	+ }
	53	+
	54	+ public void setIgnCnfStatusCode(String ignCnfStatusCode) {
	55	+ this.ignCnfStatusCode = ignCnfStatusCode;
	56	+ }
	57	+
	58	+ public LocalDateTime getIgnTime() {
	59	+ return ignTime;
	60	+ }
	61	+
	62	+ public void setIgnTime(LocalDateTime ignTime) {
	63	+ this.ignTime = ignTime;
	64	+ }
	65	+
	66	+ public String getUserCode() {
	67	+ return userCode;
	68	+ }
	69	+
	70	+ public void setUserCode(String userCode) {
	71	+ this.userCode = userCode;
	72	+ }
	73	+
	74	+
	75	+ public String getnIgnRsn() {
	76	+ return nIgnRsn;
	77	+ }
	78	+
	79	+ public void setnIgnRsn(String nIgnRsn) {
	80	+ this.nIgnRsn = nIgnRsn;
	81	+ }
	82	+}
...	...
...	...	@@ -2,6 +2,7 @@ package com.chinagas.modules.schsf.service;
2	2
3	3	import com.chinagas.modules.schsf.domain.McIgnition;
4	4	import com.chinagas.modules.schsf.domain.McVisit;
	5	+import com.chinagas.modules.schsf.domain.vo.McIgnitionMaintenanceVo;
5	6
6	7	import java.util.List;
7	8
...	...	@@ -71,10 +72,10 @@ public interface IMcIgnitionService
71	72
72	73	/**
73	74	* 点火确认
74		- * @param mcIgnition
	75	+ * @param mcIgnitionMaintenanceVo
75	76	* @return
76	77	*/
77		- int updateMcIgnitionMaintenance(McIgnition mcIgnition) throws CloneNotSupportedException;
	78	+ int updateMcIgnitionMaintenance(McIgnitionMaintenanceVo mcIgnitionMaintenanceVo) throws CloneNotSupportedException;
78	79
79	80	void updateMcIgnitionCancel(Long visitId) throws CloneNotSupportedException;
80	81	}
...	...
...	...	@@ -7,6 +7,7 @@ import com.chinagas.common.datascope.annotation.DataScope;
7	7	import com.chinagas.common.security.utils.SecurityUtils;
8	8	import com.chinagas.modules.schsf.domain.McIgnition;
9	9	import com.chinagas.modules.schsf.domain.McVisit;
	10	+import com.chinagas.modules.schsf.domain.vo.McIgnitionMaintenanceVo;
10	11	import com.chinagas.modules.schsf.enums.IgnitionStatusEnums;
11	12	import com.chinagas.modules.schsf.enums.YesNoEnums;
12	13	import com.chinagas.modules.schsf.mapper.McIgnitionMapper;
...	...	@@ -167,28 +168,32 @@ public class McIgnitionServiceImpl implements IMcIgnitionService {
167	168	* @return
168	169	*/
169	170	@Override
170		- public int updateMcIgnitionMaintenance(McIgnition mcIgnitionVo) throws CloneNotSupportedException {
	171	+ public int updateMcIgnitionMaintenance(McIgnitionMaintenanceVo mcIgnitionMaintenanceVo) throws CloneNotSupportedException {
171	172	LocalDateTime time = DateUtils.getNowLocal();
172	173	Long userId = SecurityUtils.getUserId();
173	174	String userAccount = SecurityUtils.getUsername();
174	175	String userName = SecurityUtils.getLoginUser().getSysUser().getNickName();
175	176	//老数据
176		- McIgnition mcIgnition_old = mcIgnitionMapper.selectMcIgnitionById(mcIgnitionVo.getId());
	177	+ McIgnition mcIgnition_old = mcIgnitionMapper.selectMcIgnitionById(mcIgnitionMaintenanceVo.getId());
	178	+ if (mcIgnition_old==null){
	179	+ throw new RuntimeException("被审核信息不存在！");
	180	+ }
177	181	//新数据
178	182	McIgnition mcIgnition_new = mcIgnition_old.clone();
179		- mcIgnition_new.setIgnCnfStatusCode(mcIgnitionVo.getIgnCnfStatusCode());
180		- mcIgnition_new.setIgnTime(mcIgnitionVo.getIgnTime());
181		- mcIgnition_new.setnIgnRsn(mcIgnitionVo.getnIgnRsn());
	183	+ mcIgnition_new.setIgnCnfStatusCode(mcIgnitionMaintenanceVo.getIgnCnfStatusCode());
	184	+ mcIgnition_new.setIgnTime(mcIgnitionMaintenanceVo.getIgnTime());
	185	+ mcIgnition_new.setnIgnRsn(mcIgnitionMaintenanceVo.getnIgnRsn());
182	186	mcIgnition_new.setUpdateBy(userId.toString());
183	187	mcIgnition_new.setUpdateTime(time);
184		- mcIgnition_new.setStatusCode(mcIgnitionVo.getIgnCnfStatusCode().equals("Y")?IgnitionStatusEnums.MAINTENANCE_YES.getCode():IgnitionStatusEnums.MAINTENANCE_NO.getCode());
185		- mcIgnition_new.setStatusName(mcIgnitionVo.getIgnCnfStatusCode().equals("Y")?IgnitionStatusEnums.MAINTENANCE_YES.getInfo():IgnitionStatusEnums.MAINTENANCE_NO.getInfo());
	188	+ mcIgnition_new.setStatusCode(mcIgnitionMaintenanceVo.getIgnCnfStatusCode().equals("Y")?IgnitionStatusEnums.MAINTENANCE_YES.getCode():IgnitionStatusEnums.MAINTENANCE_NO.getCode());
	189	+ mcIgnition_new.setStatusName(mcIgnitionMaintenanceVo.getIgnCnfStatusCode().equals("Y")?IgnitionStatusEnums.MAINTENANCE_YES.getInfo():IgnitionStatusEnums.MAINTENANCE_NO.getInfo());
186	190	mcIgnition_new.setCnfPersonId(userId);
187	191	mcIgnition_new.setCnfPersonAccount(userAccount);
188	192	mcIgnition_new.setCnfPersonName(userName);
	193	+ mcIgnition_new.setUserCode(StringUtils.isEmpty(mcIgnition_old.getUserCity())?mcIgnitionMaintenanceVo.getUserCode():mcIgnition_old.getUserCity());
189	194	int i = mcIgnitionMapper.updateMcIgnition(mcIgnition_new);
190	195	//1:添加记录
191		- iMcOperationLogService.insertMcOperationLog("mc_ignition", mcIgnitionVo.getId(), "schsf:mcIgnition:maintenance",
	196	+ iMcOperationLogService.insertMcOperationLog("mc_ignition", mcIgnitionMaintenanceVo.getId(), "schsf:mcIgnition:maintenance",
192	197	"维护", "1", null, JSON.toJSONString(mcIgnition_old), JSON.toJSONString(mcIgnition_new));
193	198	return i;
194	199	}
...	...