bug修复

src/main/java/com/jkcredit/invoice/annotation/LoginRequired.java

@@ -11,5 +11,6 @@ import java.lang.annotation.Target;
 @Target({ElementType.METHOD})
 @Retention(RetentionPolicy.RUNTIME)
 public @interface LoginRequired {
+    String role() default "" ;
 }
 

src/main/java/com/jkcredit/invoice/annotation/annotationdes/AuthenticationInterceptor.java

@@ -7,6 +7,7 @@ import com.jkcredit.invoice.model.entity.user.User;
 import com.jkcredit.invoice.service.user.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.util.StringUtils;
 import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.servlet.HandlerInterceptor;
 import org.springframework.web.servlet.ModelAndView;
@@ -23,8 +24,9 @@ import java.lang.reflect.Method;
  **/
 public class AuthenticationInterceptor implements HandlerInterceptor {
 
-
-
+    public static final String AUTH_ADMIN ="1";
+    public static final String AUTH_NOCAR ="2";
+    public static final String AUTH_SELFCAR ="0";
     @Autowired
     private UserService userService;
     @Autowired
@@ -58,6 +60,9 @@ public class AuthenticationInterceptor implements HandlerInterceptor {
                 throw new RuntimeException("用户不存在，请重新登录");
             }
             request.setAttribute("currentUser", user);
+            if((!StringUtils.isEmpty(methodAnnotation.role())) && !methodAnnotation.role().equals(user.getRoleId())){
+                throw new RuntimeException("无权限");
+            }
             return true;
         }
         return true;

src/main/java/com/jkcredit/invoice/config/CorsConfig.java

@@ -29,5 +29,5 @@ public class CorsConfig {
         UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
         source.registerCorsConfiguration("/**", buildConfig());
         return new CorsFilter(source);
-    }  
+    }
 }

src/main/java/com/jkcredit/invoice/config/InvoiceWebMvcConfigurer.java

@@ -3,6 +3,7 @@ package com.jkcredit.invoice.config;
 import com.jkcredit.invoice.annotation.annotationdes.AuthenticationInterceptor;
 import com.jkcredit.invoice.annotation.annotationdes.CurrentUserMethodArgumentResolver;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.web.method.support.HandlerMethodArgumentResolver;
 import org.springframework.web.servlet.config.annotation.*;
 
@@ -14,44 +15,9 @@ import java.util.List;
  * @create: 2019/3/1 10:51 AM
  * @version: V1.0
  **/
