合并

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/TaVersionController.java

@@ -0,0 +1,46 @@
+package com.community.huiju.controller;
+
+import com.community.commom.mode.ResponseBean;
+import com.community.huiju.service.TaVersionServicel;
+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.Autowired;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpSession;
+
+/**
+ * version V1.0
+ * class_name: $METHOD_NAME$
+ * param: $METHOD_PARAM$
+ * describe: TODO
+ * creat_user:fuxingfan
+ * creat_time: 2019/5/9
+ **/
+@RestController
+@RefreshScope
+@RequestMapping("/")
+@Api(value = "版本相关的API", description = "版本相关的API")
+public class TaVersionController extends BaseController {
+
+
+    @Autowired
+    private TaVersionServicel taVersionService;
+
+
+    @ApiOperation(value = "获取APP版本号并对比", notes = "获取APP版本号并对比")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path",dataType = "String",name = "type",value = "ios/android"),
+    })
+    @RequestMapping(value = "/version/{type}",method = RequestMethod.GET)
+    public ResponseBean getVersion(@PathVariable String type, HttpSession session){
+        ResponseBean responseBean = taVersionService.getVersion(type);
+        return responseBean;
+    }
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TaVersionMapper.java

@@ -0,0 +1,11 @@
+package com.community.huiju.dao;
+
+import com.community.huiju.model.TaVersion;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+
+@Mapper
+public interface TaVersionMapper {
+    TaVersion getVersion(@Param("type") String type);
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/model/TaVersion.java

@@ -0,0 +1,68 @@
+package com.community.huiju.model;
+
+import java.util.Date;
+import java.util.List;
+
+public class TaVersion {
+    private Integer id;
+    
+    /**
+     * 客户端版本号
+     */
+    private String clientVersion;
+    
+    /**
+     *  服务端版本号
+     */
+    private String serviceVersion;
+    
+    /**
+     * 类型
+     */
+    private String type;
+    
+    /**
+     * 升级地址
+     */
+    private String updateAddress;
+    
+    public Integer getId() {
+        return id;
+    }
+    
+    public void setId(Integer id) {
+        this.id = id;
+    }
+    
+    public String getClientVersion() {
+        return clientVersion;
+    }
+    
+    public void setClientVersion(String clientVersion) {
+        this.clientVersion = clientVersion;
+    }
+    
+    public String getServiceVersion() {
+        return serviceVersion;
+    }
+    
+    public void setServiceVersion(String serviceVersion) {
+        this.serviceVersion = serviceVersion;
+    }
+    
+    public String getType() {
+        return type;
+    }
+    
+    public void setType(String type) {
+        this.type = type;
+    }
+    
+    public String getUpdateAddress() {
+        return updateAddress;
+    }
+    
+    public void setUpdateAddress(String updateAddress) {
+        this.updateAddress = updateAddress;
+    }
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/TaVersionServicel.java

@@ -0,0 +1,21 @@
+package com.community.huiju.service;
+
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+
+/**
+ * version V1.0
+ * class_name: $METHOD_NAME$
+ * param: $METHOD_PARAM$
+ * describe: TODO
+ * creat_user:fuxingfan
+ * creat_time: 2019/5/9
+ **/
+public interface TaVersionServicel {
+    /**
+     * 获取版本号
+     * @param type
+     * @return
+     */
+    ResponseBean getVersion(String type);
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/FaceServicelimpl.java

@@ -240,8 +240,14 @@ public class FaceServicelimpl implements FaceServiceI {
                 userIdList.add(user.getHkUserId());
                 //临时设备编号
                 // TODO 根据期楼栋号，来查询出门口机
-                List<String> visualList = new ArrayList<>();
-                visualList.add("10010100000");
+
+                // 单元门口机
+                List<TpEquipment> visualEquipments = tpEquipmentMapper.selectByCommunityIdAndUnitId(communityId, unitId, 3);
+                List<String> visualList = visualEquipments.stream()
+                        .map(e-> tpConfigurationMapper.selectByPrimaryKey(e.getUuidId()).getConfigurationValue())
+                        .collect(Collectors.toList());
+//                List<String> visualList = new ArrayList<>();
+//                visualList.add("10010100000");
                 HKOpenApi.visualIntercom(tpEquipmentTree.getOpUserUuid(), 1, userIdList, visualList, tpEquipmentTree.getAppkey(), tpEquipmentTree.getSecret(), tpEquipmentTree.getHttpServer());
             } else {
                 responseBean.addError("请录入正确图片");

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/HKServiceImpl.java

@@ -13,6 +13,7 @@ import com.community.huiju.service.IHKService;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -131,8 +132,14 @@ public class HKServiceImpl implements IHKService {
         addOutDoorAuthMap.put("personIds", Arrays.asList(user.getHkUserId()));
         addOutDoorAuthMap.put("secret", tpEquipmentTree.getSecret());
         addOutDoorAuthMap.put("appkey", tpEquipmentTree.getAppkey());
-        List<String> visualList = new ArrayList<>();
-        visualList.add("10010100000");
+
+        // 单元门口机
+        List<TpEquipment> visualEquipments = tpEquipmentMapper.selectByCommunityIdAndUnitId(userVerify.getCommunityId(), userVerify.getUnitId(), 3);
+        List<String> visualList = visualEquipments.stream()
+                .map(e-> tpConfigurationMapper.selectByPrimaryKey(e.getUuidId()).getConfigurationValue())
+                .collect(Collectors.toList());
+//        List<String> visualList = new ArrayList<>();
+//        visualList.add("10010100000");
         addOutDoorAuthMap.put("longNums", visualList);
         // 可视对讲下发 权限
         visualIntercomPermissions(addOutDoorAuthMap);
@@ -319,12 +326,28 @@ public class HKServiceImpl implements IHKService {
         // 查询当前的房产
         TaUserVerify userVerify = taUserVerifyMapper.selectByPrimaryKey(userVerifyId);
         TpEquipmentTree tpEquipmentTree = tpEquipmentTreeMapper.selectByCommunityId(userVerify.getCommunityId());
+        // 单元门口机
+        List<TpEquipment> tpEquipments = tpEquipmentMapper.selectByCommunityIdAndUnitId(userVerify.getCommunityId(), userVerify.getUnitId(), 3);
+
+         if (CollectionUtils.isEmpty(tpEquipments)) {
+             responseBean.addError("无设备信息!");
+             return responseBean;
+         }
+
+         String str = "";
+         for (TpEquipment e : tpEquipments) {
+             TpConfiguration tpConfiguration = tpConfigurationMapper.selectByPrimaryKey(e.getUuidId());
+             str += tpConfiguration.getConfigurationValue();
+             str += ",";
+         }
 
-        // TODO 查询设备编号
+        // 查询设备编号
 
         Map<String,Object> parMap = com.beust.jcommander.internal.Maps.newHashMap();
-        parMap.put("longNums", "10010100000");
+        parMap.put("longNums", str);
         parMap.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
+        parMap.put("secret", tpEquipmentTree.getSecret());
+        parMap.put("appkey", tpEquipmentTree.getAppkey());
         String data = HKOpenApi.syncControl(parMap);
         JSONObject jsonObject = JSONObject.parseObject(data);
         int errorCode = jsonObject.getInteger("errorCode");

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TaVersionServiceimpl.java

@@ -0,0 +1,48 @@
+package com.community.huiju.service.impl;
+
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.dao.TaVersionMapper;
+import com.community.huiju.dao.TpHotelImgMapper;
+import com.community.huiju.dao.TpHotelMapper;
+import com.community.huiju.dao.TpHotelRoomMapper;
+import com.community.huiju.model.TaVersion;
+import com.community.huiju.model.TpHotel;
+import com.community.huiju.model.TpHotelRoom;
+import com.community.huiju.service.TaVersionServicel;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * version V1.0
+ * class_name: $METHOD_NAME$
+ * param: $METHOD_PARAM$
+ * describe: TODO
+ * creat_user:fuxingfan
+ * creat_time: 2019/5/9
+ **/
+@Service("taVersionService")
+@Transactional
+public class TaVersionServiceimpl implements TaVersionServicel {
+    
+    @Autowired
+    private TaVersionMapper taVersionMapper;
+    /**
+     * 获取版本号
+     *
+     * @param type
+     * @return
+     */
+    @Override
+    public ResponseBean getVersion(String type) {
+        ResponseBean responseBean = new ResponseBean();
+        TaVersion taVersion = taVersionMapper.getVersion(type);
+        responseBean.addSuccess(taVersion);
+        return responseBean;
+    }
+}

CODE/smart-community/app-api/src/main/resources/mapper/TaVersionMapper.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.community.huiju.dao.TaVersionMapper" >
+  <resultMap id="BaseResultMap" type="com.community.huiju.model.TaVersion" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="client_version" property="clientVersion" jdbcType="VARCHAR" />
+    <result column="service_version" property="serviceVersion" jdbcType="VARCHAR" />
+    <result column="type" property="type" jdbcType="VARCHAR" />
+    <result column="update_address" property="updateAddress" jdbcType="VARCHAR" />
+  </resultMap>
+
+  <select id="getVersion" resultMap="BaseResultMap">
+    select id,client_version,service_version,update_address FROM ta_version  where `type` = #{type,jdbcType=VARCHAR}
+  </select>
+</mapper>

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/TaUserLicenseOrderController.java

@@ -9,13 +9,17 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
+import java.io.OutputStream;
 
 /**
  * <p>
@@ -59,4 +63,25 @@ public class TaUserLicenseOrderController extends BaseController {
     }
 
 
+    @ApiOperation(value = "月租车导出数据", notes = "月租车导出数据")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "header", name = "X-Auth-Token", value = "token")
+    })
+    @RequestMapping(value = "/user/license/export", method = RequestMethod.GET)
+    public void exportDate(HttpServletRequest request, HttpServletResponse response, HttpSession session) {
+        UserElement userElement = getUserElement(session);
+        ResponseBean responseBean = iTaUserLicenseOrderService.exportDate(userElement);
+        Workbook workbook = (Workbook) responseBean.getData();
+        this.setResponseHeader(response, "月租租车.xlsx");
+        //响应到客户端
+        try {
+            OutputStream os = response.getOutputStream();
+            workbook.write(os);
+            os.flush();
+            os.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/TaUserLicenseOrderMapper.java

@@ -2,6 +2,11 @@ package com.community.huiju.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.community.huiju.model.TaUserLicenseOrder;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.ResultType;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +18,25 @@ import com.community.huiju.model.TaUserLicenseOrder;
  */
 public interface TaUserLicenseOrderMapper extends BaseMapper<TaUserLicenseOrder> {
 
+    /**
+     * 分页查询
+     * @param communityId
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @ResultType(TaUserLicenseOrder.class)
+    @Select("select * from ta_user_license_order where community_id = #{communityId} limit #{pageNum},#{pageSize}")
+    List<TaUserLicenseOrder> getLicensePage(@Param("communityId") Integer communityId, @Param("pageNum") Integer pageNum, @Param("pageSize") Integer pageSize);
+
+    /**
+     * 查询总数
+     * @param communityId
+     * @return
+     */
+    @ResultType(Integer.class)
+    @Select("select count(*) from ta_user_license_order where community_id = #{communityId}")
+    Integer getCount(@Param("communityId") Integer communityId);
+
+
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/ITaUserLicenseOrderService.java

@@ -26,4 +26,10 @@ public interface ITaUserLicenseOrderService extends IService<TaUserLicenseOrder>
      */
     ResponseBean getAll(Integer id, String licensePlate, String orderNumber, String paymentName, String paymentTel, Integer pageNum, Integer pageSize, UserElement userElement);
 
+    /**
+     * 导出数据
+     * @param userElement
+     * @return
+     */
+    ResponseBean exportDate(UserElement userElement);
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TaUserLicenseOrderServiceImpl.java

@@ -9,9 +9,22 @@ import com.community.commom.session.UserElement;
 import com.community.huiju.model.TaUserLicenseOrder;
 import com.community.huiju.dao.TaUserLicenseOrderMapper;
 import com.community.huiju.service.ITaUserLicenseOrderService;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.xssf.usermodel.XSSFRow;
+import org.apache.poi.xssf.usermodel.XSSFSheet;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.text.SimpleDateFormat;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+
 /**
  * <p>
  * 月租车缴费订单表 服务实现类
@@ -23,6 +36,9 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaUserLicenseOrderServiceImpl extends ServiceImpl<TaUserLicenseOrderMapper, TaUserLicenseOrder> implements ITaUserLicenseOrderService {
 
+    @Autowired
+    private TaUserLicenseOrderMapper taUserLicenseOrderMapper;
+
     @Override
     public ResponseBean getAll(Integer id, String licensePlate, String orderNumber, String paymentName, String paymentTel, Integer pageNum, Integer pageSize, UserElement userElement) {
         ResponseBean responseBean = new ResponseBean();
@@ -41,4 +57,86 @@ public class TaUserLicenseOrderServiceImpl extends ServiceImpl<TaUserLicenseOrde
         responseBean.addSuccess(orderIPage);
         return responseBean;
     }
+
+    @Override
+    public ResponseBean exportDate(UserElement userElement) {
+        ResponseBean responseBean = new ResponseBean();
+        Integer pageNum = 0;
+        Integer pageSize = 10;
+        Integer count = 0;
+        count = taUserLicenseOrderMapper.getCount(userElement.getCommunityId());
+        List<TaUserLicenseOrder> licensePage = taUserLicenseOrderMapper.getLicensePage(userElement.getCommunityId(), pageNum * pageSize, pageSize);
+
+        Workbook workbook = new XSSFWorkbook();
+        Sheet sheet = workbook.createSheet();
+        Row row = sheet.createRow(0);
+        Cell cell = row.createCell(0);
+        cell.setCellValue("编号");
+        cell = row.createCell(0);
+        cell.setCellValue("车牌号");
+        cell = row.createCell(1);
+        cell.setCellValue("续期时长（月）");
+        cell = row.createCell(2);
+        cell.setCellValue("续期费用（元）");
+        cell = row.createCell(3);
+        cell.setCellValue("缴费订单号");
+        cell = row.createCell(4);
+        cell.setCellValue("缴费人手机号");
+        cell = row.createCell(5);
+        cell.setCellValue("缴费人姓名");
+        cell = row.createCell(6);
+        cell.setCellValue("缴费方式");
+        cell = row.createCell(7);
+        cell.setCellValue("延期后到期日");
+        cell = row.createCell(8);
+        cell.setCellValue("缴费完成时间");
+
+        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd hh:mm:ss");
+
+        int listIndex = 0;
+        int currentRow = 1;
+        if (listIndex < licensePage.size()) {
+            do{
+                TaUserLicenseOrder taUserLicenseOrder = licensePage.get(listIndex);
+
+                row = sheet.createRow(currentRow);
+                cell = row.createCell(0);
+                cell.setCellValue(taUserLicenseOrder.getId());
+                cell = row.createCell(1);
+                cell.setCellValue(taUserLicenseOrder.getLicensePlate());
+                cell = row.createCell(2);
+                cell.setCellValue(taUserLicenseOrder.getExtensionMonth());
+                cell = row.createCell(3);
+                cell.setCellValue(taUserLicenseOrder.getExtensionPrice());
+                cell = row.createCell(4);
+                cell.setCellValue(taUserLicenseOrder.getOrderNumber());
+                cell = row.createCell(5);
+                cell.setCellValue(taUserLicenseOrder.getPaymentTel());
+                cell = row.createCell(6);
+                cell.setCellValue(taUserLicenseOrder.getPaymentName());
+                cell = row.createCell(7);
+                cell.setCellValue("0".equals(taUserLicenseOrder.getPaymentType()) ? "微信支付" : "2".equals(taUserLicenseOrder.getPaymentType()) ? "支付宝" : "" );
+                cell = row.createCell(8);
+                cell.setCellValue(dateTimeFormatter.format(taUserLicenseOrder.getExpireDate()));
+                cell = row.createCell(9);
+                cell.setCellValue(taUserLicenseOrder.getUpdateDate() == null ? "" : dateTimeFormatter.format(taUserLicenseOrder.getUpdateDate()));
+
+                listIndex ++;
+                currentRow ++;
+
+                if (listIndex == licensePage.size()) {
+                    listIndex = 0;
+                    pageNum ++;
+                    licensePage = taUserLicenseOrderMapper.getLicensePage(userElement.getCommunityId(), pageNum * pageSize, pageSize);
+                }
+                if (licensePage.isEmpty()) {
+                    break;
+                }
+
+            }while (pageNum <= count);
+        }
+
+        responseBean.addSuccess(workbook);
+        return responseBean;
+    }
 }

VUECODE/smart-property-manage/src/api/license.js

@@ -16,3 +16,12 @@ export function getLicenseAll(data) {
     }
   })
 }
+
+// 导出月租车数据
+export function exportLicenseData() {
+  return request({
+    url: '/user/license/export',
+    method: 'get',
+    responseType: 'blob'
+  })
+}

VUECODE/smart-property-manage/src/store/modules/license.js

@@ -1,4 +1,4 @@
-import { getLicenseAll } from '@/api/license'
+import { getLicenseAll, exportLicenseData } from '@/api/license'
 
 const license = {
   state: {
@@ -16,6 +16,15 @@ const license = {
           reject(error)
         })
       })
+    },
+    ExportLicenseData({ commit }) { // 导出月租车数据
+      return new Promise((resolve, reject) => {
+        exportLicenseData().then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
     }
   }
 }

VUECODE/smart-property-manage/src/views/bill/license/index.vue

@@ -21,14 +21,14 @@
         <el-button type="primary" @click="query">查询</el-button>
       </el-form-item>
     </el-form>
-    <div>
+    <div style="display: flex; margin-left: 20px;">
       <el-button type="primary" @click="exportLicense">导出数据</el-button>
     </div>
     <el-table
       v-loading="loading"
       :data="list"
       border
-      style="width: 100%">
+      style="width: 100%; margin-top: 20px;">
       <el-table-column
         prop="id"
         label="编号"
@@ -122,6 +122,17 @@ export default {
     this.getData()
   },
   methods: {
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`)
+      this.listQuery.pageSize = val
+      this.listQuery.pageNum = 1
+      this.getData()
+    },
+    handleCurrentChange(val) {
+      console.log(`当前页: ${val}`)
+      this.listQuery.pageNum = val
+      this.getData()
+    },
     formatDate(val) {
       if (val === null || val === '') {
         return ''
@@ -203,6 +214,24 @@ export default {
           break
       }
       return str
+    },
+    exportLicense() {
+      this.$store.dispatch('ExportLicenseData').then((res) => {
+        this.download(res)
+      })
+    },
+    download(data) { // 下载文件
+      if (!data) {
+        return
+      }
+      let url = window.URL.createObjectURL(new Blob([data]))
+      let link = document.createElement('a')
+      link.style.display = 'none'
+      link.href = url
+      link.setAttribute('download', '月租车订单.xlsx')
+
+      document.body.appendChild(link)
+      link.click()
     }
   }
 }