feats

deploy/stop.sh

@@ -0,0 +1,29 @@
+#!/bin/sh
+#
+#
+
+findProcess(){
+  PROCESS_NAME="pet-identity"
+  echo $(ps -ef |grep $PROCESS_NAME|grep java| awk '{print $2}')
+}
+
+# 查找进程
+PID=$(findProcess)
+if [ ! $PID ]; then
+  echo "Process not found !"
+  exit 0
+else
+  echo "Process ID ${PID}"
+fi
+
+echo "Please wait ..."
+kill -9 $PID
+
+# 重新查询一次
+PID=$(findProcess)
+if [ ! $PID ]; then
+  echo "Process killed success !"
+  exit 0
+else
+  echo "Process killed fail, please retry ."
+fi

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.njyunzhi</groupId>
 	<artifactId>pet_identity</artifactId>
-	<version>0.0.4</version>
+	<version>0.0.7</version>
 	<name>pet_identity</name>
 	<description>Demo project for Spring Boot</description>
 

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

@@ -267,7 +267,7 @@ public class TaApplicationController extends BaseController {
             }
             taApplication.setOriginApplyId(origin.getApplyId());
 
-            if (!taApplication.getOriginCardNo().equals(origin.getOriginCardNo())) {
+            if (!taApplication.getOriginCardNo().equals(origin.getCardNo())) {
                 return ResponseBean.error("原始证件信息校验异常");
             }
 
@@ -539,7 +539,7 @@ public class TaApplicationController extends BaseController {
         TaPetIdentity taPetIdentity = iTaPetIdentityService.getExistBy("card_no", taApplication.getCardNo(), false, true);
         if (null != taPetIdentity) {
             // 新办 续期，都需要重置有效期
-            iTaPetIdentityService.updateCardDate(taPetIdentity.getCardNo());
+            iTaPetIdentityService.extendDate(taPetIdentity);
         }
 
         if (iTaApplicationService.updateById(taApplication)){

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

@@ -93,7 +93,7 @@ public class TaPetIdentityController extends BaseController {
         queryWrapper.gt("status", Constants.STATUS_DELETE);
         queryWrapper.orderByDesc("create_date");
 
-        IPage<TaPetIdentity> result = iTaPetIdentityService.page(pg, queryWrapper);
+        IPage<TaPetIdentity> result = iTaPetIdentityService.getMineCards(pg, taPerson.getPersonId());
         return ResponseBean.success(result);
     }
 

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

@@ -1,5 +1,6 @@
 package com.njyunzhi.pet_identity.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.njyunzhi.pet_identity.entity.TaPetIdentity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
@@ -23,4 +24,6 @@ public interface TaPetIdentityMapper extends BaseMapper<TaPetIdentity> {
     int countNotDelete();
 
     List<TaPetIdentity> getListByCard(@Param("cardNoList") List<String> cardNoList);
+
+    IPage<TaPetIdentity> getMineCards(IPage<TaPetIdentity> pg, @Param("personId") String personId);
 }

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

@@ -1,5 +1,6 @@
 package com.njyunzhi.pet_identity.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.njyunzhi.pet_identity.entity.TaApplication;
 import com.njyunzhi.pet_identity.entity.TaPetIdentity;
 import com.njyunzhi.pet_identity.vo.MakeCardParam;
@@ -18,8 +19,6 @@ 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);
@@ -27,4 +26,6 @@ public interface ITaPetIdentityService extends IBaseService<TaPetIdentity> {
     int countNotDelete();
 
     List<TaPetIdentity> getListByCard(List<String> cardNoList);
+
+    IPage<TaPetIdentity> getMineCards(IPage<TaPetIdentity> pg, String personId);
 }

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

@@ -2,6 +2,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.baomidou.mybatisplus.core.metadata.IPage;
 import com.njyunzhi.pet_identity.common.Constants;
 import com.njyunzhi.pet_identity.common.DateUtils;
 import com.njyunzhi.pet_identity.entity.SysSetting;
@@ -71,23 +72,6 @@ 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 {
 
@@ -123,4 +107,9 @@ public class TaPetIdentityServiceImpl extends BaseServiceImpl<TaPetIdentityMappe
     public List<TaPetIdentity> getListByCard(List<String> cardNoList) {
         return baseMapper.getListByCard(cardNoList);
     }
+
+    @Override
+    public IPage<TaPetIdentity> getMineCards(IPage<TaPetIdentity> pg, String personId) {
+        return baseMapper.getMineCards(pg, personId);
+    }
 }

src/main/resources/mapper/TaPetIdentityMapper.xml

@@ -12,4 +12,24 @@
             #{item}
         </foreach>
     </select>
+    <select id="getMineCards" resultType="com.njyunzhi.pet_identity.entity.TaPetIdentity">
+        SELECT
+            s.*
+        FROM
+            (
+                SELECT
+                    t.*
+                FROM
+                    `ta_pet_identity` t
+                WHERE
+                    t.person_id = #{personId}
+                  AND t.`status` &gt; -1
+                HAVING
+                    1
+                ORDER BY
+                    t.create_date DESC
+            ) s
+        GROUP BY
+            s.pet_id
+    </select>
 </mapper>