对接液化气接口

zh-baseversion-admin/src/main/java/com/zehong/web/controller/operationMonitor/TWorkOrderController.java

@@ -180,7 +180,8 @@ public class TWorkOrderController extends BaseController
         }else {
             enterpriseId= String.valueOf(user.getDeptId());
         }
-        return  AjaxResult.success(tWorkOrderService.selectWorkOrderNum(enterpriseId));
+        Map<String, Object> stringObjectMap = tWorkOrderService.selectWorkOrderNum(enterpriseId);
+        return  AjaxResult.success(stringObjectMap);
     }
 
 }

zh-baseversion-admin/src/main/resources/application-test.yml

@@ -106,4 +106,9 @@ zhengfu:
   #链接访问地址
   apiUrl: http://test.zfcxjst.hebei.gov.cn:8082/openApi/index/sync/v1/entrypoint
 wjyhq:
+  #无极液化气对接地址
   apiUrl: https://api.117915.com/openapi
+  #获取Token接口参数
+  authCode: LPG_WJXHTYHQA_101855528016
+  accessKey: 41D714AC92234B1488961805E6AB8E15
+  secretKey: 38FAB0FA472E4354895085F1251052D8

zh-baseversion-common/src/main/java/com/zehong/common/core/redis/RedisCache.java

 package com.zehong.common.core.redis;
 
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.BoundSetOperations;
@@ -49,6 +45,11 @@ public class RedisCache
         redisTemplate.opsForValue().set(key, value, timeout, timeUnit);
     }
 
+    public <T> void setCacheObjectExpireAt(final String key, final Date date)
+    {
+        redisTemplate.expireAt(key,date);
+    }
+
     /**
      * 设置有效时间
      *

zh-baseversion-common/src/main/java/com/zehong/common/utils/http/HttpClientUtils.java

@@ -133,6 +133,8 @@ public class HttpClientUtils {
             response = httpClient.execute(httpPost);
             if (response!=null && response.getStatusLine().getStatusCode() == 200) {
                 resultString = EntityUtils.toString(response.getEntity(),"UTF-8");
+            }else{
+                System.out.println(response.getStatusLine().getStatusCode());
             }
         }finally {
             close(response,httpClient);

zh-baseversion-system/src/main/java/com/zehong/system/domain/TLpgGasBottleFiles.java

@@ -198,6 +198,16 @@ public class TLpgGasBottleFiles extends BaseEntity
     @Excel(name = "存储类型")
     private String fBottleStorageType;
 
+    private String fRowVersion;
+
+    public String getfRowVersion() {
+        return fRowVersion;
+    }
+
+    public void setfRowVersion(String fRowVersion) {
+        this.fRowVersion = fRowVersion;
+    }
+
     public String getfValveName() {
         return fValveName;
     }

zh-baseversion-system/src/main/java/com/zehong/system/mapper/TLpgAirChargeFilesMapper.java

@@ -19,6 +19,8 @@ public interface TLpgAirChargeFilesMapper
      */
     public TLpgAirChargeFiles selectTLpgAirChargeFilesById(Long fGasAirChargeId);
 
+    public Integer selectTLpgAirChargeFilesTotal();
+
     /**
      * 查询液化石油气-充装记录列表
      * 

zh-baseversion-system/src/main/java/com/zehong/system/service/ITLpgAirChargeFilesService.java

@@ -19,6 +19,8 @@ public interface ITLpgAirChargeFilesService
      */
     public TLpgAirChargeFiles selectTLpgAirChargeFilesById(Long fGasAirChargeId);
 
