Merge branch 'base-modify' of http://10.5.52.3/youjj/cloud-platform into base-modify

ace-auth/ace-auth-server/src/main/java/com/github/wxiaoqi/security/auth/controller/AuthController.java

@@ -56,6 +56,15 @@ public class AuthController {
         return new ObjectRestResponse<String>().data(token);
     }
 
+    @RequestMapping(value = "token/small", method = RequestMethod.POST)
+    public ObjectRestResponse<String> createAuthenticationTokenSmall(
+            @RequestBody JwtAuthenticationRequest authenticationRequest,
+            HttpServletRequest request) throws Exception {
+        log.info(authenticationRequest.getUsername()+" require logging...");
+        // keliii 分请求类型处理token
+        return authService.loginSmall(authenticationRequest);
+    }
+
     @RequestMapping(value = "refresh", method = RequestMethod.GET)
     public ObjectRestResponse<String> refreshAndGetAuthenticationToken(
             HttpServletRequest request) throws Exception {

ace-auth/ace-auth-server/src/main/java/com/github/wxiaoqi/security/auth/feign/IUserService.java

@@ -20,6 +20,9 @@ public interface IUserService {
     @RequestMapping(value = "/api/user/validate", method = RequestMethod.POST)
     public UserInfo validate(@RequestBody JwtAuthenticationRequest authenticationRequest);
 
+    @RequestMapping(value = "/api/user/validate/small", method = RequestMethod.POST)
+    public UserInfo validateSmall(@RequestBody JwtAuthenticationRequest authenticationRequest);
+
     @RequestMapping(value = "/api/app/user/validate", method = RequestMethod.POST)
     AppUserInfo AppValidate(@RequestBody JwtAuthenticationRequest authenticationRequest);
 

ace-auth/ace-auth-server/src/main/java/com/github/wxiaoqi/security/auth/service/AuthService.java

@@ -3,10 +3,12 @@ package com.github.wxiaoqi.security.auth.service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.github.wxiaoqi.security.auth.util.user.JwtAuthenticationRequest;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import org.springframework.web.bind.annotation.RequestParam;
 
 public interface AuthService {
     String login(JwtAuthenticationRequest authenticationRequest) throws Exception;
+    ObjectRestResponse loginSmall(JwtAuthenticationRequest authenticationRequest) throws Exception;
     String refresh(String oldToken) throws Exception;
     void validate(String token) throws Exception;
     JSONObject sendsms(String username, Integer type) throws Exception;

ace-auth/ace-auth-server/src/main/java/com/github/wxiaoqi/security/auth/service/impl/AppAuthServiceImpl.java

@@ -2,6 +2,7 @@ package com.github.wxiaoqi.security.auth.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.github.wxiaoqi.security.api.vo.user.AppUserInfo;
+import com.github.wxiaoqi.security.api.vo.user.UserInfo;
 import com.github.wxiaoqi.security.auth.common.util.jwt.JWTInfo;
 import com.github.wxiaoqi.security.auth.feign.IUserService;
 import com.github.wxiaoqi.security.auth.service.AuthService;
@@ -9,6 +10,7 @@ import com.github.wxiaoqi.security.auth.util.user.JwtAuthenticationRequest;
 import com.github.wxiaoqi.security.auth.util.user.JwtTokenUtil;
 import com.github.wxiaoqi.security.common.constant.RequestTypeConstants;
 import com.github.wxiaoqi.security.common.exception.auth.UserInvalidException;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
@@ -36,6 +38,20 @@ public class AppAuthServiceImpl implements AuthService {
         throw new UserInvalidException("用户不存在或账户密码错误!");
     }
 
+    @Override
+    public ObjectRestResponse loginSmall(JwtAuthenticationRequest authenticationRequest) throws Exception {
+        UserInfo info = userService.validateSmall(authenticationRequest);
+        if (info!=null&&!StringUtils.isEmpty(info.getId())) {
+            info.setPassword(null);
+            JSONObject object=new JSONObject();
+            String token=jwtTokenUtil.generateToken(new JWTInfo(info.getUsername(), info.getId() + "", info.getName()));
+            object.put("token",token);
+            object.put("info",info);
+            return ObjectRestResponse.succ(object);
+        }
+        throw new UserInvalidException("用户不存在或账户密码错误!");
+    }
+
     @Override
     public String refresh(String oldToken) throws Exception {
         return jwtTokenUtil.generateToken(jwtTokenUtil.getInfoFromToken(oldToken));

ace-auth/ace-auth-server/src/main/java/com/github/wxiaoqi/security/auth/service/impl/AuthServiceImpl.java

@@ -9,6 +9,7 @@ import com.github.wxiaoqi.security.auth.util.user.JwtAuthenticationRequest;
 import com.github.wxiaoqi.security.auth.util.user.JwtTokenUtil;
 import com.github.wxiaoqi.security.common.constant.RequestTypeConstants;
 import com.github.wxiaoqi.security.common.exception.auth.UserInvalidException;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
@@ -36,6 +37,20 @@ public class AuthServiceImpl implements AuthService {
         throw new UserInvalidException("用户不存在或账户密码错误!");
     }
 
+    @Override
+    public ObjectRestResponse loginSmall(JwtAuthenticationRequest authenticationRequest) throws Exception {
+        UserInfo info = userService.validateSmall(authenticationRequest);
+        if (info!=null&&!StringUtils.isEmpty(info.getId())) {
+            info.setPassword(null);
+            JSONObject object=new JSONObject();
+            String token=jwtTokenUtil.generateToken(new JWTInfo(info.getUsername(), info.getId() + "", info.getName()));
+            object.put("token",token);
+            object.put("info",info);
+            return ObjectRestResponse.succ(object);
+        }
+        throw new UserInvalidException("用户不存在或账户密码错误!");
+    }
+
     @Override
     public void validate(String token) throws Exception {
         jwtTokenUtil.getInfoFromToken(token);

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/UserRest.java

@@ -40,6 +40,11 @@ public class UserRest {
     public @ResponseBody UserInfo validate(@RequestBody Map<String,String> body){
         return permissionService.validate(body.get("username"),body.get("password"));
     }
+    @RequestMapping(value = "/user/validate/small", method = RequestMethod.POST)
+    public @ResponseBody UserInfo validateSmall(@RequestBody Map<String,String> body){
+        return permissionService.validateSmall(body.get("username"),body.get("password"));
+    }
+
 
 
 

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/service/PermissionService.java

@@ -14,6 +14,8 @@ import com.github.wxiaoqi.security.api.vo.user.UserInfo;
 import com.github.wxiaoqi.security.auth.client.jwt.UserAuthUtil;
 import com.github.wxiaoqi.security.common.constant.CommonConstants;
 import com.github.wxiaoqi.security.common.util.TreeUtil;
+import com.xxfc.platform.vehicle.entity.BranchCompany;
+import com.xxfc.platform.vehicle.feign.VehicleFeign;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,6 +40,9 @@ public class PermissionService {
     private ElementBiz elementBiz;
     @Autowired
     private UserAuthUtil userAuthUtil;
+    @Autowired
+    private VehicleFeign vehicleFeign;
+
     private BCryptPasswordEncoder encoder = new BCryptPasswordEncoder(12);
 
 
@@ -60,6 +65,22 @@ public class PermissionService {
         }
         return info;
     }
+     //小程序登录
+    public UserInfo validateSmall(String username,String password){
+        UserInfo info = new UserInfo();
+        User user = userBiz.getUserByUsername(username);
+        if (user!=null){
+            if (encoder.matches(password, user.getPassword())) {
+                BeanUtils.copyProperties(user, info);
+                info.setId(user.getId().toString());
+                List<BranchCompany> list=vehicleFeign.companyAll(2,user.getDataCompany(),null);
+                if (list.size()>0){
+                    info.setDataCompanyName(list.get(0).getName());
+                }
+            }
+        }
+        return info;
+    }
 
     public List<PermissionInfo> getAllPermission() {
         List<Menu> menus = menuBiz.selectListAll();

ace-modules/ace-interface/src/main/java/com/github/wxiaoqi/security/api/vo/user/UserInfo.java

@@ -18,6 +18,7 @@ public class UserInfo implements Serializable{
     private Integer dataAll;
     private String dataZone;
     private String dataCompany;
+    private String dataCompanyName;
 
     public Date getUpdTime() {
         return updTime;
@@ -92,4 +93,13 @@ public class UserInfo implements Serializable{
     public void setDataCompany(String dataCompany) {
         this.dataCompany = dataCompany;
     }
+
+    public String getDataCompanyName() {
+        return dataCompanyName;
+    }
+
+    public void setDataCompanyName(String dataCompanyName) {
+        this.dataCompanyName = dataCompanyName;
+    }
+
 }

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/VehicleDepartureLog.java

@@ -87,7 +87,7 @@ public class VehicleDepartureLog {
      */
     Integer bookRecordId;
 
-    private String illegalPic;
+     String illegalPic;
 
-    private Integer illegalAmount;
+     Integer illegalAmount;
 }

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/VehicleDepartureLogVo.java

@@ -26,4 +26,9 @@ public class VehicleDepartureLogVo {
     String departureDay;
     String departureName;
     String arrivalName;
+    Integer bookRecordId;
+
+    String illegalPic;
+
+    Integer illegalAmount;
 }

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBiz.java

 package com.xxfc.platform.vehicle.biz;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.bean.copier.CopyOptions;
 import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -418,21 +419,12 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
         VehicleBookRecord vehicleBookRecord = null;
         if(bookVehicleVo.getVehicleBookRecordId() == null) {
             vehicleBookRecord = new VehicleBookRecord();
-            vehicleBookRecord.setVehicleId(bookVehicleVo.getVehicleId());
-            vehicleBookRecord.setBookType(bookVehicleVo.getBookType());
+            BeanUtil.copyProperties(bookVehicleVo, vehicleBookRecord, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
+            vehicleBookRecord.setBookStartDate(startDay.toDate());
+            vehicleBookRecord.setBookEndDate(endDay.toDate());
             vehicleBookRecord.setStatus(VehicleBookRecordStatus.APPLY.getCode());
             vehicleBookRecord.setBookUser(userId);
             vehicleBookRecord.setBookUserName(userName);
-            vehicleBookRecord.setBookStartDate(startDay.toDate());
-            vehicleBookRecord.setBookEndDate(endDay.toDate());
-            vehicleBookRecord.setLiftAddr(bookVehicleVo.getLiftAddr());
-            vehicleBookRecord.setRemark(bookVehicleVo.getRemark());
-            vehicleBookRecord.setDestination(bookVehicleVo.getDestination());
-            vehicleBookRecord.setLiftCompany(bookVehicleVo.getLiftCompany());
-            vehicleBookRecord.setRetCompany(bookVehicleVo.getRetCompany());
-            vehicleBookRecord.setVehicleUsername(bookVehicleVo.getVehicleUsername());
-            vehicleBookRecord.setVehicleUserPhone(bookVehicleVo.getVehicleUserPhone());
-            vehicleBookRecord.setUpkeepIds(bookVehicleVo.getUpkeepIds());
             vehicleBookRecordBiz.save(vehicleBookRecord);
         } else {
             vehicleBookRecord = vehicleBookRecordBiz.selectById(bookVehicleVo.getVehicleBookRecordId());
@@ -511,21 +503,12 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
         VehicleBookRecord vehicleBookRecord = null;
         if(bookVehicleVo.getVehicleBookRecordId() == null) {
             vehicleBookRecord = new VehicleBookRecord();
-            vehicleBookRecord.setVehicleId(bookVehicleVo.getVehicleId());
-            vehicleBookRecord.setBookType(bookVehicleVo.getBookType());
+            BeanUtil.copyProperties(bookVehicleVo, vehicleBookRecord, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
+            vehicleBookRecord.setBookStartDate(startDay.toDate());
+            vehicleBookRecord.setBookEndDate(endDay.toDate());
             vehicleBookRecord.setStatus(VehicleBookRecordStatus.APPROVE.getCode());
             vehicleBookRecord.setBookUser(userId);
             vehicleBookRecord.setBookUserName(userName);
-            vehicleBookRecord.setBookStartDate(startDay.toDate());
-            vehicleBookRecord.setBookEndDate(endDay.toDate());
-            vehicleBookRecord.setLiftAddr(bookVehicleVo.getLiftAddr());
-            vehicleBookRecord.setRemark(bookVehicleVo.getRemark());
-            vehicleBookRecord.setDestination(bookVehicleVo.getDestination());
-            vehicleBookRecord.setLiftCompany(bookVehicleVo.getLiftCompany());
-            vehicleBookRecord.setRetCompany(bookVehicleVo.getRetCompany());
-            vehicleBookRecord.setVehicleUsername(bookVehicleVo.getVehicleUsername());
-            vehicleBookRecord.setVehicleUserPhone(bookVehicleVo.getVehicleUserPhone());
-            vehicleBookRecord.setUpkeepIds(bookVehicleVo.getUpkeepIds());
             vehicleBookRecordBiz.save(vehicleBookRecord);
         } else {
             vehicleBookRecord = vehicleBookRecordBiz.selectById(bookVehicleVo.getVehicleBookRecordId());
@@ -1291,22 +1274,14 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
             if(DATA_ALL_FALSE.equals(userDTO.getDataAll())) { //不能获取全部数据
                 String zoneId = null;
                 if(StringUtils.isNotBlank(userDTO.getDataZone())) {
-                    if(userDTO.getDataZone().contains(",")) {
                         zoneId = userDTO.getDataZone();
-                    } else {
-                        zoneId = userDTO.getDataZone() + ",";
-                    }
                 } else {
                     zoneId = userDTO.getZoneId() + ",";
                 }
                 vehiclePlanDto.setZoneIds(zoneId.split(","));
                 String companyId = null;
                 if(StringUtils.isNotBlank(userDTO.getDataCompany())) {
-                    if(userDTO.getDataCompany().contains(",")) {
                         companyId = userDTO.getDataCompany();
-                    } else {
-                        companyId = userDTO.getDataCompany() + ",";
-                    }
                 } else {
                     companyId = userDTO.getCompanyId() + ",";
                 }

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleDepartureService.java

@@ -14,6 +14,7 @@ import com.xxfc.platform.vehicle.mapper.VehicleDepartureLogMapper;
 import com.xxfc.platform.vehicle.mapper.VehicleMapper;
 import com.xxfc.platform.vehicle.pojo.VehicleDepartureLogVo;
 import com.xxfc.platform.vehicle.pojo.VehicleDepartureStatisticDataVo;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -25,6 +26,7 @@ import java.util.Date;
 import java.util.List;
 
 @Service
+@Slf4j
 public class VehicleDepartureService extends BaseBiz<VehicleDepartureLogMapper, VehicleDepartureLog> {
 
     @Autowired
@@ -71,21 +73,30 @@ public class VehicleDepartureService extends BaseBiz<VehicleDepartureLogMapper,
     @Transactional
     public ObjectRestResponse save(VehicleDepartureLog vehicleDepartureLog) {
         Integer id = vehicleDepartureLog.getId();
+        log.info("添加出行记录参数： vehicleDepartureLog = {}", vehicleDepartureLog);
         if (id == null || id == 0) {
             vehicleDepartureLog.setCreateTime(new Date());
             vehicleDepartureLog.setState(0);
             insertSelective(vehicleDepartureLog);
+            return ObjectRestResponse.succ();
         } else {
             vehicleDepartureLog.setUpdateTime(new Date());
             VehicleDepartureLog oldValue = mapper.selectByPrimaryKey(vehicleDepartureLog);
             if(oldValue != null) {
-                BeanUtil.copyProperties(oldValue, vehicleDepartureLog, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
+                log.info("更新出行记录： vehicleDepartureLog = {}", oldValue);
+                BeanUtil.copyProperties(vehicleDepartureLog, oldValue, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
                 oldValue.setUpdateTime(new Date());
                 updateSelectiveById(oldValue);
+                return ObjectRestResponse.succ();
+            } else {
+                vehicleDepartureLog.setCreateTime(new Date());
+                vehicleDepartureLog.setState(0);
+                insertSelective(vehicleDepartureLog);
+                return ObjectRestResponse.succ();
             }
 
         }
-        return ObjectRestResponse.succ();
+
     }