修改三方对接逻辑和环境参数配置

Pu Zhibing

2025-07-08 91fcd48801ad1120651027824f7a60a14deadf87

修改三方对接逻辑和环境参数配置

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/config/web/WebConfig.java

@@ -18,6 +18,7 @@
import org.springframework.aop.support.DefaultPointcutAdvisor;
import org.springframework.aop.support.JdkRegexpMethodPointcut;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.web.servlet.FilterRegistrationBean;
import org.springframework.boot.web.servlet.ServletListenerRegistrationBean;
import org.springframework.boot.web.servlet.ServletRegistrationBean;
@@ -44,6 +45,10 @@

    @Autowired
    private GunsProperties gunsProperties;
    
    @Value("${spring.profiles.active}")
    private String activeProfile;
    

    /**
     * 增加swagger的支持
@@ -183,44 +188,62 @@
    
    @Bean
    public FilterRegistrationBean getOnconMDCasFilter() {
//        OnconMDCasFilter onconMDCasFilter = new OnconMDCasFilter();
//        FilterRegistrationBean registrationBean = new FilterRegistrationBean();
//        registrationBean.setFilter(onconMDCasFilter);
//        List<String> urlPatterns = new ArrayList<String>();
//        urlPatterns.add("/*");
//        registrationBean.setUrlPatterns(urlPatterns);
//        registrationBean.setOrder(2);
//
//        registrationBean.addInitParameter("oncon.com.security.urls", "/**");
//        registrationBean.addInitParameter("erp.si-tech.com.cn.noCheckUrl", "/index.html,/static/**,/upload/**");
//        registrationBean.addInitParameter("erp.si-tech.com.cn.nologinstatus", "/*");
//        registrationBean.addInitParameter("erp.si-tech.com.cn.loginstatus", "/*");
//        registrationBean.addInitParameter("com.oncon.sso.urlparams.nologin", "code,code2");
//
//        registrationBean.addInitParameter("edu.yale.its.tp.cas.client.filter.loginUrl", "https://testsso1.teamshub.com/login");
//        registrationBean.addInitParameter("edu.yale.its.tp.cas.client.filter.validateUrl", "https://testsso1.teamshub.com/serviceValidate");
//        registrationBean.addInitParameter("com.oncon.md.loginUrl", "https://testsso1.teamshub.com/sso-session/login");
//        registrationBean.addInitParameter("edu.yale.its.tp.cas.client.filter.serverName", "https://traffic.qytzt.cn:443");
    
    
        OnconMDCasFilter onconMDCasFilter = new OnconMDCasFilter();
        FilterRegistrationBean registrationBean = new FilterRegistrationBean();
        registrationBean.setFilter(onconMDCasFilter);
        List<String> urlPatterns = new ArrayList<String>();
        urlPatterns.add("/*");
        registrationBean.setUrlPatterns(urlPatterns);
        registrationBean.setOrder(2);
        if("dev".equals(activeProfile)){
            registrationBean.setFilter(onconMDCasFilter);
            List<String> urlPatterns = new ArrayList<String>();
            urlPatterns.add("/*");
            registrationBean.setUrlPatterns(urlPatterns);
            registrationBean.setOrder(2);
    
        registrationBean.addInitParameter("oncon.com.security.urls", "/**");
        registrationBean.addInitParameter("erp.si-tech.com.cn.noCheckUrl", "/index.html,/static/**,/upload/**");
        registrationBean.addInitParameter("erp.si-tech.com.cn.nologinstatus", "/*");
        registrationBean.addInitParameter("erp.si-tech.com.cn.loginstatus", "/*");
        registrationBean.addInitParameter("com.oncon.sso.urlparams.nologin", "code,code2");
            registrationBean.addInitParameter("oncon.com.security.urls", "/**");
            registrationBean.addInitParameter("erp.si-tech.com.cn.noCheckUrl", "/index.html,/static/**,/upload/**");
            registrationBean.addInitParameter("erp.si-tech.com.cn.nologinstatus", "/*");
            registrationBean.addInitParameter("erp.si-tech.com.cn.loginstatus", "/*");
            registrationBean.addInitParameter("com.oncon.sso.urlparams.nologin", "code,code2");
    
        registrationBean.addInitParameter("edu.yale.its.tp.cas.client.filter.loginUrl", "https://sso.teamshub.com/login");
        registrationBean.addInitParameter("edu.yale.its.tp.cas.client.filter.validateUrl", "https://sso.teamshub.com/serviceValidate");
        registrationBean.addInitParameter("com.oncon.md.loginUrl", "https://passport.teamshub.com/login");
        registrationBean.addInitParameter("edu.yale.its.tp.cas.client.filter.serverName", "https://traffic.qytzt.cn:443");
            registrationBean.addInitParameter("edu.yale.its.tp.cas.client.filter.loginUrl", "https://testsso1.teamshub.com/login");
            registrationBean.addInitParameter("edu.yale.its.tp.cas.client.filter.validateUrl", "https://testsso1.teamshub.com/serviceValidate");
            registrationBean.addInitParameter("com.oncon.md.loginUrl", "https://testsso1.teamshub.com/sso-session/login");
            registrationBean.addInitParameter("edu.yale.its.tp.cas.client.filter.serverName", "http://127.0.0.1:8010");
        }
        if("test".equals(activeProfile)){
            registrationBean.setFilter(onconMDCasFilter);
            List<String> urlPatterns = new ArrayList<String>();
            urlPatterns.add("/*");
            registrationBean.setUrlPatterns(urlPatterns);
            registrationBean.setOrder(2);
    
            registrationBean.addInitParameter("oncon.com.security.urls", "/**");
            registrationBean.addInitParameter("erp.si-tech.com.cn.noCheckUrl", "/index.html,/static/**,/upload/**");
            registrationBean.addInitParameter("erp.si-tech.com.cn.nologinstatus", "/*");
            registrationBean.addInitParameter("erp.si-tech.com.cn.loginstatus", "/*");
            registrationBean.addInitParameter("com.oncon.sso.urlparams.nologin", "code,code2");
    
            registrationBean.addInitParameter("edu.yale.its.tp.cas.client.filter.loginUrl", "https://testsso1.teamshub.com/login");
            registrationBean.addInitParameter("edu.yale.its.tp.cas.client.filter.validateUrl", "https://testsso1.teamshub.com/serviceValidate");
            registrationBean.addInitParameter("com.oncon.md.loginUrl", "https://testsso1.teamshub.com/sso-session/login");
            registrationBean.addInitParameter("edu.yale.its.tp.cas.client.filter.serverName", "https://traffic.qytzt.cn:443");
        }
        if("prod".equals(activeProfile)){
            registrationBean.setFilter(onconMDCasFilter);
            List<String> urlPatterns = new ArrayList<String>();
            urlPatterns.add("/*");
            registrationBean.setUrlPatterns(urlPatterns);
            registrationBean.setOrder(2);
    
            registrationBean.addInitParameter("oncon.com.security.urls", "/**");
            registrationBean.addInitParameter("erp.si-tech.com.cn.noCheckUrl", "/index.html,/static/**,/upload/**");
            registrationBean.addInitParameter("erp.si-tech.com.cn.nologinstatus", "/*");
            registrationBean.addInitParameter("erp.si-tech.com.cn.loginstatus", "/*");
            registrationBean.addInitParameter("com.oncon.sso.urlparams.nologin", "code,code2");
    
            registrationBean.addInitParameter("edu.yale.its.tp.cas.client.filter.loginUrl", "https://sso.teamshub.com/login");
            registrationBean.addInitParameter("edu.yale.its.tp.cas.client.filter.validateUrl", "https://sso.teamshub.com/serviceValidate");
            registrationBean.addInitParameter("com.oncon.md.loginUrl", "https://passport.teamshub.com/login");
            registrationBean.addInitParameter("edu.yale.its.tp.cas.client.filter.serverName", "https://traffic.qytzt.cn:443");
        }
        return registrationBean;
    }
    

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/core/aop/GlobalExceptionHandler.java

@@ -12,6 +12,7 @@
import org.apache.shiro.authc.DisabledAccountException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.annotation.Order;
import org.springframework.http.HttpStatus;
import org.springframework.ui.Model;
@@ -37,7 +38,7 @@
public class GlobalExceptionHandler {
    
    private Logger log = LoggerFactory.getLogger(this.getClass());
    @Resource
    @Autowired
    private ShiroExtUtil shiroExtUtil;
    
    /**

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/core/aop/LogAop.java

@@ -18,6 +18,7 @@
import org.aspectj.lang.reflect.MethodSignature;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import javax.annotation.Resource;
@@ -36,7 +37,7 @@
    
    private Logger log = LoggerFactory.getLogger(this.getClass());
    
    @Resource
    @Autowired
    private ShiroExtUtil shiroExtUtil;
    
    @Pointcut(value = "@annotation(com.stylefeng.guns.core.common.annotion.BussinessLog)")

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/core/beetl/ShiroExtUtil.java

@@ -81,9 +81,9 @@
                throw new RuntimeException(e);
            }
            LoginUser loginUser = JSON.parseObject(onconParam, LoginUser.class);
            log.info("当前登录用户：" + JSON.toJSONString(loginUser));
            log.debug("当前登录用户：" + JSON.toJSONString(loginUser));
            String shiroUser = redisTemplate.opsForValue().get(loginUser.getOnconUUID());
            log.info("当前登录用户缓存数据：" + shiroUser);
            log.debug("当前登录用户缓存数据：" + shiroUser);
            return JSON.parseObject(shiroUser, ShiroUser.class);
        }
        throw new GunsException(BizExceptionEnum.TOKEN_ERROR);

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/core/shiro/check/PermissionCheckFactory.java

@@ -21,6 +21,7 @@
import com.stylefeng.guns.core.support.CollectionKit;
import com.stylefeng.guns.core.support.HttpKit;
import com.stylefeng.guns.core.util.SpringContextHolder;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.DependsOn;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -35,7 +36,7 @@
@DependsOn("springContextHolder")
@Transactional(readOnly = true)
public class PermissionCheckFactory implements ICheck {
    @Resource
    @Autowired
    private ShiroExtUtil shiroExtUtil;
    
    public static ICheck me() {

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/CarRentalController.java

@@ -61,7 +61,7 @@
    @Autowired
    private ITCompanyService companyService;
    
    @Resource
    @Autowired
    private ShiroExtUtil shiroExtUtil;
    
    

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/DriverActivityController.java

@@ -53,7 +53,7 @@
    @Autowired
    private IDriverActivityHistoryService driverActivityHistoryService;
    
    @Resource
    @Autowired
    private ShiroExtUtil shiroExtUtil;
    
    /**

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/HomeController.java

@@ -75,7 +75,7 @@
    @Autowired
    private IDriverOnlineService driverOnlineService;
    
    @Resource
    @Autowired
    private ShiroExtUtil shiroExtUtil;
    
    @RequestMapping("/openNetCarInfo")

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/IncomeDetailController.java

@@ -55,7 +55,7 @@
    @Autowired
    private IIncomeService incomeService;
    
    @Resource
    @Autowired
    private ShiroExtUtil shiroExtUtil;
    
    

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/MerchantActivityController.java

@@ -56,7 +56,7 @@
    @Autowired
    private IUserService userService;
    
    @Resource
    @Autowired
    private ShiroExtUtil shiroExtUtil;
    
    @RequestMapping("/index")

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/MerchantActivityGiveController.java

@@ -53,7 +53,7 @@
    @Autowired
    private IUserService userService;
    
    @Resource
    @Autowired
    private ShiroExtUtil shiroExtUtil;
    
    @RequestMapping("/index")

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/RecruitController.java

@@ -34,7 +34,7 @@
    
    @Autowired
    private IRecruitService recruitService;
    @Resource
    @Autowired
    private ShiroExtUtil shiroExtUtil;
    
    /**

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/ReportController.java

@@ -75,7 +75,7 @@
    @Autowired
    private ITOrderTaxiService orderTaxiService;
    
    @Resource
    @Autowired
    private ShiroExtUtil shiroExtUtil;
    
    /**

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SellingCarController.java

@@ -58,7 +58,7 @@
    @Autowired
    private ITCompanyService companyService;
    
    @Resource
    @Autowired
    private ShiroExtUtil shiroExtUtil;
    
    

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SpendingDetailPlatformController.java

@@ -85,7 +85,7 @@
    @Autowired
    private ITReassignService reassignService;
    
    @Resource
    @Autowired
    private ShiroExtUtil shiroExtUtil;
    
    

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysCouponActivityController.java

@@ -50,7 +50,7 @@
    
    @Autowired
    private ISysCouponRecordService couponRecordService;
    @Resource
    @Autowired
    private ShiroExtUtil shiroExtUtil;
    
    

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysRedPacketRecordController.java

@@ -37,7 +37,7 @@
    @Autowired
    private ISysRedPacketRecordService sysRedPacketRecordService;
    
    @Resource
    @Autowired
    private ShiroExtUtil shiroExtUtil;
    
    

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAdditionalFeeController.java

@@ -27,7 +27,7 @@
    @Autowired
    private ITAdditionalFeeService additionalFeeService;
    
    @Resource
    @Autowired
    private ShiroExtUtil shiroExtUtil;
    
    @RequestMapping("")

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAdvertisementController.java

@@ -39,7 +39,7 @@
    @Autowired
    private ITAdvertisementService tAdvertisementService;
    
    @Resource
    @Autowired
    private ShiroExtUtil shiroExtUtil;
    
    @Autowired

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAgreementController.java

@@ -34,7 +34,7 @@
    @Autowired
    private ITAgreementService tAgreementService;
    
    @Resource
    @Autowired
    private ShiroExtUtil shiroExtUtil;
    
    /**

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java

@@ -80,7 +80,7 @@
    
    @Resource
    private CarInsuranceMapper carInsuranceMapper;
    @Resource
    @Autowired
    private ShiroExtUtil shiroExtUtil;
    
    
@@ -659,79 +659,183 @@
                Cell cell0 = row.getCell(0);  //所属机构[平台车辆/加盟车辆]
                String zero = null;
                if (SinataUtil.isNotEmpty(cell0)){
                    zero = String.valueOf(cell0.getStringCellValue()).trim();
                    int cellType = cell0.getCellType();
                    switch (cellType) {
                        case Cell.CELL_TYPE_STRING:
                            zero = cell0.getStringCellValue().trim();
                            break;
                        case Cell.CELL_TYPE_NUMERIC:
                            zero = String.valueOf((long)cell0.getNumericCellValue()).trim();
                            break;
                    }
                }

                Cell cell1 = row.getCell(1);  //所属分公司[提示:加盟车辆选填]
                String one = null;
                if (SinataUtil.isNotEmpty(cell1)){
                    one = String.valueOf(cell1.getStringCellValue()).trim();
                    int cellType = cell1.getCellType();
                    switch (cellType) {
                        case Cell.CELL_TYPE_STRING:
                            one = cell1.getStringCellValue().trim();
                            break;
                        case Cell.CELL_TYPE_NUMERIC:
                            one = String.valueOf((long)cell1.getNumericCellValue()).trim();
                            break;
                    }
                }

                Cell cell2 = row.getCell(2);  //所属加盟商[提示:加盟车辆选填]
                String two = null;
                if (SinataUtil.isNotEmpty(cell2)){
                    two = String.valueOf(cell2.getStringCellValue()).trim();
                    int cellType = cell2.getCellType();
                    switch (cellType) {
                        case Cell.CELL_TYPE_STRING:
                            two = cell2.getStringCellValue().trim();
                            break;
                        case Cell.CELL_TYPE_NUMERIC:
                            two = String.valueOf((long)cell2.getNumericCellValue()).trim();
                            break;
                    }
                }

                Cell cell3 = row.getCell(3);  //服务模式:快车[是/否]
                String three = null;
                if (SinataUtil.isNotEmpty(cell3)){
                    three = String.valueOf(cell3.getStringCellValue()).trim();
                    int cellType = cell3.getCellType();
                    switch (cellType) {
                        case Cell.CELL_TYPE_STRING:
                            three = cell3.getStringCellValue().trim();
                            break;
                        case Cell.CELL_TYPE_NUMERIC:
                            three = String.valueOf((long)cell3.getNumericCellValue()).trim();
                            break;
                    }
                }

                Cell cell4 = row.getCell(4);  //服务模式:出租车[是/否]
                String four = null;
                if (SinataUtil.isNotEmpty(cell4)){
                    four = String.valueOf(cell4.getStringCellValue()).trim();
                    int cellType = cell4.getCellType();
                    switch (cellType) {
                        case Cell.CELL_TYPE_STRING:
                            four = cell4.getStringCellValue().trim();
                            break;
                        case Cell.CELL_TYPE_NUMERIC:
                            four = String.valueOf((long)cell4.getNumericCellValue()).trim();
                            break;
                    }
                }

                Cell cell5 = row.getCell(5);  //服务模式:跨城出行[是/否]
                String five = null;
                if (SinataUtil.isNotEmpty(cell5)){
                    five = String.valueOf(cell5.getStringCellValue()).trim();
                    int cellType = cell5.getCellType();
                    switch (cellType) {
                        case Cell.CELL_TYPE_STRING:
                            five = cell5.getStringCellValue().trim();
                            break;
                        case Cell.CELL_TYPE_NUMERIC:
                            five = String.valueOf((long)cell5.getNumericCellValue()).trim();
                            break;
                    }
                }

                Cell cell9 = row.getCell(6);  //车辆品牌
                String nine = null;
                if (SinataUtil.isNotEmpty(cell9)){
                    nine = String.valueOf(cell9.getStringCellValue()).trim();
                    int cellType = cell9.getCellType();
                    switch (cellType) {
                        case Cell.CELL_TYPE_STRING:
                            nine = String.valueOf(cell9.getStringCellValue()).trim();
                            break;
                        case Cell.CELL_TYPE_NUMERIC:
                            nine = String.valueOf((long)cell9.getNumericCellValue()).trim();
                            break;
                    }
                }

                Cell cell10 = row.getCell(7);  //车辆类型
                String ten = null;
                if (SinataUtil.isNotEmpty(cell10)){
                    ten = String.valueOf(cell10.getStringCellValue()).trim();
                    int cellType = cell10.getCellType();
                    switch (cellType) {
                        case Cell.CELL_TYPE_STRING:
                            ten = String.valueOf(cell10.getStringCellValue()).trim();
                            break;
                        case Cell.CELL_TYPE_NUMERIC:
                            ten = String.valueOf((long)cell10.getNumericCellValue()).trim();
                            break;
                    }
                }

                Cell cell11 = row.getCell(8);  //车辆颜色[黑色/银色/白色/红色/黄色/橙色/蓝色]
                String eleven = null;
                if (SinataUtil.isNotEmpty(cell11)){
                    eleven = String.valueOf(cell11.getStringCellValue()).trim();
                    int cellType = cell11.getCellType();
                    switch (cellType) {
                        case Cell.CELL_TYPE_STRING:
                            eleven = String.valueOf(cell11.getStringCellValue()).trim();
                            break;
                        case Cell.CELL_TYPE_NUMERIC:
                            eleven = String.valueOf((long)cell11.getNumericCellValue()).trim();
                            break;
                    }
                }

                Cell cell12 = row.getCell(9);  //车牌号
                String twelve = null;
                if (SinataUtil.isNotEmpty(cell12)){
                    twelve = String.valueOf(cell12.getStringCellValue()).trim();
                    int cellType = cell12.getCellType();
                    switch (cellType) {
                        case Cell.CELL_TYPE_STRING:
                            twelve = String.valueOf(cell12.getStringCellValue()).trim();
                            break;
                        case Cell.CELL_TYPE_NUMERIC:
                            twelve = String.valueOf((long)cell12.getNumericCellValue()).trim();
                            break;
                    }
                }

                Cell cell13 = row.getCell(10);  //行驶证编号
                String thirteen = null;
                if (SinataUtil.isNotEmpty(cell13)){
                    thirteen = String.valueOf(cell13.getStringCellValue()).trim();
                    int cellType = cell13.getCellType();
                    switch (cellType) {
                        case Cell.CELL_TYPE_STRING:
                            thirteen = String.valueOf(cell13.getStringCellValue()).trim();
                            break;
                        case Cell.CELL_TYPE_NUMERIC:
                            thirteen = String.valueOf((long)cell13.getNumericCellValue()).trim();
                            break;
                    }
                }

                Cell cell14 = row.getCell(11);  //年检到期时间
                String fourteen = null;
                if (SinataUtil.isNotEmpty(cell14)){
                    fourteen = String.valueOf(cell14.getStringCellValue()).trim();
                    int cellType = cell14.getCellType();
                    switch (cellType) {
                        case Cell.CELL_TYPE_STRING:
                            fourteen = String.valueOf(cell14.getStringCellValue()).trim();
                            break;
                        case Cell.CELL_TYPE_NUMERIC:
                            fourteen = String.valueOf((long)cell14.getNumericCellValue()).trim();
                            break;
                    }
                }

                Cell cell15 = row.getCell(12);  //商业保险到期时间
                String fifteen = null;
                if (SinataUtil.isNotEmpty(cell15)){
                    fifteen = String.valueOf(cell15.getStringCellValue()).trim();
                    int cellType = cell15.getCellType();
                    switch (cellType) {
                        case Cell.CELL_TYPE_STRING:
                            fifteen = String.valueOf(cell15.getStringCellValue()).trim();
                            break;
                        case Cell.CELL_TYPE_NUMERIC:
                            fifteen = String.valueOf((long)cell15.getNumericCellValue()).trim();
                            break;
                    }
                }

                if (SinataUtil.isEmpty(zero) || SinataUtil.isEmpty(three) || SinataUtil.isEmpty(four)

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java

@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.stylefeng.guns.core.base.controller.BaseController;
import com.stylefeng.guns.core.base.tips.ErrorTip;
import com.stylefeng.guns.core.beetl.ShiroExtUtil;
import com.stylefeng.guns.core.common.constant.factory.PageFactory;
import com.stylefeng.guns.core.log.LogObjectHolder;
@@ -16,6 +17,7 @@
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.PushMinistryOfTransportUtil;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import com.stylefeng.guns.modular.system.util.qianyuntong.EmployeeUtil;
import com.stylefeng.guns.modular.system.util.qianyuntong.EnterpriseUtil;
import com.stylefeng.guns.modular.system.util.qianyuntong.UserUtil;
@@ -29,7 +31,6 @@
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;

import javax.annotation.Resource;
import java.util.*;

/**
@@ -64,7 +65,7 @@
    
    @Autowired
    private ISpellOrderRuleService spellOrderRuleService;
    @Resource
    @Autowired
    private ShiroExtUtil shiroExtUtil;
    
    @Value("${pushMinistryOfTransport}")
@@ -340,58 +341,65 @@
        //调用中台接口创建企业
        CheckEnterExist checkEnterExist = EnterpriseUtil.checkEnterNameExist(tCompany.getName());
        String enterCode = "";
        Integer enterNew = null;
        Long empId = null;
        String principalName = tCompany.getPrincipalName();
        String principalPhone = tCompany.getPrincipalPhone();
	
        Integer empnew = null;
        ShiroUser user1 = shiroExtUtil.getUser();
        User user2 = userService.selectById(user1.getId());
        //企业未注册，进行注册
        if (null == checkEnterExist || "0".equals(checkEnterExist.getIsReg())) {
            CreateEnterpriseRequest request = new CreateEnterpriseRequest();
            request.setName(tCompany.getName());
            request.setNickName(tCompany.getName());
            request.setIndustry_code("123456");
            request.setMobile(principalPhone);
            request.setMobile(account);
            CreateEnterprise enterprise = EnterpriseUtil.createEnterprise(request);
            enterCode = enterprise.getIdCode();
            List<QYTUserInfo> userInfoByPhone = UserUtil.getUserInfoByPhone(principalPhone, enterCode);
            enterNew = 1;
            List<QYTUserInfo> userInfoByPhone = UserUtil.getUserInfoByPhone(account, enterCode);
            if(null != userInfoByPhone && userInfoByPhone.size() > 0){
                empId = userInfoByPhone.get(0).getEmpId();
                empnew = 0;
            }else{
                empId = 0L;
                empnew = 1;
            }
        }
        //企业已注册
        if (null != checkEnterExist && "1".equals(checkEnterExist.getIsReg())) {
            String larName = checkEnterExist.getLarName();
            String mobile = checkEnterExist.getMobile();
            enterCode = checkEnterExist.getEnterCode();
            if(!mobile.equals(principalPhone)){
            enterNew = 0;
            List<QYTUserInfo> userInfoByPhone = UserUtil.getUserInfoByPhone(account, enterCode);
            if(null == userInfoByPhone ||userInfoByPhone.size() == 0){
                //负责人不匹配，则创建新的员工到中台
                SaveStaffNodeRequest request = new SaveStaffNodeRequest();
                request.setMobile(mobile);
                request.setMobile(user2.getPhone());
                request.setEntercode(enterCode);
                request.setEmpName(principalName);
                request.setEmpNickname(principalName);
                request.setLoginNo(principalPhone);
                request.setEmpSex("女");
                request.setMphone(principalPhone);
                request.setEmail(principalPhone + "@qyt.com");
                request.setEmpName(tCompany.getName() + "管理员");
                request.setEmpNickname(tCompany.getName() + "管理员");
                request.setLoginNo(account);
                request.setEmpSex("男");
                request.setMphone(account);
                request.setEmail(account + "@qyt.com");
                request.setDeptId(0);
                request.setPositionId(1);
                request.setSuperLevel(0);
                request.setHideMobile(0);
                SaveStaffNode saveStaffNode = EmployeeUtil.saveStaffNode(request);
                ResultUtil<SaveStaffNode> resultUtil = EmployeeUtil.saveStaffNode(request);
                if(200 != resultUtil.getStatus()){
                    return new ErrorTip(resultUtil.getStatus(), resultUtil.getMsg());
                }
                SaveStaffNode saveStaffNode = resultUtil.getData();
                empId = saveStaffNode.getEmpId();
				
                empnew = 1;
            }else{
                List<QYTUserInfo> userInfoByPhone = UserUtil.getUserInfoByPhone(mobile, enterCode);
                empId = userInfoByPhone.get(0).getEmpId();
                empnew = 0;
            }
            tCompany.setPrincipalName(larName);
            tCompany.setPrincipalPhone(mobile);
        }
    
        tCompany.setEnterCode(enterCode);
        tCompany.setEnterNew(enterNew);
        tCompany.setType(2);  //2：分公司
        tCompany.setState(0); //0：正常
        tCompany.setFlag("1");
@@ -405,7 +413,7 @@
    
        //添加User对象
        User user = new User();
        user.setAccount(principalPhone);
        user.setAccount(account);
        user.setSalt(ShiroKit.getRandomSalt(5));
        user.setPassword(ShiroKit.md5(password, user.getSalt()));
        user.setRoleid("2");
@@ -419,6 +427,7 @@
        user.setEmpId(empId);
        user.setEntercode(enterCode);
        user.setEnterId(Long.valueOf(enterCode));
        user.setEmpnew(empnew);
        userService.insert(user);
        //编写异步延迟处理中台账号延迟创建的问题
        if(0 == empId){
@@ -427,7 +436,7 @@
            timer.schedule(new TimerTask() {
                @Override
                public void run() {
                    List<QYTUserInfo> userInfoByPhone = UserUtil.getUserInfoByPhone(principalPhone, finalEnterCode);
                    List<QYTUserInfo> userInfoByPhone = UserUtil.getUserInfoByPhone(account, finalEnterCode);
                    if(null != userInfoByPhone && userInfoByPhone.size() > 0){
                        Long empId1 = userInfoByPhone.get(0).getEmpId();
                        user.setEmpId(empId1);
@@ -491,8 +500,10 @@
        CheckEnterExist checkEnterExist = EnterpriseUtil.checkEnterNameExist(tCompany.getName());
        String enterCode = "";
        Long empId = null;
        String principalName = tCompany.getPrincipalName();
        String principalPhone = tCompany.getPrincipalPhone();
        Integer empnew = null;
        Integer enterNew = null;
        ShiroUser user1 = shiroExtUtil.getUser();
        User user2 = userService.selectById(user1.getId());
    
        //企业未注册，进行注册
        if (null == checkEnterExist || "0".equals(checkEnterExist.getIsReg())) {
@@ -500,48 +511,53 @@
            request.setName(tCompany.getName());
            request.setNickName(tCompany.getName());
            request.setIndustry_code("123456");
            request.setMobile(principalPhone);
            request.setMobile(account);
            CreateEnterprise enterprise = EnterpriseUtil.createEnterprise(request);
            enterCode = enterprise.getIdCode();
            List<QYTUserInfo> userInfoByPhone = UserUtil.getUserInfoByPhone(principalPhone, enterCode);
            enterNew = 1;
            List<QYTUserInfo> userInfoByPhone = UserUtil.getUserInfoByPhone(account, enterCode);
            if(null != userInfoByPhone && userInfoByPhone.size() > 0){
                empId = userInfoByPhone.get(0).getEmpId();
                empnew = 0;
            }else{
                empId = 0L;
                empnew = 1;
            }
        }
        //企业已注册
        if (null != checkEnterExist && "1".equals(checkEnterExist.getIsReg())) {
            String larName = checkEnterExist.getLarName();
            String mobile = checkEnterExist.getMobile();
            List<QYTUserInfo> userInfoByPhone = UserUtil.getUserInfoByPhone(account, enterCode);
            enterCode = checkEnterExist.getEnterCode();
            if(!mobile.equals(principalPhone)){
                //负责人不匹配，则创建新的员工到中台
            enterNew = 0;
            if(null == userInfoByPhone || userInfoByPhone.size() == 0){
                SaveStaffNodeRequest request = new SaveStaffNodeRequest();
                request.setMobile(mobile);
                request.setMobile(user2.getPhone());
                request.setEntercode(enterCode);
                request.setEmpName(principalName);
                request.setEmpNickname(principalName);
                request.setLoginNo(principalPhone);
                request.setEmpName(tCompany.getName() + "管理员");
                request.setEmpNickname(tCompany.getName() + "管理员");
                request.setLoginNo(account);
                request.setEmpSex("女");
                request.setMphone(principalPhone);
                request.setEmail(principalPhone + "@qyt.com");
                request.setMphone(account);
                request.setEmail(account + "@qyt.com");
                request.setDeptId(0);
                request.setPositionId(1);
                request.setSuperLevel(0);
                request.setHideMobile(0);
                SaveStaffNode saveStaffNode = EmployeeUtil.saveStaffNode(request);
                ResultUtil<SaveStaffNode> resultUtil = EmployeeUtil.saveStaffNode(request);
                if(200 != resultUtil.getStatus()){
                    return new ErrorTip(resultUtil.getStatus(), resultUtil.getMsg());
                }
                SaveStaffNode saveStaffNode = resultUtil.getData();
                empId = saveStaffNode.getEmpId();
			
                empnew = 1;
            }else{
                List<QYTUserInfo> userInfoByPhone = UserUtil.getUserInfoByPhone(mobile, enterCode);
                empId = userInfoByPhone.get(0).getEmpId();
                empnew = 0;
            }
            tCompany.setPrincipalName(larName);
            tCompany.setPrincipalPhone(mobile);
        }
    
        tCompany.setEnterCode(enterCode);
        tCompany.setEnterNew(enterNew);
        tCompany.setType(3);  //2：分公司
        if (shiroExtUtil.getUser().getRoleType() == 2) {
            tCompany.setSuperiorId(shiroExtUtil.getUser().getObjectId());
@@ -553,7 +569,7 @@
    
        //添加User对象
        User user = new User();
        user.setAccount(principalPhone);
        user.setAccount(account);
        user.setSalt(ShiroKit.getRandomSalt(5));
        user.setPassword(ShiroKit.md5(password, user.getSalt()));
        user.setRoleid("3");
@@ -567,6 +583,7 @@
        user.setEmpId(empId);
        user.setEntercode(enterCode);
        user.setEnterId(Long.valueOf(enterCode));
        user.setEmpnew(empnew);
        userService.insert(user);
        //编写异步延迟处理中台账号延迟创建的问题
        if(0 == empId){
@@ -575,7 +592,7 @@
            timer.schedule(new TimerTask() {
                @Override
                public void run() {
                    List<QYTUserInfo> userInfoByPhone = UserUtil.getUserInfoByPhone(principalPhone, finalEnterCode);
                    List<QYTUserInfo> userInfoByPhone = UserUtil.getUserInfoByPhone(account, finalEnterCode);
                    if(null != userInfoByPhone && userInfoByPhone.size() > 0){
                        Long empId1 = userInfoByPhone.get(0).getEmpId();
                        user.setEmpId(empId1);
@@ -595,9 +612,16 @@
    public Object delete(@RequestParam Integer tCompanyId) {
        TCompany tCompany = tCompanyService.selectById(tCompanyId);
        //调用中台接口创建企业
        CheckEnterExist checkEnterExist = EnterpriseUtil.checkEnterNameExist(tCompany.getName());
        if (null != checkEnterExist && "1".equals(checkEnterExist.getIsReg())) {
            EnterpriseUtil.delEnterprise(checkEnterExist.getEnterCode(), tCompany.getPrincipalPhone());
        if(1 == tCompany.getEnterNew()){
            CheckEnterExist checkEnterExist = EnterpriseUtil.checkEnterNameExist(tCompany.getName());
            if (null != checkEnterExist && "1".equals(checkEnterExist.getIsReg())) {
                ShiroUser user1 = shiroExtUtil.getUser();
                User user = userService.selectById(user1.getId());
                ResultUtil resultUtil = EnterpriseUtil.delEnterprise(checkEnterExist.getEnterCode(), user.getPhone());
                if(resultUtil.getStatus() != 200){
                    return new ErrorTip(resultUtil.getStatus(), resultUtil.getMsg());
                }
            }
        }
    
        tCompany.setFlag("3");
@@ -611,46 +635,13 @@
    @RequestMapping(value = "/update")
    @ResponseBody
    public Object update(TCompany tCompany,@RequestParam String subArr,String account,String password,Integer userId) {
        //判断账号
        User user = userService.selectById(userId);
        TCompany company = tCompanyService.selectById(tCompany.getId());
        //调用中台接口创建企业
        CheckEnterExist checkEnterExist = EnterpriseUtil.checkEnterNameExist(company.getName());
        String enterCode = null;
        //企业已存在，编辑企业
        if (null != checkEnterExist && "1".equals(checkEnterExist.getIsReg())) {
            ModifyEnterpriseInfoRequest request = new ModifyEnterpriseInfoRequest();
            request.setEnter_code(company.getEnterCode());
            request.setOperator(company.getPrincipalPhone());
            request.setEnter_name(tCompany.getName());
            request.setEnter_nickname(tCompany.getName());
            EnterpriseUtil.modifyEnterpriseInfo(request);
            enterCode = checkEnterExist.getEnterCode();
        if(null != user && ToolUtil.isNotEmpty(password)){
            user.setPassword(ShiroKit.md5(password, user.getSalt()));
            userService.updateById(user);
        }
        //企业不存在，新增企业
        if (null == checkEnterExist || "0".equals(checkEnterExist.getIsReg())) {
            CreateEnterpriseRequest request = new CreateEnterpriseRequest();
            request.setName(tCompany.getName());
            request.setNickName(tCompany.getName());
            request.setIndustry_code("123456");
            request.setMobile(tCompany.getPrincipalPhone());
            CreateEnterprise enterprise = EnterpriseUtil.createEnterprise(request);
            enterCode = enterprise.getIdCode();
            List<QYTUserInfo> userInfoByPhone = UserUtil.getUserInfoByPhone(tCompany.getPrincipalPhone(), enterCode);
            Long empId = userInfoByPhone.get(0).getEmpId();
            user.setEmpId(empId);
        }
	
        company.setEnterCode(enterCode);
        company.setUpdateTime(new Date());
        tCompany.setVersion(company.getVersion() + 1);
        tCompany.setUpdateTime(new Date());
        tCompanyService.updateById(tCompany);
	
        user.setEntercode(enterCode);
        user.setEnterId(Long.valueOf(enterCode));
        user.setName(tCompany.getName());
        userService.updateById(user);
	
        //添加经营区域
        addSocpe(subArr, tCompany.getId());
    
@@ -677,48 +668,13 @@
    @RequestMapping(value = "/updateFranchisee")
    @ResponseBody
    public Object updateFranchisee(TCompany tCompany,String account,String password,Integer userId) {
        //判断账号
        User user = userService.selectById(userId);
        if (!user.getAccount().equals(account)) {
            //判断账号是否已存在
            int count = userService.selectCount(new EntityWrapper<User>().eq("account", account));
            if (count > 0) {
                return "error";
            }
        }
        TCompany company = tCompanyService.selectById(tCompany.getId());
        //调用中台接口创建企业
        CheckEnterExist checkEnterExist = EnterpriseUtil.checkEnterNameExist(company.getName());
        String enterCode = null;
        //企业已存在，编辑企业
        if (null != checkEnterExist && "1".equals(checkEnterExist.getIsReg())) {
            ModifyEnterpriseInfoRequest request = new ModifyEnterpriseInfoRequest();
            request.setEnter_code(company.getEnterCode());
            request.setOperator(tCompany.getPrincipalPhone());
            request.setEnter_name(tCompany.getName());
            request.setEnter_nickname(tCompany.getName());
            EnterpriseUtil.modifyEnterpriseInfo(request);
            enterCode = checkEnterExist.getEnterCode();
        }
        //企业不存在，添加企业
        if (null == checkEnterExist || "0".equals(checkEnterExist.getIsReg())) {
            CreateEnterpriseRequest request = new CreateEnterpriseRequest();
            request.setName(tCompany.getName());
            request.setNickName(tCompany.getName());
            request.setIndustry_code("123456");
            request.setMobile(tCompany.getPrincipalPhone());
            CreateEnterprise enterprise = EnterpriseUtil.createEnterprise(request);
            enterCode = enterprise.getIdCode();
            List<QYTUserInfo> userInfoByPhone = UserUtil.getUserInfoByPhone(tCompany.getPrincipalPhone(), enterCode);
            Long empId = userInfoByPhone.get(0).getEmpId();
            user.setEmpId(empId);
        }
        tCompany.setEnterCode(enterCode);
        tCompany.setUpdateTime(new Date());
        tCompany.setVersion(tCompany.getVersion() + 1);
        tCompanyService.updateById(tCompany);
    
        //修改账号密码
        user.setEntercode(enterCode);
        user.setEnterId(Long.valueOf(enterCode));
        User user = userService.selectById(userId);
        user.setPassword(ShiroKit.md5(password, user.getSalt()));
        userService.updateById(user);
        return SUCCESS_TIP;
    }

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyWithdrawController.java

@@ -43,7 +43,7 @@
    
    @Resource
    private ITEnterpriseWithdrawalService enterpriseWithdrawalService;
    @Resource
    @Autowired
    private ShiroExtUtil shiroExtUtil;
    
    /**

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TComplaintController.java

@@ -44,7 +44,7 @@
    @Autowired
    private PushMinistryOfTransportUtil pushMinistryOfTransportUtil;
    
    @Resource
    @Autowired
    private ShiroExtUtil shiroExtUtil;
    
    @Value("${pushMinistryOfTransport}")

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java

@@ -23,7 +23,10 @@
import com.stylefeng.guns.modular.system.util.*;
import com.stylefeng.guns.modular.system.util.qianyuntong.EmployeeUtil;
import com.stylefeng.guns.modular.system.util.qianyuntong.UserUtil;
import com.stylefeng.guns.modular.system.util.qianyuntong.model.*;
import com.stylefeng.guns.modular.system.util.qianyuntong.model.DeleteStafNodeRequest;
import com.stylefeng.guns.modular.system.util.qianyuntong.model.QYTUserInfo;
import com.stylefeng.guns.modular.system.util.qianyuntong.model.SaveStaffNode;
import com.stylefeng.guns.modular.system.util.qianyuntong.model.SaveStaffNodeRequest;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
@@ -97,7 +100,7 @@
    @Autowired
    private IUserService userService;
    
    @Resource
    @Autowired
    private ShiroExtUtil shiroExtUtil;
    
    /**
@@ -648,6 +651,8 @@
    @ResponseBody
    public Object authOpt(Integer id,Integer authState) {
        if (SinataUtil.isNotEmpty(id) && SinataUtil.isNotEmpty(authState)){
            ShiroUser user1 = shiroExtUtil.getUser();
            User user2 = userService.selectById(user1.getId());
            TDriver tDriver = tDriverService.selectById(id);
            Integer type = 0;
            if (1 == authState){
@@ -680,9 +685,10 @@
                TCompany tCompany = itCompanyService.selectById(objectId);
                List<QYTUserInfo> userInfoByPhone = UserUtil.getUserInfoByPhone(tDriver.getPhone(), tCompany.getEnterCode());
                Long empId = null;
                Integer empnew = null;
                if(null == userInfoByPhone || userInfoByPhone.size() == 0){
                    SaveStaffNodeRequest request = new SaveStaffNodeRequest();
                    request.setMobile(tCompany.getPrincipalPhone());
                    request.setMobile(user2.getPhone());
                    request.setEntercode(tCompany.getEnterCode());
                    request.setEmpName(tDriver.getName());
                    request.setEmpNickname(tDriver.getName());
@@ -694,14 +700,21 @@
                    request.setPositionId(1);
                    request.setSuperLevel(0);
                    request.setHideMobile(0);
                    SaveStaffNode saveStaffNode = EmployeeUtil.saveStaffNode(request);
                    ResultUtil<SaveStaffNode> resultUtil = EmployeeUtil.saveStaffNode(request);
                    if(200 != resultUtil.getStatus()){
                        return new ErrorTip(resultUtil.getStatus(), resultUtil.getMsg());
                    }
                    SaveStaffNode saveStaffNode = resultUtil.getData();
                    empId = saveStaffNode.getEmpId();
                    empnew = 1;
                }else{
                    empId = userInfoByPhone.get(0).getEmpId();
                    empnew = 0;
                }
                tDriver.setEmpId(empId);
                tDriver.setEntercode(tCompany.getEnterCode());
                tDriver.setEnterId(Long.valueOf(tCompany.getEnterCode()));
                tDriver.setEmpnew(empnew);
            }
            tDriverService.updateById(tDriver);
        }
@@ -781,13 +794,15 @@
        //审核通过，在中台添加司机账号
        if (2 == tDriver.getAuthState()) {
            ShiroUser user = shiroExtUtil.getUser();
            User user2 = userService.selectById(user.getId());
            Integer objectId = user.getObjectId();
            TCompany tCompany = itCompanyService.selectById(objectId);
            List<QYTUserInfo> userInfoByPhone = UserUtil.getUserInfoByPhone(tDriver.getPhone(), tCompany.getEnterCode());
            Long empId = null;
            Integer empnew = null;
            if(null == userInfoByPhone || userInfoByPhone.size() == 0){
                SaveStaffNodeRequest request = new SaveStaffNodeRequest();
                request.setMobile(tCompany.getPrincipalPhone());
                request.setMobile(user2.getPhone());
                request.setEntercode(tCompany.getEnterCode());
                request.setEmpName(tDriver.getName());
                request.setEmpNickname(tDriver.getName());
@@ -799,16 +814,23 @@
                request.setPositionId(1);
                request.setSuperLevel(0);
                request.setHideMobile(0);
                SaveStaffNode saveStaffNode = EmployeeUtil.saveStaffNode(request);
                ResultUtil<SaveStaffNode> resultUtil = EmployeeUtil.saveStaffNode(request);
                if(200 != resultUtil.getStatus()){
                    return new ErrorTip(resultUtil.getStatus(), resultUtil.getMsg());
                }
                SaveStaffNode saveStaffNode = resultUtil.getData();
                empId = saveStaffNode.getEmpId();
                empnew = 1;
            }else{
                empId = userInfoByPhone.get(0).getEmpId();
                empnew = 0;
            }
            
            TCompany tCompany1 = itCompanyService.selectById(tDriver.getCompanyId());
            tDriver.setEmpId(empId);
            tDriver.setEntercode(tCompany1.getEnterCode());
            tDriver.setEnterId(Long.valueOf(tCompany1.getEnterCode()));
            tDriver.setEmpnew(empnew);
        }
        tDriverService.insert(tDriver);
    
@@ -861,19 +883,18 @@
        driver.setFlag("3");
        ShiroUser user = shiroExtUtil.getUser();
        TCompany tCompany = itCompanyService.selectById(user.getObjectId());
        if (null != driver.getEmpId()) {
        if (null != driver.getEmpId() && 1 == driver.getEmpnew()) {
            //中台先删除司机
            GetStaffNodeRequest request = new GetStaffNodeRequest();
            request.setEmpId(driver.getEmpId());
            request.setMobile(tCompany.getPrincipalPhone());
            request.setEntercode(tCompany.getEnterCode());
            StaffNodeInfo staffNode = EmployeeUtil.getStaffNode(request);
            if (null != staffNode && "1".equals(staffNode.getIsValid())) {
            List<QYTUserInfo> userInfoByPhone = UserUtil.getUserInfoByPhone(driver.getPhone(), tCompany.getEnterCode());
            if (null != userInfoByPhone && 0 < userInfoByPhone.size() && 1 == driver.getEmpnew()) {
                DeleteStafNodeRequest deleteStafNodeRequest = new DeleteStafNodeRequest();
                deleteStafNodeRequest.setEmpId(driver.getEmpId());
                deleteStafNodeRequest.setEntercode(tCompany.getEnterCode());
                deleteStafNodeRequest.setMobile(tCompany.getPrincipalPhone());
                EmployeeUtil.ecrmDeleteStafNode(deleteStafNodeRequest);
                ResultUtil resultUtil = EmployeeUtil.ecrmDeleteStafNode(deleteStafNodeRequest);
                if(200 != resultUtil.getStatus()){
                    return new ErrorTip(resultUtil.getStatus(), resultUtil.getMsg());
                }
            }
        }
        tDriverService.updateById(driver);
@@ -926,13 +947,16 @@
            tDriver.setRemark(remark);
            //审核通过，在中台添加司机账号
            if (2 == tDriver.getAuthState() && tDriver.getEmpId() == null) {
                ShiroUser user = shiroExtUtil.getUser();
                User user2 = userService.selectById(user.getId());
                Integer objectId = tDriver.getCompanyId();
                TCompany tCompany = itCompanyService.selectById(objectId);
                List<QYTUserInfo> userInfoByPhone = UserUtil.getUserInfoByPhone(tDriver.getPhone(), tCompany.getEnterCode());
                Long empId = null;
                Integer empnew = null;
                if(null == userInfoByPhone || userInfoByPhone.size() == 0){
                    SaveStaffNodeRequest request = new SaveStaffNodeRequest();
                    request.setMobile(tCompany.getPrincipalPhone());
                    request.setMobile(user2.getPhone());
                    request.setEntercode(tCompany.getEnterCode());
                    request.setEmpName(tDriver.getName());
                    request.setEmpNickname(tDriver.getName());
@@ -944,15 +968,22 @@
                    request.setPositionId(1);
                    request.setSuperLevel(0);
                    request.setHideMobile(0);
                    SaveStaffNode saveStaffNode = EmployeeUtil.saveStaffNode(request);
                    ResultUtil<SaveStaffNode> resultUtil = EmployeeUtil.saveStaffNode(request);
                    if(200 != resultUtil.getStatus()){
                        return new ErrorTip(resultUtil.getStatus(), resultUtil.getMsg());
                    }
                    SaveStaffNode saveStaffNode = resultUtil.getData();
                    empId = saveStaffNode.getEmpId();
                    empnew = 1;
                }else{
                    empId = userInfoByPhone.get(0).getEmpId();
                    empnew = 0;
                }
                
                tDriver.setEmpId(empId);
                tDriver.setEntercode(tCompany.getEnterCode());
                tDriver.setEnterId(Long.valueOf(tCompany.getEnterCode()));
                tDriver.setEmpnew(empnew);
            }
    
            tDriverService.updateById(tDriver);
@@ -1178,6 +1209,8 @@
    @RequestMapping(value="/exportDriver",method = RequestMethod.POST)
    @ResponseBody
    public Object exportDriver(HttpServletRequest request){
        ShiroUser user = shiroExtUtil.getUser();
        User user2 = userService.selectById(user.getId());
        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
        MultipartFile file = (MultipartFile) multipartRequest.getFile("myfile");
        try {
@@ -1190,97 +1223,225 @@
                    Cell cell0 = row.getCell(0);  //司机名称
                    String zero = null;
                    if (SinataUtil.isNotEmpty(cell0)) {
                        zero = String.valueOf(cell0.getStringCellValue()).trim();
                        int cellType = cell0.getCellType();
                        switch (cellType) {
                            case Cell.CELL_TYPE_STRING:
                                zero = cell0.getStringCellValue().trim();
                                break;
                            case Cell.CELL_TYPE_NUMERIC:
                                zero = String.valueOf((long)cell0.getNumericCellValue()).trim();
                                break;
                        }
                    }
            
                    Cell cell1 = row.getCell(1);  //所属机构[平台司机/加盟司机]
                    String one = null;
                    if (SinataUtil.isNotEmpty(cell1)) {
                        one = String.valueOf(cell1.getStringCellValue()).trim();
                        int cellType = cell1.getCellType();
                        switch (cellType) {
                            case Cell.CELL_TYPE_STRING:
                                one = cell1.getStringCellValue().trim();
                                break;
                            case Cell.CELL_TYPE_NUMERIC:
                                one = String.valueOf((long)cell1.getNumericCellValue()).trim();
                                break;
                        }
                    }
            
                    Cell cell2 = row.getCell(2);  //所属分公司[提示:加盟司机选填]
                    String two = null;
                    if (SinataUtil.isNotEmpty(cell2)) {
                        two = String.valueOf(cell2.getStringCellValue()).trim();
                        int cellType = cell2.getCellType();
                        switch (cellType) {
                            case Cell.CELL_TYPE_STRING:
                                two = cell2.getStringCellValue().trim();
                                break;
                            case Cell.CELL_TYPE_NUMERIC:
                                two = String.valueOf((long)cell2.getNumericCellValue()).trim();
                                break;
                        }
                    }

                    Cell cell3 = row.getCell(3);  //所属加盟商[提示:加盟司机选填]
                    String three = null;
                    if (SinataUtil.isNotEmpty(cell3)){
                        three = String.valueOf(cell3.getStringCellValue()).trim();
                        int cellType = cell3.getCellType();
                        switch (cellType) {
                            case Cell.CELL_TYPE_STRING:
                                three = cell3.getStringCellValue().trim();
                                break;
                            case Cell.CELL_TYPE_NUMERIC:
                                three = String.valueOf((long)cell3.getNumericCellValue()).trim();
                                break;
                        }
                    }

                    Cell cell4 = row.getCell(4);  //性别[男/女]
                    String four = null;
                    if (SinataUtil.isNotEmpty(cell4)){
                        four = String.valueOf(cell4.getStringCellValue()).trim();
                        int cellType = cell4.getCellType();
                        switch (cellType) {
                            case Cell.CELL_TYPE_STRING:
                                four = cell4.getStringCellValue().trim();
                                break;
                            case Cell.CELL_TYPE_NUMERIC:
                                four = String.valueOf((long)cell4.getNumericCellValue()).trim();
                                break;
                        }
                    }

                    Cell cell5 = row.getCell(5);  //驾驶证号码
                    String five = null;
                    if (SinataUtil.isNotEmpty(cell5)){
                        five = String.valueOf(cell5.getStringCellValue()).trim();
                        int cellType = cell5.getCellType();
                        switch (cellType) {
                            case Cell.CELL_TYPE_STRING:
                                five = cell5.getStringCellValue().trim();
                                break;
                            case Cell.CELL_TYPE_NUMERIC:
                                five = String.valueOf((long)cell5.getNumericCellValue()).trim();
                                break;
                        }
                    }

                    Cell cell6 = row.getCell(6);  //驾龄
                    String six = null;
                    if (SinataUtil.isNotEmpty(cell6)){
                        six = String.valueOf(cell6.getStringCellValue()).trim();
                        int cellType = cell6.getCellType();
                        switch (cellType) {
                            case Cell.CELL_TYPE_STRING:
                                six = cell6.getStringCellValue().trim();
                                break;
                            case Cell.CELL_TYPE_NUMERIC:
                                six = String.valueOf((long)cell6.getNumericCellValue()).trim();
                                break;
                        }
                    }

                    Cell cell7 = row.getCell(7);  //身份证号
                    String seven = null;
                    if (SinataUtil.isNotEmpty(cell7)){
                        seven = String.valueOf(cell7.getStringCellValue()).trim();
                        int cellType = cell7.getCellType();
                        switch (cellType) {
                            case Cell.CELL_TYPE_STRING:
                                seven = cell7.getStringCellValue().trim();
                                break;
                            case Cell.CELL_TYPE_NUMERIC:
                                seven = String.valueOf((long)cell7.getNumericCellValue()).trim();
                                break;
                        }
                    }

                    Cell cell8 = row.getCell(8);  //居住地址
                    String eight = null;
                    if (SinataUtil.isNotEmpty(cell8)){
                        eight = String.valueOf(cell8.getStringCellValue()).trim();
                        int cellType = cell8.getCellType();
                        switch (cellType) {
                            case Cell.CELL_TYPE_STRING:
                                eight = cell8.getStringCellValue().trim();
                                break;
                            case Cell.CELL_TYPE_NUMERIC:
                                eight = String.valueOf((long)cell8.getNumericCellValue()).trim();
                                break;
                        }
                    }

                    Cell cell9 = row.getCell(9);  //出租车资格证号
                    String nine = null;
                    if (SinataUtil.isNotEmpty(cell9)){
                        nine = String.valueOf(cell9.getStringCellValue()).trim();
                        int cellType = cell9.getCellType();
                        switch (cellType) {
                            case Cell.CELL_TYPE_STRING:
                                nine = cell9.getStringCellValue().trim();
                                break;
                            case Cell.CELL_TYPE_NUMERIC:
                                nine = String.valueOf((long)cell9.getNumericCellValue()).trim();
                                break;
                        }
                    }

                    Cell cell10 = row.getCell(10);  //工号[选填]
                    String ten = null;
                    if (SinataUtil.isNotEmpty(cell10)){
                        ten = String.valueOf(cell10.getStringCellValue()).trim();
                        int cellType = cell10.getCellType();
                        switch (cellType) {
                            case Cell.CELL_TYPE_STRING:
                                ten = cell10.getStringCellValue().trim();
                                break;
                            case Cell.CELL_TYPE_NUMERIC:
                                ten = String.valueOf((long)cell10.getNumericCellValue()).trim();
                                break;
                        }
                    }

                    Cell cell11 = row.getCell(11);  //经营业务:快车[是/否]
                    String eleven = null;
                    if (SinataUtil.isNotEmpty(cell11)){
                        eleven = String.valueOf(cell11.getStringCellValue()).trim();
                        int cellType = cell11.getCellType();
                        switch (cellType) {
                            case Cell.CELL_TYPE_STRING:
                                eleven = cell11.getStringCellValue().trim();
                                break;
                            case Cell.CELL_TYPE_NUMERIC:
                                eleven = String.valueOf((long)cell11.getNumericCellValue()).trim();
                                break;
                        }
                    }

                    Cell cell12 = row.getCell(12);  //经营业务:快车[是/否]
                    String twelve = null;
                    if (SinataUtil.isNotEmpty(cell12)){
                        twelve = String.valueOf(cell12.getStringCellValue()).trim();
                        int cellType = cell12.getCellType();
                        switch (cellType) {
                            case Cell.CELL_TYPE_STRING:
                                twelve = cell12.getStringCellValue().trim();
                                break;
                            case Cell.CELL_TYPE_NUMERIC:
                                twelve = String.valueOf((long)cell12.getNumericCellValue()).trim();
                                break;
                        }
                    }

                    Cell cell13 = row.getCell(13);  //经营业务:跨城出行[是/否]
                    String thirteen = null;
                    if (SinataUtil.isNotEmpty(cell13)){
                        thirteen = String.valueOf(cell13.getStringCellValue()).trim();
                        int cellType = cell13.getCellType();
                        switch (cellType) {
                            case Cell.CELL_TYPE_STRING:
                                thirteen = cell13.getStringCellValue().trim();
                                break;
                            case Cell.CELL_TYPE_NUMERIC:
                                thirteen = String.valueOf((long)cell13.getNumericCellValue()).trim();
                                break;
                        }
                    }

                    Cell cell17 = row.getCell(14);  //登录账号[手机号]
                    String seventeen = null;
                    if (SinataUtil.isNotEmpty(cell17)){
                        seventeen = String.valueOf(cell17.getStringCellValue()).trim();
                        int cellType = cell17.getCellType();
                        switch (cellType) {
                            case Cell.CELL_TYPE_STRING:
                                seventeen = cell17.getStringCellValue().trim();
                                break;
                            case Cell.CELL_TYPE_NUMERIC:
                                seventeen = String.valueOf((long)cell17.getNumericCellValue()).trim();
                                break;
                        }
                    }

                    Cell cell18 = row.getCell(15);  //登录密码[密码长度为6-18]
                    String eighteen = null;
                    if (SinataUtil.isNotEmpty(cell18)){
                        eighteen = String.valueOf(cell18.getStringCellValue()).trim();
                        int cellType = cell18.getCellType();
                        switch (cellType) {
                            case Cell.CELL_TYPE_STRING:
                                eighteen = cell18.getStringCellValue().trim();
                                break;
                            case Cell.CELL_TYPE_NUMERIC:
                                eighteen = String.valueOf((long)cell18.getNumericCellValue()).trim();
                                break;
                        }
                    }

                    if (SinataUtil.isEmpty(zero) || SinataUtil.isEmpty(one) || SinataUtil.isEmpty(four)
@@ -1387,9 +1548,10 @@
                            TCompany tCompany = itCompanyService.selectById(objectId);
                            List<QYTUserInfo> userInfoByPhone = UserUtil.getUserInfoByPhone(driver.getPhone(), tCompany.getEnterCode());
                            Long empId = null;
                            Integer empnew = null;
                            if(null == userInfoByPhone || userInfoByPhone.size() == 0){
                                SaveStaffNodeRequest saveStaffNodeRequest = new SaveStaffNodeRequest();
                                saveStaffNodeRequest.setMobile(tCompany.getPrincipalPhone());
                                saveStaffNodeRequest.setMobile(user2.getPhone());
                                saveStaffNodeRequest.setEntercode(tCompany.getEnterCode());
                                saveStaffNodeRequest.setEmpName(driver.getName());
                                saveStaffNodeRequest.setEmpNickname(driver.getName());
@@ -1401,15 +1563,22 @@
                                saveStaffNodeRequest.setPositionId(1);
                                saveStaffNodeRequest.setSuperLevel(0);
                                saveStaffNodeRequest.setHideMobile(0);
                                SaveStaffNode saveStaffNode = EmployeeUtil.saveStaffNode(saveStaffNodeRequest);
                                ResultUtil<SaveStaffNode> resultUtil = EmployeeUtil.saveStaffNode(saveStaffNodeRequest);
                                if(200 != resultUtil.getStatus()){
                                    return new ErrorTip(resultUtil.getStatus(), resultUtil.getMsg());
                                }
                                SaveStaffNode saveStaffNode = resultUtil.getData();
                                empId = saveStaffNode.getEmpId();
                                empnew = 1;
                            }else{
                                empId = userInfoByPhone.get(0).getEmpId();
                                empnew = 0;
                            }
                            
                            driver.setEmpId(empId);
                            driver.setEntercode(tCompany.getEnterCode());
                            driver.setEnterId(Long.valueOf(tCompany.getEnterCode()));
                            driver.setEmpnew(empnew);
                        }
                        tDriverService.insert(driver);
    
@@ -1446,85 +1615,197 @@
                    Cell cell0 = row.getCell(0);  //司机名称
                    String zero = null;
                    if (SinataUtil.isNotEmpty(cell0)) {
                        zero = String.valueOf(cell0.getStringCellValue()).trim();
                        int cellType = cell0.getCellType();
                        switch (cellType) {
                            case Cell.CELL_TYPE_STRING:
                                zero = cell0.getStringCellValue().trim();
                                break;
                            case Cell.CELL_TYPE_NUMERIC:
                                zero = String.valueOf((long)cell0.getNumericCellValue()).trim();
                                break;
                        }
                    }
            
                    Cell cell1 = row.getCell(1);  //所属加盟商[选填]
                    String one = null;
                    if (SinataUtil.isNotEmpty(cell1)) {
                        one = String.valueOf(cell1.getStringCellValue()).trim();
                        int cellType = cell1.getCellType();
                        switch (cellType) {
                            case Cell.CELL_TYPE_STRING:
                                one = cell1.getStringCellValue().trim();
                                break;
                            case Cell.CELL_TYPE_NUMERIC:
                                one = String.valueOf((long)cell1.getNumericCellValue()).trim();
                                break;
                        }
                    }
            
                    Cell cell2 = row.getCell(2);  //性别[男/女]
                    String two = null;
                    if (SinataUtil.isNotEmpty(cell2)) {
                        two = String.valueOf(cell2.getStringCellValue()).trim();
                        int cellType = cell2.getCellType();
                        switch (cellType) {
                            case Cell.CELL_TYPE_STRING:
                                two = cell2.getStringCellValue().trim();
                                break;
                            case Cell.CELL_TYPE_NUMERIC:
                                two = String.valueOf((long)cell2.getNumericCellValue()).trim();
                                break;
                        }
                    }

                    Cell cell3 = row.getCell(3);  //驾驶证号码
                    String three = null;
                    if (SinataUtil.isNotEmpty(cell3)){
                        three = String.valueOf(cell3.getStringCellValue()).trim();
                        int cellType = cell3.getCellType();
                        switch (cellType) {
                            case Cell.CELL_TYPE_STRING:
                                three = cell3.getStringCellValue().trim();
                                break;
                            case Cell.CELL_TYPE_NUMERIC:
                                three = String.valueOf((long)cell3.getNumericCellValue()).trim();
                                break;
                        }
                    }

                    Cell cell4 = row.getCell(4);  //驾龄
                    String four = null;
                    if (SinataUtil.isNotEmpty(cell4)){
                        four = String.valueOf(cell4.getStringCellValue()).trim();
                        int cellType = cell4.getCellType();
                        switch (cellType) {
                            case Cell.CELL_TYPE_STRING:
                                four = cell4.getStringCellValue().trim();
                                break;
                            case Cell.CELL_TYPE_NUMERIC:
                                four = String.valueOf((long)cell4.getNumericCellValue()).trim();
                                break;
                        }
                    }

                    Cell cell5 = row.getCell(5);  //身份证号
                    String five = null;
                    if (SinataUtil.isNotEmpty(cell5)){
                        five = String.valueOf(cell5.getStringCellValue()).trim();
                        int cellType = cell5.getCellType();
                        switch (cellType) {
                            case Cell.CELL_TYPE_STRING:
                                five = cell5.getStringCellValue().trim();
                                break;
                            case Cell.CELL_TYPE_NUMERIC:
                                five = String.valueOf((long)cell5.getNumericCellValue()).trim();
                                break;
                        }
                    }

                    Cell cell6 = row.getCell(6);  //居住地址
                    String six = null;
                    if (SinataUtil.isNotEmpty(cell6)){
                        six = String.valueOf(cell6.getStringCellValue()).trim();
                        int cellType = cell6.getCellType();
                        switch (cellType) {
                            case Cell.CELL_TYPE_STRING:
                                six = cell6.getStringCellValue().trim();
                                break;
                            case Cell.CELL_TYPE_NUMERIC:
                                six = String.valueOf((long)cell6.getNumericCellValue()).trim();
                                break;
                        }
                    }

                    Cell cell7 = row.getCell(7);  //出租车资格证号
                    String seven = null;
                    if (SinataUtil.isNotEmpty(cell7)){
                        seven = String.valueOf(cell7.getStringCellValue()).trim();
                        int cellType = cell7.getCellType();
                        switch (cellType) {
                            case Cell.CELL_TYPE_STRING:
                                seven = cell7.getStringCellValue().trim();
                                break;
                            case Cell.CELL_TYPE_NUMERIC:
                                seven = String.valueOf((long)cell7.getNumericCellValue()).trim();
                                break;
                        }
                    }

                    Cell cell8 = row.getCell(8);  //工号[选填]
                    String eight = null;
                    if (SinataUtil.isNotEmpty(cell8)){
                        eight = String.valueOf(cell8.getStringCellValue()).trim();
                        int cellType = cell8.getCellType();
                        switch (cellType) {
                            case Cell.CELL_TYPE_STRING:
                                eight = cell8.getStringCellValue().trim();
                                break;
                            case Cell.CELL_TYPE_NUMERIC:
                                eight = String.valueOf((long)cell8.getNumericCellValue()).trim();
                                break;
                        }
                    }

                    Cell cell9 = row.getCell(9);  //经营业务:快车[是/否]
                    String nine = null;
                    if (SinataUtil.isNotEmpty(cell9)){
                        nine = String.valueOf(cell9.getStringCellValue()).trim();
                        int cellType = cell9.getCellType();
                        switch (cellType) {
                            case Cell.CELL_TYPE_STRING:
                                nine = cell9.getStringCellValue().trim();
                                break;
                            case Cell.CELL_TYPE_NUMERIC:
                                nine = String.valueOf((long)cell9.getNumericCellValue()).trim();
                                break;
                        }
                    }

                    Cell cell10 = row.getCell(10);  //经营业务:出租车[是/否]
                    String ten = null;
                    if (SinataUtil.isNotEmpty(cell10)){
                        ten = String.valueOf(cell10.getStringCellValue()).trim();
                        int cellType = cell10.getCellType();
                        switch (cellType) {
                            case Cell.CELL_TYPE_STRING:
                                ten = cell10.getStringCellValue().trim();
                                break;
                            case Cell.CELL_TYPE_NUMERIC:
                                ten = String.valueOf((long)cell10.getNumericCellValue()).trim();
                                break;
                        }
                    }

                    Cell cell11 = row.getCell(11);  //经营业务:跨城出行[是/否]
                    String eleven = null;
                    if (SinataUtil.isNotEmpty(cell11)){
                        eleven = String.valueOf(cell11.getStringCellValue()).trim();
                        int cellType = cell11.getCellType();
                        switch (cellType) {
                            case Cell.CELL_TYPE_STRING:
                                eleven = cell11.getStringCellValue().trim();
                                break;
                            case Cell.CELL_TYPE_NUMERIC:
                                eleven = String.valueOf((long)cell11.getNumericCellValue()).trim();
                                break;
                        }
                    }

                    Cell cell15 = row.getCell(12);  //登录账号[手机号]
                    String fifteen = null;
                    if (SinataUtil.isNotEmpty(cell15)){
                        fifteen = String.valueOf(cell15.getStringCellValue()).trim();
                        int cellType = cell15.getCellType();
                        switch (cellType) {
                            case Cell.CELL_TYPE_STRING:
                                fifteen = cell15.getStringCellValue().trim();
                                break;
                            case Cell.CELL_TYPE_NUMERIC:
                                fifteen = String.valueOf((long)cell15.getNumericCellValue()).trim();
                                break;
                        }
                    }

                    Cell cell16 = row.getCell(13);  //登录密码[密码长度为6-18]
                    String sixteen = null;
                    if (SinataUtil.isNotEmpty(cell16)){
                        sixteen = String.valueOf(cell16.getStringCellValue()).trim();
                        int cellType = cell16.getCellType();
                        switch (cellType) {
                            case Cell.CELL_TYPE_STRING:
                                sixteen = cell16.getStringCellValue().trim();
                                break;
                            case Cell.CELL_TYPE_NUMERIC:
                                sixteen = String.valueOf((long)cell16.getNumericCellValue()).trim();
                                break;
                        }
                    }
                    if (SinataUtil.isEmpty(zero) || SinataUtil.isEmpty(two) || SinataUtil.isEmpty(three) || SinataUtil.isEmpty(four)
                            || SinataUtil.isEmpty(five) || SinataUtil.isEmpty(seven)
@@ -1639,79 +1920,183 @@
                    Cell cell0 = row.getCell(0);  //司机名称
                    String zero = null;
                    if (SinataUtil.isNotEmpty(cell0)) {
                        zero = String.valueOf(cell0.getStringCellValue()).trim();
                        int cellType = cell0.getCellType();
                        switch (cellType) {
                            case Cell.CELL_TYPE_STRING:
                                zero = cell0.getStringCellValue().trim();
                                break;
                            case Cell.CELL_TYPE_NUMERIC:
                                zero = String.valueOf((long)cell0.getNumericCellValue()).trim();
                                break;
                        }
                    }
            
                    Cell cell2 = row.getCell(1);  //性别[男/女]
                    String one = null;
                    if (SinataUtil.isNotEmpty(cell2)) {
                        one = String.valueOf(cell2.getStringCellValue()).trim();
                        int cellType = cell2.getCellType();
                        switch (cellType) {
                            case Cell.CELL_TYPE_STRING:
                                one = cell2.getStringCellValue().trim();
                                break;
                            case Cell.CELL_TYPE_NUMERIC:
                                one = String.valueOf((long)cell2.getNumericCellValue()).trim();
                                break;
                        }
                    }
            
                    Cell cell3 = row.getCell(2);  //驾驶证号码
                    String two = null;
                    if (SinataUtil.isNotEmpty(cell3)) {
                        two = String.valueOf(cell3.getStringCellValue()).trim();
                        int cellType = cell3.getCellType();
                        switch (cellType) {
                            case Cell.CELL_TYPE_STRING:
                                two = cell3.getStringCellValue().trim();
                                break;
                            case Cell.CELL_TYPE_NUMERIC:
                                two = String.valueOf((long)cell3.getNumericCellValue()).trim();
                                break;
                        }
                    }

                    Cell cell4 = row.getCell(3);  //驾龄
                    String three = null;
                    if (SinataUtil.isNotEmpty(cell4)){
                        three = String.valueOf(cell4.getStringCellValue()).trim();
                        int cellType = cell4.getCellType();
                        switch (cellType) {
                            case Cell.CELL_TYPE_STRING:
                                three = cell4.getStringCellValue().trim();
                                break;
                            case Cell.CELL_TYPE_NUMERIC:
                                three = String.valueOf((long)cell4.getNumericCellValue()).trim();
                                break;
                        }
                    }

                    Cell cell5 = row.getCell(4);  //身份证号
                    String four = null;
                    if (SinataUtil.isNotEmpty(cell5)){
                        four = String.valueOf(cell5.getStringCellValue()).trim();
                        int cellType = cell5.getCellType();
                        switch (cellType) {
                            case Cell.CELL_TYPE_STRING:
                                four = cell5.getStringCellValue().trim();
                                break;
                            case Cell.CELL_TYPE_NUMERIC:
                                four = String.valueOf((long)cell5.getNumericCellValue()).trim();
                                break;
                        }
                    }

                    Cell cell6 = row.getCell(5);  //居住地址
                    String five = null;
                    if (SinataUtil.isNotEmpty(cell6)){
                        five = String.valueOf(cell6.getStringCellValue()).trim();
                        int cellType = cell6.getCellType();
                        switch (cellType) {
                            case Cell.CELL_TYPE_STRING:
                                five = cell6.getStringCellValue().trim();
                                break;
                            case Cell.CELL_TYPE_NUMERIC:
                                five = String.valueOf((long)cell6.getNumericCellValue()).trim();
                                break;
                        }
                    }

                    Cell cell7 = row.getCell(6);  //出租车资格证号
                    String six = null;
                    if (SinataUtil.isNotEmpty(cell7)){
                        six = String.valueOf(cell7.getStringCellValue()).trim();
                        int cellType = cell7.getCellType();
                        switch (cellType) {
                            case Cell.CELL_TYPE_STRING:
                                six = cell7.getStringCellValue().trim();
                                break;
                            case Cell.CELL_TYPE_NUMERIC:
                                six = String.valueOf((long)cell7.getNumericCellValue()).trim();
                                break;
                        }
                    }

                    Cell cell8 = row.getCell(7);  //工号[选填]
                    String seven = null;
                    if (SinataUtil.isNotEmpty(cell8)){
                        seven = String.valueOf(cell8.getStringCellValue()).trim();
                        int cellType = cell8.getCellType();
                        switch (cellType) {
                            case Cell.CELL_TYPE_STRING:
                                seven = cell8.getStringCellValue().trim();
                                break;
                            case Cell.CELL_TYPE_NUMERIC:
                                seven = String.valueOf((long)cell8.getNumericCellValue()).trim();
                                break;
                        }
                    }

                    Cell cell9 = row.getCell(8);  //经营业务:快车[是/否]
                    String eight = null;
                    if (SinataUtil.isNotEmpty(cell9)){
                        eight = String.valueOf(cell9.getStringCellValue()).trim();
                        int cellType = cell9.getCellType();
                        switch (cellType) {
                            case Cell.CELL_TYPE_STRING:
                                eight = cell9.getStringCellValue().trim();
                                break;
                            case Cell.CELL_TYPE_NUMERIC:
                                eight = String.valueOf((long)cell9.getNumericCellValue()).trim();
                                break;
                        }
                    }

                    Cell cell10 = row.getCell(9);  //经营业务:出租车[是/否]
                    String nine = null;
                    if (SinataUtil.isNotEmpty(cell10)){
                        nine = String.valueOf(cell10.getStringCellValue()).trim();
                        int cellType = cell10.getCellType();
                        switch (cellType) {
                            case Cell.CELL_TYPE_STRING:
                                nine = cell10.getStringCellValue().trim();
                                break;
                            case Cell.CELL_TYPE_NUMERIC:
                                nine = String.valueOf((long)cell10.getNumericCellValue()).trim();
                                break;
                        }
                    }

                    Cell cell11 = row.getCell(10);  //经营业务:跨城出行[是/否]
                    String ten = null;
                    if (SinataUtil.isNotEmpty(cell11)){
                        ten = String.valueOf(cell11.getStringCellValue()).trim();
                        int cellType = cell11.getCellType();
                        switch (cellType) {
                            case Cell.CELL_TYPE_STRING:
                                ten = cell11.getStringCellValue().trim();
                                break;
                            case Cell.CELL_TYPE_NUMERIC:
                                ten = String.valueOf((long)cell11.getNumericCellValue()).trim();
                                break;
                        }
                    }

                    Cell cell15 = row.getCell(11);  //登录账号[手机号]
                    String fourteen = null;
                    if (SinataUtil.isNotEmpty(cell15)){
                        fourteen = String.valueOf(cell15.getStringCellValue()).trim();
                        int cellType = cell15.getCellType();
                        switch (cellType) {
                            case Cell.CELL_TYPE_STRING:
                                fourteen = cell15.getStringCellValue().trim();
                                break;
                            case Cell.CELL_TYPE_NUMERIC:
                                fourteen = String.valueOf((long)cell15.getNumericCellValue()).trim();
                                break;
                        }
                    }

                    Cell cell16 = row.getCell(12);  //登录密码[密码长度为6-18]
                    String fifteen = null;
                    if (SinataUtil.isNotEmpty(cell16)){
                        fifteen = String.valueOf(cell16.getStringCellValue()).trim();
                        int cellType = cell16.getCellType();
                        switch (cellType) {
                            case Cell.CELL_TYPE_STRING:
                                fifteen = cell16.getStringCellValue().trim();
                                break;
                            case Cell.CELL_TYPE_NUMERIC:
                                fifteen = String.valueOf((long)cell16.getNumericCellValue()).trim();
                                break;
                        }
                    }
                    if (SinataUtil.isEmpty(zero) || SinataUtil.isEmpty(one)  || SinataUtil.isEmpty(two) || SinataUtil.isEmpty(three) || SinataUtil.isEmpty(four)
                            || SinataUtil.isEmpty(six) || SinataUtil.isEmpty(eight)
@@ -1875,8 +2260,21 @@
     *  导出司机信息
     */
    @RequestMapping(value = "/outDriver")
    public void outDriver(HttpServletRequest request, HttpServletResponse response) {
        List<Map<String, Object>> listMap = tDriverService.getDriverListNoPage(shiroExtUtil.getUser().getRoleType(), shiroExtUtil.getUser().getObjectId());
    public void outDriver(String insertTime,
                          String companyName,
                          String phone,
                          String name,
                          Integer addType,
                          Integer authState, HttpServletRequest request, HttpServletResponse response) {
        String beginTime = null;
        String endTime = null;
        if (SinataUtil.isNotEmpty(insertTime)){
            String[] timeArray = insertTime.split(" - ");
            beginTime = timeArray[0];
            endTime = timeArray[1];
        }
        Page<Map<String, Object>> page = new Page<>(0, 10000);
        List<Map<String, Object>> listMap = tDriverService.getDriverList(page, shiroExtUtil.getUser().getRoleType(), shiroExtUtil.getUser().getObjectId(), beginTime, endTime, companyName, phone, name, addType, authState);

        // 表格数据【封装】
        List<List<String>> dataList = new ArrayList<>();

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TEnterpriseWithdrawalController.java

@@ -49,7 +49,7 @@
    @Autowired
    private ITBankNextService bankNextService;
    
    @Resource
    @Autowired
    private ShiroExtUtil shiroExtUtil;
    
    /**

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TFeedbackController.java

@@ -38,7 +38,7 @@
    
    @Autowired
    private ITSystemNoticeService tSystemNoticeService;
    @Resource
    @Autowired
    private ShiroExtUtil shiroExtUtil;
    
    /**

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TInvoiceController.java

@@ -34,7 +34,7 @@
    @Autowired
    private ITInvoiceService tInvoiceService;
    
    @Resource
    @Autowired
    private ShiroExtUtil shiroExtUtil;
    
    /**

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TNoticesController.java

@@ -40,7 +40,7 @@
    @Autowired
    private ITNoticesService tNoticesService;
    
    @Resource
    @Autowired
    private ShiroExtUtil shiroExtUtil;
    
    

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TOpenCityController.java

@@ -52,7 +52,7 @@
    
    @Autowired
    private ITOpenCityBusinessService tOpenCityBusinessService;
    @Resource
    @Autowired
    private ShiroExtUtil shiroExtUtil;
    
    /**

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TOrderEvaluateController.java

@@ -33,7 +33,7 @@
    
    @Autowired
    private ITOrderEvaluateService tOrderEvaluateService;
    @Resource
    @Autowired
    private ShiroExtUtil shiroExtUtil;
    
    /**

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TProblemController.java

@@ -39,7 +39,7 @@
    @Autowired
    private ITSystemNoticeService itSystemNoticeService;
    
    @Resource
    @Autowired
    private ShiroExtUtil shiroExtUtil;
    
    /**

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TPubWithdrawalController.java

@@ -44,7 +44,7 @@
    @Resource
    private IUserWithdrawalService userWithdrawalService;
    
    @Resource
    @Autowired
    private ShiroExtUtil shiroExtUtil;
    
    /**

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSmsrecordController.java

@@ -31,7 +31,7 @@
    
    @Autowired
    private ITSmsrecordService tSmsrecordService;
    @Resource
    @Autowired
    private ShiroExtUtil shiroExtUtil;
    
    /**

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TTaxiCardController.java

@@ -56,7 +56,7 @@
    
    @Autowired
    private ITTaxiCardPaymentService taxiCardPaymentService;
    @Resource
    @Autowired
    private ShiroExtUtil shiroExtUtil;
    
    @RequestMapping("")

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TUserController.java

@@ -52,7 +52,7 @@
    
    @Autowired
    private ITUserService tUserService;
    @Resource
    @Autowired
    private ShiroExtUtil shiroExtUtil;
    
    /**

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TVerifiedController.java

@@ -40,7 +40,7 @@
    
    @Autowired
    private ITUserService tUserService;
    @Resource
    @Autowired
    private ShiroExtUtil shiroExtUtil;
    
    /**

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TVersionManagementController.java

@@ -14,7 +14,7 @@
import com.stylefeng.guns.modular.system.service.ITVersionManagementService;
import com.stylefeng.guns.modular.system.util.PushMinistryOfTransportUtil;
import com.stylefeng.guns.modular.system.util.qianyuntong.NCOSSUtil;
import com.stylefeng.guns.modular.system.util.qianyuntong.QianYunTongProperties;
import com.stylefeng.guns.modular.system.util.qianyuntong.QianYunTongConfig;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
@@ -47,11 +47,14 @@
    @Autowired
    private PushMinistryOfTransportUtil pushMinistryOfTransportUtil;
    
    @Resource
    @Autowired
    private ShiroExtUtil shiroExtUtil;
    
    @Value("${pushMinistryOfTransport}")
    private boolean pushMinistryOfTransport;
    
    @Autowired
    private QianYunTongConfig qianYunTongConfig;
    
    /**
     * 跳转到版本管理首页
@@ -131,7 +134,7 @@
        Map<String, Object> m = new HashMap<>();
        try {
            String pictureName = UUID.randomUUID().toString() + "." + ToolUtil.getFileSuffix(myfile.getOriginalFilename());
            String bucketName = QianYunTongProperties.bucketName;
            String bucketName = qianYunTongConfig.getBucketName();
            Bucket grjyTest = NCOSSUtil.getBucketInfo(bucketName);
            if (null == grjyTest) {
                //创建桶
@@ -152,7 +155,7 @@
            if (null == object) {
                throw new RuntimeException("上传图片失败");
            }
            m.put("imgUrl", "https://traffic.qytzt.cn/v1/AUTH_" + QianYunTongProperties.account + "/" + bucketName + "/" + key);
            m.put("imgUrl", "https://traffic.qytzt.cn/v1/AUTH_" + qianYunTongConfig.getAccount() + "/" + bucketName + "/" + key);
        } catch (Exception e) {
            e.printStackTrace();
        }

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/UserActivityController.java

@@ -67,7 +67,7 @@
    
    @Autowired
    private ITUserRedPacketRecordService redPacketRecordService;
    @Resource
    @Autowired
    private ShiroExtUtil shiroExtUtil;
    
    /**

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TIntegralGoodsController.java

@@ -34,7 +34,7 @@
    
    @Autowired
    private ITIntegralGoodsService tIntegralGoodsService;
    @Resource
    @Autowired
    private ShiroExtUtil shiroExtUtil;
    
    /**

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TIntegralOrderController.java

@@ -33,7 +33,7 @@
    @Autowired
    private ITIntegralOrderService tIntegralOrderService;
    
    @Resource
    @Autowired
    private ShiroExtUtil shiroExtUtil;
    
    /**

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TLineController.java

@@ -64,7 +64,7 @@
    @Autowired
    private ITLineCompanyService itLineCompanyService;
    
    @Resource
    @Autowired
    private ShiroExtUtil shiroExtUtil;
    
    /**

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderCharterController.java

@@ -33,7 +33,7 @@
    @Autowired
    private ITOrderCharterService tOrderCharterService;
    
    @Resource
    @Autowired
    private ShiroExtUtil shiroExtUtil;
    
    /**

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderCharteredCarController.java

@@ -34,7 +34,7 @@
    @Autowired
    private ITOrderCharteredCarService tOrderCharteredCarService;
    
    @Resource
    @Autowired
    private ShiroExtUtil shiroExtUtil;
    
    /**

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderCrossCityController.java

@@ -68,7 +68,7 @@
    
    @Resource
    private MongoTemplate mongoTemplate;
    @Resource
    @Autowired
    private ShiroExtUtil shiroExtUtil;
    
    

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderLogisticsController.java

@@ -69,7 +69,7 @@
    @Autowired
    private IUserCouponRecordService userCouponRecordService;
    
    @Resource
    @Autowired
    private ShiroExtUtil shiroExtUtil;
    
    /**

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java

@@ -69,7 +69,7 @@
    @Resource
    private MongoTemplate mongoTemplate;
    
    @Resource
    @Autowired
    private ShiroExtUtil shiroExtUtil;
    
    

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java

@@ -87,7 +87,7 @@
    
    @Autowired
    private ITOrderTaxiService orderTaxiService;
    @Resource
    @Autowired
    private ShiroExtUtil shiroExtUtil;
    
    
@@ -570,30 +570,35 @@
            for (int i = 0; i < mapList.size(); i++) {
                Map<String,Object> d=mapList.get(i);
                values[i] = new String[title.length];
                values[i][0]=d.get("insertTime").toString();
                values[i][1]=d.get("originalDriver").toString();
                values[i][2]=d.get("reason").toString();
                values[i][3]=d.get("orderNum").toString();
                values[i][4]=d.get("addOrderUser").toString();
                values[i][5]=d.get("travelTime").toString();
                values[i][6]=d.get("startAddress").toString();
                values[i][7]=d.get("endAddress").toString();
                values[i][8]=d.get("originalCar").toString();
                values[i][9]=d.get("money").toString();
                values[i][10]=d.get("nowDriver")==null?"":d.get("nowDriver").toString();
                values[i][11]=d.get("nowCar")==null?"":d.get("nowCar").toString();
                values[i][12]=d.get("orderState").toString().equals("1")?"待接单":
                        d.get("orderState").toString().equals("2")?"待出发":
                                d.get("orderState").toString().equals("3")?"待到达预约地点":
                                        d.get("orderState").toString().equals("4")?"待取货":
                                                d.get("orderState").toString().equals("5")?"服务中":
                                                        d.get("orderState").toString().equals("6")?"已送达":
                                                                d.get("orderState").toString().equals("7")?"待支付":
                                                                        d.get("orderState").toString().equals("8")?"需补差价":
                                                                                d.get("orderState").toString().equals("9")?"已取货":
                                                                                        d.get("orderState").toString().equals("10")?"已取消":
                                                                                                d.get("orderState").toString().equals("11")?"改派中":
                                                                                                        d.get("orderState").toString().equals("12")?"已支付差价":"";
                values[i][0]=null == d.get("insertTime") ? "" : d.get("insertTime").toString();
                values[i][1]=null == d.get("originalDriver") ? "" : d.get("originalDriver").toString();
                values[i][2]=null == d.get("reason") ? "" : d.get("reason").toString();
                values[i][3]=null == d.get("orderNum") ? "" : d.get("orderNum").toString();
                values[i][4]=null == d.get("addOrderUser") ? "" : d.get("addOrderUser").toString();
                values[i][5]=null == d.get("travelTime") ? "" : d.get("travelTime").toString();
                values[i][6]=null == d.get("startAddress") ? "" : d.get("startAddress").toString();
                values[i][7]=null == d.get("endAddress") ? "" : d.get("endAddress").toString();
                values[i][8]=null == d.get("originalCar") ? "" : d.get("originalCar").toString();
                values[i][9]=null == d.get("money") ? "" : d.get("money").toString();
                values[i][10]=null == d.get("nowDriver") ? "" : d.get("nowDriver").toString();
                values[i][11]=null == d.get("nowCar") ? "" : d.get("nowCar").toString();
                if(null == d.get("orderState")){
                    values[i][12]="";
                }else{
                    values[i][12]=d.get("orderState").toString().equals("1")?"待接单":
                            d.get("orderState").toString().equals("2")?"待出发":
                                    d.get("orderState").toString().equals("3")?"待到达预约地点":
                                            d.get("orderState").toString().equals("4")?"待取货":
                                                    d.get("orderState").toString().equals("5")?"服务中":
                                                            d.get("orderState").toString().equals("6")?"已送达":
                                                                    d.get("orderState").toString().equals("7")?"待支付":
                                                                            d.get("orderState").toString().equals("8")?"需补差价":
                                                                                    d.get("orderState").toString().equals("9")?"已取货":
                                                                                            d.get("orderState").toString().equals("10")?"已取消":
                                                                                                    d.get("orderState").toString().equals("11")?"改派中":
                                                                                                            d.get("orderState").toString().equals("12")?"已支付差价":"";
                }
                
                values[i][13]=d.get("state").toString().equals("1")?"提交申请":
                        d.get("state").toString().equals("2")?"已支付":
                                d.get("state").toString().equals("3")?"已改派":

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSiteController.java

@@ -55,7 +55,7 @@
    
    @Autowired
    private GDMapElectricFenceUtil gdMapElectricFenceUtil;
    @Resource
    @Autowired
    private ShiroExtUtil shiroExtUtil;
    
    

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSystemPriceController.java

@@ -53,7 +53,7 @@
    
    @Autowired
    private IUserService userService;
    @Resource
    @Autowired
    private ShiroExtUtil shiroExtUtil;
    
    @Value("${pushMinistryOfTransport}")

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/LoginController.java

@@ -96,7 +96,7 @@
        String onconParam = edu.yale.its.tp.cas.client.Util.getOnconParam(session);
        onconParam = new String(Base64.decodeBase64(onconParam), "UTF-8");
        LoginUser loginUser = JSON.parseObject(onconParam, LoginUser.class);
        log.info("登录账号: " + JSON.toJSONString(loginUser));
        log.debug("登录账号: " + JSON.toJSONString(loginUser));
        
        //获取菜单列表
        User user = userMapper.getByAccount(loginUser.getImUser());

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/MenuController.java

@@ -52,7 +52,7 @@

    @Autowired
    private IMenuService menuService;
    @Resource
    @Autowired
    private ShiroExtUtil shiroExtUtil;
    
    @Resource

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/RoleController.java

@@ -52,7 +52,7 @@

    @Autowired
    private IRoleService roleService;
    @Resource
    @Autowired
    private ShiroExtUtil shiroExtUtil;



 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/UediterController.java

@@ -5,7 +5,7 @@
import com.stylefeng.guns.config.properties.GunsProperties;
import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.system.util.qianyuntong.NCOSSUtil;
import com.stylefeng.guns.modular.system.util.qianyuntong.QianYunTongProperties;
import com.stylefeng.guns.modular.system.util.qianyuntong.QianYunTongConfig;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -19,6 +19,9 @@

@Controller
public class UediterController {
    
    @Autowired
    private QianYunTongConfig qianYunTongConfig;
    
    /*@RequestMapping("/config")
    public String getConfigInfo(HttpServletRequest request,HttpServletResponse response){
@@ -111,7 +114,7 @@
            String callback = request.getParameter("callback");
            try {
                String pictureName = UUID.randomUUID().toString() + "." + ToolUtil.getFileSuffix(picture.getOriginalFilename());
                String bucketName = QianYunTongProperties.bucketName;
                String bucketName = qianYunTongConfig.getBucketName();
                Bucket grjyTest = NCOSSUtil.getBucketInfo(bucketName);
                if (null == grjyTest) {
                    //创建桶
@@ -133,7 +136,7 @@
                    throw new RuntimeException("上传图片失败");
                }
    
                pictureName = "https://traffic.qytzt.cn/v1/AUTH_" + QianYunTongProperties.account + "/" + bucketName + "/" + key;
                pictureName = "https://traffic.qytzt.cn/v1/AUTH_" + qianYunTongConfig.getAccount() + "/" + bucketName + "/" + key;
    
    
                //文件上传，具体根据实际替换

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/UserMgrController.java

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.plugins.Page;
import com.stylefeng.guns.config.properties.GunsProperties;
import com.stylefeng.guns.core.base.controller.BaseController;
import com.stylefeng.guns.core.base.tips.ErrorTip;
import com.stylefeng.guns.core.base.tips.Tip;
import com.stylefeng.guns.core.beetl.ShiroExtUtil;
import com.stylefeng.guns.core.common.annotion.BussinessLog;
@@ -27,9 +28,13 @@
import com.stylefeng.guns.modular.system.service.ITDriverService;
import com.stylefeng.guns.modular.system.service.IUserService;
import com.stylefeng.guns.modular.system.transfer.UserDto;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import com.stylefeng.guns.modular.system.util.qianyuntong.EmployeeUtil;
import com.stylefeng.guns.modular.system.util.qianyuntong.UserUtil;
import com.stylefeng.guns.modular.system.util.qianyuntong.model.*;
import com.stylefeng.guns.modular.system.util.qianyuntong.model.DeleteStafNodeRequest;
import com.stylefeng.guns.modular.system.util.qianyuntong.model.QYTUserInfo;
import com.stylefeng.guns.modular.system.util.qianyuntong.model.SaveStaffNode;
import com.stylefeng.guns.modular.system.util.qianyuntong.model.SaveStaffNodeRequest;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
@@ -37,7 +42,6 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import javax.annotation.Resource;
import javax.naming.NoPermissionException;
import javax.validation.Valid;
import java.io.File;
@@ -69,7 +73,7 @@
    
    @Autowired
    private ITCompanyService companyService;
    @Resource
    @Autowired
    private ShiroExtUtil shiroExtUtil;
    
    
@@ -207,9 +211,10 @@
        TCompany tCompany = companyService.selectById(user2.getObjectId());
        List<QYTUserInfo> userInfoByPhone = UserUtil.getUserInfoByPhone(user.getPhone(), tCompany.getEnterCode());
        Long empId = null;
        Integer empnew = null;
        if(null == userInfoByPhone || userInfoByPhone.size() == 0){
            SaveStaffNodeRequest request1 = new SaveStaffNodeRequest();
            request1.setMobile(tCompany.getPrincipalPhone());
            request1.setMobile(user2.getPhone());
            request1.setEntercode(tCompany.getEnterCode());
            request1.setEmpName(user.getName());
            request1.setEmpNickname(user.getName());
@@ -221,10 +226,16 @@
            request1.setPositionId(1);
            request1.setSuperLevel(0);
            request1.setHideMobile(0);
            SaveStaffNode saveStaffNode = EmployeeUtil.saveStaffNode(request1);
            ResultUtil<SaveStaffNode> resultUtil = EmployeeUtil.saveStaffNode(request1);
            if(200 != resultUtil.getStatus()){
                return new ErrorTip(resultUtil.getStatus(), resultUtil.getMsg());
            }
            SaveStaffNode saveStaffNode = resultUtil.getData();
            empId = saveStaffNode.getEmpId();
            empnew = 1;
        }else{
            empId = userInfoByPhone.get(0).getEmpId();
            empnew = 0;
        }
    
        // 完善账号信息
@@ -238,6 +249,7 @@
    
        User objectUser = UserFactory.createUser(user);
        objectUser.setObjectId(user1.getObjectId());
        objectUser.setEmpnew(empnew);
        this.userService.insert(objectUser);
    
        return SUCCESS_TIP;
@@ -260,71 +272,44 @@
        User user2 = userService.selectById(user1.getId());
        TCompany tCompany = companyService.selectById(user2.getObjectId());
        //调用中台接口
        GetStaffNodeRequest request = new GetStaffNodeRequest();
        request.setEmpId(oldUser.getEmpId());
        request.setMobile(tCompany.getPrincipalPhone());
        request.setEntercode(tCompany.getEnterCode());
        StaffNodeInfo staffNode = EmployeeUtil.getStaffNode(request);
        Long empId = null;
        if (null == staffNode || "0".equals(staffNode.getIsValid())) {
            List<QYTUserInfo> userInfoByPhone = UserUtil.getUserInfoByPhone(user.getPhone(), tCompany.getEnterCode());
            if(null == userInfoByPhone || userInfoByPhone.size() == 0){
                SaveStaffNodeRequest request1 = new SaveStaffNodeRequest();
                request1.setMobile(tCompany.getPrincipalPhone());
                request1.setEntercode(tCompany.getEnterCode());
                request1.setEmpName(user.getName());
                request1.setEmpNickname(user.getName());
                request1.setLoginNo(user.getAccount());
                request1.setEmpSex(user.getSex() == 1 ? "男" : "女");
                request1.setMphone(user.getPhone());
                request1.setEmail(user.getPhone() + "@qyt.com");
                request1.setDeptId(0);
                request1.setPositionId(1);
                request1.setSuperLevel(0);
                request1.setHideMobile(0);
                SaveStaffNode saveStaffNode = EmployeeUtil.saveStaffNode(request1);
                empId = saveStaffNode.getEmpId();
            }else{
                empId = userInfoByPhone.get(0).getEmpId();
            }
        } else {
            EditStaffNodeRequest request1 = new EditStaffNodeRequest();
            request1.setEmpId(staffNode.getEmpId());
            request1.setMobile(tCompany.getPrincipalPhone());
        Integer empnew = null;
        List<QYTUserInfo> userInfoByPhone = UserUtil.getUserInfoByPhone(oldUser.getPhone(), tCompany.getEnterCode());
        if(null == userInfoByPhone || userInfoByPhone.size() == 0){
            SaveStaffNodeRequest request1 = new SaveStaffNodeRequest();
            request1.setMobile(user2.getPhone());
            request1.setEntercode(tCompany.getEnterCode());
            request1.setEnterId(Long.valueOf(tCompany.getEnterCode()));
            request1.setEmpName(user.getName());
            request1.setEmpNickname(user.getName());
            request1.setLoginNo(user.getAccount());
            request1.setEmpSex(user.getSex() == 1 ? "男" : "女");
            request1.setMphone(user.getPhone());
            request1.setEmail(user.getPhone() + "@qyt.com");
            request1.setDeptIds(staffNode.getDeptId() + "");
            request1.setPositionId(1);
            request1.setEmail(user.getPhone() + "@qyt.com");
            request1.setDeptId(0);
            request1.setPositionId(1);
            request1.setSuperLevel(0);
            request1.setHideMobile(0);
            EmployeeUtil.editStaffNode(request1);
            empId = staffNode.getEmpId();
            ResultUtil<SaveStaffNode> resultUtil = EmployeeUtil.saveStaffNode(request1);
            if(200 != resultUtil.getStatus()){
                return new ErrorTip(resultUtil.getStatus(), resultUtil.getMsg());
            }
            SaveStaffNode saveStaffNode = resultUtil.getData();
            empId = saveStaffNode.getEmpId();
            empnew = 1;
        }else{
            empId = userInfoByPhone.get(0).getEmpId();
            empnew = 0;
        }
        oldUser.setEmpId(empId);
        oldUser.setEntercode(tCompany.getEnterCode());
        oldUser.setEnterId(Long.valueOf(tCompany.getEnterCode()));
        oldUser.setEmpnew(empnew);
        user.setEmpId(empId);
        user.setEntercode(tCompany.getEnterCode());
        user.setEnterId(Long.valueOf(tCompany.getEnterCode()));
    
        if (shiroExtUtil.getUser().isAdmin) {
            this.userService.updateById(UserFactory.editUser(user, oldUser));
            return SUCCESS_TIP;
        } else {
            ShiroUser shiroUser = shiroExtUtil.getUser();
            if (shiroUser.getId().equals(user.getId())) {
                this.userService.updateById(UserFactory.editUser(user, oldUser));
                return SUCCESS_TIP;
            } else {
                throw new GunsException(BizExceptionEnum.NO_PERMITION);
            }
        }
        user.setEmpnew(empnew);
        this.userService.updateById(UserFactory.editUser(user, oldUser));
        return SUCCESS_TIP;
    }

    /**
@@ -346,18 +331,20 @@
        User user2 = userService.selectById(user1.getId());
        TCompany tCompany = companyService.selectById(user2.getObjectId());
        //调用中台接口
        GetStaffNodeRequest request = new GetStaffNodeRequest();
        request.setEmpId(user.getEmpId());
        request.setMobile(tCompany.getPrincipalPhone());
        request.setEntercode(tCompany.getEnterCode());
        StaffNodeInfo staffNode = EmployeeUtil.getStaffNode(request);
        if (null != staffNode && "1".equals(staffNode.getIsValid())) {
            DeleteStafNodeRequest request1 = new DeleteStafNodeRequest();
            request1.setEmpId(user.getEnterId());
            request1.setMobile(tCompany.getPrincipalPhone());
            request1.setEntercode(tCompany.getEnterCode());
            EmployeeUtil.ecrmDeleteStafNode(request1);
        if(1 == user.getEmpnew()){
            List<QYTUserInfo> userInfoByPhone = UserUtil.getUserInfoByPhone(user.getPhone(), tCompany.getEnterCode());
            if (null != userInfoByPhone && 0 < userInfoByPhone.size() && 1 == user.getEmpnew()) {
                DeleteStafNodeRequest request1 = new DeleteStafNodeRequest();
                request1.setEmpId(user.getEnterId());
                request1.setMobile(tCompany.getPrincipalPhone());
                request1.setEntercode(tCompany.getEnterCode());
                ResultUtil resultUtil = EmployeeUtil.ecrmDeleteStafNode(request1);
                if(200 != resultUtil.getStatus()){
                    return new ErrorTip(resultUtil.getStatus(), resultUtil.getMsg());
                }
            }
        }
        //不删除中台数据，需要线下删除
        this.userService.setStatus(userId, ManagerStatus.DELETED.getCode());
        return SUCCESS_TIP;
    }

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/taxi/TOrderTaxiController.java

@@ -60,7 +60,7 @@
    @Resource
    private MongoTemplate mongoTemplate;
    
    @Resource
    @Autowired
    private ShiroExtUtil shiroExtUtil;
    
    /**

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/util/UploadUtil.java

@@ -9,7 +9,7 @@
import com.stylefeng.guns.modular.system.service.ITImgMidService;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import com.stylefeng.guns.modular.system.util.qianyuntong.NCOSSUtil;
import com.stylefeng.guns.modular.system.util.qianyuntong.QianYunTongProperties;
import com.stylefeng.guns.modular.system.util.qianyuntong.QianYunTongConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -36,6 +36,9 @@

    @Autowired
    private GunsProperties gunsProperties;
    
    @Autowired
    private QianYunTongConfig qianYunTongConfig;

    /**
     * 上传图片(上传到项目的webapp/static/img)
@@ -70,7 +73,7 @@
            MultipartFile file = (MultipartFile) multipartRequest.getFile("myfile");
            if (file.getSize() != 0) {
                String pictureName = UUID.randomUUID().toString() + "." + ToolUtil.getFileSuffix(file.getOriginalFilename());
                String bucketName = QianYunTongProperties.bucketName;
                String bucketName = qianYunTongConfig.getBucketName();
                Bucket grjyTest = NCOSSUtil.getBucketInfo(bucketName);
                if (null == grjyTest) {
                    //创建桶
@@ -92,7 +95,7 @@
                    throw new RuntimeException("上传图片失败");
                }
    
                ossUpload = "https://traffic.qytzt.cn/v1/AUTH_" + QianYunTongProperties.account + "/" + bucketName + "/" + key;
                ossUpload = "https://traffic.qytzt.cn/v1/AUTH_" + qianYunTongConfig.getAccount() + "/" + bucketName + "/" + key;


//                ossUpload = OssUploadUtil.ossUpload(request, file);
@@ -113,7 +116,7 @@
    public ResultUtil image1(@RequestPart("file") MultipartFile file, HttpServletRequest request) {
        try {
            String pictureName = UUID.randomUUID().toString() + "." + ToolUtil.getFileSuffix(file.getOriginalFilename());
            String bucketName = QianYunTongProperties.bucketName;
            String bucketName = qianYunTongConfig.getBucketName();
            Bucket grjyTest = NCOSSUtil.getBucketInfo(bucketName);
            if (null == grjyTest) {
                //创建桶
@@ -135,7 +138,7 @@
                return ResultUtil.error("上传图片失败");
            }
    
            pictureName = "https://traffic.qytzt.cn/v1/AUTH_" + QianYunTongProperties.account + "/" + bucketName + "/" + key;
            pictureName = "https://traffic.qytzt.cn/v1/AUTH_" + qianYunTongConfig.getAccount() + "/" + bucketName + "/" + key;

//            String pictureName = OssUploadUtil.ossUpload(request, file);
            System.out.println("mediaResp");
@@ -158,7 +161,7 @@
        String suffix = picture.getOriginalFilename().substring(picture.getOriginalFilename().lastIndexOf("."));
        String pictureName = UUID.randomUUID().toString() + suffix;
        try {
            String bucketName = QianYunTongProperties.bucketName;
            String bucketName = qianYunTongConfig.getBucketName();
            Bucket grjyTest = NCOSSUtil.getBucketInfo(bucketName);
            if (null == grjyTest) {
                //创建桶
@@ -180,7 +183,7 @@
                throw new RuntimeException("上传图片失败");
            }
    
            pictureName = "https://traffic.qytzt.cn/v1/AUTH_" + QianYunTongProperties.account + "/" + bucketName + "/" + key;
            pictureName = "https://traffic.qytzt.cn/v1/AUTH_" + qianYunTongConfig.getAccount() + "/" + bucketName + "/" + key;
        } catch (Exception e) {
            log.error(e.getMessage(), e);
            throw new GunsException(BizExceptionEnum.UPLOAD_ERROR);
@@ -197,7 +200,7 @@
        try {
            // 上传文件目录
            String pictureName = UUID.randomUUID().toString() + "." + ToolUtil.getFileSuffix(picture.getOriginalFilename());
            String bucketName = QianYunTongProperties.bucketName;
            String bucketName = qianYunTongConfig.getBucketName();
            Bucket grjyTest = NCOSSUtil.getBucketInfo(bucketName);
            if (null == grjyTest) {
                //创建桶
@@ -219,7 +222,7 @@
                throw new RuntimeException("上传图片失败");
            }
    
            pictureName = "https://traffic.qytzt.cn/v1/AUTH_" + QianYunTongProperties.account + "/" + bucketName + "/" + key;
            pictureName = "https://traffic.qytzt.cn/v1/AUTH_" + qianYunTongConfig.getAccount() + "/" + bucketName + "/" + key;
//            pictureName = OssUploadUtil.ossUpload(super.getHttpServletRequest(), picture);
    
            String result = "{'original': '" + picture.getOriginalFilename() + "', 'state': 'SUCCESS', 'url': '" + pictureName + "'}";

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCompany.java

@@ -277,6 +277,10 @@
     * 中台企业编号
     */
    private String enterCode;
    /**
     * 中台新增标识（0=否，1=是）
     */
    private Integer enterNew;
    
    private Integer version;
    
@@ -840,6 +844,14 @@
        OnCall = onCall;
    }
    
    public Integer getEnterNew() {
        return enterNew;
    }
    
    public void setEnterNew(Integer enterNew) {
        this.enterNew = enterNew;
    }
    
    @Override
    protected Serializable pkVal() {
        return this.id;

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriver.java

@@ -295,6 +295,11 @@
     */
    @TableField("entercode")
    private String entercode;
    /**
     * 中台新增状态（0=否，1=是）
     */
    @TableField("empnew")
    private Integer empnew;
    
    public Double getActivityMoney() {
        return activityMoney;
@@ -856,6 +861,14 @@
        this.entercode = entercode;
    }
    
    public Integer getEmpnew() {
        return empnew;
    }
    
    public void setEmpnew(Integer empnew) {
        this.empnew = empnew;
    }
    
    @Override
    protected Serializable pkVal() {
        return this.id;

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/User.java

@@ -106,6 +106,11 @@
     */
    @TableField("entercode")
    private String entercode;
    /**
     * 中台新增状态（0=否，1=是）
     */
    @TableField("empnew")
    private Integer empnew;
    
    public Integer getRoleType() {
        return roleType;
@@ -267,6 +272,14 @@
        this.entercode = entercode;
    }
    
    public Integer getEmpnew() {
        return empnew;
    }
	
    public void setEmpnew(Integer empnew) {
        this.empnew = empnew;
    }
	
    @Override
    protected Serializable pkVal() {
        return this.id;

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityServiceImpl.java

@@ -44,7 +44,7 @@
    @Autowired
    private IDriverActivityRegisteredService driverActivityRegisteredService;
    
    @Resource
    @Autowired
    private ShiroExtUtil shiroExtUtil;
    
    @Override

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/IncomeServiceImpl.java

@@ -43,7 +43,7 @@
    
    @Autowired
    private ITDriverService driverService;
    @Resource
    @Autowired
    private ShiroExtUtil shiroExtUtil;
    
    

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/RecruitServiceImpl.java

@@ -6,9 +6,9 @@
import com.stylefeng.guns.modular.system.dao.RecruitMapper;
import com.stylefeng.guns.modular.system.model.Recruit;
import com.stylefeng.guns.modular.system.service.IRecruitService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -16,7 +16,7 @@
@Service
public class RecruitServiceImpl extends ServiceImpl<RecruitMapper, Recruit> implements IRecruitService {
    
    @Resource
    @Autowired
    private ShiroExtUtil shiroExtUtil;
    
    @Override

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/SellingCarServiceImpl.java

@@ -32,7 +32,7 @@
    @Autowired
    private ITSystemNoticeService systemNoticeService;
    
    @Resource
    @Autowired
    private ShiroExtUtil shiroExtUtil;
    
    

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java

@@ -9,9 +9,9 @@
import com.stylefeng.guns.modular.system.model.TDriver;
import com.stylefeng.guns.modular.system.service.ITDriverService;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.HashMap;
import java.util.List;
@@ -28,7 +28,7 @@
@Service
public class TDriverServiceImpl extends ServiceImpl<TDriverMapper, TDriver> implements ITDriverService {
    
    @Resource
    @Autowired
    private ShiroExtUtil shiroExtUtil;
    
    @Override

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderTaxiServiceImpl.java

@@ -50,7 +50,7 @@
    @Autowired
    private IIncomeService incomeService;
    
    @Resource
    @Autowired
    private ShiroExtUtil shiroExtUtil;
    
    

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityServiceImpl.java

@@ -54,7 +54,7 @@
    
    @Autowired
    private IUserService userService;
    @Resource
    @Autowired
    private ShiroExtUtil shiroExtUtil;
    
    @Override

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/transfer/UserDto.java

@@ -45,6 +45,11 @@
     */
    @TableField("entercode")
    private String entercode;
    /**
     * 中台新增状态（0=否，1=是）
     */
    @TableField("empnew")
    private Integer empnew;
    
    
    public Integer getId() {
@@ -190,4 +195,12 @@
    public void setEntercode(String entercode) {
        this.entercode = entercode;
    }
	
    public Integer getEmpnew() {
        return empnew;
    }
	
    public void setEmpnew(Integer empnew) {
        this.empnew = empnew;
    }
}

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/EmployeeUtil.java

@@ -5,6 +5,8 @@
import com.google.gson.Gson;
import com.open.common.util.OpenApiClient;
import com.open.common.util.SystemParameterNames;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import com.stylefeng.guns.modular.system.util.SpringContextsUtil;
import com.stylefeng.guns.modular.system.util.qianyuntong.model.*;
import lombok.extern.slf4j.Slf4j;

@@ -22,6 +24,7 @@
@Slf4j
public class EmployeeUtil {
    
    private static QianYunTongConfig qianYunTongConfig = SpringContextsUtil.getBean(QianYunTongConfig.class).getQianYunTongConfig();;
    
    public static void main(String[] args) {
//        SaveStaffNodeRequest request = new SaveStaffNodeRequest();
@@ -42,11 +45,11 @@
        
        
        
        DeleteStafNodeRequest deleteStafNodeRequest = new DeleteStafNodeRequest();
        deleteStafNodeRequest.setEmpId(11451968L);
        deleteStafNodeRequest.setEntercode("981100006318563");
        deleteStafNodeRequest.setMobile("13688394165");
        EmployeeUtil.ecrmDeleteStafNode(deleteStafNodeRequest);
//        DeleteStafNodeRequest deleteStafNodeRequest = new DeleteStafNodeRequest();
//        deleteStafNodeRequest.setEmpId(11451968L);
//        deleteStafNodeRequest.setEntercode("981100006318563");
//        deleteStafNodeRequest.setMobile("13688394165");
//        EmployeeUtil.ecrmDeleteStafNode(deleteStafNodeRequest);
    }
    
    
@@ -57,11 +60,11 @@
     */
    public static Boolean editStaffNode(EditStaffNodeRequest request){
        //请求路径
        String url = QianYunTongProperties.apiUrl + "/openapi/rest/1.0/editStaffNode";
        String url = qianYunTongConfig.getApiUrl() + "/openapi/rest/1.0/editStaffNode";
        //私钥文件
        String skprivateKeyFile = QianYunTongProperties.privateKeyPath;
        String skprivateKeyFile = qianYunTongConfig.getPrivateKeyPath();
        //注意：私钥文件需要开发者手动新建.pem文件，将委办局提供的私钥串复制进文件里用于sign加密
        String appKey = QianYunTongProperties.appkey;//appkey
        String appKey = qianYunTongConfig.getAppkey();//appkey
        Map<String, String> headers = new HashMap<>();
        headers.put("Content-Type", "application/json");
        Map<String, Object> contentMap = new HashMap<String, Object>();
@@ -72,8 +75,8 @@
        String messageId = UUID.randomUUID().toString().replaceAll("-", "");
        contentMap.put(SystemParameterNames.getAppKey(), appKey);
        contentMap.put(SystemParameterNames.getMessage_id(), messageId);
        contentMap.put(SystemParameterNames.getUserName(), QianYunTongProperties.userName);
        contentMap.put(SystemParameterNames.getStatus(), QianYunTongProperties.status);
        contentMap.put(SystemParameterNames.getUserName(), qianYunTongConfig.getUserName());
        contentMap.put(SystemParameterNames.getStatus(), qianYunTongConfig.getStatus());
        contentMap.put("content", new Gson().toJson(request));
        log.info("【企业修改员工信息】请求地址:" + url);
        log.info("【企业修改员工信息】请求参数:" + JSON.toJSONString(contentMap));
@@ -100,13 +103,13 @@
     * @param request
     * @return
     */
    public static Boolean ecrmDeleteStafNode(DeleteStafNodeRequest request){
    public static ResultUtil ecrmDeleteStafNode(DeleteStafNodeRequest request){
        //请求路径
        String url = QianYunTongProperties.apiUrl + "/openapi/rest/1.0/ecrmDeleteStafNode";
        String url = qianYunTongConfig.getApiUrl() + "/openapi/rest/1.0/ecrmDeleteStafNode";
        //私钥文件
        String skprivateKeyFile = QianYunTongProperties.privateKeyPath;
        String skprivateKeyFile = qianYunTongConfig.getPrivateKeyPath();
        //注意：私钥文件需要开发者手动新建.pem文件，将委办局提供的私钥串复制进文件里用于sign加密
        String appKey = QianYunTongProperties.appkey;//appkey
        String appKey = qianYunTongConfig.getAppkey();//appkey
        String content = "";//业务参数
        Map<String, String> headers = new HashMap<>();
        headers.put("Content-Type", "application/json");
@@ -118,8 +121,8 @@
        String messageId = UUID.randomUUID().toString().replaceAll("-", "");
        contentMap.put(SystemParameterNames.getAppKey(), appKey);
        contentMap.put(SystemParameterNames.getMessage_id(), messageId);
        contentMap.put(SystemParameterNames.getUserName(), QianYunTongProperties.userName);
        contentMap.put(SystemParameterNames.getStatus(), QianYunTongProperties.status);
        contentMap.put(SystemParameterNames.getUserName(), qianYunTongConfig.getUserName());
        contentMap.put(SystemParameterNames.getStatus(), qianYunTongConfig.getStatus());
        contentMap.put("content", new Gson().toJson(request));
        log.info("【企业删除人员】请求地址:" + url);
        log.info("【企业删除人员】请求参数:" + JSON.toJSONString(contentMap));
@@ -129,15 +132,15 @@
        String retCode = jsonObject.getString("retCode");
        if (!"0".equals(retCode)) {
            log.error("【企业删除人员】请求失败:" + result);
            throw new RuntimeException("【企业删除人员】请求失败:" + result);
            return ResultUtil.error("【企业删除人员】请求失败:" + result);
        }
        JSONObject object = jsonObject.getJSONObject("object");
        String status = object.getString("status");
        if (!"0".equals(status)) {
            log.error("【企业删除人员】失败:" + object.toJSONString());
            throw new RuntimeException("【企业删除人员】失败:" + object.toJSONString());
            return ResultUtil.error("【企业删除人员】失败:" + object.getString("desc"));
        }
        return true;
        return ResultUtil.success();
    }
    
    
@@ -148,11 +151,11 @@
     */
    public static StaffNodeInfo getStaffNode(GetStaffNodeRequest request){
        //请求路径
        String url = QianYunTongProperties.apiUrl + "/openapi/rest/1.0/getStaffNode";
        String url = qianYunTongConfig.getApiUrl() + "/openapi/rest/1.0/getStaffNode";
        //私钥文件
        String skprivateKeyFile = QianYunTongProperties.privateKeyPath;
        String skprivateKeyFile = qianYunTongConfig.getPrivateKeyPath();
        //注意：私钥文件需要开发者手动新建.pem文件，将委办局提供的私钥串复制进文件里用于sign加密
        String appKey = QianYunTongProperties.appkey;//appkey
        String appKey = qianYunTongConfig.getAppkey();//appkey
        Map<String, String> headers = new HashMap<>();
        headers.put("Content-Type", "application/json");
        Map<String, Object> contentMap = new HashMap<String, Object>();
@@ -163,8 +166,8 @@
        String messageId = UUID.randomUUID().toString().replaceAll("-", "");
        contentMap.put(SystemParameterNames.getAppKey(), appKey);
        contentMap.put(SystemParameterNames.getMessage_id(), messageId);
        contentMap.put(SystemParameterNames.getUserName(), QianYunTongProperties.userName);
        contentMap.put(SystemParameterNames.getStatus(), QianYunTongProperties.status);
        contentMap.put(SystemParameterNames.getUserName(), qianYunTongConfig.getUserName());
        contentMap.put(SystemParameterNames.getStatus(), qianYunTongConfig.getStatus());
        contentMap.put("content", new Gson().toJson(request));
        log.info("【根据员工ID获取人员信息】请求地址:" + url);
        log.info("【根据员工ID获取人员信息】请求参数:" + JSON.toJSONString(contentMap));
@@ -191,13 +194,13 @@
     * @param request
     * @return
     */
    public static SaveStaffNode saveStaffNode(SaveStaffNodeRequest request){
    public static ResultUtil<SaveStaffNode> saveStaffNode(SaveStaffNodeRequest request){
        //请求路径
        String url = QianYunTongProperties.apiUrl + "/openapi/rest/1.0/saveStaffNode";
        String url = qianYunTongConfig.getApiUrl() + "/openapi/rest/1.0/saveStaffNode";
        //私钥文件
        String skprivateKeyFile = QianYunTongProperties.privateKeyPath;
        String skprivateKeyFile = qianYunTongConfig.getPrivateKeyPath();
        //注意：私钥文件需要开发者手动新建.pem文件，将委办局提供的私钥串复制进文件里用于sign加密
        String appKey = QianYunTongProperties.appkey;//appkey
        String appKey = qianYunTongConfig.getAppkey();//appkey
        Map<String, String> headers = new HashMap<>();
        headers.put("Content-Type", "application/json");
        Map<String, Object> contentMap = new HashMap<String, Object>();
@@ -208,8 +211,8 @@
        String messageId = UUID.randomUUID().toString().replaceAll("-", "");
        contentMap.put(SystemParameterNames.getAppKey(), appKey);
        contentMap.put(SystemParameterNames.getMessage_id(), messageId);
        contentMap.put(SystemParameterNames.getUserName(), QianYunTongProperties.userName);
        contentMap.put(SystemParameterNames.getStatus(), QianYunTongProperties.status);
        contentMap.put(SystemParameterNames.getUserName(), qianYunTongConfig.getUserName());
        contentMap.put(SystemParameterNames.getStatus(), qianYunTongConfig.getStatus());
        contentMap.put("content", new Gson().toJson(request));
        log.info("【企业增加员工】请求地址:" + url);
        log.info("【企业增加员工】请求参数:" + JSON.toJSONString(contentMap));
@@ -219,15 +222,15 @@
        String retCode = jsonObject.getString("retCode");
        if (!"0".equals(retCode)) {
            log.error("【企业增加员工】请求失败:" + result);
            throw new RuntimeException("【企业增加员工】请求失败:" + result);
            return ResultUtil.error("【企业增加员工】请求失败:" + result);
        }
        JSONObject object = jsonObject.getJSONObject("object");
        String status = object.getString("status");
        if (!"0".equals(status)) {
            log.error("【企业增加员工】失败:" + object.toJSONString());
            throw new RuntimeException("【企业增加员工】失败:" + object.toJSONString());
            return ResultUtil.error("【企业增加员工】失败:" + object.getString("desc"));
        }
        SaveStaffNode saveStaffNode = object.getObject("data", SaveStaffNode.class);
        return saveStaffNode;
        return ResultUtil.success(saveStaffNode);
    }
}

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/EnterpriseUtil.java

@@ -5,6 +5,8 @@
import com.google.gson.Gson;
import com.open.common.util.OpenApiClient;
import com.open.common.util.SystemParameterNames;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import com.stylefeng.guns.modular.system.util.SpringContextsUtil;
import com.stylefeng.guns.modular.system.util.qianyuntong.model.*;
import lombok.extern.slf4j.Slf4j;

@@ -23,6 +25,7 @@
@Slf4j
public class EnterpriseUtil {
    
    private static QianYunTongConfig qianYunTongConfig = SpringContextsUtil.getBean(QianYunTongConfig.class).getQianYunTongConfig();
    
    /**
     * 根据社会信用代码判断企业是否已存在
@@ -32,11 +35,11 @@
     */
    public static CheckEnterExist checkEnterExistByEnterIdCardNo(String uscc) {
        //请求路径
        String url = QianYunTongProperties.apiUrl + "/openapi/rest/1.0/check_enter_exist_by_enterIdCardNo";
        String url = qianYunTongConfig.getApiUrl() + "/openapi/rest/1.0/check_enter_exist_by_enterIdCardNo";
        //私钥文件
        String skprivateKeyFile = QianYunTongProperties.privateKeyPath;
        String skprivateKeyFile = qianYunTongConfig.getPrivateKeyPath();
        //注意：私钥文件需要开发者手动新建.pem文件，将委办局提供的私钥串复制进文件里用于sign加密
        String appKey = QianYunTongProperties.appkey;//appkey
        String appKey = qianYunTongConfig.getAppkey();//appkey
        Map<String, String> headers = new HashMap<>();
        headers.put("Content-Type", "application/json");
        Map<String, Object> map = new HashMap<>();
@@ -47,8 +50,8 @@
        String messageId = UUID.randomUUID().toString().replaceAll("-", "");
        map.put(SystemParameterNames.getAppKey(), appKey);
        map.put(SystemParameterNames.getMessage_id(), messageId);
        map.put(SystemParameterNames.getUserName(), QianYunTongProperties.userName);
        map.put(SystemParameterNames.getStatus(), QianYunTongProperties.status);
        map.put(SystemParameterNames.getUserName(), qianYunTongConfig.getUserName());
        map.put(SystemParameterNames.getStatus(), qianYunTongConfig.getStatus());
        map.put("content", "{\"uscc\":\"" + uscc + "\"}");
        log.info("【根据社会信用代码判断企业是否已存在】请求地址:" + url);
        log.info("【根据社会信用代码判断企业是否已存在】请求参数:" + JSON.toJSONString(map));
@@ -78,11 +81,11 @@
     */
    public static CheckEnterExist checkEnterNameExist(String enterName) {
        //请求路径
        String url = QianYunTongProperties.apiUrl + "/openapi/rest/1.0/checkEnterNameExist";
        String url = qianYunTongConfig.getApiUrl() + "/openapi/rest/1.0/checkEnterNameExist";
        //私钥文件
        String skprivateKeyFile = QianYunTongProperties.privateKeyPath;
        String skprivateKeyFile = qianYunTongConfig.getPrivateKeyPath();
        //注意：私钥文件需要开发者手动新建.pem文件，将委办局提供的私钥串复制进文件里用于sign加密
        String appKey = QianYunTongProperties.appkey;//appkey
        String appKey = qianYunTongConfig.getAppkey();//appkey
        Map<String, String> headers = new HashMap<>();
        headers.put("Content-Type", "application/json");
        Map<String, Object> map = new HashMap<>();
@@ -93,8 +96,8 @@
        String messageId = UUID.randomUUID().toString().replaceAll("-", "");
        map.put(SystemParameterNames.getAppKey(), appKey);
        map.put(SystemParameterNames.getMessage_id(), messageId);
        map.put(SystemParameterNames.getUserName(), QianYunTongProperties.userName);
        map.put(SystemParameterNames.getStatus(), QianYunTongProperties.status);
        map.put(SystemParameterNames.getUserName(), qianYunTongConfig.getUserName());
        map.put(SystemParameterNames.getStatus(), qianYunTongConfig.getStatus());
        map.put("content", "{\"enterName\":\"" + enterName + "\"}");
        log.info("【根据企业名称判断企业是否已存在】请求地址:" + url);
        log.info("【根据企业名称判断企业是否已存在】请求参数:" + JSON.toJSONString(map));
@@ -124,11 +127,11 @@
     */
    public static EnterpriseInfo getEnterpriseDetail(String enter_code) {
        //请求路径
        String url = QianYunTongProperties.apiUrl + "/openapi/rest/1.0/getEnterpriseDetail";
        String url = qianYunTongConfig.getApiUrl() + "/openapi/rest/1.0/getEnterpriseDetail";
        //私钥文件
        String skprivateKeyFile = QianYunTongProperties.privateKeyPath;
        String skprivateKeyFile = qianYunTongConfig.getPrivateKeyPath();
        //注意：私钥文件需要开发者手动新建.pem文件，将委办局提供的私钥串复制进文件里用于sign加密
        String appKey = QianYunTongProperties.appkey;//appkey
        String appKey = qianYunTongConfig.getAppkey();//appkey
        Map<String, String> headers = new HashMap<>();
        headers.put("Content-Type", "application/json");
        Map<String, Object> map = new HashMap<>();
@@ -139,8 +142,8 @@
        String messageId = UUID.randomUUID().toString().replaceAll("-", "");
        map.put(SystemParameterNames.getAppKey(), appKey);
        map.put(SystemParameterNames.getMessage_id(), messageId);
        map.put(SystemParameterNames.getUserName(), QianYunTongProperties.userName);
        map.put(SystemParameterNames.getStatus(), QianYunTongProperties.status);
        map.put(SystemParameterNames.getUserName(), qianYunTongConfig.getUserName());
        map.put(SystemParameterNames.getStatus(), qianYunTongConfig.getStatus());
        map.put("content", "{\"enter_code\":\"" + enter_code + "\"}");
        log.info("【查询企业详情】请求地址:" + url);
        log.info("【查询企业详情】请求参数:" + JSON.toJSONString(map));
@@ -171,11 +174,11 @@
     */
    public static Boolean modifyEnterpriseInfo(ModifyEnterpriseInfoRequest request) {
        //请求路径
        String url = QianYunTongProperties.apiUrl + "/openapi/rest/1.0/modifyEnterpriseInfo";
        String url = qianYunTongConfig.getApiUrl() + "/openapi/rest/1.0/modifyEnterpriseInfo";
        //私钥文件
        String skprivateKeyFile = QianYunTongProperties.privateKeyPath;
        String skprivateKeyFile = qianYunTongConfig.getPrivateKeyPath();
        //注意：私钥文件需要开发者手动新建.pem文件，将委办局提供的私钥串复制进文件里用于sign加密
        String appKey = QianYunTongProperties.appkey;//appkey
        String appKey = qianYunTongConfig.getAppkey();//appkey
        Map<String, String> headers = new HashMap<>();
        headers.put("Content-Type", "application/json");
        Map<String, Object> map = new HashMap<>();
@@ -186,8 +189,8 @@
        String messageId = UUID.randomUUID().toString().replaceAll("-", "");
        map.put(SystemParameterNames.getAppKey(), appKey);
        map.put(SystemParameterNames.getMessage_id(), messageId);
        map.put(SystemParameterNames.getUserName(), QianYunTongProperties.userName);
        map.put(SystemParameterNames.getStatus(), QianYunTongProperties.status);
        map.put(SystemParameterNames.getUserName(), qianYunTongConfig.getUserName());
        map.put(SystemParameterNames.getStatus(), qianYunTongConfig.getStatus());
        map.put("content", new Gson().toJson(request));
        log.info("【修改企业基本信息】请求地址:" + url);
        log.info("【修改企业基本信息】请求参数:" + JSON.toJSONString(map));
@@ -211,11 +214,11 @@
     */
    public static CreateEnterprise createEnterprise(CreateEnterpriseRequest request) {
        //请求路径
        String url = QianYunTongProperties.apiUrl + "/openapi/rest/1.0/createEnterprise";
        String url = qianYunTongConfig.getApiUrl() + "/openapi/rest/1.0/createEnterprise";
        //私钥文件
        String skprivateKeyFile = QianYunTongProperties.privateKeyPath;
        String skprivateKeyFile = qianYunTongConfig.getPrivateKeyPath();
        //注意：私钥文件需要开发者手动新建.pem文件，将委办局提供的私钥串复制进文件里用于sign加密
        String appKey = QianYunTongProperties.appkey;//appkey
        String appKey = qianYunTongConfig.getAppkey();//appkey
        Map<String, String> headers = new HashMap<>();
        headers.put("Content-Type", "application/json");
        Map<String, Object> map = new HashMap<String, Object>();
@@ -226,8 +229,8 @@
        String messageId = UUID.randomUUID().toString().replaceAll("-", "");
        map.put(SystemParameterNames.getAppKey(), appKey);
        map.put(SystemParameterNames.getMessage_id(), messageId);
        map.put(SystemParameterNames.getUserName(), QianYunTongProperties.userName);
        map.put(SystemParameterNames.getStatus(), QianYunTongProperties.status);
        map.put(SystemParameterNames.getUserName(), qianYunTongConfig.getUserName());
        map.put(SystemParameterNames.getStatus(), qianYunTongConfig.getStatus());
        map.put("content", new Gson().toJson(request));
        
        log.info("【创建企业】请求地址:" + url);
@@ -257,13 +260,13 @@
     * @param operator 管理员手机号码
     * @return
     */
    public static boolean delEnterprise(String enterNum, String operator) {
    public static ResultUtil delEnterprise(String enterNum, String operator) {
        //请求路径
        String url = QianYunTongProperties.apiUrl + "/openapi/rest/1.0/delCompany";
        String url = qianYunTongConfig.getApiUrl() + "/openapi/rest/1.0/delCompany";
        //私钥文件
        String skprivateKeyFile = QianYunTongProperties.privateKeyPath;
        String skprivateKeyFile = qianYunTongConfig.getPrivateKeyPath();
        //注意：私钥文件需要开发者手动新建.pem文件，将委办局提供的私钥串复制进文件里用于sign加密
        String appKey = QianYunTongProperties.appkey;//appkey
        String appKey = qianYunTongConfig.getAppkey();//appkey
        Map<String, String> headers = new HashMap<>();
        headers.put("Content-Type", "application/json");
        Map<String, Object> map = new HashMap<String, Object>();
@@ -274,8 +277,8 @@
        String messageId = UUID.randomUUID().toString().replaceAll("-", "");
        map.put(SystemParameterNames.getAppKey(), appKey);
        map.put(SystemParameterNames.getMessage_id(), messageId);
        map.put(SystemParameterNames.getUserName(), QianYunTongProperties.userName);
        map.put(SystemParameterNames.getStatus(), QianYunTongProperties.status);
        map.put(SystemParameterNames.getUserName(), qianYunTongConfig.getUserName());
        map.put(SystemParameterNames.getStatus(), qianYunTongConfig.getStatus());
        map.put("content", "{\"enterNum\":\"" + enterNum + "\",\"operator\":\"" + operator + "\"}");
        
        log.info("【删除企业信息】请求地址:" + url);
@@ -286,15 +289,15 @@
        String retCode = jsonObject.getString("retCode");
        if (!"0".equals(retCode)) {
            log.error("【删除企业信息】请求失败:" + result);
            throw new RuntimeException("【删除企业信息】请求失败:" + result);
            return ResultUtil.error("【删除企业信息】请求失败:" + result);
        }
        JSONObject object = jsonObject.getJSONObject("object");
        String status = object.getString("status");
        if (!"0".equals(status)) {
            log.error("【删除企业信息】请求失败:" + object.toJSONString());
            throw new RuntimeException("【删除企业信息】请求失败:" + object.toJSONString());
            return ResultUtil.error("【删除企业信息】请求失败:" + object.getString("desc"));
        }
        return true;
        return ResultUtil.success();
    }
    
    

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/NCOSSUtil.java

@@ -8,6 +8,7 @@
import com.heredata.hos.model.PutObjectResult;
import com.heredata.hos.model.bucket.Bucket;
import com.heredata.model.VoidResult;
import com.stylefeng.guns.modular.system.util.SpringContextsUtil;
import lombok.extern.slf4j.Slf4j;

import java.io.InputStream;
@@ -19,7 +20,9 @@
 */
@Slf4j
public class NCOSSUtil {

	
    private static QianYunTongConfig qianYunTongConfig = SpringContextsUtil.getBean(QianYunTongConfig.class).getQianYunTongConfig();;
	
    /**
     * 创建桶
     * @param bucketName
@@ -32,7 +35,7 @@
         * accessKey：向UAAS服务请求到的access_key
         * secretKey：向UAAS服务请求到的secret_key
         */
        HOS hos = new HOSClientBuilder().build(QianYunTongProperties.endPoint, QianYunTongProperties.account, QianYunTongProperties.accessKey, QianYunTongProperties.secretKey);
        HOS hos = new HOSClientBuilder().build(qianYunTongConfig.getEndPoint(), qianYunTongConfig.getAccount(), qianYunTongConfig.getAccessKey(), qianYunTongConfig.getSecretKey());
        try {
            // 创建请求对象，并且设置创建桶名为"example"的桶
            CreateBucketRequest createBucketRequest = new CreateBucketRequest(bucketName);
@@ -61,7 +64,7 @@
         * accessKey：向UAAS服务请求到的access_key
         * secretKey：向UAAS服务请求到的secret_key
         */
        HOS hos = new HOSClientBuilder().build(QianYunTongProperties.endPoint, QianYunTongProperties.account, QianYunTongProperties.accessKey, QianYunTongProperties.secretKey);
        HOS hos = new HOSClientBuilder().build(qianYunTongConfig.getEndPoint(), qianYunTongConfig.getAccount(), qianYunTongConfig.getAccessKey(), qianYunTongConfig.getSecretKey());
        try {
            // 查询桶名为"example"的详情
            Bucket bucket = hos.getBucketInfo(bucketName);
@@ -85,7 +88,7 @@
         * accessKey：向UAAS服务请求到的access_key
         * secretKey：向UAAS服务请求到的secret_key
         */
        HOS hos = new HOSClientBuilder().build(QianYunTongProperties.endPoint, QianYunTongProperties.account, QianYunTongProperties.accessKey, QianYunTongProperties.secretKey);
        HOS hos = new HOSClientBuilder().build(qianYunTongConfig.getEndPoint(), qianYunTongConfig.getAccount(), qianYunTongConfig.getAccessKey(), qianYunTongConfig.getSecretKey());
        try {
            VoidResult result = hos.deleteBucket(bucketName);
            if (result.getResponse().isSuccessful()) {
@@ -137,7 +140,7 @@
         * accessKey：向UAAS服务请求到的access_key
         * secretKey：向UAAS服务请求到的secret_key
         */
        HOS hos = new HOSClientBuilder().build(QianYunTongProperties.endPoint, QianYunTongProperties.account, QianYunTongProperties.accessKey, QianYunTongProperties.secretKey);
        HOS hos = new HOSClientBuilder().build(qianYunTongConfig.getEndPoint(), qianYunTongConfig.getAccount(), qianYunTongConfig.getAccessKey(), qianYunTongConfig.getSecretKey());
        // 桶策略字符串
        try {
            VoidResult result = hos.setBucketPolicy(bucketName, policyText);
@@ -167,7 +170,7 @@
         * accessKey：向UAAS服务请求到的access_key
         * secretKey：向UAAS服务请求到的secret_key
         */
        HOS hos = new HOSClientBuilder().build(QianYunTongProperties.endPoint, QianYunTongProperties.account, QianYunTongProperties.accessKey, QianYunTongProperties.secretKey);
        HOS hos = new HOSClientBuilder().build(qianYunTongConfig.getEndPoint(), qianYunTongConfig.getAccount(), qianYunTongConfig.getAccessKey(), qianYunTongConfig.getSecretKey());
        try {
            PutObjectRequest putObjectRequest = new PutObjectRequest(bucketName, key , inputStream);
            PutObjectResult example = hos.putObject(putObjectRequest);
@@ -196,7 +199,7 @@
         * accessKey：向UAAS服务请求到的access_key
         * secretKey：向UAAS服务请求到的secret_key
         */
        HOS hos = new HOSClientBuilder().build(QianYunTongProperties.endPoint, QianYunTongProperties.account, QianYunTongProperties.accessKey, QianYunTongProperties.secretKey);
        HOS hos = new HOSClientBuilder().build(qianYunTongConfig.getEndPoint(), qianYunTongConfig.getAccount(), qianYunTongConfig.getAccessKey(), qianYunTongConfig.getSecretKey());
        try {
            HOSObject example = hos.getObject(bucketName, key);
            if (example.getResponse().isSuccessful()) {
@@ -224,7 +227,7 @@
         * accessKey：向UAAS服务请求到的access_key
         * secretKey：向UAAS服务请求到的secret_key
         */
        HOS hos = new HOSClientBuilder().build(QianYunTongProperties.endPoint, QianYunTongProperties.account, QianYunTongProperties.accessKey, QianYunTongProperties.secretKey);
        HOS hos = new HOSClientBuilder().build(qianYunTongConfig.getEndPoint(), qianYunTongConfig.getAccount(), qianYunTongConfig.getAccessKey(), qianYunTongConfig.getSecretKey());
        try {
            VoidResult example = hos.deleteObject(bucketName, key);
            if (example.getResponse().isSuccessful()) {

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/QianYunTongConfig.java

New file
@@ -0,0 +1,110 @@
package com.stylefeng.guns.modular.system.util.qianyuntong;

import lombok.Data;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;

/**
 * @author zhibing.pu
 * @Date 2025/7/8 11:31
 */
@Data
@Component
public class QianYunTongConfig {
	
    @Value("${spring.profiles.active}")
    private String activeProfile;
	
	
    /**
     * appkey
     */
    private String appkey;
    /**
     * 私钥地址
     */
    private String privateKeyPath;
    /**
     * 消费者账号
     */
    private String userName;
    /**
     * 状态
     * 1：生产环境
     * 2：测试环境
     */
    private String status;
    /**
     * API地址
     */
    private String apiUrl;
    /**
     * 桶名
     */
    private String bucketName;
    /**
     * 小程序appId
     */
    private String appId;
    /**
     * HOS的基础路径(公共前缀)
     */
    private String endPoint;
    /**
     * 账户的ID
     */
    private String account;
    /**
     * 向UAAS服务请求到的access_key
     */
    private String accessKey;
    /**
     * 向UAAS服务请求到的secret_key
     */
    private String secretKey;
	
	
    public QianYunTongConfig getQianYunTongConfig() {
        if("dev".equals(activeProfile)){
            this.appkey = "10001104";
            this.privateKeyPath = "C:\\Users\\39373\\Desktop\\黔云通\\private_key_test.pem";
            this.userName = "xiaofei";
            this.status = "1";
            this.setApiUrl("https://test-zhongtai.stqcloud.com:10070");
            this.setBucketName("bucuTest0625");
            this.setAppId("wxcc3c9058e2b294db");
            this.setEndPoint("http://119.4.112.68:27741/v1");
            this.setAccount("d8bef0a04db511f0b79d01a3e2b7587e");
            this.setAccessKey("TYMFTFD5SIIT15DCCUD7");
            this.setSecretKey("AoI1dkH3yoAvXoaQlREO3ed9mwQJFluLTliS9T1z");
        }
        if("test".equals(activeProfile)){
            this.setAppkey("10001104");
            this.setPrivateKeyPath("/root/server/app/key/private_key_test.pem");
            this.setUserName("xiaofei");
            this.setStatus("1");
            this.setApiUrl("https://test-zhongtai.stqcloud.com:10070");
            this.setBucketName("bucuTest0625");
            this.setAppId("wxcc3c9058e2b294db");
            this.setEndPoint("http://119.4.112.68:27741/v1");
            this.setAccount("d8bef0a04db511f0b79d01a3e2b7587e");
            this.setAccessKey("TYMFTFD5SIIT15DCCUD7");
            this.setSecretKey("AoI1dkH3yoAvXoaQlREO3ed9mwQJFluLTliS9T1z");
        }
        if("prod".equals(activeProfile)){
            this.setAppkey("10001104");
            this.setPrivateKeyPath("/root/server/app/key/private_key.pem");
            this.setUserName("xiwang");
            this.setStatus("1");
            this.setApiUrl("http://jjzhongtai.stqcloud.com:10010");
            this.setBucketName("qyt20250702");
            this.setAppId("wxcc3c9058e2b294db");
            this.setEndPoint("http://119.4.112.68:27741/v1");
            this.setAccount("d8bef0a04db511f0b79d01a3e2b7587e");
            this.setAccessKey("TYMFTFD5SIIT15DCCUD7");
            this.setSecretKey("AoI1dkH3yoAvXoaQlREO3ed9mwQJFluLTliS9T1z");
        }
        return this;
    }
	
}

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/QianYunTongProperties1.java

File was renamed from ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/QianYunTongProperties.java
@@ -6,7 +6,7 @@
 * @author zhibing.pu
 * @Date 2025/6/6 15:03
 */
public interface QianYunTongProperties {
public interface QianYunTongProperties1 {
    /************************************开发/测试start***********************************/
    
//    /**

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/SMSUtil.java

@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSONObject;
import com.open.common.util.OpenApiClient;
import com.open.common.util.SystemParameterNames;
import com.stylefeng.guns.modular.system.util.SpringContextsUtil;
import lombok.extern.slf4j.Slf4j;

import java.text.SimpleDateFormat;
@@ -20,7 +21,7 @@
@Slf4j
public class SMSUtil {
    
	
    private static QianYunTongConfig qianYunTongConfig = SpringContextsUtil.getBean(QianYunTongConfig.class).getQianYunTongConfig();;
    /**
     * 获取易信验证码
     * @param mobile
@@ -28,11 +29,11 @@
     */
    public static String sendVerifyCode(String mobile) {
        //请求路径
        String url = QianYunTongProperties.apiUrl + "/openapi/rest/1.0/sendVerifyCode";
        String url = qianYunTongConfig.getApiUrl() + "/openapi/rest/1.0/sendVerifyCode";
        //私钥文件
        String skprivateKeyFile = QianYunTongProperties.privateKeyPath;
        String skprivateKeyFile = qianYunTongConfig.getPrivateKeyPath();
        //注意：私钥文件需要开发者手动新建.pem文件，将委办局提供的私钥串复制进文件里用于sign加密
        String appKey = QianYunTongProperties.appkey;//appkey
        String appKey = qianYunTongConfig.getAppkey();//appkey
        Map<String, String> headers = new HashMap<>();
        headers.put("Content-Type", "application/json");
        Map<String, Object> contentMap = new HashMap<String, Object>();
@@ -43,8 +44,8 @@
        String messageId = UUID.randomUUID().toString().replaceAll("-", "");
        contentMap.put(SystemParameterNames.getAppKey(), appKey);
        contentMap.put(SystemParameterNames.getMessage_id(), messageId);
        contentMap.put(SystemParameterNames.getUserName(), QianYunTongProperties.userName);
        contentMap.put(SystemParameterNames.getStatus(), QianYunTongProperties.status);
        contentMap.put(SystemParameterNames.getUserName(), qianYunTongConfig.getUserName());
        contentMap.put(SystemParameterNames.getStatus(), qianYunTongConfig.getStatus());
        contentMap.put("content", "{\"mobile\":\"" + mobile + "\"}");
        log.info("【获取易信验证码】请求地址:" + url);
        log.info("【获取易信验证码】请求参数:" + JSON.toJSONString(contentMap));

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/UserUtil.java

@@ -6,6 +6,7 @@
import com.google.gson.Gson;
import com.open.common.util.OpenApiClient;
import com.open.common.util.SystemParameterNames;
import com.stylefeng.guns.modular.system.util.SpringContextsUtil;
import com.stylefeng.guns.modular.system.util.qianyuntong.model.*;
import lombok.extern.slf4j.Slf4j;

@@ -21,6 +22,7 @@
@Slf4j
public class UserUtil {
    
    private static QianYunTongConfig qianYunTongConfig = SpringContextsUtil.getBean(QianYunTongConfig.class).getQianYunTongConfig();
    
    /**
     * 根据手机号码获取人员信息
@@ -30,11 +32,11 @@
     */
    public static List<QYTUserInfo> getUserInfoByPhone(String mobile, String enterNum) {
        //请求路径
        String url = QianYunTongProperties.apiUrl + "/openapi/rest/1.0/getUserInfoByPhone";
        String url = qianYunTongConfig.getApiUrl() + "/openapi/rest/1.0/getUserInfoByPhone";
        //私钥文件
        String skprivateKeyFile = QianYunTongProperties.privateKeyPath;
        String skprivateKeyFile = qianYunTongConfig.getPrivateKeyPath();
        //注意：私钥文件需要开发者手动新建.pem文件，将委办局提供的私钥串复制进文件里用于sign加密
        String appKey = QianYunTongProperties.appkey;//appkey
        String appKey = qianYunTongConfig.getAppkey();//appkey
        Map<String, String> headers = new HashMap<>();
        headers.put("Content-Type", "application/json");
        Map<String, Object> contentMap = new HashMap<String, Object>();
@@ -45,8 +47,8 @@
        String messageId = UUID.randomUUID().toString().replaceAll("-", "");
        contentMap.put(SystemParameterNames.getAppKey(), appKey);
        contentMap.put(SystemParameterNames.getMessage_id(), messageId);
        contentMap.put(SystemParameterNames.getUserName(), QianYunTongProperties.userName);
        contentMap.put(SystemParameterNames.getStatus(), QianYunTongProperties.status);
        contentMap.put(SystemParameterNames.getUserName(), qianYunTongConfig.getUserName());
        contentMap.put(SystemParameterNames.getStatus(), qianYunTongConfig.getStatus());
        Map<String, String> map = new HashMap<>();
        map.put("mobile", mobile);
        if (null != enterNum) {
@@ -88,11 +90,11 @@
     */
    public static RegisterViaMobile registerViaMobile(RegisterViaMobileRequest request) {
        //请求路径
        String url = QianYunTongProperties.apiUrl + "/openapi/rest/1.0/m1_register_via_mobile";
        String url = qianYunTongConfig.getApiUrl() + "/openapi/rest/1.0/m1_register_via_mobile";
        //私钥文件
        String skprivateKeyFile = QianYunTongProperties.privateKeyPath;
        String skprivateKeyFile = qianYunTongConfig.getPrivateKeyPath();
        //注意：私钥文件需要开发者手动新建.pem文件，将委办局提供的私钥串复制进文件里用于sign加密
        String appKey = QianYunTongProperties.appkey;//appkey
        String appKey = qianYunTongConfig.getAppkey();//appkey
        Map<String, String> headers = new HashMap<>();
        headers.put("Content-Type", "application/json");
        Map<String, Object> contentMap = new HashMap<String, Object>();
@@ -103,8 +105,8 @@
        String messageId = UUID.randomUUID().toString().replaceAll("-", "");
        contentMap.put(SystemParameterNames.getAppKey(), appKey);
        contentMap.put(SystemParameterNames.getMessage_id(), messageId);
        contentMap.put(SystemParameterNames.getUserName(), QianYunTongProperties.userName);
        contentMap.put(SystemParameterNames.getStatus(), QianYunTongProperties.status);
        contentMap.put(SystemParameterNames.getUserName(), qianYunTongConfig.getUserName());
        contentMap.put(SystemParameterNames.getStatus(), qianYunTongConfig.getStatus());
        contentMap.put("content", new Gson().toJson(request));
        log.info("【根据手机号注册用户】请求地址:" + url);
        log.info("【根据手机号注册用户】请求参数:" + JSON.toJSONString(contentMap));
@@ -134,11 +136,11 @@
     */
    public static Boolean modifyPwd(ModifyPwdRequest request) {
        //请求路径
        String url = QianYunTongProperties.apiUrl + "/openapi/rest/1.0/modifyPwd";
        String url = qianYunTongConfig.getApiUrl() + "/openapi/rest/1.0/modifyPwd";
        //私钥文件
        String skprivateKeyFile = QianYunTongProperties.privateKeyPath;
        String skprivateKeyFile = qianYunTongConfig.getPrivateKeyPath();
        //注意：私钥文件需要开发者手动新建.pem文件，将委办局提供的私钥串复制进文件里用于sign加密
        String appKey = QianYunTongProperties.appkey;//appkey
        String appKey = qianYunTongConfig.getAppkey();//appkey
        Map<String, String> headers = new HashMap<>();
        headers.put("Content-Type", "application/json");
        Map<String, Object> contentMap = new HashMap<String, Object>();
@@ -149,8 +151,8 @@
        String messageId = UUID.randomUUID().toString().replaceAll("-", "");
        contentMap.put(SystemParameterNames.getAppKey(), appKey);
        contentMap.put(SystemParameterNames.getMessage_id(), messageId);
        contentMap.put(SystemParameterNames.getUserName(), QianYunTongProperties.userName);
        contentMap.put(SystemParameterNames.getStatus(), QianYunTongProperties.status);
        contentMap.put(SystemParameterNames.getUserName(), qianYunTongConfig.getUserName());
        contentMap.put(SystemParameterNames.getStatus(), qianYunTongConfig.getStatus());
        contentMap.put("content", new Gson().toJson(request));
        log.info("【易信用户修改密码】请求地址:" + url);
        log.info("【易信用户修改密码】请求参数:" + JSON.toJSONString(contentMap));
@@ -180,11 +182,11 @@
     */
    public static Boolean resetPwd(ResetPwdRequest request) {
        //请求路径
        String url = QianYunTongProperties.apiUrl + "/openapi/rest/1.0/resetPwd";
        String url = qianYunTongConfig.getApiUrl() + "/openapi/rest/1.0/resetPwd";
        //私钥文件
        String skprivateKeyFile = QianYunTongProperties.privateKeyPath;
        String skprivateKeyFile = qianYunTongConfig.getPrivateKeyPath();
        //注意：私钥文件需要开发者手动新建.pem文件，将委办局提供的私钥串复制进文件里用于sign加密
        String appKey = QianYunTongProperties.appkey;//appkey
        String appKey = qianYunTongConfig.getAppkey();//appkey
        Map<String, String> headers = new HashMap<>();
        headers.put("Content-Type", "application/json");
        Map<String, Object> contentMap = new HashMap<String, Object>();
@@ -195,8 +197,8 @@
        String messageId = UUID.randomUUID().toString().replaceAll("-", "");
        contentMap.put(SystemParameterNames.getAppKey(), appKey);
        contentMap.put(SystemParameterNames.getMessage_id(), messageId);
        contentMap.put(SystemParameterNames.getUserName(), QianYunTongProperties.userName);
        contentMap.put(SystemParameterNames.getStatus(), QianYunTongProperties.status);
        contentMap.put(SystemParameterNames.getUserName(), qianYunTongConfig.getUserName());
        contentMap.put(SystemParameterNames.getStatus(), qianYunTongConfig.getStatus());
        contentMap.put("content", new Gson().toJson(request));
        log.info("【易信重置密码】请求地址:" + url);
        log.info("【易信重置密码】请求参数:" + JSON.toJSONString(contentMap));

 ManagementQYTTravel/guns-admin/src/main/resources/application-dev.yml

@@ -15,7 +15,6 @@
spring:
  profiles:
    active: dev
#    active: prod
  mvc:
    static-path-pattern: /static/**
    view:
@@ -30,13 +29,9 @@
      max-request-size: 500MB
      max-file-size: 500MB
  redis:
    host: 172.21.35.151
    port: 6514
    password: Test_cache@20#25
    database: 0
    timeout: 1000
    cluster:
      nodes: 172.21.35.151:6514,172.21.35.152:6514,172.21.35.153:6514,172.21.35.151:6515,172.21.35.152:6515,172.21.35.153:6515
    host: 127.0.0.1
    port: 6379
    password: 123456

mybatis-plus:
  type-aliases-package: com.stylefeng.guns.modular.system.model
@@ -50,10 +45,10 @@
---
spring:
  datasource:
    url: jdbc:mysql://172.21.35.140:8066/traffic_scdb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
    username: traffic_testusr
    password: QYT_test@20#25
    db-name: traffic_scdb #用来搜集数据库的所有表
    url: jdbc:mysql://127.0.0.1:3306/qyttravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
    username: root
    password: 123456
    db-name: qyttravel #用来搜集数据库的所有表
    filters: wall,mergeStat


@@ -61,7 +56,7 @@
spring:
  data:
    mongodb:
      uri: mongodb://qyt_jtcx:qyt_jtcx2025@172.21.35.197:27017/traveling_track
      uri: mongodb://127.0.0.1:27017/traveling_track


---
@@ -88,7 +83,7 @@

#支付回调地址
#正式环境
callbackPath: https://traffic.qytzt.cn
callbackPath: http://127.0.0.1

#交通部推送数据功能开关
pushMinistryOfTransport: false

 ManagementQYTTravel/guns-admin/src/main/resources/application-prod.yml

New file
@@ -0,0 +1,94 @@
server:
  port: 8010

guns:
  swagger-open: true              #是否开启swagger (true/false)
  kaptcha-open: false             #是否开启登录时验证码 (true/false)
  spring-session-open: true      #是否开启spring session,如果是多机环境需要开启(true/false)
  session-invalidate-time: 1800     #session失效时间(只在单机环境下生效，多机环境在SpringSessionConfig类中配置) 单位：秒
  session-validation-interval: 900  #多久检测一次失效的session(只在单机环境下生效) 单位：秒
  file-upload-path: C:\Users\hi\Desktop\ #文件上传目录(不配置的话为java.io.tmpdir目录)
  picture-server-address: http://192.168.0.43/resources/  #图片服务器地址
  rest-url: http://139.9.249.67:8080/rest/    #前端接口调用基础路径


spring:
  profiles:
    active: prod
  mvc:
    static-path-pattern: /static/**
    view:
      prefix: /WEB-INF/view
  devtools:
    restart:
      enabled: false
      additional-paths: src/main/java
      exclude: static/**,WEB-INF/view/**
  servlet:
    multipart:
      max-request-size: 500MB
      max-file-size: 500MB
  redis:
    host: 172.21.35.151
    port: 6512
    password: SC_cache@20#25
    database: 0
    timeout: 1000
    cluster:
      nodes: 172.21.35.151:6512,172.21.35.152:6512,172.21.35.153:6512,172.21.35.151:6513,172.21.35.152:6513,172.21.35.153:6513

mybatis-plus:
  type-aliases-package: com.stylefeng.guns.modular.system.model
  global-config:
    id-type: 0  #0:数据库ID自增   1:用户输入id  2:全局唯一id(IdWorker)  3:全局唯一ID(uuid)
    db-column-underline: false
  configuration:
    configuration.map-underscore-to-camel-case: true #是否开启自动驼峰命名规则（camel case）映射
    log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl #输出Sql，如需打印Sql注释该配置

---
spring:
  datasource:
    url: jdbc:mysql://172.21.35.140:8066/traffic_scdb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
    username: traffic_scusr
    password: QYT_sc@20#25
    db-name: traffic_scdb #用来搜集数据库的所有表
    filters: wall,mergeStat


---
spring:
  data:
    mongodb:
      uri: mongodb://qyt_jtcx:qyt_jtcx2025@172.21.35.195:27017,172.21.35.196:27017/traveling_track


---
wx:
  grantType: authorization_code #填authorization_code
  appid: 1111 #应用唯一标识，在微信开放平台提交应用审核通过后获得
  appSecret: 1111 #应用密钥AppSecret，在微信开放平台提交应用审核通过后获得
  appletsAppid: wxcc3c9058e2b294db #小程序APPid
  appletsAppSecret: 5610fc6126255ca5f7bd9fa4330338b6 #
  mchId: 1111 #微信支付分配的商户号
  key: 1111 #key为商户平台设置的密钥key：

---

alipay:
  appid: 1111  #应用程序唯一标识
  appPrivateKey: 1111 #开发者应用私钥
  alipayPublicKey: 1111 #应用公钥
  alipay_public_key: 1111 #支付宝公钥



---

#支付回调地址
#正式环境
callbackPath: https://traffic.qytzt.cn

#交通部推送数据功能开关
pushMinistryOfTransport: false


 ManagementQYTTravel/guns-admin/src/main/resources/application-test.yml

New file
@@ -0,0 +1,94 @@
server:
  port: 8010

guns:
  swagger-open: true              #是否开启swagger (true/false)
  kaptcha-open: false             #是否开启登录时验证码 (true/false)
  spring-session-open: true      #是否开启spring session,如果是多机环境需要开启(true/false)
  session-invalidate-time: 1800     #session失效时间(只在单机环境下生效，多机环境在SpringSessionConfig类中配置) 单位：秒
  session-validation-interval: 900  #多久检测一次失效的session(只在单机环境下生效) 单位：秒
  file-upload-path: C:\Users\hi\Desktop\ #文件上传目录(不配置的话为java.io.tmpdir目录)
  picture-server-address: http://192.168.0.43/resources/  #图片服务器地址
  rest-url: http://139.9.249.67:8080/rest/    #前端接口调用基础路径


spring:
  profiles:
    active: test
  mvc:
    static-path-pattern: /static/**
    view:
      prefix: /WEB-INF/view
  devtools:
    restart:
      enabled: false
      additional-paths: src/main/java
      exclude: static/**,WEB-INF/view/**
  servlet:
    multipart:
      max-request-size: 500MB
      max-file-size: 500MB
  redis:
    host: 172.21.35.151
    port: 6514
    password: Test_cache@20#25
    database: 0
    timeout: 1000
    cluster:
      nodes: 172.21.35.151:6514,172.21.35.152:6514,172.21.35.153:6514,172.21.35.151:6515,172.21.35.152:6515,172.21.35.153:6515

mybatis-plus:
  type-aliases-package: com.stylefeng.guns.modular.system.model
  global-config:
    id-type: 0  #0:数据库ID自增   1:用户输入id  2:全局唯一id(IdWorker)  3:全局唯一ID(uuid)
    db-column-underline: false
  configuration:
    configuration.map-underscore-to-camel-case: true #是否开启自动驼峰命名规则（camel case）映射
    log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl #输出Sql，如需打印Sql注释该配置

---
spring:
  datasource:
    url: jdbc:mysql://172.21.35.140:8066/traffic_scdb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
    username: traffic_testusr
    password: QYT_test@20#25
    db-name: traffic_scdb #用来搜集数据库的所有表
    filters: wall,mergeStat


---
spring:
  data:
    mongodb:
      uri: mongodb://qyt_jtcx:qyt_jtcx2025@172.21.35.197:27017/traveling_track


---
wx:
  grantType: authorization_code #填authorization_code
  appid: 1111 #应用唯一标识，在微信开放平台提交应用审核通过后获得
  appSecret: 1111 #应用密钥AppSecret，在微信开放平台提交应用审核通过后获得
  appletsAppid: wxcc3c9058e2b294db #小程序APPid
  appletsAppSecret: 5610fc6126255ca5f7bd9fa4330338b6 #
  mchId: 1111 #微信支付分配的商户号
  key: 1111 #key为商户平台设置的密钥key：

---

alipay:
  appid: 1111  #应用程序唯一标识
  appPrivateKey: 1111 #开发者应用私钥
  alipayPublicKey: 1111 #应用公钥
  alipay_public_key: 1111 #支付宝公钥



---

#支付回调地址
#正式环境
callbackPath: https://traffic.qytzt.cn

#交通部推送数据功能开关
pushMinistryOfTransport: false


 ManagementQYTTravel/guns-admin/src/main/resources/application.yml

@@ -1,95 +1,4 @@
server:
  port: 8010

guns:
  swagger-open: true              #是否开启swagger (true/false)
  kaptcha-open: false             #是否开启登录时验证码 (true/false)
  spring-session-open: true      #是否开启spring session,如果是多机环境需要开启(true/false)
  session-invalidate-time: 1800     #session失效时间(只在单机环境下生效，多机环境在SpringSessionConfig类中配置) 单位：秒
  session-validation-interval: 900  #多久检测一次失效的session(只在单机环境下生效) 单位：秒
  file-upload-path: C:\Users\hi\Desktop\ #文件上传目录(不配置的话为java.io.tmpdir目录)
  picture-server-address: http://192.168.0.43/resources/  #图片服务器地址
  rest-url: http://139.9.249.67:8080/rest/    #前端接口调用基础路径


spring:
  profiles:
#    active: dev
    active: prod
  mvc:
    static-path-pattern: /static/**
    view:
      prefix: /WEB-INF/view
  devtools:
    restart:
      enabled: false
      additional-paths: src/main/java
      exclude: static/**,WEB-INF/view/**
  servlet:
    multipart:
      max-request-size: 500MB
      max-file-size: 500MB
  redis:
    host: 172.21.35.151
    port: 6512
    password: SC_cache@20#25
    database: 0
    timeout: 1000
    cluster:
      nodes: 172.21.35.151:6512,172.21.35.152:6512,172.21.35.153:6512,172.21.35.151:6513,172.21.35.152:6513,172.21.35.153:6513

mybatis-plus:
  type-aliases-package: com.stylefeng.guns.modular.system.model
  global-config:
    id-type: 0  #0:数据库ID自增   1:用户输入id  2:全局唯一id(IdWorker)  3:全局唯一ID(uuid)
    db-column-underline: false
  configuration:
    configuration.map-underscore-to-camel-case: true #是否开启自动驼峰命名规则（camel case）映射
    log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl #输出Sql，如需打印Sql注释该配置

---
spring:
  datasource:
    url: jdbc:mysql://172.21.35.140:8066/traffic_scdb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
    username: traffic_scusr
    password: QYT_sc@20#25
    db-name: traffic_scdb #用来搜集数据库的所有表
    filters: wall,mergeStat


---
spring:
  data:
    mongodb:
      uri: mongodb://qyt_jtcx:qyt_jtcx2025@172.21.35.195:27017,172.21.35.196:27017/traveling_track


---
wx:
  grantType: authorization_code #填authorization_code
  appid: 1111 #应用唯一标识，在微信开放平台提交应用审核通过后获得
  appSecret: 1111 #应用密钥AppSecret，在微信开放平台提交应用审核通过后获得
  appletsAppid: wxcc3c9058e2b294db #小程序APPid
  appletsAppSecret: 5610fc6126255ca5f7bd9fa4330338b6 #
  mchId: 1111 #微信支付分配的商户号
  key: 1111 #key为商户平台设置的密钥key：

---

alipay:
  appid: 1111  #应用程序唯一标识
  appPrivateKey: 1111 #开发者应用私钥
  alipayPublicKey: 1111 #应用公钥
  alipay_public_key: 1111 #支付宝公钥



---

#支付回调地址
#正式环境
callbackPath: https://traffic.qytzt.cn

#交通部推送数据功能开关
pushMinistryOfTransport: false
    active: @spring.active@


 ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_edit.html

@@ -202,7 +202,7 @@
                    <div class="form-group">
                        <label class="col-sm-2 control-label">登录账号：</label>
                        <div class="col-sm-9">
                            <input type="text" class="form-control" id="account" name="account" value="${user.account}">
                            <input type="text" class="form-control" id="account" name="account" value="${user.account}" readonly>
                        </div>
                    </div>
                    <div class="form-group">

 ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_updateFranchisee.html

@@ -119,7 +119,7 @@
                    <div class="form-group">
                        <label class="col-sm-3 control-label">登录账号：</label>
                        <div class="col-sm-9">
                            <input type="text" class="form-control" id="account" name="account" value="${user.account}">
                            <input type="text" class="form-control" id="account" name="account" value="${user.account}" readonly>
                        </div>
                    </div>
                    <div class="form-group">

 ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_immediately.html

@@ -115,7 +115,7 @@
                                <div class="col-sm-6">
                                    <div id="networkCarlssueImgPreId">
                                        <div>
                                            @if(isEmpty(item.headImgUrl)){
                                            @if(isEmpty(item.networkCarlssueImg)){
                                            <img onclick="lookBigImg('${ctxPath}/static/img/NoPIC.png')" src="${ctxPath}/static/img/NoPIC.png" style="width:150px;">
                                            @}else{
                                            <img onclick="lookBigImg('${item.networkCarlssueImg}')" src="${item.networkCarlssueImg}" style="width:150px;">

 ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/user/user_edit.html

@@ -27,7 +27,7 @@
                        <#input id="birthday" name="出生日期" underline="true" type="text"
                        value="${user.birthday}"/>

                        <#input id="phone" name="电话" value="${user.phone}"/>
                        <#input id="phone" name="电话" value="${user.phone}" readonly="readonly"/>

                    </div>
                </div>

 ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/report/tCompany.js

@@ -246,8 +246,12 @@
            closeOnConfirm: false
        }, function () {
            var ajax = new $ax(Feng.ctxPath + "/tCompany/delete", function (data) {
                swal("删除成功", "您已经删除了" + nickname + "。", "success");
                TCompany.table.refresh();
                if(data.code == 200){
                    swal("删除成功", "您已经删除了" + nickname + "。", "success");
                    TCompany.table.refresh();
                }else{
                    swal(data.message, "warning");
                }
            }, function (data) {
                swal("删除失败", data.responseJSON.message + "！", "warning");
            });

 ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/report/tDriver.js

@@ -306,8 +306,12 @@
            closeOnConfirm: false
        }, function () {
            var ajax = new $ax(Feng.ctxPath + "/tDriver/delete", function (data) {
                swal("删除成功", "您已经删除了" + nickname + "。", "success");
                AppMachineInfo.table.refresh();
                if(200 == data.code){
                    swal("删除成功", "您已经删除了" + nickname + "。", "success");
                    AppMachineInfo.table.refresh();
                }else{
                    swal("删除失败", data.message + "！", "warning");
                }
            }, function (data) {
                swal("删除失败", data.responseJSON.message + "！", "warning");
            });

 ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tCompany/franchisee.js

@@ -225,8 +225,12 @@
            closeOnConfirm: false
        }, function () {
            var ajax = new $ax(Feng.ctxPath + "/tCompany/delete", function (data) {
                swal("删除成功", "您已经删除了" + nickname + "。", "success");
                Franchisee.table.refresh();
                if(data.code == 200){
                    swal("删除成功", "您已经删除了" + nickname + "。", "success");
                    TCompany.table.refresh();
                }else{
                    swal(data.message, "warning");
                }
            }, function (data) {
                swal("删除失败", data.responseJSON.message + "！", "warning");
            });

 ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tCompany/franchisee_info.js

@@ -306,9 +306,13 @@
            Feng.error("登录账户已存在,请重新输入");
            return;
        }
        Feng.success("添加成功!");
        window.parent.Franchisee.table.refresh();
        FranchiseeInfoDlg.close();
        if(200 == data.code){
            Feng.success("添加成功!");
            window.parent.Franchisee.table.refresh();
            FranchiseeInfoDlg.close();
        }else{
            Feng.error("添加失败!" + data.message + "!");
        }
    },function(data){
        Feng.error("添加失败!" + data.responseJSON.message + "!");
    });

 ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tCompany/tCompany.js

@@ -246,8 +246,12 @@
            closeOnConfirm: false
        }, function () {
            var ajax = new $ax(Feng.ctxPath + "/tCompany/delete", function (data) {
                swal("删除成功", "您已经删除了" + nickname + "。", "success");
                TCompany.table.refresh();
                if(data.code == 200){
                    swal("删除成功", "您已经删除了" + nickname + "。", "success");
                    TCompany.table.refresh();
                }else{
                    swal(data.message, "warning");
                }
            }, function (data) {
                swal("删除失败", data.responseJSON.message + "！", "warning");
            });

 ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tCompany/tCompany_info.js

@@ -325,9 +325,13 @@
            Feng.error("登录账户已存在,请重新输入");
            return;
        }
        Feng.success("添加成功!");
        window.parent.TCompany.table.refresh();
        TCompanyInfoDlg.close();
        if(200 == data.code){
            Feng.success("添加成功!");
            window.parent.TCompany.table.refresh();
            TCompanyInfoDlg.close();
        }else{
            Feng.error("添加失败!" + data.message + "!");
        }
    },function(data){
        Feng.error("添加失败!" + data.responseJSON.message + "!");
    });

 ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriver.js

@@ -265,8 +265,12 @@
            closeOnConfirm: false
        }, function () {
            var ajax = new $ax(Feng.ctxPath + "/tDriver/delete", function (data) {
                swal("删除成功", "您已经删除了" + nickname + "。", "success");
                AppMachineInfo.table.refresh();
                if(200 == data.code){
                    swal("删除成功", "您已经删除了" + nickname + "。", "success");
                    AppMachineInfo.table.refresh();
                }else{
                    swal("删除失败", data.message + "！", "warning");
                }
            }, function (data) {
                swal("删除失败", data.responseJSON.message + "！", "warning");
            });

 ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriver_info.js

@@ -116,9 +116,13 @@
    var authState = $("input[name='authState']:checked").val();
    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/tDriver/authOpt", function(data){
        Feng.success("操作成功!");
        window.parent.TDriver.table.refresh();
        TDriverInfoDlg.close();
        if(200 == data.code){
            Feng.success("操作成功!");
            window.parent.TDriver.table.refresh();
            TDriverInfoDlg.close();
        }else{
            Feng.error("操作失败!" + data.message + "!");
        }
    },function(data){
        Feng.error("操作失败!" + data.responseJSON.message + "!");
    });
@@ -137,9 +141,13 @@

    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/tDriver/add", function(data){
        Feng.success("添加成功!");
        window.parent.TDriver.table.refresh();
        TDriverInfoDlg.close();
        if(200 == data.code){
            Feng.success("添加成功!");
            window.parent.TDriver.table.refresh();
            TDriverInfoDlg.close();
        }else{
            Feng.error("添加失败!" + data.message + "!");
        }
    },function(data){
        Feng.error("添加失败!" + data.responseJSON.message + "!");
    });

 ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/yesDriver.js

@@ -421,8 +421,12 @@
            closeOnConfirm: false
        }, function () {
            var ajax = new $ax(Feng.ctxPath + "/tDriver/delete", function (data) {
                swal("删除成功", "您已经删除了" + nickname + "。", "success");
                YesDriver.table.refresh();
                if(200 == data.code){
                    swal("删除成功", "您已经删除了" + nickname + "。", "success");
                    YesDriver.table.refresh();
                }else{
                    swal("删除失败", data.message + "！", "warning");
                }
            }, function (data) {
                swal("删除失败", data.responseJSON.message + "！", "warning");
            });
@@ -546,7 +550,7 @@
        type : type,
        data : data,
        success : function(result) {
            if(result.code==500) {
            if(result.code!=200) {
                Feng.info(result.message);
                $('input[name=file]').val('');
            }else {
@@ -574,7 +578,14 @@
 */
YesDriver.outDriver = function () {
    var operation = function() {
        window.location.href = Feng.ctxPath + "/tDriver/outDriver";
        var insertTime = $("#insertTime").val();
        var companyName = $("#companyName").val();
        var phone = $("#phone").val();
        var name = $("#name").val();
        var addType = $("#addType").val();
        var authState = $("#authState").val();
        window.location.href = Feng.ctxPath + "/tDriver/outDriver?insertTime=" + insertTime + "&companyName=" + "&phone=" + phone + "&" +
                "name=" + name + "&addType=" + addType + "&authState=" + authState;
    };
    Feng.confirm("是否确认导出司机信息?", operation);
}

 ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/yesDriver_info.js

@@ -460,9 +460,13 @@
            Feng.error("登录账户已存在,请重新输入");
            return;
        }
        Feng.success("添加成功!");
        window.parent.YesDriver.table.refresh();
        YesDriverInfoDlg.close();
        if(200 == data.code){
            Feng.success("添加成功!");
            window.parent.YesDriver.table.refresh();
            YesDriverInfoDlg.close();
        }else{
            Feng.error("添加失败!" + data.message + "!");
        }
    },function(data){
        Feng.error("添加失败!" + data.responseJSON.message + "!");
    });
@@ -714,9 +718,13 @@
        return;
    }
    var ajax = new $ax(Feng.ctxPath + "/tDriver/optDriver", function(data){
        Feng.success("操作成功!");
        window.parent.YesDriver.table.refresh();
        YesDriverInfoDlg.close();
        if(200 == data.code){
            Feng.success("操作成功!");
            window.parent.YesDriver.table.refresh();
            YesDriverInfoDlg.close();
        }else{
            Feng.error("操作失败!" + data.message + "!");
        }
    },function(data){
        Feng.error("操作失败!" + data.responseJSON.message + "!");
    });

 ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/user/user.js

@@ -148,9 +148,13 @@

        var operation = function(){
            var userId = MgrUser.seItem.id;
            var ajax = new $ax(Feng.ctxPath + "/mgr/delete", function () {
                Feng.success("删除成功!");
                MgrUser.table.refresh();
            var ajax = new $ax(Feng.ctxPath + "/mgr/delete", function (data) {
                if(200 == data.code){
                    Feng.success("删除成功!");
                    MgrUser.table.refresh();
                }else{
                    Feng.error("删除失败!" + data.message + "!");
                }
            }, function (data) {
                Feng.error("删除失败!" + data.responseJSON.message + "!");
            });

 ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/user/user_info.js

@@ -232,12 +232,16 @@

    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/mgr/add", function (data) {
        Feng.success("添加成功!");
        window.parent.MgrUser.table.refresh();
        UserInfoDlg.close();
        $(".img-circle").each(function () {
            $(this).attr("src",Feng.ctxPath+$("#avatar").val());
        })
        if(200 == data.code){
            Feng.success("添加成功!");
            window.parent.MgrUser.table.refresh();
            UserInfoDlg.close();
            $(".img-circle").each(function () {
                $(this).attr("src",Feng.ctxPath+$("#avatar").val());
            })
        }else{
            Feng.error("添加失败!" + data.message + "!");
        }
    }, function (data) {
        Feng.error("添加失败!" + data.responseJSON.message + "!");
    });
@@ -271,16 +275,20 @@

    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/mgr/edit", function (data) {
        Feng.success("修改成功!");
        if (window.parent.MgrUser != undefined) {
            window.parent.MgrUser.table.refresh();
            UserInfoDlg.close();
        if(200 == data.code){
            Feng.success("修改成功!");
            if (window.parent.MgrUser != undefined) {
                window.parent.MgrUser.table.refresh();
                UserInfoDlg.close();
            }
            window.parent.$(".img-circle").each(function () {
                $(this).attr("src",$("#avatar").val());
            })
    
            window.parent.$("#userNameTab").text($("#name").val());
        }else{
            Feng.error("修改失败!" + data.message + "!");
        }
        window.parent.$(".img-circle").each(function () {
            $(this).attr("src",$("#avatar").val());
        })

        window.parent.$("#userNameTab").text($("#name").val());
    }, function (data) {
        Feng.error("修改失败!" + data.responseJSON.message + "!");
    });

 ManagementQYTTravel/pom.xml

@@ -210,19 +210,13 @@

    <profiles>
        <profile>
            <id>local</id>
            <properties>
                <spring.active>local</spring.active>
            </properties>
            <activation>
                <activeByDefault>true</activeByDefault>
            </activation>
        </profile>
        <profile>
            <id>dev</id>
            <properties>
                <spring.active>dev</spring.active>
            </properties>
            <activation>
                <activeByDefault>true</activeByDefault>
            </activation>
        </profile>
        <profile>
            <id>test</id>
@@ -231,9 +225,9 @@
            </properties>
        </profile>
        <profile>
            <id>produce</id>
            <id>prod</id>
            <properties>
                <spring.active>produce</spring.active>
                <spring.active>prod</spring.active>
            </properties>
        </profile>
    </profiles>