Merge branch 'master' of http://git.ycjcjy.com/pet_identity/service

src/main/java/com/njyunzhi/pet_identity/common/ExcelUtils.java

@@ -14,7 +14,9 @@ import org.apache.poi.xssf.usermodel.DefaultIndexedColorMap;
 import org.apache.poi.xssf.usermodel.XSSFColor;
 
 import javax.servlet.http.HttpServletResponse;
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.io.OutputStream;
 import java.util.List;
 
 public class ExcelUtils {
@@ -70,6 +72,24 @@ public class ExcelUtils {
         return new HorizontalCellStyleStrategy(headWriteCellStyle, contentWriteCellStyle);
     }
 
+    /**
+     * 内存生成 Excel
+     * @param dataClass
+     * @param data
+     * @param style
+     * @return
+     */
+    public static byte[] buildExcel(Class dataClass, List data, HorizontalCellStyleStrategy style) {
+        ByteArrayOutputStream outputStream = new ByteArrayOutputStream(128);
+        ExcelWriterBuilder builder = EasyExcel.write(outputStream, dataClass);
+        if (null == style) {
+            style = defaultStyle();
+            builder.registerWriteHandler(style);
+        }
+        builder.autoCloseStream(Boolean.TRUE).sheet("sheet1").doWrite(data);
+        return outputStream.toByteArray();
+    }
+
     /**
      * 发送 excel 到客户端
      * 暂时只支持单 sheet 页

src/main/java/com/njyunzhi/pet_identity/common/ZipUtil.java

@@ -1,11 +1,7 @@
 package com.njyunzhi.pet_identity.common;
 
-import com.alibaba.excel.EasyExcel;
-import com.alibaba.excel.write.builder.ExcelWriterBuilder;
 import com.alibaba.fastjson.JSON;
 import lombok.Data;
-import net.lingala.zip4j.ZipFile;
-import net.lingala.zip4j.exception.ZipException;
 import net.lingala.zip4j.io.outputstream.ZipOutputStream;
 import net.lingala.zip4j.model.ZipParameters;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -13,10 +9,6 @@ import org.springframework.stereotype.Component;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
-import java.nio.ByteBuffer;
-import java.nio.channels.Channels;
-import java.nio.channels.ReadableByteChannel;
-import java.nio.channels.WritableByteChannel;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
@@ -34,7 +26,7 @@ public class ZipUtil {
         return LocalDateTime.now(ZoneId.of("Asia/Shanghai")).format(formatter);
     }
 
-    private void zipStream(List<RFile> files, OutputStream outputStream) throws IOException {
+    private void zipImages(List<RFile> files, OutputStream outputStream) throws IOException {
         ZipOutputStream zos = new ZipOutputStream(outputStream);
         ZipParameters zipParameters = new ZipParameters();
 
@@ -48,6 +40,25 @@ public class ZipUtil {
         zos.close();
     }
 
+    private void zipFiles(List<ZFile> files, OutputStream outputStream) throws IOException {
+        ZipOutputStream zos = new ZipOutputStream(outputStream);
+        ZipParameters zipParameters = new ZipParameters();
+
+        for (ZFile f : files) {
+            zipParameters.setFileNameInZip(f.getName());
+            zos.putNextEntry(zipParameters);
+            zos.write(f.getData());
+            zos.closeEntry();
+        }
+        zos.close();
+    }
+
+    /**
+     * 打包远程文件，并导出
+     * @param response
+     * @param files
+     * @throws IOException
+     */
     public void flush(HttpServletResponse response, List<RFile> files) throws IOException {
         try {
             if (files == null || files.size() < 1) {
@@ -58,7 +69,37 @@ public class ZipUtil {
             response.setContentType("application/zip");
             response.setCharacterEncoding("utf-8");
             response.setHeader("Content-disposition", "attachment;filename="+StringUtils.urlEncode(fileName));
-            zipStream(files, response.getOutputStream());
+            zipImages(files, response.getOutputStream());
+            response.flushBuffer();
+        } catch (Exception e) {
+            e.printStackTrace();
+
+            // 重置response
+            response.reset();
+            response.setContentType("application/json");
+            response.setCharacterEncoding("utf-8");
+            ResponseBean res = ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
+            response.getWriter().println(JSON.toJSONString(res));
+        }
+    }
+
+    /**
+     * 打包文件，并导出
+     * @param response
+     * @param files
+     * @throws IOException
+     */
+    public void flushMixFile(HttpServletResponse response, List<ZFile> files) throws IOException {
+        try {
+            if (files == null || files.size() < 1) {
+                throw new Exception("导出内容为空");
+            }
+
+            String fileName = today() + ".zip";
+            response.setContentType("application/zip");
+            response.setCharacterEncoding("utf-8");
+            response.setHeader("Content-disposition", "attachment;filename="+StringUtils.urlEncode(fileName));
+            zipFiles(files, response.getOutputStream());
             response.flushBuffer();
         } catch (Exception e) {
             e.printStackTrace();
@@ -77,4 +118,10 @@ public class ZipUtil {
         String url;
         String name;
     }
+
+    @Data
+    public static class ZFile {
+        byte[] data;
+        String name;
+    }
 }

src/main/java/com/njyunzhi/pet_identity/controller/TaApplicationController.java

@@ -3,10 +3,7 @@ package com.njyunzhi.pet_identity.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.njyunzhi.pet_identity.common.BaseController;
-import com.njyunzhi.pet_identity.common.Constants;
-import com.njyunzhi.pet_identity.common.ResponseBean;
-import com.njyunzhi.pet_identity.common.StringUtils;
+import com.njyunzhi.pet_identity.common.*;
 import com.njyunzhi.pet_identity.entity.*;
 import com.njyunzhi.pet_identity.service.ITaCardNoService;
 import com.njyunzhi.pet_identity.service.ITaOrderService;
@@ -27,8 +24,10 @@ import org.springframework.web.bind.annotation.RequestParam;
 import com.njyunzhi.pet_identity.service.ITaApplicationService;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletResponse;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.List;
 
 /**
  * <p>
@@ -58,6 +57,12 @@ public class TaApplicationController extends BaseController {
     @Autowired
     public ITaCardNoService iTaCardNoService;
 
+    @Autowired
+    HttpUtils httpUtils;
+
+    @Autowired
+    ZipUtil zipUtil;
+
     /**
      * 分页查询列表
      * @param pageNum
@@ -140,6 +145,58 @@ public class TaApplicationController extends BaseController {
         return ResponseBean.success(result);
     }
 
+    @RequestMapping(value="/admin/application/card/export",method= RequestMethod.POST)
+    @ApiOperation(value="发证导出", notes = "发证导出", httpMethod = "POST", response = ResponseBean.class)
+    public ResponseBean exportCard(@ApiParam("证件号列表") @RequestBody List<String> cardNoList,
+                                   HttpServletResponse response) throws Exception {
+        List<TaPetIdentity> taPetIdentityList = iTaPetIdentityService.getListByCard(cardNoList);
+
+        if (null == taPetIdentityList || taPetIdentityList.size() < 1) {
+            return ResponseBean.error("未找到导出数据");
+        }
+
+        List<ZipUtil.ZFile> zipFiles = new ArrayList<>();
+
+        // 批量生成图片
+        for (TaPetIdentity item : taPetIdentityList) {
+            // 如果是企业
+            if (!StringUtils.isEmpty(item.getOrgName())) {
+                item.setPersonName(item.getOrgName());
+            }
+
+            // 下载图片
+            if (!StringUtils.isEmpty(item.getPetImg1())) {
+                ZipUtil.ZFile f = buildImage(item.getPetImg1());
+                zipFiles.add(f);
+                item.setPetImg1(StringUtils.trimEnd(f.getName(), ".jpg"));
+            }
+            if (!StringUtils.isEmpty(item.getQrImage())) {
+                ZipUtil.ZFile f = buildImage(item.getQrImage());
+                zipFiles.add(f);
+                item.setQrImage(StringUtils.trimEnd(f.getName(), ".jpg"));
+            }
+        }
+
+        // 生成 excel 文档
+        byte[] excelData = ExcelUtils.buildExcel(TaPetIdentity.class, taPetIdentityList, null);
+        ZipUtil.ZFile f = new ZipUtil.ZFile();
+        String fname = StringUtils.random(16);
+        f.setName(fname + ".xlsx");
+        f.setData(excelData);
+        zipFiles.add(f);
+
+        zipUtil.flushMixFile(response, zipFiles);
+        return null;
+    }
+
+    private ZipUtil.ZFile buildImage(String imgURL) {
+        ZipUtil.ZFile f = new ZipUtil.ZFile();
+        String fname = StringUtils.random(16);
+        f.setName(fname + ".jpg");
+        f.setData(httpUtils.download(imgURL));
+        return f;
+    }
+
 
     /**
      * 分页查询列表
@@ -371,6 +428,51 @@ public class TaApplicationController extends BaseController {
         }
     }
 
+    /**
+     * 绑卡
+     * @param id  实体ID
+     * @param makeCardParam 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/application/{id}/bindCard",method= RequestMethod.PUT)
+    @ApiOperation(value="绑卡", notes = "绑卡", httpMethod = "PUT", response = ResponseBean.class)
+    public ResponseBean bindCard(@ApiParam("对象ID") @PathVariable Integer id,
+                                 @ApiParam("更新内容") @RequestBody MakeCardParam makeCardParam) throws Exception{
+        SysUser sysUser = currentUser();
+        if (!checkRole(sysUser.getRoleName(), Constants.USER_MAKER)) {
+            return ResponseBean.error("暂无权限");
+        }
+
+        TaApplication taApplication = iTaApplicationService.getById(id);
+        if (null == taApplication || taApplication.getStatus() == Constants.STATUS_DELETE) {
+            return ResponseBean.error("未找到数据");
+        }
+
+        if (StringUtils.isEmpty(makeCardParam.getCardNo())) {
+            return ResponseBean.error("卡号不能为空");
+        } else {
+            TaCardNo taCardNo = iTaCardNoService.getUnuseCard(makeCardParam.getCardNo());
+            if (taCardNo == null) {
+                return ResponseBean.error("卡号无效或者已使用");
+            }
+
+            // 将卡号置为已使用
+            taCardNo.setStatus(Constants.STATUS_NORMAL);
+            iTaCardNoService.updateById(taCardNo);
+
+            TaPetIdentity taPetIdentity = iTaPetIdentityService.getExistBy("card_no", makeCardParam.getCardNo(), false, true);
+            if (null != taPetIdentity) {
+                return ResponseBean.error("卡号已被占用");
+            }
+        }
+
+        taApplication.setOriginCardNo(makeCardParam.getCardNo());
+        iTaApplicationService.updateById(taApplication);
+        TaPetIdentity newCard = iTaPetIdentityService.createNewCard(taApplication, makeCardParam);
+        return ResponseBean.success(newCard);
+    }
+
+
     /**
      * 发证
      * @param id  实体ID
@@ -415,26 +517,6 @@ public class TaApplicationController extends BaseController {
             }
         }
 
-        if (StringUtils.isEmpty(makeCardParam.getCardNo())) {
-            return ResponseBean.error("卡号不能为空");
-        } else {
-            TaCardNo taCardNo = iTaCardNoService.getUnuseCard(makeCardParam.getCardNo());
-            if (taCardNo == null) {
-                return ResponseBean.error("卡号无效或者已使用");
-            }
-
-            // 将卡号置为已使用
-            taCardNo.setStatus(Constants.STATUS_NORMAL);
-            iTaCardNoService.updateById(taCardNo);
-
-            TaPetIdentity taPetIdentity = iTaPetIdentityService.getExistBy("card_no", makeCardParam.getCardNo(), false, true);
-            if (null != taPetIdentity) {
-                return ResponseBean.error("卡号已被占用");
-            }
-        }
-
-        // 关联证件
-        taApplication.setOriginCardNo(makeCardParam.getCardNo());
         taApplication.setMakeStatus(Constants.MAKE_STATUS_MADE);
         taApplication.setMakeDate(LocalDateTime.now());
         taApplication.setMakeUser(sysUser.getUserId());
@@ -443,10 +525,14 @@ public class TaApplicationController extends BaseController {
         taApplication.setTrackingNo(makeCardParam.getTrackingNo());
         taApplication.setStatus(Constants.WORKFLOW_STATUS_MADE);
 
-        if (iTaApplicationService.updateById(taApplication)){
-            TaPetIdentity newCard = iTaPetIdentityService.createNewCard(taApplication, makeCardParam);
+        TaPetIdentity taPetIdentity = iTaPetIdentityService.getExistBy("card_no", taApplication.getOriginCardNo(), false, true);
+        if (!taApplication.getApplyType().equals(Constants.APPLY_TYPE_REISSUE)) {
+            // 新办 续期，都需要重置有效期
+            iTaPetIdentityService.updateCardDate(taPetIdentity.getCardNo());
+        }
 
-            return ResponseBean.success(newCard);
+        if (iTaApplicationService.updateById(taApplication)){
+            return ResponseBean.success(taApplication);
         } else {
             return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
         }

src/main/java/com/njyunzhi/pet_identity/entity/TaPetIdentity.java

@@ -1,7 +1,11 @@
 package com.njyunzhi.pet_identity.entity;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.IdType;
 import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
 import io.swagger.annotations.ApiModel;
@@ -24,70 +28,105 @@ import lombok.experimental.Accessors;
 @ApiModel(value="TaPetIdentity对象", description="宠物证件")
 public class TaPetIdentity implements Serializable {
 
+    @ExcelIgnore
     private static final long serialVersionUID = 1L;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "证件ID")
     @TableId(value = "card_id", type = IdType.UUID)
     private String cardId;
 
+    @ExcelProperty(value = "证件号码", index = 6)
     @ApiModelProperty(value = "证件号码")
     private String cardNo;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "属主ID")
     private String personId;
 
+    @ExcelProperty(value = "犬主", index = 1)
     @ApiModelProperty(value = "属主姓名")
     private String personName;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "属主手机")
     private String phone;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "宠物ID")
     private String petId;
 
+    @ExcelProperty(value = "犬名", index = 2)
     @ApiModelProperty(value = "宠物名称")
     private String petName;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "宠物性别")
     private Integer petSex;
 
+    @ExcelProperty(value = "毛色", index = 4)
     @ApiModelProperty(value = "毛色")
     private String petColor;
 
+    @ExcelProperty(value = "犬种", index = 3)
     @ApiModelProperty(value = "宠物类别")
     private String petType;
 
+    @ExcelProperty(value = "狗照片", index = 7)
     @ApiModelProperty(value = "宠物照片")
     private String petImg1;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "宠物照片")
     private String petImg2;
 
+    @ExcelProperty(value = "地址", index = 5)
     @ApiModelProperty(value = "详细地址")
     private String address;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "起始期;格式YYYY-MM-DD")
     private String startDate;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "有效期;格式YYYY-MM-DD")
     private String expireDate;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "状态;1正常,2挂失,3过期")
     private Integer status;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "创建日期")
     private LocalDateTime createDate;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "是否企业",notes = "")
     private Boolean isOrg ;
+
+    @ExcelIgnore
     @ApiModelProperty(value = "企业ID",notes = "")
     private String orgId ;
+
+    @ExcelIgnore
     @ApiModelProperty(value = "企业名称",notes = "")
     private String orgName ;
+
+    @ExcelIgnore
     @ApiModelProperty(value = "营业执照",notes = "")
     private String orgLicense ;
+
+    @ExcelIgnore
     @ApiModelProperty(value = "伤人信息",notes = "")
     private String criminalInfo ;
+
+    @ExcelIgnore
     @ApiModelProperty(value = "处罚信息",notes = "")
     private String penaltyInfo ;
+
+    @ExcelProperty(value = "小程序码", index = 8)
+    @TableField(exist = false)
+    @ApiModelProperty(value = "二维码",notes = "")
+    private String qrImage ;
+
 }

src/main/java/com/njyunzhi/pet_identity/mapper/TaPetIdentityMapper.java

@@ -3,8 +3,11 @@ package com.njyunzhi.pet_identity.mapper;
 import com.njyunzhi.pet_identity.entity.TaPetIdentity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
+import java.util.List;
+
 /**
  * <p>
  * 宠物证件 Mapper 接口
@@ -18,4 +21,6 @@ public interface TaPetIdentityMapper extends BaseMapper<TaPetIdentity> {
 
     @Select("SELECT COUNT(*) FROM ta_pet_identity WHERE status > -1")
     int countNotDelete();
+
+    List<TaPetIdentity> getListByCard(@Param("cardNoList") List<String> cardNoList);
 }

src/main/java/com/njyunzhi/pet_identity/service/ITaPetIdentityService.java

@@ -4,6 +4,8 @@ import com.njyunzhi.pet_identity.entity.TaApplication;
 import com.njyunzhi.pet_identity.entity.TaPetIdentity;
 import com.njyunzhi.pet_identity.vo.MakeCardParam;
 
+import java.util.List;
+
 /**
  * <p>
  * 宠物证件 服务类
@@ -16,9 +18,13 @@ public interface ITaPetIdentityService extends IBaseService<TaPetIdentity> {
 
     TaPetIdentity createNewCard(TaApplication taApplication, MakeCardParam makeCardParam) throws Exception;
 
+    boolean updateCardDate(String cardNo) throws Exception;
+
     boolean extendDate(TaPetIdentity taPetIdentity) throws Exception;
 
     TaPetIdentity getByPet(String petId, String personId);
 
     int countNotDelete();
+
+    List<TaPetIdentity> getListByCard(List<String> cardNoList);
 }

src/main/java/com/njyunzhi/pet_identity/service/impl/TaPetIdentityServiceImpl.java

@@ -1,6 +1,7 @@
 package com.njyunzhi.pet_identity.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.njyunzhi.pet_identity.common.Constants;
 import com.njyunzhi.pet_identity.common.DateUtils;
 import com.njyunzhi.pet_identity.entity.SysSetting;
@@ -15,6 +16,7 @@ import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
 import java.time.ZoneId;
+import java.util.List;
 
 /**
  * <p>
@@ -33,11 +35,9 @@ public class TaPetIdentityServiceImpl extends BaseServiceImpl<TaPetIdentityMappe
     @Override
     public TaPetIdentity createNewCard(TaApplication taApplication, MakeCardParam makeCardParam) throws Exception {
 
-        SysSetting sysSetting = sysSettingMapper.selectById(Constants.SYSSETTING_CARD_EXPIRE);
-
         // 北京时间
         LocalDateTime now = LocalDateTime.now(ZoneId.of("Asia/Shanghai"));
-        LocalDateTime expire = now.plusDays(Long.parseLong(sysSetting.getContent()));
+//        LocalDateTime expire = now.plusDays(Long.parseLong(sysSetting.getContent()));
 
         TaPetIdentity taPetIdentity = new TaPetIdentity();
         taPetIdentity.setCardNo(makeCardParam.getCardNo());
@@ -52,8 +52,8 @@ public class TaPetIdentityServiceImpl extends BaseServiceImpl<TaPetIdentityMappe
         taPetIdentity.setPetImg1(taApplication.getImg1());
         taPetIdentity.setPetImg2(taApplication.getImg2());
         taPetIdentity.setAddress(taApplication.getAddress());
-        taPetIdentity.setStartDate(DateUtils.toString(now, "yyyy-MM-dd"));
-        taPetIdentity.setExpireDate(DateUtils.toString(expire, "yyyy-MM-dd"));
+//        taPetIdentity.setStartDate(DateUtils.toString(now, "yyyy-MM-dd"));
+//        taPetIdentity.setExpireDate(DateUtils.toString(expire, "yyyy-MM-dd"));
         taPetIdentity.setStatus(Constants.STATUS_NORMAL);
         taPetIdentity.setCreateDate(now);
 
@@ -71,6 +71,23 @@ public class TaPetIdentityServiceImpl extends BaseServiceImpl<TaPetIdentityMappe
         return taPetIdentity;
     }
 
+    @Override
+    public boolean updateCardDate(String cardNo) throws Exception {
+        SysSetting sysSetting = sysSettingMapper.selectById(Constants.SYSSETTING_CARD_EXPIRE);
+        // 北京时间
+        LocalDateTime now = LocalDateTime.now(ZoneId.of("Asia/Shanghai"));
+        LocalDateTime expire = now.plusDays(Long.parseLong(sysSetting.getContent()));
+
+
+        UpdateWrapper<TaPetIdentity> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.set("start_date", now);
+        updateWrapper.set("expire_date", expire);
+        updateWrapper.eq("card_no", cardNo);
+
+        return update(updateWrapper);
+    }
+
+
     @Override
     public boolean extendDate(TaPetIdentity taPetIdentity) throws Exception {
 
@@ -101,4 +118,9 @@ public class TaPetIdentityServiceImpl extends BaseServiceImpl<TaPetIdentityMappe
     public int countNotDelete() {
         return baseMapper.countNotDelete();
     }
+
+    @Override
+    public List<TaPetIdentity> getListByCard(List<String> cardNoList) {
+        return baseMapper.getListByCard(cardNoList);
+    }
 }

src/main/resources/mapper/TaPetIdentityMapper.xml

@@ -2,4 +2,14 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.njyunzhi.pet_identity.mapper.TaPetIdentityMapper">
 
+    <select id="getListByCard" resultType="com.njyunzhi.pet_identity.entity.TaPetIdentity">
+        SELECT t.*, s.qr_image
+        FROM ta_pet_identity t
+            INNER JOIN ta_card_no s ON t.card_no = s.card_no
+        WHERE t.status &gt; -1
+            AND t.card_no IN
+        <foreach item="item" collection="cardNoList" separator="," open="(" close=")" index="">
+            #{item}
+        </foreach>
+    </select>
 </mapper>