Merge remote-tracking branch 'origin/master'

anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java

@@ -506,7 +506,11 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
         String local = LocaleContextHolder.getLocale().getLanguage();
         abnormalBillDispose.setHandle(HandleEnum.ABNORMAL_BILL_DISPOSE.getHandle(site,abnormalBill.getAbnormalNo()));
 
-        abnormalBill.setStatus(Constants.SHUT_DOWN);
+        if(!StringUtil.isBlank(abnormalBill.getStatus())){
+            abnormalBill.setStatus(abnormalBill.getStatus());
+        }else{
+            abnormalBill.setStatus(Constants.SHUT_DOWN);
+        }
         abnormalBillDispose.setClosedUser(user);
         abnormalBillDispose.setClosedDateTime(now);
         // this.anomalyCreatedAndSendMessage(abnormalBill,abnormalBillDispose);

quartz/src/main/java/com/foreverwin/mesnac/quartz/controller/SystemJobController.java

@@ -86,17 +86,17 @@ public class SystemJobController {
      * @param systemJobDTO  传递的实体
      * @return  null 失败  实体成功
      */
-    @PostMapping
+    @PostMapping("/save")
     public R save(@RequestBody SystemJobDTO systemJobDTO) {
         return R.ok(systemJobService.save(systemJobDTO));
     }
 
     /**
      * 修改
-     * @param systemJob  传递的实体
+     * @param systemJobDTO  传递的实体
      * @return  null 失败  实体成功
      */
-    @PutMapping
+    @PostMapping("/update")
     public R updateById(@RequestBody SystemJobDTO systemJobDTO) {
         return R.ok(systemJobService.updateById(systemJobDTO));
     }
@@ -107,8 +107,8 @@ public class SystemJobController {
      * @return 0 失败  1 成功
      */
     @ResponseBody
-    @RequestMapping(method = RequestMethod.DELETE, value = "/{id:.+}")
+    @GetMapping("/delete")
-    public R removeById(@PathVariable("id") String id){
+    public R removeById(String id){
         return R.ok(systemJobService.removeById(id));
     }