-/*@Configuration*/
+@Configuration
 public class InvoiceWebMvcConfigurer extends WebMvcConfigurationSupport {
 
-    /**
-     * 支持跨域访问
-     * @param registry
-     */
-    @Override
-    public void addCorsMappings(CorsRegistry registry) {
-        registry.addMapping("/**")
-                .allowedOrigins("*")
-                .allowedMethods("POST", "GET", "PUT", "OPTIONS", "DELETE")
-                .allowCredentials(true);
-    }
-    /**
-     * 发现如果继承了WebMvcConfigurationSupport，则在yml中配置的相关内容会失效。
-     * 需要重新指定静态资源
-     * @param registry
-     */
-    @Override
-    public void addResourceHandlers(ResourceHandlerRegistry registry) {
-        registry.addResourceHandler("/**").addResourceLocations("classpath:/static/");
-        registry.addResourceHandler("docs.html")
-                .addResourceLocations("classpath:/META-INF/resources/");
-        registry.addResourceHandler("/webjars/**")
-                .addResourceLocations("classpath:/META-INF/resources/webjars/");
-        /*registry.addResourceHandler("/static/**")
-                .addResourceLocations("file://home/invoiceSrv/app/bin/static");*/
-
-        super.addResourceHandlers(registry);
-    }
-
-    @Override
-    public void addArgumentResolvers(List<HandlerMethodArgumentResolver> argumentResolvers) {
-        argumentResolvers.add(currentUserMethodArgumentResolver());
-        super.addArgumentResolvers(argumentResolvers);
-    }
-
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
         // 拦截所有请求，通过判断是否有 @LoginRequired 注解 决定是否需要登录

src/main/java/com/jkcredit/invoice/controller/business/CustomerController.java

@@ -5,6 +5,7 @@ import cn.com.taiji.sdk.model.comm.protocol.eoms.company.B2bCompanyModel;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jkcredit.invoice.annotation.LoginRequired;
+import com.jkcredit.invoice.annotation.annotationdes.AuthenticationInterceptor;
 import com.jkcredit.invoice.model.entity.customer.Customer;
 import com.jkcredit.invoice.model.entity.CustomerRecharge;
 import com.jkcredit.invoice.model.entity.customer.CustomerRec;
@@ -82,7 +83,7 @@ public class CustomerController {
      */
     @PostMapping("/findCustomerRecharge")
     @ApiOperation(value="分页查询客户充值信息", notes="分页查询客户充值信息")
-    @LoginRequired
+    @LoginRequired(role = AuthenticationInterceptor.AUTH_ADMIN)
     public RespR findCustomerRecharge(Page page, CustomerRecharge customerRecharge) {
 
         return new RespR(customerRechargeService.findAllCustomerRecharge(page, customerRecharge));
@@ -98,7 +99,6 @@ public class CustomerController {
      */
     @PostMapping("/findCustomerRechargeMoney")
     @ApiOperation(value="分页查询客户端客户充值信息", notes="分页查询客户端客户充值信息")
-    @LoginRequired
     public RespR findCustomerRechargeMoney(Page page, CustomerRecharge customerRecharge) {
 
         return new RespR(customerRechargeService.findAllCustomerRechargeMoney(page, customerRecharge));
@@ -110,7 +110,7 @@ public class CustomerController {
      */
     @GetMapping("/findCustomerRecListExport")
     @ApiOperation(value="客户信息导出", notes="客户信息导出")
-    @LoginRequired
+    @LoginRequired(role = AuthenticationInterceptor.AUTH_ADMIN)
     public void findCustomerRechargeExport(String  customerName,String companyName,String companyBelongName,HttpServletResponse response) throws Exception{
         CustomerRec customerRec = new CustomerRec();
         customerRec.setCustomerName(customerName);
@@ -160,7 +160,7 @@ public class CustomerController {
      */
     @PostMapping("/updateCustomer")
     @ApiOperation(value="更新用户", notes="更新用户")
-    @LoginRequired
+    @LoginRequired(role = AuthenticationInterceptor.AUTH_ADMIN)
     public RespR updateCustomer(@RequestBody  Customer customer) {
 
         return new RespR(customerService.updateCustomer(customer));
@@ -171,7 +171,7 @@ public class CustomerController {
      */
     @PostMapping("/customeRecStop")
     @ApiOperation(value="停用备案用户", notes="停用备案用户")
-    @LoginRequired
+    @LoginRequired(role = AuthenticationInterceptor.AUTH_ADMIN)
     public RespR customeRecStop(@RequestBody  CustomerRec customerRec) {
         customerRec.setRecStatus(4);
         return customerService.updateCustomerRecStatus(customerRec);
@@ -182,7 +182,7 @@ public class CustomerController {
      */
     @PostMapping("/customerRecAdd")
     @ApiOperation(value="手工添加备案信息", notes="手工添加备案信息")
-    @LoginRequired
+    @LoginRequired(role = AuthenticationInterceptor.AUTH_ADMIN)
     public RespR customerRecAdd(@RequestBody  CustomerRec customerRec) {
         customerRec.setInterType(1);
         List<CustomerRec> customerRecList = new ArrayList<>();
@@ -239,7 +239,7 @@ public class CustomerController {
      */
     @PostMapping("/customRecharge")
     @ApiOperation(value="账号充值", notes="账号充值")
-    @LoginRequired
+    @LoginRequired(role = AuthenticationInterceptor.AUTH_ADMIN)
     public RespR customRecharge(@RequestBody CustomerRecharge customerRecharge) {
 
         return new RespR(customerService.customRecharge(customerRecharge));
@@ -247,14 +247,14 @@ public class CustomerController {
 
     @PostMapping("/customeRec")
     @ApiOperation(value="用户备案确认", notes="用户备案确认")
-    @LoginRequired
+    @LoginRequired(role = AuthenticationInterceptor.AUTH_ADMIN)
     public RespR customeRec(@RequestBody CustomerRec customerRec){
         return customerService.customeRec(customerRec);
     }
 
     @PostMapping("/contractAdd")
     @ApiOperation(value="协议上传确认", notes="协议上传确认")
-    @LoginRequired
+    @LoginRequired(role = AuthenticationInterceptor.AUTH_ADMIN)
     public RespR contractAdd(@RequestBody CustomerRec customerRec){
         return customerService.contractAdd(customerRec);
     }
@@ -331,7 +331,7 @@ public class CustomerController {
      */
     @PostMapping("/findCustomerRecTimeList")
     @ApiOperation(value="客户备案预警查询", notes="客户备案预警查询")
-    @LoginRequired
+    @LoginRequired(role = AuthenticationInterceptor.AUTH_ADMIN)
     public RespR findCustomerRecTimeList(Page page, CustomerRec customerRec) {
         IPage ipage = null;
         if(StringUtils.isNotEmpty(customerRec.getServiceEndTime())  && !"null".equals(customerRec.getServiceEndTime())){
@@ -372,7 +372,7 @@ public class CustomerController {
      */
     @PostMapping("/findCustomerMoney")
     @ApiOperation(value="分页查询余额告警用户", notes="分页查询余额告警用户")
-    @LoginRequired
+    @LoginRequired(role = AuthenticationInterceptor.AUTH_ADMIN)
     public RespR getCustomerMoneysByPage(Page page, Customer customer) {
         Param param = paramService.getParamsByParamName("CUST_MONEY_WARNING");
         IPage ipage = null;

src/main/java/com/jkcredit/invoice/controller/business/SelfCarController.java

@@ -45,6 +45,8 @@ import java.util.*;
 */
 public class SelfCarController {
     @Autowired
+    SelfCarServiceL selfCarServiceL;
+    @Autowired
     SelfCarService selfCarService;
     @Autowired
     SelfCarServiceL selfCarServicel;
@@ -97,6 +99,57 @@ public class SelfCarController {
     /**
      * 分页查询自有车交易信息
      *
+     * @param page    参数集
+     * @return 交易信息
+     */
+    @PostMapping("/findTradesUpper")
+    @ApiOperation(value="分页查询自有车交易信息", notes="分页查询自有车交易信息")
+    @LoginRequired
+    public RespR findTradesUpper(Page page, SelfCarTrade selfCarTrade) {
+        try {
+            setTimeDue(selfCarTrade);
+            if(StringUtils.isEmpty(selfCarTrade.getCompanyName())){
+                return new RespR(false,"需要输入公司名称");
+            }
+            if(StringUtils.isEmpty(selfCarTrade.getCardId())){
+                return new RespR(false,"需要输入etc卡号");
+            }
+            if(StringUtils.isEmpty(selfCarTrade.getExTimeBegin())){
+                return new RespR(false,"需要交易开始时间");
+            }
+            if(StringUtils.isEmpty(selfCarTrade.getExTimeEnd())){
+                return new RespR(false,"需要输入交易结束时间");
+            }
+            //先更新查询信息
+            TradeRequestVo tradeRequestVo  = new TradeRequestVo();
+            tradeRequestVo.setCustomerName(selfCarTrade.getCustomId());
+            tradeRequestVo.setCompanyName(selfCarTrade.getCompanyName());
+            tradeRequestVo.setStartTime(selfCarTrade.getExTimeBegin());
+            tradeRequestVo.setEndTime(selfCarTrade.getExTimeEnd());
+            tradeRequestVo.setEtcId(selfCarTrade.getCardId());
+            tradeRequestVo.setTradeStatus(selfCarTrade.getStatus());
+            tradeRequestVo.setInterType(1);//0 接口
+
+            if(tradeRequestVo.getTradeStatus() ==null){
+                tradeRequestVo.setTradeStatus(1);
+                selfCarServiceL.getTradeList(tradeRequestVo);
+                tradeRequestVo.setTradeStatus(2);
+                selfCarServiceL.getTradeList(tradeRequestVo);
+                tradeRequestVo.setTradeStatus(3);
+                selfCarServiceL.getTradeList(tradeRequestVo);
+            }else{
+                selfCarServiceL.getTradeList(tradeRequestVo);
+            }
+            RespR respR = new RespR(selfCarTradeService.findByPageAndTrade(page, selfCarTrade));
+            return respR;
+        }catch (Exception e){
+            e.printStackTrace();
+            return new RespR(false,e.getMessage());
+        }
+    }
+    /**
+     * 分页查询自有车交易信息
+     *
      * @param  selfCarTradesStr
      * @return 交易信息
      */

src/main/java/com/jkcredit/invoice/controller/user/AuthenticationController.java

@@ -59,4 +59,9 @@ public class AuthenticationController {
         }
         return new RespR<>(jsonObject);
     }
+    @ApiOperation(value="用户退出", notes="用户退出")
+    @PostMapping("/loginOut")
+    public void login( String token) {
+        authenticationService.deleteToken(token);
+    }
 }

src/main/java/com/jkcredit/invoice/credit/SimpleCORSFilter.java

@@ -118,7 +118,7 @@ public class SimpleCORSFilter implements Filter {
             "/customer/findCustomerMoney",
             "/customer/customeRecQueryListByPage",
             "/customer/customeRecQueryUpper",
-
+            "/auth/login/loginOut",
             "/noCar/findCarRec",
             "/noCar/findBillWay",
             "/noCar/findBillWayCust",
@@ -140,6 +140,7 @@ public class SimpleCORSFilter implements Filter {
 
 
             "/selfCar/selfCarUnBind",
+            "/selfCar/findTradesUpper",
             "/selfCar/findTrades",
             "/selfCar/findSelfCarInvoices",
             "/selfCar/findSelfcarCalculateInfo",

src/main/java/com/jkcredit/invoice/mapper/waybill/SellCarTradeMapper.java

@@ -23,7 +23,7 @@ public interface SellCarTradeMapper extends BaseMapper<SelfCarTrade> {
     List<SelfCarTrade> selectByTradeId(String tradeId);
     List<SelfCarTrade> selectByCardIdByStatus(SelfCarTrade record);
     List<SelfCarTrade> selectByCardId(String cardId);
-
+    List<SelfCarTrade> selectByStatus(String status);
     int upDateCompany(CompanyVo companyVo);
 
 }

src/main/java/com/jkcredit/invoice/service/selfcar/impl/SelfCarTradeServiceImpl.java

@@ -56,6 +56,9 @@ public class SelfCarTradeServiceImpl extends ServiceImpl<SellCarTradeMapper,Self
     @Override
     public boolean updateTrades(List<SelfCarTrade> selfCarTrades) {
         Map<String,TradeRequestVo> map = new HashMap<>();
+        if(selfCarTrades== null || selfCarTrades.size()==0){
+            selfCarTrades = sellCarTradeMapper.selectByStatus("2");
+        }
         selfCarTrades.forEach(selfCarTrade -> {
             TradeRequestVo tradeRequestVo = map.get(selfCarTrade.getCardId());
             if(tradeRequestVo == null){

src/main/java/com/jkcredit/invoice/service/user/AuthenticationService.java

@@ -12,4 +12,6 @@ import com.jkcredit.invoice.model.entity.user.User;
 public interface AuthenticationService {
 
     String getToken(User user);
+
+    void deleteToken(String token);
 }

src/main/java/com/jkcredit/invoice/service/user/impl/AuthenticationServiceImpl.java

@@ -40,4 +40,13 @@ public class AuthenticationServiceImpl implements AuthenticationService {
         }
         return token;
     }
+
+    @Override
+    public void deleteToken(String token) {
+        try {
+            redisTemplate.delete(CommonConstants.TOKEN_KEY + token);
+        }catch (Exception e){
+
+        }
+    }
 }

src/main/resources/mapper/invoice/SelfCarInvoiceMapper.xml

@@ -57,7 +57,7 @@
     </sql>
     <select id="selectAllByPage" resultMap="BaseResultMap">
         select
-        <include refid="baseSql" />,(select t.status from t_SellCarTrade t where t.tradeId = g.tradeId ) tradeStatus,(select f.calTime from t_SelfCalculateInfor f where f.etcNum = cardId and instr(g.exTime,f.calTime)>0) calculateTime
+        <include refid="baseSql" />,(select DISTINCT t.status from t_SellCarTrade t where t.tradeId = g.tradeId ) tradeStatus,(select f.calTime from t_SelfCalculateInfor f where f.etcNum = cardId and instr(g.exTime,f.calTime)>0) calculateTime
         from t_SelfCarInvoice g
         <where>
             <if test="selfCarInvoice.companyName != null and selfCarInvoice.companyName != ''">

src/main/resources/mapper/waybill/SellCarTradeMapper.xml

@@ -139,7 +139,12 @@
         from t_SellCarTrade
         where  cardId = BINARY #{cardId,jdbcType=VARCHAR} and  status = #{status,jdbcType=VARCHAR}
     </select>
-
+    <select id="selectByStatus" resultMap="BaseResultMap" parameterType="java.lang.String" >
+        select
+        <include refid="baseSql" />
+        from t_SellCarTrade
+        where  status = #{status,jdbcType=VARCHAR}
+    </select>
     <update id="upDateCompany" parameterType="com.jkcredit.invoice.model.vo.CompanyVo">
         UPDATE t_SellCarTrade set companyName = #{newCompanyName} where companyName = #{oldCompanyName}
     </update>