+    public Integer selectTLpgAirChargeFilesTotal();
+
     /**
      * 查询液化石油气-充装记录列表
      * 

zh-baseversion-system/src/main/java/com/zehong/system/service/impl/TLpgAirChargeFilesServiceImpl.java

@@ -31,6 +31,13 @@ public class TLpgAirChargeFilesServiceImpl implements ITLpgAirChargeFilesService
         return tLpgAirChargeFilesMapper.selectTLpgAirChargeFilesById(fGasAirChargeId);
     }
 
+    @Override
+    public Integer selectTLpgAirChargeFilesTotal()
+    {
+        return tLpgAirChargeFilesMapper.selectTLpgAirChargeFilesTotal();
+    }
+
+
     /**
      * 查询液化石油气-充装记录列表
      * 

zh-baseversion-system/src/main/resources/mapper/system/TLpgAirChargeFilesMapper.xml

@@ -36,6 +36,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectTLpgAirChargeFilesVo"/>
         where f_gas_air_charge_id = #{fGasAirChargeId}
     </select>
+
+    <select id="selectTLpgAirChargeFilesTotal" resultType="int">
+        SELECT COUNT(*) FROM t_lpg_air_charge_files
+    </select>
         
     <insert id="insertTLpgAirChargeFiles" parameterType="TLpgAirChargeFiles" useGeneratedKeys="true" keyProperty="fGasAirChargeId">
         insert into t_lpg_air_charge_files

zh-baseversion-system/src/main/resources/mapper/system/TLpgGasBottleFilesMapper.xml

@@ -50,6 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="fThirdPartyLabel"    column="f_third_party_label"    />
         <result property="fHoleCode"    column="f_hole_code"    />
         <result property="fBottleStorageType"    column="f_bottle_storage_type"    />
+        <result property="fRowVersion"    column="f_row_version"    />
     </resultMap>
 
     <sql id="selectTLpgGasBottleFilesVo">
@@ -57,7 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                ( CASE f_is_specialized WHEN '1' THEN '专用' WHEN '2' THEN '托管' ELSE '-' END ) AS f_is_specialized,
                f_valve_manu_facturer, f_inspection_label, f_third_party_label, f_hole_code, f_bottle_storage_type,
                ( CASE f_state WHEN '1' THEN '新增' WHEN '2' THEN '修改' WHEN '-1' THEN '删除' ELSE '-' END ) AS f_state,
-               f_opt_name, f_add_time, f_up_time, f_up_opt_name from t_lpg_gas_bottle_files
+               f_opt_name, f_add_time, f_up_time, f_up_opt_name, f_row_version from t_lpg_gas_bottle_files
     </sql>
 
     <select id="selectTLpgGasBottleFilesList" parameterType="TLpgGasBottleFiles" resultMap="TLpgGasBottleFilesResult">
@@ -130,6 +131,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fAddTime != null">f_add_time,</if>
             <if test="fUpTime != null">f_up_time,</if>
             <if test="fUpOptName != null">f_up_opt_name,</if>
+            <if test="fRowVersion != null">f_row_version,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="fRegCode != null">#{fRegCode},</if>
@@ -178,6 +180,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fUpTime != null">#{fUpTime},</if>
 
             <if test="fUpOptName != null">#{fUpOptName},</if>
+            <if test="fRowVersion != null">#{fRowVersion},</if>
          </trim>
     </insert>
 
@@ -229,6 +232,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fAddTime != null">f_add_time = #{fAddTime},</if>
             <if test="fUpTime != null">f_up_time = #{fUpTime},</if>
             <if test="fUpOptName != null">f_up_opt_name = #{fUpOptName},</if>
+            <if test="fRowVersion != null">f_row_version = #{fRowVersion},</if>
         </trim>
         where f_gas_bottle_files_id = #{fGasBottleFilesId}
     </update>

zh-baseversion-web/src/views/examine/index.vue

@@ -79,10 +79,10 @@
       return{
         user:{name:'',type:'',num:'',price:''},
         stu: [
-        // {
-        //
-        // },
         {
+
+        },
+        /*{
           name: "河北省石家庄平山县",
           type: "中诚燃气",
           num: "管道燃气",
@@ -101,7 +101,7 @@
           ts: "20次",
           kh: 100,
           jg: "优秀",
-        },
+        },*/
         // {
         //   name: "河北省石家庄平山县",
         //   type: "盈德气体",