Ver Fonte

秤体量程添加修改

dengyj há 4 anos atrás
pai
commit
c749197587

+ 4 - 5
src/main/java/com/steerinfo/baseinfo/meterbasescalerange/controller/MeterBaseScaleRangeController.java

@@ -83,17 +83,16 @@ throw new MarkerMetException(500, "操作异常!!");
     @Transactional
     @PostMapping(value = "/")
     public RESTfulResult add(@RequestBody MeterBaseScaleRange model) {
+        RESTfulResult rm = new RESTfulResult();
+        rm.setFailed();
         try {
-            String msg = meterBaseScaleRangeService.checkandadd(model);
-            if (StringUtils.isNotEmpty(msg)) {
-                return failed(null, msg);
-            }
+            rm = meterBaseScaleRangeService.checkandadd(model);
         } catch (Exception e) {
             e.printStackTrace();
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return failed(null, "操作异常,请确认!");
         }
-        return success();
+        return rm;
     }
 
     @ApiOperation(value = "获取详细信息", notes = "根据url的id来获取详细信息")

+ 2 - 1
src/main/java/com/steerinfo/baseinfo/meterbasescalerange/service/IMeterBaseScaleRangeService.java

@@ -1,5 +1,6 @@
 package com.steerinfo.baseinfo.meterbasescalerange.service;
 
+import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.IBaseService;
 import com.steerinfo.baseinfo.meterbasescalerange.model.MeterBaseScaleRange;
 
@@ -17,7 +18,7 @@ import com.steerinfo.baseinfo.meterbasescalerange.model.MeterBaseScaleRange;
  * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
  */
 public interface IMeterBaseScaleRangeService extends IBaseService<MeterBaseScaleRange, String>{
-     String checkandadd(MeterBaseScaleRange model);
+     RESTfulResult checkandadd(MeterBaseScaleRange model);
 
      String checkandupdate(String id,MeterBaseScaleRange model);
 }

+ 33 - 17
src/main/java/com/steerinfo/baseinfo/meterbasescalerange/service/impl/MeterBaseScaleRangeServiceImpl.java

@@ -1,6 +1,7 @@
 package com.steerinfo.baseinfo.meterbasescalerange.service.impl;
 
 
+import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.framework.service.impl.BaseServiceImpl;
 import com.steerinfo.baseinfo.meterbasescalerange.model.MeterBaseScaleRange;
@@ -42,25 +43,40 @@ public class MeterBaseScaleRangeServiceImpl extends BaseServiceImpl<MeterBaseSca
     }
 
     @Override
-    public String checkandadd(MeterBaseScaleRange model)
+    public RESTfulResult checkandadd(MeterBaseScaleRange model)
     {
-        String msg=check(model);
-        if (StringUtils.isNotEmpty(msg)){
-            return msg;
+        RESTfulResult rm = new RESTfulResult();
+        rm.setFailed();
+        try{
+            String msg=check(model);
+            if (StringUtils.isNotEmpty(msg)){
+                rm.setMessage(msg);
+                return rm;
+            }
+            HashMap<String, Object> obj = new HashMap<>();
+            obj.put("baseSpotNo", model.getBaseSpotNo());
+            obj.put("baseSpotName", model.getBaseSpotName());
+            obj.put("scalePointNo", model.getScalePointNo());
+            obj.put("scalePointName", model.getScalePointName());
+            List<MeterBaseScaleRange> list=meterBaseScaleRangeMapper.selectByParameters(obj);
+            if(list.size()>0 && list!=null) {
+                rm.setMessage(model.getBaseSpotName()+"计量点下的"+model.getScalePointName()+"秤点已存在,请先删除或者修改!");
+                return rm;
+            }
+            String no=meterBaseScaleRangeMapper.GetNewID();
+            model.setScaleRangeNo(new SimpleDateFormat("yyyyMMdd").format(new Date()) +no);
+            int i = meterBaseScaleRangeMapper.insertSelective(model);
+            if(i >= 1) {
+                rm.setSucceed();
+                rm.setCode("200");
+                rm.setMessage("操作成功");
+            }
+        }catch (Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常,请确认!>>>" + e.getMessage());
         }
-        HashMap<String, Object> obj = new HashMap<>();
-        obj.put("baseSpotNo", model.getBaseSpotNo());
-        obj.put("baseSpotName", model.getBaseSpotName());
-        obj.put("scalePointNo", model.getScalePointNo());
-        obj.put("scalePointName", model.getScalePointName());
-        List<MeterBaseScaleRange> list=meterBaseScaleRangeMapper.selectByParameters(obj);
-        if(list.size()>0 && list!=null) {
-            return model.getBaseSpotName()+"计量点下的"+model.getScalePointName()+"秤点已存在,请先删除或者修改!";
-        }
-        String no=meterBaseScaleRangeMapper.GetNewID();
-        model.setScaleRangeNo(new SimpleDateFormat("yyyyMMdd").format(new Date()) +no);
-        meterBaseScaleRangeMapper.insert(model);
-        return "";
+        return rm;
+
     }
 
     @Override