接收字段调整

src/main/java/com/chinaitop/depot/fumigation/controller/FumigationForRecordController.java

@@ -18,6 +18,7 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang.ObjectUtils;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.MediaType;
 import org.springframework.util.CollectionUtils;
@@ -513,30 +514,91 @@ public class FumigationForRecordController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "forRecord", value = "熏蒸备案基础信息和备案信息", paramType = "form")
     })
-    public void insertRecord(String forRecord) throws Exception {
+    public Map<String, Object> insertRecord(String forRecord) throws Exception {
+        Map<String, Object> modelMap = new HashMap<>();
+        if(StringUtils.isEmpty(forRecord)){
+            modelMap.put("msg","所传信息为空，请检查");
+            return modelMap;
+        }
         JSONObject recordInfo = JSONObject.parseObject(forRecord);
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        String xzzydh = (String)recordInfo.get("id");
-        String operationSupervisor = (String)recordInfo.get("operationSupervisor");
-        String contactPhone = (String)recordInfo.get("contactPhone");
-        String xzzydd=(String)recordInfo.get("operationLocaltion");
-        String lyccdwfzr = (String)recordInfo.get("orgPerson");
-        String lyccdw = (String)recordInfo.get("orgName");
-        String ylccdwlxdh = (String)recordInfo.get("orgPhone");
-        String fumigationStart=(String)recordInfo.get("fumigationStart");
-        String fumigationEnd = (String)recordInfo.get("fumigationEnd");
-        String creater = (String)recordInfo.get("creater");
-        String createTime = (String)recordInfo.get("createTime");
-        String updateTime = (String)recordInfo.get("updateTime");
-        String enterpriseOpinion = (String)recordInfo.get("qyspyj");
-        String organsOpinion = (String)recordInfo.get("qlbspyj");
-        String spsj = (String)recordInfo.get("qlbspsj");
-        String spr =(String)recordInfo.get("qyfzr");
-        String position =(String)recordInfo.get("position");
-        String fhry =(String)recordInfo.get("fhry");
-
-
-        List<Map<String,Object>> details = ( List<Map<String,Object>>)recordInfo.get("detailVOS");
+        String xzzydh = null;
+        String operationSupervisor = null;
+        String contactPhone = null;
+        String xzzydd = null;
+        String lyccdwfzr = null;
+        String lyccdw = null;
+        String ylccdwlxdh = null;
+        String fumigationStart = null;
+        String fumigationEnd = null;
+        String creater = null;
+        String createTime = null;
+        String updateTime = null;
+        String enterpriseOpinion = null;
+        String organsOpinion = null;
+        String spsj = null;
+        String spr = null;
+        String position = null;
+        String fhry = null;
+        if(recordInfo.get("id")!=null){
+            xzzydh = (String)recordInfo.get("id");
+        }
+        if(recordInfo.get("operationSupervisor")!=null){
+            operationSupervisor = (String)recordInfo.get("operationSupervisor");
+        }
+       if(recordInfo.get("contactPhone")!=null){
+           contactPhone = (String)recordInfo.get("contactPhone");
+       }
+       if(recordInfo.get("operationLocaltion")!=null){
+           xzzydd=(String)recordInfo.get("operationLocaltion");
+       }
+       if(recordInfo.get("orgPerson")!=null){
+           lyccdwfzr = (String)recordInfo.get("orgPerson");
+       }
+       if(recordInfo.get("orgName")!=null){
+           lyccdw = (String)recordInfo.get("orgName");
+       }
+       if(recordInfo.get("orgPhone")!=null){
+           ylccdwlxdh = (String)recordInfo.get("orgPhone");
+       }
+       if(recordInfo.get("fumigationStart")!=null){
+           fumigationStart=(String)recordInfo.get("fumigationStart");
+       }
+       if(recordInfo.get("fumigationEnd")!=null){
+           fumigationEnd = (String)recordInfo.get("fumigationEnd");
+       }
+       if(recordInfo.get("creater")!=null){
+           creater = (String)recordInfo.get("creater");
+       }
+       if(recordInfo.get("createTime")!=null){
+           createTime = (String)recordInfo.get("createTime");
+       }
+       if(recordInfo.get("updateTime")!=null){
+           updateTime = (String)recordInfo.get("updateTime");
+       }
+       if(recordInfo.get("qyspyj")!=null){
+           enterpriseOpinion = (String)recordInfo.get("qyspyj");
+       }
+       if(recordInfo.get("qlbspyj")!=null){
+           organsOpinion = (String)recordInfo.get("qlbspyj");
+       }
+       if(recordInfo.get("qlbspsj")!=null){
+           spsj = (String)recordInfo.get("qlbspsj");
+       }
+       if(recordInfo.get("qyfzr")!=null){
+           spr =(String)recordInfo.get("qyfzr");
+       }
+       if(recordInfo.get("position")!=null){
+           position =(String)recordInfo.get("position");
+       }
+       if(recordInfo.get("fhry")!=null){
+           fhry =(String)recordInfo.get("fhry");
+       }
+        if(recordInfo.get("detailVOS")==null){
+            modelMap.put("msg","缺少库房信息");
+            return modelMap;
+        }
+        List<Map<String,Object>> details = (List<Map<String,Object>>)recordInfo.get("detailVOS");
         for (Map<String, Object> detail : details) {
             TFumigationForrecord fumigationForrecord = new TFumigationForrecord();
             String uuid = ParameterUtil.getCode();
@@ -550,53 +612,162 @@ public class FumigationForRecordController {
             fumigationForrecord.setLyccdwfzr(lyccdwfzr);
             fumigationForrecord.setLyccdw(lyccdw);
             fumigationForrecord.setYlccdwlxdh(ylccdwlxdh);
-            fumigationForrecord.setFumigationStart(format.parse(fumigationStart));
-            fumigationForrecord.setFumigationEnd(format.parse(fumigationEnd));
+            if(fumigationStart!=null){
+                fumigationForrecord.setFumigationStart(format.parse(fumigationStart));
+            }
+            if(fumigationEnd!=null){
+                fumigationForrecord.setFumigationEnd(format.parse(fumigationEnd));
+            }
             fumigationForrecord.setSqr(creater);
-            fumigationForrecord.setCreateTime(format.parse(createTime));
-            fumigationForrecord.setUpdatetime(format.parse(updateTime));
+            if(createTime!=null){
+                fumigationForrecord.setCreateTime(format.parse(createTime));
+            }
+            if(updateTime!=null){
+                fumigationForrecord.setUpdatetime(format.parse(updateTime));
+            }
             fumigationForrecord.setEnterpriseOpinion(enterpriseOpinion);
             fumigationForrecord.setOrgansOpinion(organsOpinion);
-            fumigationForrecord.setSpsj(format.parse(spsj));
+            if(spsj!=null){
+                fumigationForrecord.setSpsj(format.parse(spsj));
+                fumigationForrecord.setOutForrecordTime(format.parse(spsj));
+            }
             fumigationForrecord.setSpr(spr);
             fumigationForrecord.setDeleteState("1");
-            fumigationForrecord.setOutForrecordTime(format.parse(spsj));
             fumigationForrecord.setOutPerson(spr);
-            String cfdm = (String)detail.get("cfbh");
-            Map<String,Integer> info = fumigationFroRecordService.getByCfdm(cfdm);
-            Integer orgId = info.get("orgid");
-            Integer houseId = info.get("houseid");
-            String cfmc = (String)detail.get("cfmc");
-            BigDecimal lssl = new BigDecimal(ObjectUtils.toString(detail.get("kcsl")));
-            String lspz = (String)detail.get("lspz");
-            String lyxz = (String)detail.get("lsxz");
-            String cgxzfs = (String)detail.get("convFumigation");
-            String hlxzfs = (String)detail.get("recFumigation");
-            Integer xzfs = (Integer)detail.get("xzfs");
-            String hlxzynhljsjh = (String)detail.get("recIcCombine");
-            String yjmc = (String)detail.get("drugCode");
-            String jx = (String)detail.get("drugType");
-            BigDecimal nd = new BigDecimal(ObjectUtils.toString(detail.get("drugConcentration")));;
-            String syff = (String)detail.get("applicationMethod");
-            Integer lqsl = (Integer)detail.get("getNumber");
-            BigDecimal lddwyyl = new BigDecimal(ObjectUtils.toString(detail.get("grainDosage")));
-            BigDecimal kjdwyyl = new BigDecimal(ObjectUtils.toString(detail.get("spaceDosage")));
-            BigDecimal zyyl = new BigDecimal(ObjectUtils.toString(detail.get("totalDosage")));
-            String hcjcdh = (String)detail.get("pestNo");
-
-            BigDecimal lysf =new BigDecimal(ObjectUtils.toString(detail.get("lysf")));;
-            String dzfs =(String)detail.get("dzfs");
-            String east =(String)detail.get("east");
-            String west =(String)detail.get("west");
-            String south =(String)detail.get("south");
-            String north =(String)detail.get("north");
-            String yjyxq =(String)detail.get("yjyxq");
-            String lqr =(String)detail.get("lqr");
-            String lqsj =(String)detail.get("lqsj");
-            String xzzhr =(String)detail.get("xzzhr");
-            Integer xzrs =(Integer)detail.get("xzrs");
-            String xzczry =(String)detail.get("xzczry");
-            String processingInstructions =(String)detail.get("processingInstructions");
+            String cfdm = null;
+            Integer orgId =null;
+            Integer houseId =null;
+            String cfmc = null;
+            BigDecimal lssl = null;
+            String lspz = null;
+            String lyxz = null;
+            String cgxzfs = null;
+            String hlxzfs = null;
+            Integer xzfs = null;
+            String hlxzynhljsjh = null;
+            String yjmc = null;
+            String jx =null;
+            BigDecimal nd =null;
+            String syff = null;
+            Integer lqsl = null;
+            BigDecimal lddwyyl = null;
+            BigDecimal kjdwyyl = null;
+            BigDecimal zyyl = null;
+            String hcjcdh = null;
+            BigDecimal lysf = null;
+            String dzfs = null;
+            String east = null;
+            String west = null;
+            String south = null;
+            String north = null;
+            String yjyxq = null;
+            String lqr = null;
+            String lqsj = null;
+            String xzzhr = null;
+            Integer xzrs = null;
+            String xzczry = null;
+            String processingInstructions = null;
+            if(detail.get("cfbh")!=null){
+                cfdm = (String)detail.get("cfbh");
+                Map<String,Integer> info = fumigationFroRecordService.getByCfdm(cfdm);
+                if(info!=null){
+                    orgId = info.get("orgid");
+                    houseId = info.get("houseid");
+                }else{
+                    modelMap.put("msg","未获取到仓房对应org信息和house信息");
+                    return modelMap;
+                }
+            }
+            if(detail.get("cfmc")!=null){
+                cfmc = (String)detail.get("cfmc");
+            }
+            if(detail.get("kcsl")!=null){
+                lssl = new BigDecimal(ObjectUtils.toString(detail.get("kcsl")));
+            }
+            if(detail.get("lspzCode")!=null){
+                lspz = ObjectUtils.toString(detail.get("lspzCode"));
+            }
+            if(detail.get("lsxzCode")!=null){
+                lyxz = ObjectUtils.toString(detail.get("lsxzCode"));
+            }
+            if(detail.get("convFumigation")!=null){
+                cgxzfs = (String)detail.get("convFumigation");
+            }
+            if(detail.get("recFumigation")!=null){
+                hlxzfs = (String)detail.get("recFumigation");
+            }
+            if(detail.get("xzfs")!=null){
+                xzfs = (Integer)detail.get("xzfs");
+            }
+            if(detail.get("recIcCombine")!=null){
+                hlxzynhljsjh = (String)detail.get("recIcCombine");
+            }
+            if(detail.get("drugNameCode")!=null){
+                yjmc = ObjectUtils.toString(detail.get("drugNameCode"));
+            }
+            if(detail.get("drugTypeCode")!=null){
+                jx = ObjectUtils.toString(detail.get("drugTypeCode"));
+            }
+            if(detail.get("drugConcentration")!=null){
+                nd = new BigDecimal(ObjectUtils.toString(detail.get("drugConcentration")));;
+            }
+            if(detail.get("applicationMethod")!=null){
+                syff = (String)detail.get("applicationMethod");
+            }
+            if(detail.get("getNumber")!=null){
+                lqsl = (Integer)detail.get("getNumber");
+            }
+            if(detail.get("grainDosage")!=null){
+                lddwyyl = new BigDecimal(ObjectUtils.toString(detail.get("grainDosage")));
+            }
+            if(detail.get("spaceDosage")!=null){
+                kjdwyyl = new BigDecimal(ObjectUtils.toString(detail.get("spaceDosage")));
+            }
+            if(detail.get("totalDosage")!=null){
+                zyyl = new BigDecimal(ObjectUtils.toString(detail.get("totalDosage")));
+            }
+            if(detail.get("pestNo")!=null){
+                hcjcdh = (String)detail.get("pestNo");
+            }
+            if(detail.get("lysf")!=null){
+                lysf =new BigDecimal(ObjectUtils.toString(detail.get("lysf")));
+            }
+            if(detail.get("dzfs")!=null){
+                dzfs =(String)detail.get("dzfs");
+            }
+            if(detail.get("east")!=null){
+                east =(String)detail.get("east");
+            }
+            if(detail.get("west")!=null){
+                west =(String)detail.get("west");
+            }
+            if(detail.get("south")!=null){
+                south =(String)detail.get("south");
+            }
+            if(detail.get("north")!=null){
+                north =(String)detail.get("north");
+            }
+            if(detail.get("yjyxq")!=null){
+                yjyxq =(String)detail.get("yjyxq");
+            }
+            if(detail.get("lqr")!=null){
+                lqr =(String)detail.get("lqr");
+            }
+            if(detail.get("lqsj")!=null){
+                lqsj =(String)detail.get("lqsj");
+            }
+            if(detail.get("xzzhr")!=null){
+                xzzhr =(String)detail.get("xzzhr");
+            }
+            if(detail.get("xzrs")!=null){
+                xzrs =(Integer)detail.get("xzrs");
+            }
+            if(detail.get("xzczry")!=null){
+                xzczry =(String)detail.get("xzczry");
+            }
+            if(detail.get("processingInstructions")!=null){
+                processingInstructions =(String)detail.get("processingInstructions");
+            }
             fumigationForrecord.setLysf(lysf);
             fumigationForrecord.setDzfs(dzfs);
             fumigationForrecord.setEast(east);
@@ -605,81 +776,91 @@ public class FumigationForRecordController {
             fumigationForrecord.setStowWay(dzfs);
             fumigationForrecord.setSyff(syff);
             fumigationForrecord.setNorth(north);
-            fumigationForrecord.setYjyxq(format.parse(yjyxq));
+            if(yjyxq!=null){
+                fumigationForrecord.setYjyxq(format.parse(yjyxq));
+            }
             fumigationForrecord.setLqr(lqr);
-            fumigationForrecord.setLqsj(format.parse(lqsj));
+            if(lqsj!=null){
+                fumigationForrecord.setLqsj(format.parse(lqsj));
+            }
             fumigationForrecord.setXzzhr(xzzhr);
             fumigationForrecord.setXzrs(xzrs);
             fumigationForrecord.setXzczry(xzczry);
             fumigationForrecord.setProcessingInstructions(processingInstructions);
-            List<Map<String,Object>> pest =  (List<Map<String,Object>>)detail.get("pestVOS");
-            if(!CollectionUtils.isEmpty(pest)){
-                String zyhc = "";
-                String ckmd = "";
-                for (Map<String, Object> stringObjectMap : pest) {
-                    TFumigationPesticide pesticide = new TFumigationPesticide();
-                    pesticide.setId(ParameterUtil.getCode());
-                    pesticide.setRecordId(uuid);
-                    pesticide.setUseDrugType(syff);
-                    pesticide.setReagentType(jx);
-                    pesticide.setCreateTime(new Date());
-                    pesticide.setDrugPurity(nd.toString());
-                    if(stringObjectMap.get("pestType") !=null){
-                        zyhc +=(String)stringObjectMap.get("pestType")+"#";
-                        pesticide.setMajorInsectPests(Integer.valueOf((String)stringObjectMap.get("pestType")));
+            if(detail.get("pestVOS")!=null){
+                if(detail.get("pestVOS")!=null){
+                    List<Map<String,Object>> pest =  (List<Map<String,Object>>)detail.get("pestVOS");
+                    if(!CollectionUtils.isEmpty(pest)){
+                        String zyhc = "";
+                        String ckmd = "";
+                        for (Map<String, Object> stringObjectMap : pest) {
+                            TFumigationPesticide pesticide = new TFumigationPesticide();
+                            pesticide.setId(ParameterUtil.getCode());
+                            pesticide.setRecordId(uuid);
+                            pesticide.setUseDrugType(syff);
+                            pesticide.setReagentType(jx);
+                            pesticide.setCreateTime(new Date());
+                            pesticide.setDrugPurity(nd.toString());
+                            if(stringObjectMap.get("hczlCode") !=null){
+                                zyhc +=ObjectUtils.toString(stringObjectMap.get("hczlCode"))+"#";
+                                pesticide.setMajorInsectPests(Integer.valueOf(ObjectUtils.toString(stringObjectMap.get("hczlCode"))));
+                            }
+                            if(stringObjectMap.get("density") !=null){
+                                ckmd += (String)stringObjectMap.get("density") + "|";
+                                pesticide.setInsectDensity((String)stringObjectMap.get("density"));
+                            }
+                            if(yjmc!=null){
+                                pesticide.setDrugName(Integer.valueOf(yjmc));
+                            }
+                            if(stringObjectMap.get("discoveryTime")!=null){
+                                pesticide.setInsectProductTime(format.parse((String)stringObjectMap.get("discoveryTime")));
+                            }
+                            if(stringObjectMap.get("happenPosition")!=null){
+                                pesticide.setOccurrencePlace((String)stringObjectMap.get("happenPosition"));
+                            }
+                            if(stringObjectMap.get("pestResistance")!=null){
+                                pesticide.setDrugResistance((String)stringObjectMap.get("pestResistance"));
+                            }
+                            if(stringObjectMap.get("sealType")!=null){
+                                pesticide.setSealType((String)stringObjectMap.get("sealType"));
+                            }
+                            pesticidePlanService.add(pesticide);
+                        }
+                        zyhc = zyhc.substring(0,zyhc.lastIndexOf("#"));
+                        ckmd = ckmd.substring(0,ckmd.lastIndexOf("|"));
+                        fumigationForrecord.setZyhc(zyhc);
+                        fumigationForrecord.setCkmd(ckmd);
                     }
-                    if(stringObjectMap.get("density") !=null){
-                        ckmd += (String)stringObjectMap.get("density") + "|";
-                        pesticide.setInsectDensity((String)stringObjectMap.get("density"));
-                    }
-                    if(yjmc!=null){
-                        pesticide.setDrugName(Integer.valueOf(yjmc));
-                    }
-                    if(stringObjectMap.get("discoveryTime")!=null){
-                        pesticide.setInsectProductTime(format.parse((String)stringObjectMap.get("discoveryTime")));
-                    }
-                    if(stringObjectMap.get("happenPosition")!=null){
-                        pesticide.setOccurrencePlace((String)stringObjectMap.get("happenPosition"));
-                    }
-                    if(stringObjectMap.get("pestResistance")!=null){
-                        pesticide.setDrugResistance((String)stringObjectMap.get("pestResistance"));
-                    }
-                    if(stringObjectMap.get("sealType")!=null){
-                        pesticide.setSealType((String)stringObjectMap.get("sealType"));
-                    }
-                    pesticidePlanService.add(pesticide);
                 }
-                zyhc = zyhc.substring(0,zyhc.lastIndexOf("#"));
-                ckmd = ckmd.substring(0,ckmd.lastIndexOf("|"));
-                fumigationForrecord.setZyhc(zyhc);
-                fumigationForrecord.setCkmd(ckmd);
-            }
-            List<Map<String,String>> person  =  (List<Map<String,String>>)detail.get("fumigationPersonnelList");
-            if(!CollectionUtils.isEmpty(person)){
-                for (Map<String, String> stringObjectMap : person) {
-                    TFumigationPersonnel personnel = new TFumigationPersonnel();
-                    personnel.setDeleteState("1");//默认设置删除标志
-                    personnel.setCreateTime(new Date());//创建时间
-                    personnel.setId(ParameterUtil.getCode());
-                    personnel.setForrecordId(uuid);
-                    personnel.setOrgId(orgId);
-
-                    if(stringObjectMap.get("personnelName") !=null){
-                        personnel.setPersonnelName(stringObjectMap.get("personnelName"));
-                    }
-                    if(stringObjectMap.get("professionalQualification") !=null){
-                        personnel.setProfessionalQualification(stringObjectMap.get("professionalQualification"));
-                    }
-                    if(stringObjectMap.get("physicalCondition") !=null){
-                        personnel.setPhysicalCondition(stringObjectMap.get("physicalCondition"));
-                    }
-                    if(stringObjectMap.get("workTask") !=null){
-                        personnel.setWorkTask(stringObjectMap.get("workTask"));
-                    }
-                    if(stringObjectMap.get("outside") !=null){
-                        personnel.setOutside(stringObjectMap.get("outside").equals("1")?"是":"否");
+            }
+            if(detail.get("fumigationPersonnelList")!=null){
+                List<Map<String,String>> person  =  (List<Map<String,String>>)detail.get("fumigationPersonnelList");
+                if(!CollectionUtils.isEmpty(person)){
+                    for (Map<String, String> stringObjectMap : person) {
+                        TFumigationPersonnel personnel = new TFumigationPersonnel();
+                        personnel.setDeleteState("1");//默认设置删除标志
+                        personnel.setCreateTime(new Date());//创建时间
+                        personnel.setId(ParameterUtil.getCode());
+                        personnel.setForrecordId(uuid);
+                        personnel.setOrgId(orgId);
+
+                        if(stringObjectMap.get("personnelName") !=null){
+                            personnel.setPersonnelName(stringObjectMap.get("personnelName"));
+                        }
+                        if(stringObjectMap.get("professionalQualification") !=null){
+                            personnel.setProfessionalQualification(stringObjectMap.get("professionalQualification"));
+                        }
+                        if(stringObjectMap.get("physicalCondition") !=null){
+                            personnel.setPhysicalCondition(stringObjectMap.get("physicalCondition"));
+                        }
+                        if(stringObjectMap.get("workTask") !=null){
+                            personnel.setWorkTask(stringObjectMap.get("workTask"));
+                        }
+                        if(stringObjectMap.get("outside") !=null){
+                            personnel.setOutside(stringObjectMap.get("outside").equals("1")?"是":"否");
+                        }
+                        fumigationFroRecordService.addPersonnel(personnel);
                     }
-                    fumigationFroRecordService.addPersonnel(personnel);
                 }
             }
             fumigationForrecord.setCfdm(cfdm);
@@ -697,7 +878,9 @@ public class FumigationForRecordController {
             fumigationForrecord.setJx(jx);
             fumigationForrecord.setNd(nd);
             fumigationForrecord.setSyff(syff);
-            fumigationForrecord.setLqsl(new BigDecimal(lqsl));
+            if(lqsl!=null){
+                fumigationForrecord.setLqsl(new BigDecimal(lqsl));
+            }
             fumigationForrecord.setLddwyyl(lddwyyl);
             fumigationForrecord.setKjdwyyl(kjdwyyl);
             fumigationForrecord.setZyyl(zyyl);
@@ -705,7 +888,8 @@ public class FumigationForRecordController {
             fumigationForrecord.setState(8);
             fumigationFroRecordService.add(fumigationForrecord);
         }
-
+        modelMap.put("msg","新增成功");
+        return modelMap;
         //市级传输过来的审批过后的备案数据
         /*Map<String, Object> modelMap = new HashMap<>();*/
         // JSON字符串转对象