天津熏蒸接口修改

pom.xml

@@ -101,12 +101,23 @@
             <artifactId>poi-ooxml</artifactId>
             <version>3.9</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.5.6</version>
+        </dependency>
         <!-- 阿里巴巴json -->
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
             <version>1.2.37</version>
         </dependency>
+        <dependency>
+            <groupId>net.sf.json-lib</groupId>
+            <artifactId>json-lib</artifactId>
+            <version>2.4</version>
+            <classifier>jdk15</classifier>
+        </dependency>
         <dependency><!-- 该依赖必加，里面有sping对schedule的支持 -->
             <groupId>org.springframework</groupId>
             <artifactId>spring-context-support</artifactId>

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

@@ -9,6 +9,7 @@ import com.chinaitop.depot.intelligent.fumigation.service.PesticidePlanService;
 import com.chinaitop.depot.intelligent.grainsituation.model.TQtdevinfoValue;
 import com.chinaitop.depot.intelligent.grainsituation.model.TTestdataExample;
 import com.chinaitop.depot.intelligent.grainsituation.service.GasDetectionService;
+import com.chinaitop.depot.intelligent.utils.HttpUtil;
 import com.chinaitop.depot.intelligent.utils.JsonToObjectUtils;
 import com.chinaitop.depot.intelligent.utils.ParameterUtil;
 import com.chinaitop.depot.intelligent.utils.UuidUtils;
@@ -19,6 +20,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -50,6 +52,9 @@ public class FumigationForRecordController {
     @Resource
     private PesticidePlanService pesticidePlanService;
 
+    // 获取ip地址
+    @Value("${reportUrl}")
+    private String reportPath;
     /**
      * 列表
      * @param pageNum
@@ -173,7 +178,6 @@ public class FumigationForRecordController {
     public Map<String, Object> saveFumigationForRecordDate(String forRecord, String addedDetail,String fumigation,String stateType) throws Exception {
         if(ParameterUtil.isequal(stateType,"getSubmit")){
             stateType = "7";
-            //如果是提交的话则除了保存还要把数据提交到市级来进行审批
         }else{
             stateType = "6";
         }
@@ -247,6 +251,14 @@ public class FumigationForRecordController {
             pesticidePlanService.updateByExample(tFumigationPesticide, pesticideExample);
         }
 
+        if(ParameterUtil.isequal(stateType,"getSubmit")){
+            //如果是提交的话则除了保存还要把数据提交到市级来进行审批
+            Map<String, Object> dataMap = fumigationFroRecordService.getFroRecordByIds(uuid);
+            Map<String, Object> sjMap = new HashMap<String, Object>();
+            String url = reportPath+"/fumigation/insertFumigation";//市级接口
+            sjMap.put("TFumigationForrecord",JSON.toJSONString(dataMap));
+            String strResult = HttpUtil.doPost(url,sjMap);
+        }
         modelMap.put("status", "success");
         return modelMap;
     }
@@ -298,7 +310,7 @@ public class FumigationForRecordController {
      * @throws Exception
      */
     @RequestMapping(value="/getSubmit", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
-    @ApiOperation(value="提交熏蒸备案信息", notes = "删除熏蒸备案信息")
+    @ApiOperation(value="提交熏蒸备案信息", notes = "提交熏蒸备案信息")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "planIds", value = "熏蒸主键集合", paramType = "form"),
             @ApiImplicitParam(name = "forrecordId", value = "主键id", paramType = "form")
@@ -318,7 +330,60 @@ public class FumigationForRecordController {
                 fumigationPlanService.updateByExample(tFumigationPlan, example);
             }
         }
+
+        //如果是提交的话则除了保存还要把数据提交到市级来进行审批
+        Map<String, Object> dataMap = fumigationFroRecordService.getFroRecordByIds(forrecordId);
+        Map<String, Object> sjMap = new HashMap<String, Object>();
+        String url = reportPath+"/api/cbl-app/cbl/fumigation/insertFumigation";//市级接口
+//        dataMap.put("tyshxydm","91120118712878209L");
+        String strResult = HttpUtil.doPost(url,JSON.toJSONString(dataMap));
         modelMap.put("status", "success");
         return modelMap;
     }
