Merge remote-tracking branch 'remotes/origin/base-modify' into dev

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserLoginBiz.java

@@ -2,24 +2,29 @@ package com.github.wxiaoqi.security.admin.biz;
 
 import com.ace.cache.annotation.Cache;
 import com.ace.cache.annotation.CacheClear;
+import com.alibaba.fastjson.JSONObject;
 import com.github.wxiaoqi.security.admin.entity.AppUserLogin;
 import com.github.wxiaoqi.security.admin.mapper.AppUserLoginMapper;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.github.wxiaoqi.security.common.config.rabbit.RabbitConstant;
 import com.github.wxiaoqi.security.common.constant.UserConstant;
+import com.xxfc.platform.universal.entity.IdInformation;
+import com.xxfc.platform.universal.feign.MQSenderFeign;
+import com.xxfc.platform.universal.feign.ThirdFeign;
 import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import tk.mybatis.mapper.entity.Example;
-import tk.mybatis.mapper.weekend.WeekendSqls;
 
 import java.time.Instant;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
-import java.util.concurrent.atomic.AtomicReference;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -36,6 +41,11 @@ public class AppUserLoginBiz extends BaseBiz<AppUserLoginMapper, AppUserLogin> {
     private static final  String WX_TYPE="wx";
     private static final  String QQ_TYPE="q";
 
+    @Autowired
+    ThirdFeign thirdFeign;
+    @Autowired
+    MQSenderFeign mqSenderFeign;
+
     @Transactional(rollbackFor = Exception.class,propagation = Propagation.REQUIRED)
     @Override
     public void insertSelective(AppUserLogin entity) {
@@ -62,6 +72,44 @@ public class AppUserLoginBiz extends BaseBiz<AppUserLoginMapper, AppUserLogin> {
         super.updateSelectiveById(entity);
     }
 
+    public Object test() {
+        threadRunner();
+        return "success";
+    }
+
+    public void threadRunner() {
+        List<AppUserLogin> list = mapper.selectAll();
+        ExecutorService executorService = Executors.newCachedThreadPool();
+        executorService.execute(new Runnable() {
+             @Override
+              public void run() {
+                 if(list != null && list.size() > 0) {
+                     for(AppUserLogin appUserLogin : list) {
+                         try {
+                             Thread.sleep(3000);
+                         } catch (Exception e){}
+                         IdInformation idInformation = thirdFeign.getOneByUserId(appUserLogin.getId());
+                         if(idInformation != null) { //实名认证
+                             JSONObject jsonObject = new JSONObject();
+                             jsonObject.put("userId", appUserLogin.getId());
+                             jsonObject.put("integralRuleCode", "CRETIFICATION");
+                             jsonObject.put("channelId", idInformation.getId());
+                             mqSenderFeign.sendMessage(RabbitConstant.INTEGRAL_TOPIC, RabbitConstant.INTEGRAL_ROUTING_KEY, jsonObject.toJSONString());
+                         }
+                         try {
+                             Thread.sleep(3000);
+                         } catch (Exception e){}
+                         JSONObject jsonObject = new JSONObject();
+                         jsonObject.put("userId", appUserLogin.getId());
+                         jsonObject.put("integralRuleCode", "REGISTER");
+                         jsonObject.put("channelId", appUserLogin.getId());
+                         mqSenderFeign.sendMessage(RabbitConstant.INTEGRAL_TOPIC, RabbitConstant.INTEGRAL_ROUTING_KEY, jsonObject.toJSONString());
+
+                     }
+                 }
+               }
+        });
+    }
 
     /**
      * 根据用户名获取用户信息

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/AppUserController.java

 package com.github.wxiaoqi.security.admin.rest;
 
-import com.ace.cache.annotation.Cache;
 import com.github.wxiaoqi.security.admin.biz.*;
 import com.github.wxiaoqi.security.admin.entity.*;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
-import com.github.wxiaoqi.security.admin.feign.rest.UserRestInterface;
 import com.github.wxiaoqi.security.admin.vo.AppUserGroups;
 import com.github.wxiaoqi.security.admin.vo.AppUserInfoVo;
 import com.github.wxiaoqi.security.admin.vo.AppUserVo;
@@ -14,24 +12,20 @@ import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
 import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
 import com.github.wxiaoqi.security.auth.client.jwt.UserAuthUtil;
 import com.github.wxiaoqi.security.auth.common.util.jwt.IJWTInfo;
-import com.github.wxiaoqi.security.common.context.BaseContextHandler;
 import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.msg.TableResultResponse;
 import com.github.wxiaoqi.security.common.rest.CommonBaseController;
 import com.github.wxiaoqi.security.common.util.Query;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
-import com.xxfc.platform.order.entity.BaseOrder;
 import com.xxfc.platform.order.feign.OrderFeign;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.beanutils.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.GET;
 import java.util.List;
 import java.util.Map;
 
@@ -285,4 +279,11 @@ public class AppUserController extends CommonBaseController{
          AppUserInfoVo appUserInfoVo = userDetailBiz.findUserInfoByCode(code);
          return ObjectRestResponse.succ(appUserInfoVo);
     }
+
+    @GetMapping("/app/unauth/test")
+    @IgnoreUserToken
+    @IgnoreClientToken
+    public Object test() {
+        return appUserLoginBiz.test();
+    }
 }

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/IntegralUserRecordBiz.java

@@ -181,7 +181,7 @@ public class IntegralUserRecordBiz extends BaseBiz<IntegralUserRecordMapper, Int
         } else {
             integralUserRecordDto.setStartTime(null);
             Integer count = mapper.countByUserAndCode(integralUserRecordDto);
-            integralUserStatus.setIntegralStatus(count == number);
+            integralUserStatus.setIntegralStatus(true);
         }
         integralUserStatusBiz.save(integralUserStatus);
     }

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/rest/IntegralUserRecordController.java

@@ -38,4 +38,6 @@ public class IntegralUserRecordController {
     public ObjectRestResponse getListByCode(IntegralUserRecordDto integralUserRecordDto) {
         return integralUserRecordBiz.getByUserAndTime(integralUserRecordDto);
     }
+
+
 }

xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/entity/IdInformation.java

@@ -47,7 +47,7 @@ public class IdInformation implements Serializable {
      * 用户id
      */
     @Column(name = "user_login_id")
-    private Integer  userLonginId;
+    private Integer  userLoginId;
 
     /**
      *

xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/feign/ThirdFeign.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.xxfc.platform.universal.dto.SmsTemplateDTO;
 import com.xxfc.platform.universal.entity.Dictionary;
+import com.xxfc.platform.universal.entity.IdInformation;
 import com.xxfc.platform.universal.vo.OrderPayVo;
 import com.xxfc.platform.universal.vo.OrderRefundVo;
 import com.xxfc.platform.universal.vo.TrafficViolations;
@@ -74,7 +75,8 @@ public interface ThirdFeign {
     @PostMapping("/dictionary/type_code")
     public  Dictionary findDictionaryByTypeAndCode(@RequestParam(value = "type") String type,@RequestParam(value = "code") String code);
 
-
+    @GetMapping(value = "/certif/app/unauth/selectByUser")
+    public IdInformation getOneByUserId(@RequestParam(value = "userId")Integer userId);
 
     /*****************************************  违章 ********************************************/
     @GetMapping("/3p/tv/getRentViolation")

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/controller/CertificationController.java

@@ -12,14 +12,10 @@ import com.xxfc.platform.universal.biz.MQServiceBiZ;
 import com.xxfc.platform.universal.entity.IdInformation;
 import com.xxfc.platform.universal.service.CertificationService;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.aop.framework.AopContext;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.core.task.TaskExecutor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.concurrent.CompletableFuture;
@@ -78,11 +74,11 @@ public class CertificationController   {
             return ObjectRestResponse.createFailedResult(ResultCode.GET_APPUSER_FAILED_CODE,"无法识别,请重新上传");
         }
         AppUserDTO appUserDTO = appUserDTOObjectRestResponse.getData();
-        idInformation.setUserLonginId(appUserDTO.getUserid());
+        idInformation.setUserLoginId(appUserDTO.getUserid());
         //获取用户认证信息
         ObjectRestResponse orr = null;
         try {
-            orr = userFeign.authentication(idInformation.getUserLonginId(), null,null, 0);
+            orr = userFeign.authentication(idInformation.getUserLoginId(), null,null, 0);
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -124,4 +120,8 @@ public class CertificationController   {
         mqServiceBiZ.sendMessage(RabbitConstant.INTEGRAL_TOPIC, RabbitConstant.INTEGRAL_ROUTING_KEY, jsonObject.toJSONString());
     }
 
+    @GetMapping(value = "/app/unauth/selectByUser")
+    public IdInformation getOneByUserId(Integer userId) {
+        return certificationService.getByUser(userId);
+    }
 }

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/mapper/IdInformationMapper.java

@@ -2,8 +2,6 @@ package com.xxfc.platform.universal.mapper;
 
 import com.xxfc.platform.universal.entity.IdInformation;
 import org.apache.ibatis.annotations.Insert;
-import org.apache.ibatis.annotations.Options;
-import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Repository;
 import tk.mybatis.mapper.common.Mapper;
 
@@ -11,6 +9,8 @@ import tk.mybatis.mapper.common.Mapper;
 public interface IdInformationMapper extends Mapper<IdInformation> {
 
     @Insert(value = "insert into id_information (user_login_id,name,id_number,certificate_type,front_url,back_url,expiration_date) " +
-                                       "values (#{userLonginId},#{name},#{idNumber},#{certificateType},#{frontUrl},#{backUrl},#{expirationDate})")
+                                       "values (#{userLoginId},#{name},#{idNumber},#{certificateType},#{frontUrl},#{backUrl},#{expirationDate})")
      void addIdInformation(IdInformation idInformation);
+
+    IdInformation selectByUserId(Integer userLoginId);
 }

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/service/CertificationService.java

@@ -10,7 +10,6 @@ import com.xxfc.platform.universal.entity.IdInformation;
 import com.xxfc.platform.universal.mapper.IdInformationMapper;
 import com.xxfc.platform.universal.utils.CertifHttpUtils;
 import com.xxfc.platform.universal.utils.Validation;
-import javafx.application.Application;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.map.HashedMap;
@@ -22,7 +21,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.TransactionStatus;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import tk.mybatis.mapper.entity.Example;
@@ -335,7 +333,7 @@ public class CertificationService {
             Example exa = new Example(IdInformation.class);
             Example.Criteria criteria = exa.createCriteria();
             criteria.andEqualTo("idNumber",idInformation.getIdNumber());
-            criteria.andEqualTo("userLonginId",idInformation.getUserLonginId());
+            criteria.andEqualTo("userLoginId",idInformation.getUserLoginId());
             List<IdInformation> idInformations = idInformationMapper.selectByExample(exa);
             if (CollectionUtils.isEmpty(idInformations)) {
                 idInformation.setCrtTime(new Date());
@@ -346,22 +344,20 @@ public class CertificationService {
                 idInformation.setUpdTime(new Date());
                 idInformationMapper.updateByPrimaryKeySelective(idInformation);
             }
-            log.info("----addIdInformation---userid==="+idInformation.getUserLonginId()+"----name====" + idInformation.getName()+"---IdNumber==="+idInformation.getIdNumber());
+            log.info("----addIdInformation---userid==="+idInformation.getUserLoginId()+"----name====" + idInformation.getName()+"---IdNumber==="+idInformation.getIdNumber());
             //认证成功后修改用户,用户认证状态
-            ObjectRestResponse authentication = userFeign.authentication(idInformation.getUserLonginId(), idInformation.getName(), idInformation.getIdNumber(), 1);
+            ObjectRestResponse authentication = userFeign.authentication(idInformation.getUserLoginId(), idInformation.getName(), idInformation.getIdNumber(), 1);
            return ObjectRestResponse.succ(idInformation.getId());
         } catch (Exception e) {
             e.printStackTrace();
             TransactionAspectSupport.currentTransactionStatus();
             return ObjectRestResponse.createFailedResult(ResultCode.INCOMPLETE_DATA,"无法识别,请重新上传");
         }
-
-
-
-
     }
 
-
+    public IdInformation getByUser(Integer userId) {
+        return idInformationMapper.selectByUserId(userId);
+    }
 
 }
 

xx-universal/xx-universal-server/src/main/resources/mapper/IdInformationMapper.xml

@@ -6,14 +6,16 @@
         <result property="id" column="id"/>
         <result property="idNumber" column="id_number"/>
         <result property="name" column="name"/>
-        <result property="userLonginId" column="user_login_id"/>
+        <result property="userLoginId" column="user_login_id"/>
         <result property="certificateType" column="certificate_type"/>
         <result property="frontUrl" column="front_url"/>
         <result property="backUrl" column="back_url"/>
         <result property="expirationDate" column="expiration_date"/>
         <result property="authenticationMethods" column="authentication_methods"/>
     </resultMap>
-
+    <select id="selectByUserId" resultType="com.xxfc.platform.universal.entity.IdInformation" parameterType="java.lang.Integer">
+        select * from id_information where user_login_id = #{userLoginId}
+    </select>
 
 
 </mapper>
\ No newline at end of file

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleMapper.xml

@@ -467,6 +467,7 @@
                     #{id}
                 </foreach>
             </if>
+            and v1.is_del != 1
         </where>
         GROUP BY v1.status
         union all
@@ -489,6 +490,7 @@
                     #{id}
                 </foreach>
             </if>
+            and v1.is_del != 1
         </where>
     </select>