化学品信息导入新增单位和计量方式

zd-modules/zd-chemical/src/main/java/com/zd/chemical/controller/HxpChemicalController.java

@@ -125,9 +125,9 @@ public class HxpChemicalController extends BaseController {
                 "6、请注意：需填写系统中已录入的对应数据名称，否则无法正常导入。\n" +
                 "系统字段要求提示："+
                 "化学品分类：普通化学品、危险化学品；"+
-                "化学品属性：爆炸品、压缩气体或液化气体、易燃液体、易燃固体、自燃物品和遇湿易燃物品、氧化剂和有机过氧化物、有毒品、放射性物品、腐蚀品、无；"+
-                "形态：固体、液体、气体、其他；"+
-                "标签类型：二维码、RFID。";
+                "化学品属性：爆炸品、压缩气体或液化气体、易燃液体、易燃固体、自燃物品和遇湿易燃物品、氧化剂和有机过氧化物、有毒品、放射性物品、腐蚀品、无；\n"+
+                "形态：固体、液体、气体、其他："+
+                "标签类型：二维码、RFID，计量方式：重量、体积、个数";
         ExcelUtil<HxpChemicalByExcel> util = new ExcelUtil<HxpChemicalByExcel>(HxpChemicalByExcel.class);
         List<HxpChemicalByExcel> chemicalByExcels = redisService.getCacheObject("exportByChemical"+SecurityUtils.getUserId());
         if(chemicalByExcels.size()>0){
@@ -147,9 +147,9 @@ public class HxpChemicalController extends BaseController {
                 "6、请注意：需填写系统中已录入的对应数据名称，否则无法正常导入。\n" +
                 "系统字段要求提示："+
                 "化学品分类：普通化学品、危险化学品；"+
-                "化学品属性：爆炸品、压缩气体或液化气体、易燃液体、易燃固体、自燃物品和遇湿易燃物品、氧化剂和有机过氧化物、有毒品、放射性物品、腐蚀品、无；"+
-                "形态：固体、液体、气体、其他；"+
-                "标签类型：二维码、RFID。";
+                "化学品属性：爆炸品、压缩气体或液化气体、易燃液体、易燃固体、自燃物品和遇湿易燃物品、氧化剂和有机过氧化物、有毒品、放射性物品、腐蚀品、无；\n"+
+                "形态：固体、液体、气体、其他："+
+                "标签类型：二维码、RFID，计量方式：重量、体积、个数";
         ExcelUtil<HxpChemicalByExcel> util = new ExcelUtil<HxpChemicalByExcel>(HxpChemicalByExcel.class);
         util.exportExcel(response, null, "化学品信息", tips, "化学品信息-批量导入模板");
     }

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/vo/HxpChemicalByExcel.java

@@ -35,25 +35,33 @@ public class HxpChemicalByExcel {
     @ApiModelProperty(value = "标签类型内容")
     private String labelContent;
 
-    @Excel(name = "属性",sort = 5)
+    @Excel(name = "计量单位",sort = 4, isRequired=true)
+    @ApiModelProperty(value = "计量单位")
+    private String chemicalUnit;
+
+    @Excel(name = "计量方式",sort = 5, isRequired=true)
+    @ApiModelProperty(value = "计量方式")
+    private String measuringMethod;
+
+    @Excel(name = "属性",sort = 6)
     @ApiModelProperty(value = "分类属性")
     private String classifyAttribute;
 
-    @Excel(name = "cas号",sort = 6)
+    @Excel(name = "cas号",sort = 7)
     @Length(message = "cas号长度不能超过50")
     @ApiModelProperty(value = "cas号")
     private String casNum;
 
-    @Excel(name = "别名",sort = 7)
+    @Excel(name = "别名",sort = 8)
     @ApiModelProperty(value = "别名")
     private String anotherName;
 
-    @Excel(name = "纯度",sort = 8)
+    @Excel(name = "纯度",sort = 9)
     @ApiModelProperty(value = "纯度")
     private String purity;
 
 
-    @Excel(name = "生产厂家",sort = 9)
+    @Excel(name = "生产厂家",sort = 10)
     @ApiModelProperty(value = "生产厂家")
     private String factory;
 
@@ -160,4 +168,12 @@ public class HxpChemicalByExcel {
     public void setUpDate(Boolean upDate) {
         this.upDate = upDate;
     }
+
+    public String getChemicalUnit() {        return chemicalUnit;    }
+
+    public void setChemicalUnit(String chemicalUnit) {        this.chemicalUnit = chemicalUnit;    }
+
+    public String getMeasuringMethod() {        return measuringMethod;    }
+
+    public void setMeasuringMethod(String measuringMethod) {        this.measuringMethod = measuringMethod;    }
 }

zd-modules/zd-chemical/src/main/java/com/zd/chemical/service/impl/HxpChemicalServiceImpl.java

@@ -175,6 +175,43 @@ public class HxpChemicalServiceImpl implements IHxpChemicalService {
             }
         }
 
+        //计量单位
+        if(StringUtils.isNotEmpty(chemical.getChemicalUnit())){
+            if(chemical.getChemicalUnit().length()>8){
+                chemical.getFailRemark().append("失败：");
+                failChemicalList.add(chemical);
+                checkBox = false;
+                chemical.getFailRemark().append("计量单位过长、");
+            }
+            hxpChemical.setChemicalUnit(chemical.getChemicalUnit());
+        }else{
+            chemical.getFailRemark().append("失败：");
+            failChemicalList.add(chemical);
+            checkBox = false;
+            chemical.getFailRemark().append("计量单位不能为空、");
+        }
+
+        //计量方式
+        if(StringUtils.isNotEmpty(chemical.getMeasuringMethod())){
+            if("重量".equals(chemical.getMeasuringMethod())){
+                hxpChemical.setMeasuringMethod(1);
+            }else if("体积".equals(chemical.getMeasuringMethod())){
+                hxpChemical.setMeasuringMethod(2);
+            }else if("个数".equals(chemical.getMeasuringMethod())){
+                hxpChemical.setMeasuringMethod(3);
+            }else{
+                chemical.getFailRemark().append("失败：");
+                failChemicalList.add(chemical);
+                checkBox = false;
+                chemical.getFailRemark().append("计量方式不存在、");
+            }
+        }else {
+            chemical.getFailRemark().append("失败：");
+            failChemicalList.add(chemical);
+            checkBox = false;
+            chemical.getFailRemark().append("计量方式不能为空、");
+        }
+
 //        Map<String,Integer> labelMap = new HashMap<>();
 //        labelMap.put("RFID",1);
 //        labelMap.put("二维码",2);
@@ -262,8 +299,8 @@ public class HxpChemicalServiceImpl implements IHxpChemicalService {
 
         if(StringUtils.isEmpty(chemical.getFailRemark())){
             //这里目前先写死
-            hxpChemical.setMeasuringMethod(1);
-            hxpChemical.setChemicalUnit("");
+            //hxpChemical.setMeasuringMethod(1);
+            //hxpChemical.setChemicalUnit("");
             // hxpChemical.setChemicalUnit("g");
             hxpChemicalService.insertHxpChemical(hxpChemical);
         }