-}
+
+    /**
+     * 提交熏蒸申请信息
+     * @param forrecordId 主键id
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value="/getForRecordApproval", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
+    @ApiOperation(value="提交熏蒸备案信息", notes = "提交熏蒸备案信息-市级用")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "forrecordId", value = "主键id", paramType = "form")
+    })
+    public void getForRecordApproval(String forRecord) throws Exception {
+        //市级传输过来的审批过后的备案数据
+        JSONObject forRecordData = JSONObject.parseObject(forRecord);
+        String forrecordId = forRecordData.get("forrecordId").toString();
+        Map<String, Object> modelMap = new HashMap<>();
+        if (forrecordId != null) {
+            //修改熏蒸备案信息
+            TFumigationForrecordExample tFumigationForrecordExample = new TFumigationForrecordExample();
+            TFumigationForrecordExample.Criteria criteria = tFumigationForrecordExample.createCriteria();
+            criteria.andIdEqualTo(forrecordId);
+
+            TFumigationForrecord tFumigationForrecord = new TFumigationForrecord();
+            tFumigationForrecord.setOrgansOpinion(forRecordData.get("organsOpinion").toString());
+            tFumigationForrecord.setOutPerson(forRecordData.get("outPerson").toString());
+            tFumigationForrecord.setOutForrecordTime(ParameterUtil.string2datetime(forRecordData.get("outForrecordTime").toString()));
+            fumigationFroRecordService.updateByExample(tFumigationForrecord, tFumigationForrecordExample);
+
+            //获取备案数据
+            Map<String, Object> forRecords = fumigationFroRecordService.getFroRecordById(forrecordId);
+
+            //下边获取熏蒸数据
+            String[] planId = forRecords.get("planIds").toString().split(",");
+            for (String id:planId) {
+                //修改熏蒸状态
+                TFumigationPlanExample example = new TFumigationPlanExample();
+                TFumigationPlanExample.Criteria planCriteria = example.createCriteria();
+                planCriteria.andIdEqualTo(id);
+
+                TFumigationPlan tFumigationPlan = new TFumigationPlan();
+                tFumigationPlan.setState(8);
+                fumigationPlanService.updateByExample(tFumigationPlan, example);
+            }
+        }
+    }
+}

src/main/java/com/chinaitop/depot/intelligent/fumigation/mapper/TFumigationForrecordMapper.java

@@ -34,5 +34,10 @@ public interface TFumigationForrecordMapper {
 
     List<Map<String, Object>> getFumigationDateByIds(Map<String, Object> map);
 
-    Map<String, Object> getFroRecordById(String forRecordId);
+    Map<String, Object> getFroRecordById(String forRecordId);//本地用备案详情
+    Map<String, Object> getFroRecordByIds(String forRecordId);//市级用备案数据
+    List<Map<String, Object>> getpersonnelByIds(String forRecordId);//市级用备案熏蒸人员数据
+    List<Map<String, Object>> getplanByIds(String forRecordId);//市级用熏蒸计划数据
+    List<Map<String, Object>> getpesticideByIds(String forRecordId);//市级用熏蒸计划数据
+    String getLYXZ(String enumIds);//查询粮油性质
 }

src/main/java/com/chinaitop/depot/intelligent/fumigation/mapper/TFumigationForrecordMapper.xml

@@ -83,9 +83,9 @@
     </where>
   </sql>
   <sql id="Base_Column_List" >
-    id, operation_supervisor, position, contact_phone, fumigation_start, fumigation_end, 
-    stow_way, east, south, west, north, processing_instructions, enterprise_opinion, 
-    organs_opinion, creater, create_time, out_person, out_forrecord_time, org_id, delete_state, 
+    id, operation_supervisor, position, contact_phone, fumigation_start, fumigation_end,
+    stow_way, east, south, west, north, processing_instructions, enterprise_opinion,
+    organs_opinion, creater, create_time, out_person, out_forrecord_time, org_id, delete_state,
     updatetime
   </sql>
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.intelligent.fumigation.model.TFumigationForrecordExample" >
@@ -103,7 +103,7 @@
     </if>
   </select>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
-    select 
+    select
     <include refid="Base_Column_List" />
     from t_fumigation_forrecord
     where id = #{id,jdbcType=VARCHAR}
@@ -119,20 +119,20 @@
     </if>
   </delete>
   <insert id="insert" parameterType="com.chinaitop.depot.intelligent.fumigation.model.TFumigationForrecord" >
-    insert into t_fumigation_forrecord (id, operation_supervisor, position, 
-      contact_phone, fumigation_start, fumigation_end, 
-      stow_way, east, south, 
-      west, north, processing_instructions, 
-      enterprise_opinion, organs_opinion, creater, 
-      create_time, out_person, out_forrecord_time, 
+    insert into t_fumigation_forrecord (id, operation_supervisor, position,
+      contact_phone, fumigation_start, fumigation_end,
+      stow_way, east, south,
+      west, north, processing_instructions,
+      enterprise_opinion, organs_opinion, creater,
+      create_time, out_person, out_forrecord_time,
       org_id, delete_state, updatetime
       )
-    values (#{id,jdbcType=VARCHAR}, #{operationSupervisor,jdbcType=VARCHAR}, #{position,jdbcType=VARCHAR}, 
-      #{contactPhone,jdbcType=VARCHAR}, #{fumigationStart,jdbcType=TIMESTAMP}, #{fumigationEnd,jdbcType=TIMESTAMP}, 
-      #{stowWay,jdbcType=VARCHAR}, #{east,jdbcType=VARCHAR}, #{south,jdbcType=VARCHAR}, 
-      #{west,jdbcType=VARCHAR}, #{north,jdbcType=VARCHAR}, #{processingInstructions,jdbcType=VARCHAR}, 
-      #{enterpriseOpinion,jdbcType=VARCHAR}, #{organsOpinion,jdbcType=VARCHAR}, #{creater,jdbcType=INTEGER}, 
-      #{createTime,jdbcType=TIMESTAMP}, #{outPerson,jdbcType=VARCHAR}, #{outForrecordTime,jdbcType=TIMESTAMP}, 
+    values (#{id,jdbcType=VARCHAR}, #{operationSupervisor,jdbcType=VARCHAR}, #{position,jdbcType=VARCHAR},
+      #{contactPhone,jdbcType=VARCHAR}, #{fumigationStart,jdbcType=TIMESTAMP}, #{fumigationEnd,jdbcType=TIMESTAMP},
+      #{stowWay,jdbcType=VARCHAR}, #{east,jdbcType=VARCHAR}, #{south,jdbcType=VARCHAR},
+      #{west,jdbcType=VARCHAR}, #{north,jdbcType=VARCHAR}, #{processingInstructions,jdbcType=VARCHAR},
+      #{enterpriseOpinion,jdbcType=VARCHAR}, #{organsOpinion,jdbcType=VARCHAR}, #{creater,jdbcType=INTEGER},
+      #{createTime,jdbcType=TIMESTAMP}, #{outPerson,jdbcType=VARCHAR}, #{outForrecordTime,jdbcType=TIMESTAMP},
       #{orgId,jdbcType=INTEGER}, #{deleteState,jdbcType=VARCHAR}, #{updatetime,jdbcType=TIMESTAMP}
       )
   </insert>
@@ -547,6 +547,106 @@
         forrecord.id
   </select>
 
+  <select id="getFroRecordByIds" resultType="java.util.Map" parameterType="java.lang.String" >
+    SELECT
+        forrecord.id,
+        forrecord.create_time createTime,
+        forrecord.operation_supervisor operationSupervisor,
+        forrecord.position position,
+        forrecord.contact_phone contactPhone,
+        forrecord.fumigation_start fumigationStart,
+        forrecord.fumigation_end fumigationEnd,
+        forrecord.stow_way stowWay,
+        forrecord.east east,
+        forrecord.south south,
+        forrecord.west west,
+        forrecord.north north,
+        forrecord.processing_instructions processingInstructions,
+        forrecord.enterprise_opinion enterpriseOpinion,
+        forrecord.organs_opinion organsOpinion,
+        users.real_name creater,
+        users.mobile createrPhone,
+        forrecord.org_id orgId,
+        forrecord.out_person outPerson,
+        forrecord.out_forrecord_time outForrecordTime,
+        forrecord.delete_state deleteState,
+        forrecord.updatetime updatetime
+    FROM
+        t_fumigation_forrecord forrecord
+    LEFT JOIN user_info users ON users.user_id = forrecord.creater
+    WHERE
+        forrecord.id = #{forRecordId,jdbcType=VARCHAR}
+  </select>
+  <select id="getpersonnelByIds" resultType="java.util.HashMap" parameterType="java.lang.String" >
+    SELECT
+        personnel.id,
+        personnel.forrecord_id forrecordId,
+        personnel.personnel_name personnelName,
+        personnel.professional_qualification professionalQualification,
+        personnel.physical_condition physicalCondition,
+        personnel.work_task workTask,
+        personnel.outside outside,
+        personnel.create_time createTime,
+        personnel.org_id orgId,
+        personnel.delete_state deleteState,
+        personnel.updatetime
+    FROM
+        t_fumigation_personnel personnel
+    WHERE
+        personnel.forrecord_id = #{forRecordId,jdbcType=VARCHAR}
+  </select>
+  <select id="getplanByIds" resultType="java.util.HashMap" parameterType="java.lang.String" >
+    SELECT
+        plan.id, plan.for_record_id forRecordId, plan.house_id houseId, plan.keeper, lspzenum.enumName grainKind,
+        plan.grain_count grainCount, plan.harvest_years harvestYears, plan.put_storage_years putStorageYears,
+        plan.fumigation_num fumigationNum, ones.enumName oneMethods, plan.one_dose oneDose, plan.one_date oneDate,
+        twos.enumName twoMethods, plan.two_dose twoDose, plan.two_date twoDate, threes.enumName threeMethods,
+        plan.three_dose threeDose, plan.three_date threeDate, fours.enumName fourMethods, plan.four_dose fourDose,
+        plan.four_date fourDate, plan.deliquescence, plan.bag_buried bagBuried, plan.test_tube testTube,
+        plan.applying_pesticide applyingPesticide, plan.fixed_decorate fixedDecorate, plan.mobile_decorate mobileDecorate,
+        plan.fixed, plan.mobile, plan.single_control singleControl, plan.double_control doubleControl, fumtype.enumName fumigationType,
+        plan.fumigation_number fumigationNumber, plan.fumigation_command fumigationCommand, plan.fumigation_operation fumigationOperation,
+        plan.fumiagtion_protective fumiagtionProtective, plan.fumiagtion_period_time fumiagtionPeriodTime, plan.fumiagtion_chief fumiagtionChief,
+        plan.expected, plan.points_work pointsWork, plan.note, plan.state, creater.enumName creater, plan.create_time createTime,
+        plan.plan_formulation planFormulation, plan.reported, plan.pesticide_qualification pesticideQualification, plan.qualification,
+        plan.approve_people approvePeople, plan.approve_department approveDepartment, plan.approve_note approveNote,
+        plan.approve_time approveTime, plan.grain_moisture grainMoisture, plan.delete_state deleteState, plan.org_id orgId,
+        plan.updatetime,infos.company_org_code tyshxydm
+    FROM
+        t_fumigation_plan plan
+    LEFT JOIN basic_enum lspzenum on lspzenum.enumId = plan.grain_kind
+    LEFT JOIN basic_enum fumtype on fumtype.enumId = plan.fumigation_type
+    LEFT JOIN basic_enum ones on ones.enumId = plan.one_methods
+    LEFT JOIN basic_enum twos on twos.enumId = plan.two_methods
+    LEFT JOIN basic_enum threes on threes.enumId = plan.three_methods
+    LEFT JOIN basic_enum fours on fours.enumId = plan.four_methods
+    LEFT JOIN basic_enum creater on creater.enumId = plan.creater
+    LEFT JOIN org_info infos on infos.org_id = plan.org_id
+    WHERE
+        plan.for_record_id = #{forRecordId,jdbcType=VARCHAR}
+  </select>
+  <select id="getpesticideByIds" resultType="java.util.HashMap" parameterType="java.lang.String" >
+    SELECT
+        pesticide.id, pesticide.fumigation_id fumigationId, pests.enumName majorInsectPests,pesticide.insect_density insectDensity,
+        pesticide.occurrence_place occurrencePlace, pesticide.insect_product_time insectProductTime, pesticide.drug_resistance drugResistance,
+        yjmc.enumName drugName, yjlx.enumName reagentType, pesticide.validity, pesticide.get_number getNumber,
+        pesticide.get_person getPerson, pesticide.get_time getTime, pesticide.drug_purity drugPurity, pesticide.use_drug_type useDrugType,
+        pesticide.plann_drug_start_time plannDrugStartTime, pesticide.plann_drug_use_up_time plannDrugUseUpTime, pesticide.plann_drug_count plannDrugCount,
+        pesticide.seal_type sealType, pesticide.setting_concentration setting_concentration, pesticide.concentration_check_type concentrationCheckType,
+        pesticide.bulk_gas_type bulkGasType, pesticide.drug_user_number drugUserNumber, pesticide.pesticide_operator pesticideOperator,
+        pesticide.creater, pesticide.create_time createTime, pesticide.state, pesticide.approve_people approvePeople,
+        pesticide.approve_department approveDepartment, pesticide.approve_note approveNote, pesticide.approve_time approveTime, pesticide.org_id orgId,
+        pesticide.delete_state deleteState, pesticide.updatetime
+    FROM
+        t_fumigation_pesticide pesticide
+        LEFT JOIN t_fumigation_plan plan ON plan.id = pesticide.fumigation_id
+        LEFT JOIN basic_enum pests on pests.enumId = pesticide.major_insect_pests
+        LEFT JOIN basic_enum yjmc on yjmc.enumId = pesticide.drug_name
+        LEFT JOIN basic_enum yjlx on yjlx.enumId = pesticide.reagent_type
+    WHERE
+        plan.for_record_id = #{forRecordId,jdbcType=VARCHAR}
+  </select>
+
   <select id="getFumigationDateByIds" resultType="java.util.Map" parameterType="java.util.Map" >
     SELECT
     plan.id planId,
@@ -579,4 +679,13 @@
       #{planId}
     </foreach>
   </select>
+
+  <select id="getLYXZ" resultType="java.lang.String" parameterType="java.lang.String" >
+    SELECT
+    enums.enumName
+    FROM
+    basic_enum enums
+    WHERE
+    enums.enumId = #{enumIds,jdbcType=VARCHAR}
+  </select>
 </mapper>

src/main/java/com/chinaitop/depot/intelligent/fumigation/service/FumigationForRecordService.java

@@ -17,6 +17,7 @@ public interface FumigationForRecordService {
     List<Map<String, Object>> getFumigationDateByIds(Map<String, Object> map);
 
     Map<String, Object> getFroRecordById(String forRecordId);
+    Map<String, Object> getFroRecordByIds(String forRecordId);
 
     void add(TFumigationForrecord tFumigationForrecord);
     void addPersonnel(TFumigationPersonnel tFumigationPersonnel);

src/main/java/com/chinaitop/depot/intelligent/fumigation/service/impl/FumigationForRecordServiceImpl.java

@@ -1,16 +1,22 @@
 package com.chinaitop.depot.intelligent.fumigation.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.chinaitop.depot.intelligent.fumigation.mapper.TFumigationForrecordMapper;
 import com.chinaitop.depot.intelligent.fumigation.mapper.TFumigationPersonnelMapper;
 import com.chinaitop.depot.intelligent.fumigation.mapper.TFumigationProcessMapper;
 import com.chinaitop.depot.intelligent.fumigation.model.*;
 import com.chinaitop.depot.intelligent.fumigation.service.FumigationForRecordService;
 import com.chinaitop.depot.intelligent.fumigation.service.FumigationProcessService;
+import com.chinaitop.depot.intelligent.utils.HttpUtil;
+import com.chinaitop.depot.intelligent.utils.ParameterUtil;
+import net.sf.json.JSONObject;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import net.sf.json.JSONArray;
 
 /**
  * @author lvzhikai
@@ -36,6 +42,39 @@ public class FumigationForRecordServiceImpl implements FumigationForRecordServic
     }
 
     @Override
+    public Map<String, Object> getFroRecordByIds(String forRecordId) {
+        Map<String, Object> FroRecordMap = tFumigationForrecordMapper.getFroRecordByIds(forRecordId);
+        List<Map<String, Object>> personnelMap = tFumigationForrecordMapper.getpersonnelByIds(forRecordId);
+        List<Map<String, Object>> planMap = tFumigationForrecordMapper.getplanByIds(forRecordId);
+        List<Map<String, Object>> pesticideMap = tFumigationForrecordMapper.getpesticideByIds(forRecordId);
+        FroRecordMap.put("fumigationPersonnels",personnelMap);
+
+        String url = "http://localhost:9026/agile/kcsw/queryLKNewData?orgId="+FroRecordMap.get("orgId");;//粮油性质
+        String strResult = HttpUtil.doGet(url);
+        JSONArray json = JSONArray.fromObject(strResult);
+
+        for (Map<String, Object> plans:planMap) {
+            for (Map<String, Object> pesticide:pesticideMap) {
+                if(ParameterUtil.isequal(plans.get("id"),pesticide.get("fumigationId"))){
+                    plans.put("fumigationPesticide",pesticide);
+                }
+            }
+            if (json.size() > 0) {//循环添加粮油性质
+                for (int i = 0; i < json.size(); i++) {
+                    JSONObject job = json.getJSONObject(i);
+                    if(ParameterUtil.isequal(plans.get("houseId"),job.get("ch"))){
+                        String lyxz = tFumigationForrecordMapper.getLYXZ(job.get("hwxz").toString());
+                        plans.put("grainNature",lyxz);
+                    }
+                }
+            }
+        }
+
+        FroRecordMap.put("fumigationPlans",planMap);
+        return FroRecordMap;
+    }
+
+    @Override
     public List<Map<String, Object>> getFumigationDateByIds(Map<String, Object> map) {
         return tFumigationForrecordMapper.getFumigationDateByIds(map);
     }

src/main/resources/bootstrap.yml

@@ -69,6 +69,8 @@ socket-port: 42121
 #设置全局变量判断是云端还是库端；1云端，2本地
 localOrCloud: 2
 
+reportUrl: http://101.36.160.140:8097
+
 
 ## ==============================================应急端========================================================
 #server: