瀏覽代碼

删除无用代码

wks 3 年之前
父節點
當前提交
c7736e85fd
共有 63 個文件被更改,包括 0 次插入 和 10980 次删除
  1. 0 78
      src/main/java/com/ydtech/aop/HttpAspect.java
  2. 0 96
      src/main/java/com/ydtech/aop/MethodLogAspect.java
  3. 0 38
      src/main/java/com/ydtech/components/AnShengRequestComponents.java
  4. 0 51
      src/main/java/com/ydtech/components/HengbangRequestComponents.java
  5. 0 68
      src/main/java/com/ydtech/components/RenbaoRequestComponents.java
  6. 0 48
      src/main/java/com/ydtech/components/YongchengRequestComponents.java
  7. 0 120
      src/main/java/com/ydtech/config/WebSecurityConfig.java
  8. 0 500
      src/main/java/com/ydtech/constants/enums/City.java
  9. 0 107
      src/main/java/com/ydtech/constants/enums/InsYcAccident.java
  10. 0 87
      src/main/java/com/ydtech/constants/enums/Province.java
  11. 0 114
      src/main/java/com/ydtech/core/page/BaseController.java
  12. 0 24
      src/main/java/com/ydtech/modules/admin/controller/DemoController.java
  13. 0 36
      src/main/java/com/ydtech/modules/admin/dao/SysRoleDao.java
  14. 0 38
      src/main/java/com/ydtech/modules/admin/dao/SysUserDao.java
  15. 0 319
      src/main/java/com/ydtech/modules/admin/dao/impl/SysRoleDaoImpl.java
  16. 0 505
      src/main/java/com/ydtech/modules/admin/dao/impl/SysUserDaoImpl.java
  17. 0 518
      src/main/java/com/ydtech/modules/esm/controller/EsmUserInternalCheckController.java
  18. 0 923
      src/main/java/com/ydtech/modules/esm/controller/EsmUserInternalController.java
  19. 0 17
      src/main/java/com/ydtech/modules/esm/convert/EsmUserInternalConvert.java
  20. 0 37
      src/main/java/com/ydtech/modules/esm/dao/EsmInsCompanyDao.java
  21. 0 35
      src/main/java/com/ydtech/modules/esm/dao/EsmUserAgentDao.java
  22. 0 37
      src/main/java/com/ydtech/modules/esm/dao/EsmUserInternalCheckDao.java
  23. 0 37
      src/main/java/com/ydtech/modules/esm/dao/EsmUserInternalDao.java
  24. 0 101
      src/main/java/com/ydtech/modules/esm/dao/EsmUserInternalMapper.java
  25. 0 370
      src/main/java/com/ydtech/modules/esm/dao/impl/EsmInsCompanyDaoImpl.java
  26. 0 345
      src/main/java/com/ydtech/modules/esm/dao/impl/EsmUserAgentDaoImpl.java
  27. 0 664
      src/main/java/com/ydtech/modules/esm/dao/impl/EsmUserInternalCheckDaoImpl.java
  28. 0 657
      src/main/java/com/ydtech/modules/esm/dao/impl/EsmUserInternalDaoImpl.java
  29. 0 50
      src/main/java/com/ydtech/modules/esm/model/EsmUserCheck.java
  30. 0 66
      src/main/java/com/ydtech/modules/esm/model/EsmUserInternal.java
  31. 0 355
      src/main/java/com/ydtech/modules/esm/model/EsmUserInternalCheck.java
  32. 0 87
      src/main/java/com/ydtech/modules/esm/model/vo/EsmUserInternalVo.java
  33. 0 45
      src/main/java/com/ydtech/modules/esm/model/vo/VoEsmUserInternal.java
  34. 0 36
      src/main/java/com/ydtech/modules/esm/model/vo/VoEsmUserInternalCheck.java
  35. 0 11
      src/main/java/com/ydtech/modules/esm/service/EsmUserInternalCheckService.java
  36. 0 30
      src/main/java/com/ydtech/modules/esm/service/EsmUserInternalService.java
  37. 0 300
      src/main/java/com/ydtech/modules/esm/service/impl/EsmEasyepcServiceImpl.java
  38. 0 428
      src/main/java/com/ydtech/modules/esm/service/impl/EsmUserInternalCheckServiceImpl.java
  39. 0 364
      src/main/java/com/ydtech/modules/esm/service/impl/EsmUserInternalServiceImpl.java
  40. 0 73
      src/main/java/com/ydtech/modules/ins/controller/HengbangController.java
  41. 0 58
      src/main/java/com/ydtech/modules/ins/controller/InsYongchengController.java
  42. 0 92
      src/main/java/com/ydtech/modules/ins/controller/InsZhongmeiController.java
  43. 0 64
      src/main/java/com/ydtech/modules/ins/controller/RenbaoController.java
  44. 0 108
      src/main/java/com/ydtech/modules/ins/model/yc/callbackAnOrder/response/CallbackAnOrderResponse.java
  45. 0 45
      src/main/java/com/ydtech/modules/ins/service/InsHengbangService.java
  46. 0 43
      src/main/java/com/ydtech/modules/ins/service/InsRenbaoService.java
  47. 0 21
      src/main/java/com/ydtech/modules/ins/service/InsYongchengService.java
  48. 0 61
      src/main/java/com/ydtech/modules/ins/service/YongAnService.java
  49. 0 225
      src/main/java/com/ydtech/modules/ins/service/impl/InsHengbangServiceImpl.java
  50. 0 504
      src/main/java/com/ydtech/modules/ins/service/impl/InsRenbaoServiceImpl.java
  51. 0 285
      src/main/java/com/ydtech/modules/ins/service/impl/InsYongchengServiceImpl.java
  52. 0 565
      src/main/java/com/ydtech/modules/ins/service/impl/YongAnServiceImpl.java
  53. 0 112
      src/main/java/com/ydtech/modules/inv/controller/InvPayableStatementController.java
  54. 0 69
      src/main/java/com/ydtech/modules/inv/controller/InvoiceController.java
  55. 0 29
      src/main/java/com/ydtech/security/GrantedAuthorityImpl.java
  56. 0 44
      src/main/java/com/ydtech/security/JwtAuthenticatioToken.java
  57. 0 35
      src/main/java/com/ydtech/security/JwtAuthenticationFilter.java
  58. 0 59
      src/main/java/com/ydtech/security/JwtAuthenticationProvider.java
  59. 0 133
      src/main/java/com/ydtech/security/JwtLoginFilter.java
  60. 0 103
      src/main/java/com/ydtech/security/JwtUserDetails.java
  61. 0 41
      src/main/java/com/ydtech/security/UserDetailsServiceImpl.java
  62. 0 316
      src/main/java/com/ydtech/security/utils/JwtTokenUtils.java
  63. 0 153
      src/main/java/com/ydtech/security/utils/SecurityUtils.java

+ 0 - 78
src/main/java/com/ydtech/aop/HttpAspect.java

@@ -1,78 +0,0 @@
-//package com.ydtech.aop;
-//
-//
-//import com.ydtech.core.page.HttpResult;
-//import org.aspectj.lang.JoinPoint;
-//import org.aspectj.lang.ProceedingJoinPoint;
-//import org.aspectj.lang.annotation.*;
-//import org.slf4j.Logger;
-//import org.slf4j.LoggerFactory;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.stereotype.Component;
-//import org.springframework.web.context.request.RequestContextHolder;
-//import org.springframework.web.context.request.ServletRequestAttributes;
-//
-//import javax.servlet.http.HttpServletRequest;
-//
-///**
-// * https://blog.csdn.net/qq_31001665/article/details/71357825
-// * Created by zhuzhengping on 2017/5/4.
-// * 切面类
-// * AOP切面,记录方法的调用,入参以及出參
-// */
-//@Aspect
-//@Component
-//public class HttpAspect {
-//
-//    private final static Logger LOGGER = LoggerFactory.getLogger(HttpAspect.class);
-//
-//    @Autowired
-//    private GlobalExceptionHandler exceptionHandle;
-//
-//    @Pointcut("execution(public * com.ydtech.*.controller.*.*(..))")
-////    @Pointcut("@annotation(logOnly)")
-//    public void log() {
-//
-//    }
-//
-//    @Before("log()")
-//    public void doBefore(JoinPoint joinPoint) {
-//        ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
-//        HttpServletRequest request = attributes.getRequest();
-//
-//        //url
-//        LOGGER.info("url={}", request.getRequestURL());
-//        //method
-//        LOGGER.info("method={}", request.getMethod());
-//        //ip
-//        LOGGER.info("id={}", request.getRemoteAddr());
-//        //class_method
-//        LOGGER.info("class_method={}", joinPoint.getSignature().getDeclaringTypeName() + "," + joinPoint.getSignature().getName());
-//        //args[]
-//        LOGGER.info("args={}", joinPoint.getArgs());
-//    }
-//
-//    @Around("log()")
-//    public Object doAround(ProceedingJoinPoint proceedingJoinPoint) throws Throwable {
-//        HttpResult result = null;
-//        try {
-//
-//        } catch (Exception e) {
-//            return exceptionHandle.exceptionGet(e);
-//        }
-//        if (result == null) {
-//            return proceedingJoinPoint.proceed();
-//        } else {
-//            return result;
-//        }
-//    }
-//
-//    @AfterReturning(pointcut = "log()", returning = "object")//打印输出结果
-//    public void doAfterReturing(Object object) {
-//        if (object != null) {
-//            LOGGER.info("response={}", object.toString());
-//        }
-//    }
-//}
-//
-//

+ 0 - 96
src/main/java/com/ydtech/aop/MethodLogAspect.java

@@ -1,96 +0,0 @@
-//package com.ydtech.aop;
-//
-//import com.ydtech.aop.request.MethodLogAnnotation;
-//import lombok.Data;
-//import org.aspectj.lang.JoinPoint;
-//import org.aspectj.lang.ProceedingJoinPoint;
-//import org.aspectj.lang.Signature;
-//import org.aspectj.lang.annotation.*;
-//import org.aspectj.lang.reflect.MethodSignature;
-//import org.slf4j.Logger;
-//import org.slf4j.LoggerFactory;
-//import org.springframework.stereotype.Component;
-//
-//import java.lang.reflect.Method;
-//
-///**
-// * 切面类
-// * AOP切面,记录方法的调用,入参以及出參
-// */
-//@Aspect
-//@Component
-//@Data
-//public class MethodLogAspect {
-//
-////    @Autowired
-////    private SysMethodLogDao sysMethodLogDao;
-//
-//
-//    /**
-//     * 保存线程共享变量,开始执行时间
-//     */
-//    ThreadLocal<Long> startTime = new ThreadLocal<>();
-//
-//
-//    private final static Logger LOGGER = LoggerFactory.getLogger(MethodLogAspect.class);
-//
-////    @Pointcut("execution(public * com.ydtech.*.*.*.*(..))")
-//    @Pointcut("@annotation(com.ydtech.aop.request.MethodLogAnnotation)")
-//    private void methodLog() {
-//    }
-//
-//    /**
-//     * 环绕通知
-//     */
-//    @Around("methodLog()")
-//    public Object advice(ProceedingJoinPoint joinPoint) throws Throwable {
-//        //记下请求开始时间
-//        startTime.set(System.currentTimeMillis());
-//
-//        Signature signature = joinPoint.getSignature();
-//        MethodSignature methodSignature = (MethodSignature) signature;
-//        Method method = methodSignature.getMethod();
-//        MethodLogAnnotation mla = method.getAnnotation(MethodLogAnnotation.class);
-//        //获取切入点所在目标对象
-//        Object targetObj =joinPoint.getTarget();
-//
-////        sml.setDescription(mla.title());
-////        SysMethodLog sml = new SysMethodLog();
-////        sml.setCreateTime(new Date());
-////        sml.setRequestMethod(method.getName());
-////        sml.setRequestElapsedTime(System.currentTimeMillis() - startTime.get());
-////        sml.setRequestClass(targetObj.getClass().getName());
-////
-////        //4. 获取方法的参数
-////        Object[] args = joinPoint.getArgs();
-////        JSONArray json = (JSONArray) JSONObject.toJSON(args);
-////        sml.setParams(json.toJSONString());
-////        sysMethodLogDao.insert(sml);
-//
-//        //执行到这里走原来的方法
-//        Object proceed = joinPoint.proceed();
-//        System.out.println("around after....");
-//        return proceed;
-//    }
-//
-//    @Before("methodLog()")
-//    public void record(JoinPoint joinPoint) {
-////        System.out.println("Before");
-////        Signature signature = joinPoint.getSignature();
-////        MethodSignature methodSignature = (MethodSignature) signature;
-////        Method method = methodSignature.getMethod();
-////        MethodLogAnnotation mla = method.getAnnotation(MethodLogAnnotation.class);
-////        System.err.println("tttt:"+mla.title());
-////        System.err.println("tttt================");
-////        startTime = System.currentTimeMillis();
-//    }
-//
-//    @After("methodLog()")
-//    public void after(JoinPoint joinPoint) {
-//
-//
-//
-//    }
-//}
-//
-//

+ 0 - 38
src/main/java/com/ydtech/components/AnShengRequestComponents.java

@@ -1,38 +0,0 @@
-//package com.ydtech.components;
-//
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.beans.factory.annotation.Value;
-//import org.springframework.stereotype.Component;
-//
-//@Component
-//public class AnShengRequestComponents {
-//
-//
-//    @Value("${as.domain}")
-//    private String asDomain;
-//
-//    @Value("${as.quote.url}")
-//    private String asQuoteUrl;
-//
-//    @Value("${as.audit.url}")
-//    private String asAuditUrl;
-//
-//    @Value("${as.image.url}")
-//    private String asImageUrl;
-//
-//    @Autowired
-//    private RenbaoRequestComponents renbaoRequestComponents;
-//
-//    public <T, B> B quote(T t, Class<B> responseType) {
-//        return renbaoRequestComponents.post(asDomain + asQuoteUrl, "安盛天平报价", t, responseType);
-//    }
-//
-//    public <T, B> B audit(T t, Class<B> responseType) {
-//        return renbaoRequestComponents.post(asDomain + asAuditUrl, "安盛天平核保", t, responseType);
-//    }
-//
-//    public <T, B> B submitImage(T t, Class<B> responseType) {
-//        return renbaoRequestComponents.post(asDomain + asImageUrl, "安盛天平上传影像", t, responseType);
-//    }
-//
-//}

+ 0 - 51
src/main/java/com/ydtech/components/HengbangRequestComponents.java

@@ -1,51 +0,0 @@
-//package com.ydtech.components;
-//
-//import com.ydtech.modules.ins.model.hb.HengbangPolicyPrintResponse;
-//import com.ydtech.modules.ins.model.request.Response;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.beans.factory.annotation.Value;
-//import org.springframework.core.ParameterizedTypeReference;
-//import org.springframework.stereotype.Component;
-//
-//import java.util.Map;
-//
-//@Component
-//public class HengbangRequestComponents {
-//
-//    @Value("${hb.quote.url}")
-//    private String hbQuoteUrl;
-//
-//    @Value("${hb.audit.url}")
-//    private String hbAuditUrl;
-//
-//    @Value("${hb.image.url}")
-//    private String hbImageUrl;
-//
-//    @Value("${hb.getPolicyPrint.url}")
-//    private String hbPolicyPrintUrl;
-//
-//
-//    private RenbaoRequestComponents renbaoRequestComponents;
-//
-//    @Autowired
-//    public void setRenbaoRequestComponents(RenbaoRequestComponents renbaoRequestComponents) {
-//        this.renbaoRequestComponents = renbaoRequestComponents;
-//    }
-//
-//    public <T, B> B quote(T t, Class<B> responseType) {
-//        return renbaoRequestComponents.post(hbQuoteUrl, "恒邦报价", t, responseType);
-//    }
-//
-//    public <T, B> B audit(T t, Class<B> responseType) {
-//        return renbaoRequestComponents.post(hbAuditUrl, "恒邦核保", t, responseType);
-//    }
-//
-//    public <T, B> B submitImage(T t, Class<B> responseType) {
-//        return renbaoRequestComponents.post(hbImageUrl, "恒邦上传影响", t, responseType);
-//    }
-//
-//    public <T, B> B getPolicyPrint(T t, Class<B> responseType) {
-//        return renbaoRequestComponents.post(hbPolicyPrintUrl, "获取电子保单", t, responseType);
-//    }
-//
-//}

+ 0 - 68
src/main/java/com/ydtech/components/RenbaoRequestComponents.java

@@ -1,68 +0,0 @@
-//package com.ydtech.components;
-//
-//import com.alibaba.fastjson.JSON;
-//import com.ydtech.exception.SystemException;
-//import lombok.extern.slf4j.Slf4j;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.beans.factory.annotation.Value;
-//import org.springframework.http.*;
-//import org.springframework.lang.Nullable;
-//import org.springframework.stereotype.Component;
-//import org.springframework.web.client.RestTemplate;
-//
-//@Slf4j
-//@Component
-//public class RenbaoRequestComponents {
-//
-//    @Autowired
-//    private RestTemplate restTemplate;
-//
-//    @Value("${rb.quote.url}")
-//    private String rbQuoteUrl;
-//
-//    @Value("${rb.audit.url}")
-//    private String rbAuditUrl;
-//
-//    @Value("${rb.car.search.url}")
-//    private String rbCarSearchUrl;
-//
-//    @Value("${rb.brand.search.url}")
-//    private String rbBrandSearchUrl;
-//
-//    //    @MethodLogAnnotation(title = "报价-请求python")
-//    public <T, B> B post(String url, String message, @Nullable T requestBody, Class<B> responseType) {
-//        HttpHeaders httpHeaders = new HttpHeaders();
-//        httpHeaders.setContentType(MediaType.APPLICATION_JSON);
-//        HttpEntity<T> yaQuoteInfoVoHttpEntity = new HttpEntity<>(requestBody, httpHeaders);
-//
-//        String request = JSON.toJSONString(requestBody);
-//        log.info("---------> 请求参数: url {} {}", url, request);
-//
-//        ResponseEntity<B> stringResponseEntity = restTemplate.postForEntity(url, yaQuoteInfoVoHttpEntity, responseType);
-//        B body = stringResponseEntity.getBody();
-//        if (body == null) {
-//            throw new SystemException(message + "接口请求失败");
-//        }
-//
-//        String response = JSON.toJSONString(body);
-//        log.info("---------> 响应参数:{}", response);
-//        return body;
-//    }
-//
-//    public <T, B> B quote(T t, Class<B> responseType) {
-//        return post(rbQuoteUrl, "人保报价", t, responseType);
-//    }
-//
-//    public <T, B> B audit(T t, Class<B> responseType) {
-//        return post(rbAuditUrl, "人保核保", t, responseType);
-//    }
-//
-//    public <T, B> B licensePlateQuery(T t, Class<B> responseType) {
-//        return post(rbCarSearchUrl, "人保车牌号查询车辆信息", t, responseType);
-//    }
-//
-//    public <T, B> B modelsQuery(T t, Class<B> responseType) {
-//        return post(rbBrandSearchUrl, "人保车辆查询", t, responseType);
-//    }
-//
-//}

+ 0 - 48
src/main/java/com/ydtech/components/YongchengRequestComponents.java

@@ -1,48 +0,0 @@
-//package com.ydtech.components;
-//
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.beans.factory.annotation.Value;
-//import org.springframework.stereotype.Component;
-//
-//@Component
-//public class YongchengRequestComponents {
-//
-//    @Value("${yc.domain}")
-//    private String ycDomain;
-//
-//    @Value("${yc.quote.url}")
-//    private String ycQuoteUrl;
-//
-//    @Value("${yc.audit.url}")
-//    private String ycAuditUrl;
-//
-//    @Value("${yc.image.url}")
-//    private String ycImageUrl;
-//
-//    @Value("${yc.getPolicyPrint.url}")
-//    private String ycPolicyPrintUrl;
-//
-//    private final RenbaoRequestComponents renbaoRequestComponents;
-//
-//    public YongchengRequestComponents(RenbaoRequestComponents renbaoRequestComponents) {
-//        this.renbaoRequestComponents = renbaoRequestComponents;
-//    }
-//
-//
-//    public <T, B> B quote(T t, Class<B> responseType) {
-//        return renbaoRequestComponents.post(ycDomain + ycQuoteUrl, "永诚报价", t, responseType);
-//    }
-//
-//    public <T, B> B audit(T t, Class<B> responseType) {
-//        return renbaoRequestComponents.post(ycDomain + ycAuditUrl, "永诚核保", t, responseType);
-//    }
-//
-//    public <T, B> B submitImage(T t, Class<B> responseType) {
-//        return renbaoRequestComponents.post(ycDomain + ycImageUrl, "永诚上传影像", t, responseType);
-//    }
-//
-//    public <T, B> B getPolicyPrint(T t, Class<B> responseType) {
-//        return renbaoRequestComponents.post(ycDomain + ycPolicyPrintUrl, "永诚获取电子保单", t, responseType);
-//    }
-//
-//}

+ 0 - 120
src/main/java/com/ydtech/config/WebSecurityConfig.java

@@ -1,120 +0,0 @@
-//package com.ydtech.config;
-//
-//import com.ydtech.security.JwtAuthenticationFilter;
-//import com.ydtech.security.JwtAuthenticationProvider;
-//import com.ydtech.security.UserDetailsServiceImpl;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.beans.factory.annotation.Value;
-//import org.springframework.context.annotation.Bean;
-//import org.springframework.context.annotation.Configuration;
-//import org.springframework.security.authentication.AuthenticationManager;
-//import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
-//import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
-//import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-//import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-//import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
-//import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
-//import org.springframework.security.web.authentication.logout.HttpStatusReturningLogoutSuccessHandler;
-//
-//@Configuration
-//@EnableWebSecurity
-//@EnableGlobalMethodSecurity(prePostEnabled = true)
-//public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
-//
-//    @Autowired
-//    private UserDetailsServiceImpl userDetailsService;
-//
-//    @Autowired
-//    private MasterPasswordConfig masterPasswordConfig;
-//
-//    @Value("${upload.file.url}")
-//    private String uploadFileUrl;
-//
-//    @Override
-//    public void configure(AuthenticationManagerBuilder auth) throws Exception {
-//        // 使用自定义登录身份认证组件
-//        auth.authenticationProvider(new JwtAuthenticationProvider(userDetailsService, masterPasswordConfig));
-//    }
-//
-//    @Override
-//    protected void configure(HttpSecurity http) throws Exception {
-//        // 禁用 csrf, 由于使用的是JWT,我们这里不需要csrf
-//        http.cors().and().csrf().disable()
-//                .authorizeRequests()
-//                // 跨域预检请求
-////                .antMatchers(HttpMethod.OPTIONS, "/**").permitAll()
-//                // web jars
-//                .antMatchers("/webjars/**").permitAll()
-//                // 查看SQL监控(druid)
-//                .antMatchers("/druid/**").permitAll()
-//                // 首页和登录页面
-//                .antMatchers("/").permitAll()
-//                .antMatchers("/login").permitAll()
-//                .antMatchers("/sendMsg").permitAll()
-//                .antMatchers("/loginByPhone").permitAll()
-//                .antMatchers("/user/findById").permitAll()
-//                .antMatchers("/esmUserInternalcheck/userRegist").permitAll()
-//                .antMatchers("/insOrder/queryOrder").permitAll()
-//                .antMatchers("/insOrder/getPayCode").permitAll()
-//                .antMatchers("/zm/Underwriting").permitAll()//自动核保回调
-//                .antMatchers("/zm/ArtificialUnderwriting").permitAll()//人工核保回调
-//                .antMatchers("/esmUserInternalcheck/updateName").permitAll()
-//                // swagger
-//                .antMatchers("/doc.html").permitAll()
-//                .antMatchers("/swagger**/**").permitAll()
-//                .antMatchers("/webjars/**").permitAll()
-//                .antMatchers("/v2/**").permitAll()
-////                .antMatchers("/swagger-ui.html").permitAll()
-////                .antMatchers("/swagger-resources").permitAll()
-////                .antMatchers("/v2/api-docs").permitAll()
-////                .antMatchers("/webjars/springfox-swagger-ui/**").permitAll()
-//                // 字典
-//                .antMatchers("/dict/**").permitAll()
-//                //静态资源
-//                .antMatchers("/static/**").permitAll()
-//                //api
-//                .antMatchers("/api/**").permitAll()
-//                //app
-//                .antMatchers("/app/android/**").permitAll()
-//                // 文件上传访问路径
-//                .antMatchers(uploadFileUrl + "**").permitAll()
-//                // 验证码
-//                .antMatchers("/captcha.jpg**").permitAll()
-//                // 服务监控
-//                .antMatchers("/actuator/**").permitAll()
-//                .antMatchers("/API/insCBIT/**").permitAll()
-//                .antMatchers("/CBIT/API/insCBIT/**").permitAll()
-//                .antMatchers("/CBITAPI/insCBIT/**").permitAll()
-//                .antMatchers("/api/yongan/**").permitAll()
-//                .antMatchers("/order/yongAn/**").permitAll()
-//                .antMatchers("/api/insRenbao/**").permitAll()
-//                .antMatchers("/ins/**").permitAll()
-//                .antMatchers("/wechat/**").permitAll()
-//                .antMatchers("/esm/policy/**").permitAll()
-//                // 中煤回调
-//                .antMatchers("/order/zhongMeiApi/underwritingCallback").permitAll()
-//                .antMatchers("/order/zhongMeiApi/auditCallback").permitAll()
-//
-//                //审核退回
-//                .antMatchers("/api/inv/invoiceInfo/approvalBack").hasAuthority("inv:invoice:info:approval:back")
-//                //审核通过
-//                .antMatchers("/api/inv/invoiceInfo/approvalPass").hasAuthority("inv:invoice:info:approval:pass")
-//                // 其他所有请求需要身份认证
-//                .anyRequest().authenticated();
-//        // 退出登录处理器
-//        http.logout().logoutSuccessHandler(new HttpStatusReturningLogoutSuccessHandler());
-//        // 开启登录认证流程过滤器
-////        http.addFilterBefore(new JwtLoginFilter(authenticationManager()), UsernamePasswordAuthenticationFilter.class);
-//        // 访问控制时登录状态检查过滤器
-//        http.addFilterBefore(new JwtAuthenticationFilter(authenticationManager()), UsernamePasswordAuthenticationFilter.class);
-//    }
-//
-//
-//
-//    @Bean
-//    @Override
-//    public AuthenticationManager authenticationManager() throws Exception {
-//        return super.authenticationManager();
-//    }
-//
-//}

+ 0 - 500
src/main/java/com/ydtech/constants/enums/City.java

@@ -1,500 +0,0 @@
-//package com.ydtech.constants.enums;
-//
-//import lombok.AllArgsConstructor;
-//import lombok.Getter;
-//import org.apache.commons.lang3.StringUtils;
-//
-//import java.util.Arrays;
-//import java.util.List;
-//import java.util.stream.Collectors;
-//
-//
-///**
-// * @description: 城市
-// * @author: lig
-// * @date: 2023-02-13
-// */
-//@Getter
-//@AllArgsConstructor
-//public enum City {
-//
-//    龙岩市("350800", "龙岩市"),
-//    宁德市("350900", "宁德市"),
-//    南昌市("360100", "南昌市"),
-//    景德镇市("360200", "景德镇市"),
-//    萍乡市("360300", "萍乡市"),
-//    九江市("360400", "九江市"),
-//    新余市("360500", "新余市"),
-//    鹰潭市("360600", "鹰潭市"),
-//    赣州市("360700", "赣州市"),
-//    吉安市("360800", "吉安市"),
-//    潍坊市("370700", "潍坊市"),
-//    泉州市("350500", "泉州市"),
-//    漳州市("350600", "漳州市"),
-//    吴忠市("640300", "吴忠市"),
-//    温州市("330300", "温州市"),
-//    湖州市("330500", "湖州市"),
-//    绍兴市("330600", "绍兴市"),
-//    金华市("330700", "金华市"),
-//    滁州市("341100", "滁州市"),
-//    阜阳市("341200", "阜阳市"),
-//    宿州市("341300", "宿州市"),
-//    益阳市("430900", "益阳市"),
-//    郴州市("431000", "郴州市"),
-//    永州市("431100", "永州市"),
-//    怀化市("431200", "怀化市"),
-//    临夏回族自治州("622900", "临夏回族自治州"),
-//    马鞍山市("340500", "马鞍山市"),
-//    淮北市("340600", "淮北市"),
-//    铜陵市("340700", "铜陵市"),
-//    安庆市("340800", "安庆市"),
-//    黄山市("341000", "黄山市"),
-//    汕头市("440500", "汕头市"),
-//    梧州市("450400", "梧州市"),
-//    固原市("640400", "固原市"),
-//    中卫市("640500", "中卫市"),
-//    乌鲁木齐市("650100", "乌鲁木齐市"),
-//    克拉玛依市("650200", "克拉玛依市"),
-//    吐鲁番地区("652100", "吐鲁番地区"),
-//    哈密地区("652200", "哈密地区"),
-//    昌吉回族自治州("652300", "昌吉回族自治州"),
-//    宁波市("330200", "宁波市"),
-//    哈尔滨市("230100", "哈尔滨市"),
-//    齐齐哈尔市("230200", "齐齐哈尔市"),
-//    濮阳市("410900", "濮阳市"),
-//    许昌市("411000", "许昌市"),
-//    东城区("110101", "东城区"),
-//    西城区("110102", "西城区"),
-//    巢湖市("341400", "巢湖市"),
-//    六安市("341500", "六安市"),
-//    亳州市("341600", "亳州市"),
-//    池州市("341700", "池州市"),
-//    宣城市("341800", "宣城市"),
-//    安康市("610900", "安康市"),
-//    沧州市("130900", "沧州市"),
-//    钦州市("450700", "钦州市"),
-//    贵港市("450800", "贵港市"),
-//    玉林市("450900", "玉林市"),
-//    百色市("451000", "百色市"),
-//    贺州市("451100", "贺州市"),
-//    河池市("451200", "河池市"),
-//    来宾市("451300", "来宾市"),
-//    崇左市("451400", "崇左市"),
-//    海口市("460100", "海口市"),
-//    三亚市("460200", "三亚市"),
-//    五指山市("469001", "五指山市"),
-//    琼海市("469002", "琼海市"),
-//    儋州市("469003", "儋州市"),
-//    文昌市("469005", "文昌市"),
-//    万宁市("469006", "万宁市"),
-//    东方市("469007", "东方市"),
-//    定安县("469021", "定安县"),
-//    屯昌县("469022", "屯昌县"),
-//    澄迈县("469023", "澄迈县"),
-//    临高县("469024", "临高县"),
-//    白沙黎族自治县("469025", "白沙黎族自治县"),
-//    昌江黎族自治县("469026", "昌江黎族自治县"),
-//    乐东黎族自治县("469027", "乐东黎族自治县"),
-//    阿克苏地区("652900", "阿克苏地区"),
-//    蚌埠市("340300", "蚌埠市"),
-//    淮南市("340400", "淮南市"),
-//    防城港市("450600", "防城港市"),
-//    泰安市("370900", "泰安市"),
-//    威海市("371000", "威海市"),
-//    日照市("371100", "日照市"),
-//    莱芜市("371200", "莱芜市"),
-//    临沂市("371300", "临沂市"),
-//    德州市("371400", "德州市"),
-//    聊城市("371500", "聊城市"),
-//    滨州市("371600", "滨州市"),
-//    菏泽市("371700", "菏泽市"),
-//    郑州市("410100", "郑州市"),
-//    克孜勒苏柯尔克孜自治州("653000", "克孜勒苏柯尔克孜自治州"),
-//    喀什地区("653100", "喀什地区"),
-//    汕尾市("441500", "汕尾市"),
-//    河源市("441600", "河源市"),
-//    阳江市("441700", "阳江市"),
-//    清远市("441800", "清远市"),
-//    东莞市("441900", "东莞市"),
-//    中山市("442000", "中山市"),
-//    潮州市("445100", "潮州市"),
-//    揭阳市("445200", "揭阳市"),
-//    云浮市("445300", "云浮市"),
-//    南宁市("450100", "南宁市"),
-//    柳州市("450200", "柳州市"),
-//    桂林市("450300", "桂林市"),
-//    绥化市("231200", "绥化市"),
-//    大兴安岭地区("232700", "大兴安岭地区"),
-//    静安区("310106", "静安区"),
-//    普陀区("310107", "普陀区"),
-//    闸北区("310108", "闸北区"),
-//    虹口区("310109", "虹口区"),
-//    杨浦区("310110", "杨浦区"),
-//    闵行区("310112", "闵行区"),
-//    宝山区("310113", "宝山区"),
-//    嘉定区("310114", "嘉定区"),
-//    浦东新区("310115", "浦东新区"),
-//    金山区("310116", "金山区"),
-//    松江区("310117", "松江区"),
-//    青浦区("310118", "青浦区"),
-//    驻马店市("411700", "驻马店市"),
-//    济源市("419001", "济源市"),
-//    武汉市("420100", "武汉市"),
-//    黄石市("420200", "黄石市"),
-//    十堰市("420300", "十堰市"),
-//    宜昌市("420500", "宜昌市"),
-//    襄樊市("420600", "襄樊市"),
-//    秦皇岛市("130300", "秦皇岛市"),
-//    邯郸市("130400", "邯郸市"),
-//    邢台市("130500", "邢台市"),
-//    保定市("130600", "保定市"),
-//    张家口市("130700", "张家口市"),
-//    北海市("450500", "北海市"),
-//    娄底市("431300", "娄底市"),
-//    湘西土家族苗族自治州("433100", "湘西土家族苗族自治州"),
-//    广州市("440100", "广州市"),
-//    韶关市("440200", "韶关市"),
-//    深圳市("440300", "深圳市"),
-//    珠海市("440400", "珠海市"),
-//    佛山市("440600", "佛山市"),
-//    江门市("440700", "江门市"),
-//    湛江市("440800", "湛江市"),
-//    茂名市("440900", "茂名市"),
-//    肇庆市("441200", "肇庆市"),
-//    惠州市("441300", "惠州市"),
-//    梅州市("441400", "梅州市"),
-//    乌海市("150300", "乌海市"),
-//    赤峰市("150400", "赤峰市"),
-//    巴彦淖尔市("150800", "巴彦淖尔市"),
-//    大连市("210200", "大连市"),
-//    鞍山市("210300", "鞍山市"),
-//    抚顺市("210400", "抚顺市"),
-//    本溪市("210500", "本溪市"),
-//    丹东市("210600", "丹东市"),
-//    通辽市("150500", "通辽市"),
-//    鄂尔多斯市("150600", "鄂尔多斯市"),
-//    呼伦贝尔市("150700", "呼伦贝尔市"),
-//    济宁市("370800", "济宁市"),
-//    株洲市("430200", "株洲市"),
-//    湘潭市("430300", "湘潭市"),
-//    衡阳市("430400", "衡阳市"),
-//    邵阳市("430500", "邵阳市"),
-//    嘉兴市("330400", "嘉兴市"),
-//    衢州市("330800", "衢州市"),
-//    舟山市("330900", "舟山市"),
-//    台州市("331000", "台州市"),
-//    丽水市("331100", "丽水市"),
-//    合肥市("340100", "合肥市"),
-//    芜湖市("340200", "芜湖市"),
-//    信阳市("411500", "信阳市"),
-//    周口市("411600", "周口市"),
-//    乌兰察布市("150900", "乌兰察布市"),
-//    渭南市("610500", "渭南市"),
-//    延安市("610600", "延安市"),
-//    大石桥市("211500", "大石桥市"),
-//    香港特别行政区("810100", "香港特别行政区"),
-//    邳州市("321400", "邳州市"),
-//    兴安盟("152200", "兴安盟"),
-//    锡林郭勒盟("152500", "锡林郭勒盟"),
-//    阿拉善盟("152900", "阿拉善盟"),
-//    沈阳市("210100", "沈阳市"),
-//    福州市("350100", "福州市"),
-//    厦门市("350200", "厦门市"),
-//    甘南藏族自治州("623000", "甘南藏族自治州"),
-//    西宁市("630100", "西宁市"),
-//    海东地区("632100", "海东地区"),
-//    海北藏族自治州("632200", "海北藏族自治州"),
-//    博尔塔拉蒙古自治州("652700", "博尔塔拉蒙古自治州"),
-//    巴音郭楞蒙古自治州("652800", "巴音郭楞蒙古自治州"),
-//    黄南藏族自治州("632300", "黄南藏族自治州"),
-//    海南藏族自治州("632500", "海南藏族自治州"),
-//    德宏傣族景颇族自治州("533100", "德宏傣族景颇族自治州"),
-//    怒江傈僳族自治州("533300", "怒江傈僳族自治州"),
-//    迪庆藏族自治州("533400", "迪庆藏族自治州"),
-//    拉萨市("540100", "拉萨市"),
-//    黔东南苗族侗族自治州("522600", "黔东南苗族侗族自治州"),
-//    双鸭山市("230500", "双鸭山市"),
-//    大庆市("230600", "大庆市"),
-//    伊春市("230700", "伊春市"),
-//    佳木斯市("230800", "佳木斯市"),
-//    七台河市("230900", "七台河市"),
-//    牡丹江市("231000", "牡丹江市"),
-//    黑河市("231100", "黑河市"),
-//    黄浦区("310101", "黄浦区"),
-//    卢湾区("310103", "卢湾区"),
-//    徐汇区("310104", "徐汇区"),
-//    长宁区("310105", "长宁区"),
-//    鄂州市("420700", "鄂州市"),
-//    荆门市("420800", "荆门市"),
-//    孝感市("420900", "孝感市"),
-//    昌都地区("542100", "昌都地区"),
-//    山南地区("542200", "山南地区"),
-//    三明市("350400", "三明市"),
-//    宜春市("360900", "宜春市"),
-//    抚州市("361000", "抚州市"),
-//    上饶市("361100", "上饶市"),
-//    济南市("370100", "济南市"),
-//    凉山彝族自治州("513400", "凉山彝族自治州"),
-//    贵阳市("520100", "贵阳市"),
-//    六盘水市("520200", "六盘水市"),
-//    遵义市("520300", "遵义市"),
-//    安顺市("520400", "安顺市"),
-//    铜仁地区("522200", "铜仁地区"),
-//    黔西南布依族苗族自治州("522300", "黔西南布依族苗族自治州"),
-//    毕节地区("522400", "毕节地区"),
-//    陵水黎族自治县("469028", "陵水黎族自治县"),
-//    保亭黎族苗族自治县("469029", "保亭黎族苗族自治县"),
-//    琼中黎族苗族自治县("469030", "琼中黎族苗族自治县"),
-//    西沙群岛("469031", "西沙群岛"),
-//    南沙群岛("469032", "南沙群岛"),
-//    中沙群岛的岛礁及其海域("469033", "中沙群岛的岛礁及其海域"),
-//    万州区("500101", "万州区"),
-//    涪陵区("500102", "涪陵区"),
-//    渝中区("500103", "渝中区"),
-//    大渡口区("500104", "大渡口区"),
-//    江北区("500105", "江北区"),
-//    沙坪坝区("500106", "沙坪坝区"),
-//    九龙坡区("500107", "九龙坡区"),
-//    南岸区("500108", "南岸区"),
-//    青岛市("370200", "青岛市"),
-//    淄博市("370300", "淄博市"),
-//    枣庄市("370400", "枣庄市"),
-//    东营市("370500", "东营市"),
-//    烟台市("370600", "烟台市"),
-//    临汾市("141000", "临汾市"),
-//    吕梁市("141100", "吕梁市"),
-//    呼和浩特市("150100", "呼和浩特市"),
-//    包头市("150200", "包头市"),
-//    和田地区("653200", "和田地区"),
-//    伊犁哈萨克自治州("654000", "伊犁哈萨克自治州"),
-//    塔城地区("654200", "塔城地区"),
-//    阿勒泰地区("654300", "阿勒泰地区"),
-//    石河子市("659001", "石河子市"),
-//    阿拉尔市("659002", "阿拉尔市"),
-//    图木舒克市("659003", "图木舒克市"),
-//    五家渠市("659004", "五家渠市"),
-//    漯河市("411100", "漯河市"),
-//    三门峡市("411200", "三门峡市"),
-//    南阳市("411300", "南阳市"),
-//    商丘市("411400", "商丘市"),
-//    焦作市("410800", "焦作市"),
-//    南平市("350700", "南平市"),
-//    辽阳市("211000", "辽阳市"),
-//    盘锦市("211100", "盘锦市"),
-//    铁岭市("211200", "铁岭市"),
-//    朝阳市("211300", "朝阳市"),
-//    葫芦岛市("211400", "葫芦岛市"),
-//    长春市("220100", "长春市"),
-//    吉林市("220200", "吉林市"),
-//    四平市("220300", "四平市"),
-//    辽源市("220400", "辽源市"),
-//    通化市("220500", "通化市"),
-//    忻州市("140900", "忻州市"),
-//    鸡西市("230300", "鸡西市"),
-//    鹤岗市("230400", "鹤岗市"),
-//    开封市("410200", "开封市"),
-//    洛阳市("410300", "洛阳市"),
-//    平顶山市("410400", "平顶山市"),
-//    安阳市("410500", "安阳市"),
-//    鹤壁市("410600", "鹤壁市"),
-//    新乡市("410700", "新乡市"),
-//    荆州市("421000", "荆州市"),
-//    黄冈市("421100", "黄冈市"),
-//    日喀则地区("542300", "日喀则地区"),
-//    那曲地区("542400", "那曲地区"),
-//    阿里地区("542500", "阿里地区"),
-//    林芝地区("542600", "林芝地区"),
-//    西安市("610100", "西安市"),
-//    铜川市("610200", "铜川市"),
-//    自贡市("510300", "自贡市"),
-//    攀枝花市("510400", "攀枝花市"),
-//    泸州市("510500", "泸州市"),
-//    德阳市("510600", "德阳市"),
-//    莆田市("350300", "莆田市"),
-//    宝鸡市("610300", "宝鸡市"),
-//    廊坊市("131000", "廊坊市"),
-//    衡水市("131100", "衡水市"),
-//    太原市("140100", "太原市"),
-//    大同市("140200", "大同市"),
-//    阳泉市("140300", "阳泉市"),
-//    长治市("140400", "长治市"),
-//    晋城市("140500", "晋城市"),
-//    朔州市("140600", "朔州市"),
-//    黔南布依族苗族自治州("522700", "黔南布依族苗族自治州"),
-//    普洱市("530800", "普洱市"),
-//    临沧市("530900", "临沧市"),
-//    楚雄彝族自治州("532300", "楚雄彝族自治州"),
-//    红河哈尼族彝族自治州("532500", "红河哈尼族彝族自治州"),
-//    文山壮族苗族自治州("532600", "文山壮族苗族自治州"),
-//    西双版纳傣族自治州("532800", "西双版纳傣族自治州"),
-//    大理白族自治州("532900", "大理白族自治州"),
-//    锦州市("210700", "锦州市"),
-//    营口市("210800", "营口市"),
-//    延边朝鲜族自治州("222400", "延边朝鲜族自治州"),
-//    晋中市("140700", "晋中市"),
-//    常州市("320400", "常州市"),
-//    苏州市("320500", "苏州市"),
-//    南通市("320600", "南通市"),
-//    连云港市("320700", "连云港市"),
-//    淮安市("320800", "淮安市"),
-//    盐城市("320900", "盐城市"),
-//    扬州市("321000", "扬州市"),
-//    镇江市("321100", "镇江市"),
-//    泰州市("321200", "泰州市"),
-//    宿迁市("321300", "宿迁市"),
-//    咸阳市("610400", "咸阳市"),
-//    汉中市("610700", "汉中市"),
-//    榆林市("610800", "榆林市"),
-//    商洛市("611000", "商洛市"),
-//    兰州市("620100", "兰州市"),
-//    嘉峪关市("620200", "嘉峪关市"),
-//    金昌市("620300", "金昌市"),
-//    白银市("620400", "白银市"),
-//    天水市("620500", "天水市"),
-//    武威市("620600", "武威市"),
-//    张掖市("620700", "张掖市"),
-//    杭州市("330100", "杭州市"),
-//    昆明市("530100", "昆明市"),
-//    曲靖市("530300", "曲靖市"),
-//    玉溪市("530400", "玉溪市"),
-//    保山市("530500", "保山市"),
-//    昭通市("530600", "昭通市"),
-//    丽江市("530700", "丽江市"),
-//    运城市("140800", "运城市"),
-//    咸宁市("421200", "咸宁市"),
-//    随州市("421300", "随州市"),
-//    恩施土家族苗族自治州("422800", "恩施土家族苗族自治州"),
-//    仙桃市("429004", "仙桃市"),
-//    潜江市("429005", "潜江市"),
-//    天门市("429006", "天门市"),
-//    神农架林区("429021", "神农架林区"),
-//    长沙市("430100", "长沙市"),
-//    岳阳市("430600", "岳阳市"),
-//    常德市("430700", "常德市"),
-//    张家界市("430800", "张家界市"),
-//    奉贤区("310120", "奉贤区"),
-//    崇明县("310230", "崇明县"),
-//    南京市("320100", "南京市"),
-//    无锡市("320200", "无锡市"),
-//    徐州市("320300", "徐州市"),
-//    甘孜藏族自治州("513300", "甘孜藏族自治州"),
-//    北碚区("500109", "北碚区"),
-//    万盛区("500110", "万盛区"),
-//    双桥区("500111", "双桥区"),
-//    渝北区("500112", "渝北区"),
-//    巴南区("500113", "巴南区"),
-//    黔江区("500114", "黔江区"),
-//    长寿区("500115", "长寿区"),
-//    江津区("500116", "江津区"),
-//    合川区("500117", "合川区"),
-//    永川区("500118", "永川区"),
-//    南川区("500119", "南川区"),
-//    綦江县("500222", "綦江县"),
-//    潼南县("500223", "潼南县"),
-//    铜梁县("500224", "铜梁县"),
-//    大足县("500225", "大足县"),
-//    荣昌县("500226", "荣昌县"),
-//    璧山县("500227", "璧山县"),
-//    梁平县("500228", "梁平县"),
-//    城口县("500229", "城口县"),
-//    丰都县("500230", "丰都县"),
-//    垫江县("500231", "垫江县"),
-//    武隆县("500232", "武隆县"),
-//    忠县("500233", "忠县"),
-//    开县("500234", "开县"),
-//    云阳县("500235", "云阳县"),
-//    奉节县("500236", "奉节县"),
-//    巫山县("500237", "巫山县"),
-//    巫溪县("500238", "巫溪县"),
-//    石柱土家族自治县("500240", "石柱土家族自治县"),
-//    秀山土家族苗族自治县("500241", "秀山土家族苗族自治县"),
-//    酉阳土家族苗族自治县("500242", "酉阳土家族苗族自治县"),
-//    彭水苗族土家族自治县("500243", "彭水苗族土家族自治县"),
-//    成都市("510100", "成都市"),
-//    果洛藏族自治州("632600", "果洛藏族自治州"),
-//    玉树藏族自治州("632700", "玉树藏族自治州"),
-//    海西蒙古族藏族自治州("632800", "海西蒙古族藏族自治州"),
-//    银川市("640100", "银川市"),
-//    石嘴山市("640200", "石嘴山市"),
-//    白山市("220600", "白山市"),
-//    松原市("220700", "松原市"),
-//    平凉市("620800", "平凉市"),
-//    崇文区("110103", "崇文区"),
-//    宣武区("110104", "宣武区"),
-//    朝阳区("110105", "朝阳区"),
-//    丰台区("110106", "丰台区"),
-//    石景山区("110107", "石景山区"),
-//    海淀区("110108", "海淀区"),
-//    门头沟区("110109", "门头沟区"),
-//    房山区("110111", "房山区"),
-//    通州区("110112", "通州区"),
-//    顺义区("110113", "顺义区"),
-//    昌平区("110114", "昌平区"),
-//    大兴区("110115", "大兴区"),
-//    怀柔区("110116", "怀柔区"),
-//    平谷区("110117", "平谷区"),
-//    密云县("110228", "密云县"),
-//    延庆县("110229", "延庆县"),
-//    和平区("120101", "和平区"),
-//    河东区("120102", "河东区"),
-//    河西区("120103", "河西区"),
-//    南开区("120104", "南开区"),
-//    河北区("120105", "河北区"),
-//    红桥区("120106", "红桥区"),
-//    东丽区("120110", "东丽区"),
-//    西青区("120111", "西青区"),
-//    津南区("120112", "津南区"),
-//    北辰区("120113", "北辰区"),
-//    武清区("120114", "武清区"),
-//    宝坻区("120115", "宝坻区"),
-//    滨海新区("120116", "滨海新区"),
-//    宁河县("120221", "宁河县"),
-//    静海县("120223", "静海县"),
-//    蓟县("120225", "蓟县"),
-//    石家庄市("130100", "石家庄市"),
-//    唐山市("130200", "唐山市"),
-//    承德市("130800", "承德市"),
-//    白城市("220800", "白城市"),
-//    酒泉市("620900", "酒泉市"),
-//    庆阳市("621000", "庆阳市"),
-//    定西市("621100", "定西市"),
-//    陇南市("621200", "陇南市"),
-//    广安市("511600", "广安市"),
-//    达州市("511700", "达州市"),
-//    雅安市("511800", "雅安市"),
-//    巴中市("511900", "巴中市"),
-//    资阳市("512000", "资阳市"),
-//    阿坝藏族羌族自治州("513200", "阿坝藏族羌族自治州"),
-//    绵阳市("510700", "绵阳市"),
-//    广元市("510800", "广元市"),
-//    遂宁市("510900", "遂宁市"),
-//    内江市("511000", "内江市"),
-//    乐山市("511100", "乐山市"),
-//    南充市("511300", "南充市"),
-//    眉山市("511400", "眉山市"),
-//    宜宾市("511500", "宜宾市"),
-//    阜新市("210900", "阜新市"),
-//
-//
-//    ;
-//
-//
-//    @Getter
-//    private String code;
-//
-//    @Getter
-//    private String desc;
-//
-//
-//    public static String buildCity(String addr) {
-//        if (StringUtils.isNotEmpty(addr)) {
-//            List<City> citys = Arrays.stream(City.values()).filter(a -> addr.contains(a.name())).collect(Collectors.toList());
-//            if (null != citys && citys.size() > 0) {
-//                return citys.get(0).getCode();
-//            }
-//        }
-//        return "141000";
-//    }
-//
-//
-//}

+ 0 - 107
src/main/java/com/ydtech/constants/enums/InsYcAccident.java

@@ -1,107 +0,0 @@
-//package com.ydtech.constants.enums;
-//
-//import lombok.AllArgsConstructor;
-//import lombok.Getter;
-//
-//import java.util.ArrayList;
-//import java.util.HashMap;
-//import java.util.List;
-//import java.util.Map;
-//
-//
-///**
-// * 保险  永诚意外险
-// *
-// * @author: lig
-// * @date: 2023-02-16
-// */
-//@Getter
-//@AllArgsConstructor
-//public enum InsYcAccident {
-//
-//    A100("100", "A - 5座车方案"),
-//    A101("101", "B - 7座车方案"),
-//    A102("102", "C - 人员意外伤害"),
-//    A103("103", "A-1- 5座车方案"),
-//    A104("104", "A - 5座车方案"),
-//    A105("105", "B - 7座车方案"),
-//    A106("106", "智和诚车商专属方案——5座车300元档"),
-//    A107("107", "嘉诚车商专属方案——5座车200元档"),
-//    A108("108", "驾乘无忧标准版 - 5座车方案"),
-//    A109("109", "驾乘无忧标准版 - 6座车方案"),
-//    A110("110", "驾乘无忧标准版 - 7座车方案"),
-//    A111("111", "驾乘无忧豪华版 –5座车方案"),
-//    A112("112", "驾乘无忧尊享版 –5座车方案"),
-//    A113("113", "全车驾乘险高端版: –5座车方案"),
-//    A114("114", "摩托车驾意险方案"),
-//    A115("115", "A - 5座车低保额方案"),
-//    A116("116", "B - 7座车低保额方案"),
-//    A117("117", "智和诚车商专属方案-通用版"),
-//    A118("118", "驾驶人交通意外方案"),
-//    A119("119", "5座车交强险方案"),
-//    A120("120", "7座车交强险方案"),
-//    A121("121", "A - 5座车方案 常规版"),
-//    A122("122", "A - 5座车方案 标准版"),
-//    A123("123", "B- 7座车方案 – 标准版"),
-//    A132("132", "嘉诚专属方案-5座豪华版"),
-//    A133("133", "嘉诚专属方案-7座豪华版"),
-//    A134("134", "嘉诚专属方案-5座尊享版"),
-//    A135("135", "嘉诚专属方案-7座尊享版"),
-//    A136("136", "嘉诚专属方案-非营运货车5座豪华版"),
-//    A137("137", "嘉诚专属方案-非营运货车5座尊享版"),
-//    A138("138", "全国版C-4座车方案"),
-//    A139("139", "全国版D-5座车方案"),
-//    A140("140", "全国版E-6座车方案"),
-//    A141("141", "全国版F-7座车方案"),
-//    A142("142", "A - 5座车协诚专用方案"),
-//    A143("143", "B - 7座车协诚专用方案"),
-//    A144("144", "C - 5座车协诚专用方案"),
-//    A145("145", "D - 7座车协诚专用方案"),
-//    A146("146", "E - 5座车协诚专用方案"),
-//    A147("147", "E - 7座车协诚专用方案"),
-//    A148("148", "嘉诚专属方案(非新)-5座20万档"),
-//    A149("149", "嘉诚专属方案(非新)-5座25万档"),
-//    A150("150", "嘉诚专属方案(非新)-5座40万档"),
-//    A151("151", "嘉诚专属方案(非新)-7座20万档"),
-//    A152("152", "嘉诚专属方案(非新)-7座25万档"),
-//    A153("153", "嘉诚专属方案(非新)-7座40万档"),
-//    A154("154", "诚意行驾乘险-5座"),
-//
-//    ;
-//
-//    public static InsYcAccident matchKey(String key) {
-//        InsYcAccident result = null;
-//        for (InsYcAccident e : values()) {
-//            if (e.getCode() == key) {
-//                result = e;
-//                break;
-//            }
-//        }
-//        return result;
-//    }
-//
-//
-//    /**
-//     * 转为数据
-//     * @return 枚举对象数组
-//     */
-//    public static List<Map<String, String>> toList() {
-//        List<Map<String, String>> list = new ArrayList<>();
-//        for (InsYcAccident item : InsYcAccident.values()) {
-//            Map<String, String> map = new HashMap<>();
-//            map.put("code", item.getCode());
-//            map.put("name", item.getDesc());
-//            list.add(map);
-//        }
-//        return list;
-//    }
-//
-//
-//    @Getter
-//    private String code;
-//
-//    @Getter
-//    private String desc;
-//
-//
-//}

+ 0 - 87
src/main/java/com/ydtech/constants/enums/Province.java

@@ -1,87 +0,0 @@
-//package com.ydtech.constants.enums;
-//
-//import lombok.AllArgsConstructor;
-//import lombok.Getter;
-//import org.apache.commons.lang3.StringUtils;
-//
-//import java.util.Arrays;
-//import java.util.List;
-//import java.util.stream.Collectors;
-//
-//
-///**
-// * @description: 省份
-// * @author: lig
-// * @date: 2023-02-13
-// */
-//@Getter
-//@AllArgsConstructor
-//public enum Province {
-//
-//    江西省("360000", "江西省"),
-//    新疆维吾尔自治区("650000", "新疆维吾尔自治区"),
-//    黑龙江省("230000", "黑龙江省"),
-//    北京市("110000", "北京市"),
-//    海南省("460000", "海南省"),
-//    河南省("410000", "河南省"),
-//    广西壮族自治区("450000", "广西壮族自治区"),
-//    湖北省("420000", "湖北省"),
-//    广东省("440000", "广东省"),
-//    安徽省("340000", "安徽省"),
-//    辽宁省("210000", "辽宁省"),
-//    福建省("350000", "福建省"),
-//    青海省("630000", "青海省"),
-//    西藏自治区("540000", "西藏自治区"),
-//    上海市("310000", "上海市"),
-//    山东省("370000", "山东省"),
-//    贵州省("520000", "贵州省"),
-//    重庆市("500000", "重庆市"),
-//    内蒙古自治区("150000", "内蒙古自治区"),
-//    台湾省("710000", "台湾省"),
-//    香港特别行政区("810000", "香港特别行政区"),
-//    澳门特别行政区("820000", "澳门特别行政区"),
-//    吉林省("220000", "吉林省"),
-//    陕西省("610000", "陕西省"),
-//    山西省("140000", "山西省"),
-//    甘肃省("620000", "甘肃省"),
-//    浙江省("330000", "浙江省"),
-//    云南省("530000", "云南省"),
-//    湖南省("430000", "湖南省"),
-//    江苏省("320000", "江苏省"),
-//    四川省("510000", "四川省"),
-//    宁夏回族自治区("640000", "宁夏回族自治区"),
-//    天津市("120000", "天津市"),
-//    河北省("130000", "河北省"),
-//
-//
-//    ;
-//
-//
-//    @Getter
-//    private String code;
-//
-//    @Getter
-//    private String desc;
-//
-//
-//
-//    public static String buildProvince(String addr){
-//        if(StringUtils.isNotEmpty(addr)){
-//            List<Province> provinces = Arrays.stream(Province.values()).filter(a -> addr.contains(a.name())).collect(Collectors.toList());
-//            if(null != provinces && provinces.size() > 0){
-//                return provinces.get(0).getCode();
-//            }
-//        }
-//        return "";
-//    }
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//}

+ 0 - 114
src/main/java/com/ydtech/core/page/BaseController.java

@@ -1,114 +0,0 @@
-//package com.ydtech.core.page;
-//
-//
-//import cn.dev33.satoken.session.SaSession;
-//import cn.dev33.satoken.stp.StpUtil;
-//import com.ydtech.modules.admin.model.SysUser;
-//
-//import javax.servlet.http.HttpServletRequest;
-//
-//public class BaseController {
-//
-//    public SysUser getUser() {
-////        return (SysUser) SecurityContextHolder.getContext()
-////                .getAuthentication()
-////                .getPrincipal();
-//        SaSession saSession = StpUtil.getSessionByLoginId(StpUtil.getLoginId());
-//        SysUser sysUser = (SysUser) saSession.get(SaSession.USER);
-//        return sysUser;
-//    }
-//
-//    public String getUserName() {
-////        String userName = null;
-////        Object principal = SecurityContextHolder.getContext().getAuthentication().getPrincipal();
-////
-////        if (principal instanceof UserDetails) {
-////            userName = ((UserDetails) principal).getUsername();
-////        } else {
-////            userName = principal.toString();
-////        }
-//        return StpUtil.getLoginId().toString();
-//    }
-//
-//
-////    /**
-////     * 获取过滤字段的值
-////     *
-////     * @param filterName
-////     * @return
-////     */
-////    public String getColumnFilterValue(PageRequest pageRequest, String filterName) {
-////        String value = null;
-////        ColumnFilter columnFilter = pageRequest.getColumnFilter(filterName);
-////        if (columnFilter != null) {
-////            value = columnFilter.getValue();
-////        }
-////        return value;
-////    }
-//
-//    /**
-//     * 获取部门id
-//     *
-//     * @param request
-//     * @return
-//     */
-//    public String getdeptId(HttpServletRequest request) {
-//        SaSession saSession = StpUtil.getSessionByLoginId(StpUtil.getLoginId());
-//        SysUser sysUser = (SysUser) saSession.get(SaSession.USER);
-//        return sysUser.getDeptId();
-////        return JwtTokenUtils.getDeptIdFromRequest(request);
-//    }
-//
-//
-//    /**
-//     * 获取用户ID
-//     *
-//     * @param request
-//     * @return
-//     */
-//    public String getUserId(HttpServletRequest request) {
-//        return StpUtil.getLoginId().toString();
-////        return JwtTokenUtils.getUserIdFromRequest(request);
-//    }
-//
-//
-//    /**
-//     * 新加 可用
-//     *
-//     * @author: lig
-//     * @date: 2023年05月18日 0018
-//     */
-//    public String getUserId2() {
-//        return StpUtil.getLoginId().toString();
-////        Authentication authentication = SecurityUtils.getAuthentication();
-////
-////        JwtAuthenticatioToken j = (JwtAuthenticatioToken) authentication;
-////        return JwtTokenUtils.getUserIdFromToken(j.getToken());
-//    }
-//    /**
-//     * 新加 可用
-//     *
-//     * @author: lig
-//     * @date: 2023年05月18日 0018
-//     */
-//    public String getUserId() {
-//        return StpUtil.getLoginId().toString();
-////        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
-//////        Authentication authentication = SecurityUtils.getAuthentication();
-////
-////        JwtAuthenticatioToken j = (JwtAuthenticatioToken) authentication;
-////        return JwtTokenUtils.getUserIdFromToken(j.getToken());
-//    }
-//
-//    /**
-//     * 获取用户名
-//     *
-//     * @param request
-//     * @return
-//     */
-//    public String getJwtUserName(HttpServletRequest request) {
-//        return StpUtil.getLoginId().toString();
-////        return JwtTokenUtils.getUsernameFromRequest(request);
-//    }
-//
-//}

+ 0 - 24
src/main/java/com/ydtech/modules/admin/controller/DemoController.java

@@ -1,24 +0,0 @@
-//package com.ydtech.modules.admin.controller;
-//
-//import com.ydtech.modules.admin.model.SysUser;
-//import org.springframework.web.bind.annotation.GetMapping;
-//import org.springframework.web.bind.annotation.RestController;
-//
-//import java.util.List;
-//
-//
-//@RestController
-//public class DemoController {
-//
-////    @PreAuthorize("hasAuthority('sys:demo:view')")
-//    @GetMapping("/hello")
-//    public String hello() {
-//        return "Hello SpringSecurity!";
-//    }
-//
-//    public static void main(String[] args) {
-//        List<SysUser> ls = null;
-//        System.out.println(ls.size());
-//    }
-//}
-//

+ 0 - 36
src/main/java/com/ydtech/modules/admin/dao/SysRoleDao.java

@@ -1,36 +0,0 @@
-//package com.ydtech.modules.admin.dao;
-//
-//import com.ydtech.core.page.PageResult;
-//import com.ydtech.modules.admin.model.SysRole;
-//
-//import java.util.List;
-//
-//public interface SysRoleDao {
-//
-//    public SysRole selectByPk(Long id);
-//
-//    public List<SysRole> selectAll();
-//
-//    public List<SysRole> selectList(String whereCase, Object[] paramValues);
-//
-//    public Integer count(String whereCase, Object[] paramValues);
-//
-//    public PageResult selectPaging(int pageNumber, int pageSize, String whereCase, Object[] paramValues);
-//
-//    public Integer insert(SysRole model);
-//
-//    public Integer insertReturnPk(SysRole model);
-//
-//    public Integer insertSelective(SysRole model);
-//
-//    public Integer update(SysRole model);
-//
-//    public Integer updateSelective(SysRole model);
-//
-//    public Integer delete(Long id);
-//
-//    public Integer delete(List<SysRole> lsSysRole);
-//}
-//
-//
-//

+ 0 - 38
src/main/java/com/ydtech/modules/admin/dao/SysUserDao.java

@@ -1,38 +0,0 @@
-//package com.ydtech.modules.admin.dao;
-//
-//import com.ydtech.core.page.PageResult;
-//import com.ydtech.modules.admin.model.SysUser;
-//import com.ydtech.modules.admin.model.vo.SysUserVO;
-//
-//import java.util.List;
-//
-//public interface SysUserDao {
-//    SysUser selectByPk(String id);
-//
-//    SysUserVO selectById(String id);
-//
-//    SysUserVO selectByDeptId(String deptId);
-//
-//    List<SysUser> selectAll();
-//
-//    List<SysUser> selectList(String whereCase, Object[] paramValues);
-//
-//    Integer count(String whereCase, Object[] paramValues);
-//
-//    PageResult selectPaging(int pageNumber, int pageSize, String whereCase, Object[] paramValues);
-//
-//    Integer insert(SysUser model);
-//
-//    Integer insertReturnPk(SysUser model);
-//
-//    Integer insertSelective(SysUser model);
-//
-//    Integer update(SysUser model);
-//
-//    Integer updateSelective(SysUser model);
-//
-//    Integer delete(String id);
-//
-//    Integer delete(List<SysUser> lsSysUser);
-//
-//}

+ 0 - 319
src/main/java/com/ydtech/modules/admin/dao/impl/SysRoleDaoImpl.java

@@ -1,319 +0,0 @@
-//
-//
-//
-//package com.ydtech.modules.admin.dao.impl;
-//
-//import com.github.drinkjava2.jdialects.Dialect;
-//import com.ydtech.core.page.PageResult;
-//import com.ydtech.modules.admin.dao.SysRoleDao;
-//import com.ydtech.modules.admin.model.SysRole;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.dao.support.DataAccessUtils;
-//import org.springframework.jdbc.core.*;
-//import org.springframework.jdbc.support.GeneratedKeyHolder;
-//import org.springframework.jdbc.support.KeyHolder;
-//import org.springframework.stereotype.Repository;
-//
-//import javax.sql.DataSource;
-//import java.sql.Connection;
-//import java.sql.PreparedStatement;
-//import java.sql.ResultSet;
-//import java.sql.SQLException;
-//import java.util.ArrayList;
-//import java.util.List;
-//
-//
-//@Repository
-//public class SysRoleDaoImpl implements SysRoleDao {
-//
-//    @Autowired
-//    public DataSource dataSource;
-//
-//    public static class SysRoleRowMapper implements RowMapper {
-//        public SysRole mapRow(ResultSet resultSet, int rowNum) throws SQLException {
-//            SysRole model = new SysRole();
-//
-//            model.setId(resultSet.getLong("id"));
-//            model.setName(resultSet.getString("name"));
-//            model.setRemark(resultSet.getString("remark"));
-//            model.setCreateBy(resultSet.getString("create_by"));
-//            model.setCreateTime(resultSet.getDate("create_time"));
-//            model.setLastUpdateBy(resultSet.getString("last_update_by"));
-//            model.setLastUpdateTime(resultSet.getDate("last_update_time"));
-//            model.setDelFlag(resultSet.getInt("del_flag"));
-//            return model;
-//        }
-//    }
-//
-//    @Override
-//    public SysRole selectByPk(Long id) {
-//        String sql = "select t.id, t.name, t.remark, t.create_by, t.create_time, t.last_update_by, t.last_update_time, t.del_flag from sys_role t  where id=?";
-//
-//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-//
-//        List<SysRole> query = jdbcTemplate.query(sql, new BeanPropertyRowMapper<SysRole>(SysRole.class), new Object[]{id});
-//
-//        return DataAccessUtils.uniqueResult(query);
-//    }
-//
-//    @Override
-//    public List<SysRole> selectAll() {
-//        String sql = "select t.id, t.name, t.remark, t.create_by, t.create_time, t.last_update_by, t.last_update_time, t.del_flag from sys_role t  ";
-//
-//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-//
-//        return jdbcTemplate.query(sql, new SysRoleRowMapper());
-//    }
-//
-//    public List<SysRole> selectList(String whereCase, Object[] paramValues) {
-//        String sql = "select t.id, t.name, t.remark, t.create_by, t.create_time, t.last_update_by, t.last_update_time, t.del_flag from sys_role t  " + whereCase;
-//
-//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-//
-//        return jdbcTemplate.query(sql, paramValues, new SysRoleRowMapper());
-//    }
-//
-//    public Integer count(String whereCase, Object[] paramValues) {
-//        String sql = "select count(1) from sys_role t " + whereCase;
-//
-//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-//
-//        return jdbcTemplate.queryForObject(sql, paramValues, Integer.class);
-//    }
-//
-//    public PageResult selectPaging(int pageNumber, int pageSize, String whereCase, Object[] paramValues) {
-//
-//        Dialect dialect = Dialect.guessDialect(dataSource);
-//        String sql = dialect.pagin(pageNumber, pageSize, "select t.id, t.name, t.remark, t.create_by, t.create_time, t.last_update_by, t.last_update_time, t.del_flag from sys_role t  " + whereCase);
-//
-//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-//        List<SysRole> recordList = jdbcTemplate.query(sql, paramValues, new SysRoleRowMapper());
-//
-//        int totalCount = count(whereCase, paramValues);
-//
-//        PageResult PageResult = new PageResult(pageNumber, pageSize, totalCount, recordList);
-//
-//        return PageResult;
-//    }
-//
-//
-//    @Override
-//    public Integer insert(SysRole model) {
-//
-//        String sql = "insert into sys_role ( id, name, remark, create_by, create_time, last_update_by, last_update_time, del_flag) values ( ?, ?, ?, ?, ?, ?, ?, ?) ";
-//
-//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-//
-//        Object[] params = new Object[]{model.getId(), model.getName(), model.getRemark(), model.getCreateBy(), model.getCreateTime(), model.getLastUpdateBy(), model.getLastUpdateTime(), model.getDelFlag()};
-//
-//        int out = jdbcTemplate.update(sql, params);
-//
-//        return out;
-//    }
-//
-//    @Override
-//    public Integer insertReturnPk(SysRole model) {
-//
-//        String sql = "insert into sys_role ( id, name, remark, create_by, create_time, last_update_by, last_update_time, del_flag) values ( ?, ?, ?, ?, ?, ?, ?, ?) ";
-//
-//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-//
-//        KeyHolder keyHolder = new GeneratedKeyHolder();
-//        jdbcTemplate.update(new PreparedStatementCreator() {
-//            @Override
-//            public PreparedStatement createPreparedStatement(Connection conn) throws SQLException {
-//                PreparedStatement ps = conn.prepareStatement(sql, PreparedStatement.RETURN_GENERATED_KEYS);
-//                ps.setObject(1, model.getId());
-//                ps.setObject(2, model.getName());
-//                ps.setObject(3, model.getRemark());
-//                ps.setObject(4, model.getCreateBy());
-//                ps.setObject(5, model.getCreateTime());
-//                ps.setObject(6, model.getLastUpdateBy());
-//                ps.setObject(7, model.getLastUpdateTime());
-//                ps.setObject(8, model.getDelFlag());
-//                return ps;
-//            }
-//        }, keyHolder);
-//
-//        return keyHolder.getKey().intValue();
-//    }
-//
-//
-//    @Override
-//    public Integer insertSelective(SysRole model) {
-//
-//        StringBuffer sbSql = new StringBuffer();
-//        StringBuffer sbParams = new StringBuffer();
-//        ArrayList<Object> alParamsValues = new ArrayList<Object>();
-//
-//        String pre = "";
-//
-//        if (model.getId() != null) {
-//            sbSql.append(pre + "id");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getId());
-//            pre = ",";
-//        }
-//        if (model.getName() != null) {
-//            sbSql.append(pre + "name");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getName());
-//            pre = ",";
-//        }
-//        if (model.getRemark() != null) {
-//            sbSql.append(pre + "remark");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getRemark());
-//            pre = ",";
-//        }
-//        if (model.getCreateBy() != null) {
-//            sbSql.append(pre + "create_by");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getCreateBy());
-//            pre = ",";
-//        }
-//        if (model.getCreateTime() != null) {
-//            sbSql.append(pre + "create_time");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getCreateTime());
-//            pre = ",";
-//        }
-//        if (model.getLastUpdateBy() != null) {
-//            sbSql.append(pre + "last_update_by");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getLastUpdateBy());
-//            pre = ",";
-//        }
-//        if (model.getLastUpdateTime() != null) {
-//            sbSql.append(pre + "last_update_time");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getLastUpdateTime());
-//            pre = ",";
-//        }
-//        if (model.getDelFlag() != null) {
-//            sbSql.append(pre + "del_flag");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getDelFlag());
-//            pre = ",";
-//        }
-//
-//
-//        String sql = "INSERT INTO sys_role (" + sbSql.toString() + ") VALUES (" + sbParams.toString() + ")";
-//
-//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-//
-//        Object[] params = alParamsValues.toArray();
-//
-//        int out = jdbcTemplate.update(sql, params);
-//
-//        return out;
-//    }
-//
-//    @Override
-//    public Integer update(SysRole model) {
-//
-//        String sql = "update sys_role set name=?, remark=?, create_by=?, create_time=?, last_update_by=?, last_update_time=?, del_flag=? where id=?";
-//
-//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-//
-//        Object[] params = new Object[]{model.getName(), model.getRemark(), model.getCreateBy(), model.getCreateTime(), model.getLastUpdateBy(), model.getLastUpdateTime(), model.getDelFlag(), model.getId()};
-//
-//        return jdbcTemplate.update(sql, params);
-//    }
-//
-//    @Override
-//    public Integer updateSelective(SysRole model) {
-//
-//        StringBuffer sbSql = new StringBuffer();
-//        StringBuffer sbParams = new StringBuffer();
-//        ArrayList<Object> alParamsValues = new ArrayList<Object>();
-//
-//        String pre = "";
-//        String preWhere = "";
-//
-//        if (model.getName() != null) {
-//            sbSql.append(pre + "name=?");
-//            alParamsValues.add(model.getName());
-//            pre = ",";
-//        }
-//        if (model.getRemark() != null) {
-//            sbSql.append(pre + "remark=?");
-//            alParamsValues.add(model.getRemark());
-//            pre = ",";
-//        }
-//        if (model.getCreateBy() != null) {
-//            sbSql.append(pre + "create_by=?");
-//            alParamsValues.add(model.getCreateBy());
-//            pre = ",";
-//        }
-//        if (model.getCreateTime() != null) {
-//            sbSql.append(pre + "create_time=?");
-//            alParamsValues.add(model.getCreateTime());
-//            pre = ",";
-//        }
-//        if (model.getLastUpdateBy() != null) {
-//            sbSql.append(pre + "last_update_by=?");
-//            alParamsValues.add(model.getLastUpdateBy());
-//            pre = ",";
-//        }
-//        if (model.getLastUpdateTime() != null) {
-//            sbSql.append(pre + "last_update_time=?");
-//            alParamsValues.add(model.getLastUpdateTime());
-//            pre = ",";
-//        }
-//        if (model.getDelFlag() != null) {
-//            sbSql.append(pre + "del_flag=?");
-//            alParamsValues.add(model.getDelFlag());
-//            pre = ",";
-//        }
-//        if (model.getId() != null) {
-//            sbParams.append(preWhere + "id=?");
-//            alParamsValues.add(model.getId());
-//            preWhere = ",";
-//        }
-//
-//
-//        if (!sbSql.toString().equalsIgnoreCase("")) {
-//            String sql = "update sys_role set " + sbSql.toString() + " where " + sbParams.toString();
-//
-//            JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-//
-//            Object[] params = alParamsValues.toArray();
-//
-//            return jdbcTemplate.update(sql, params);
-//        }
-//
-//        return 0;
-//    }
-//
-//    @Override
-//    public Integer delete(Long id) {
-//
-//        String sql = "delete from sys_role where id=?";
-//
-//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-//
-//        return jdbcTemplate.update(sql, id);
-//    }
-//
-//    @Override
-//    public Integer delete(List<SysRole> lsSysRole) {
-//        String sql = "delete from sys_role where id=?";
-//
-//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-//
-//        return jdbcTemplate.batchUpdate(sql, new BatchPreparedStatementSetter() {
-//            @Override
-//            public void setValues(PreparedStatement preparedStatement, int i) throws SQLException {
-//                preparedStatement.setLong(1, lsSysRole.get(i).getId());
-//            }
-//
-//            @Override
-//            public int getBatchSize() {
-//                return lsSysRole.size();
-//            }
-//        }).length;
-//    }
-//}
-//
-//

+ 0 - 505
src/main/java/com/ydtech/modules/admin/dao/impl/SysUserDaoImpl.java

@@ -1,505 +0,0 @@
-//package com.ydtech.modules.admin.dao.impl;
-//
-//import com.github.drinkjava2.jdialects.Dialect;
-//import com.ydtech.core.page.PageResult;
-//import com.ydtech.modules.admin.dao.SysUserDao;
-//import com.ydtech.modules.admin.model.SysUser;
-//import com.ydtech.modules.admin.model.vo.SysUserVO;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.jdbc.core.*;
-//import org.springframework.jdbc.support.GeneratedKeyHolder;
-//import org.springframework.jdbc.support.KeyHolder;
-//import org.springframework.stereotype.Repository;
-//
-//import javax.sql.DataSource;
-//import java.sql.Connection;
-//import java.sql.PreparedStatement;
-//import java.sql.ResultSet;
-//import java.sql.SQLException;
-//import java.util.ArrayList;
-//import java.util.List;
-//
-//
-//@Repository
-//public class SysUserDaoImpl implements SysUserDao {
-//
-//    @Autowired
-//    public DataSource dataSource;
-//
-//    public static class SysUserRowMapper implements RowMapper {
-//        public SysUser mapRow(ResultSet resultSet, int rowNum) throws SQLException {
-//            SysUser model = new SysUser();
-//
-//            model.setId(resultSet.getString("id"));
-//            model.setName(resultSet.getString("name"));
-//            model.setPassword(resultSet.getString("password"));
-//            model.setSalt(resultSet.getString("salt"));
-//            model.setEmail(resultSet.getString("email"));
-//            model.setMobile(resultSet.getString("mobile"));
-//            model.setStatus(resultSet.getInt("status"));
-//            model.setDeptId(resultSet.getString("dept_id"));
-//            model.setCreateBy(resultSet.getString("create_by"));
-//            model.setCreateTime(resultSet.getDate("create_time"));
-////            model.setLastUpdateBy(resultSet.getString("last_update_by"));
-////            model.setLastUpdateTime(resultSet.getDate("last_update_time"));
-////            model.setDelFlag(resultSet.getInt("del_flag"));
-////            model.setUsertype(resultSet.getString("usertype"));
-////            model.setTenantId(resultSet.getString("tenant_id"));
-//            model.setSex(resultSet.getString("sex"));
-////            model.setJobCode(resultSet.getString("job_code"));
-//            return model;
-//        }
-//    }
-//
-//    public static class SysUserVORowMapper implements RowMapper {
-//        public SysUserVO mapRow(ResultSet resultSet, int rowNum) throws SQLException {
-//            SysUserVO model = new SysUserVO();
-//
-//            model.setId(resultSet.getString("id"));
-//            model.setName(resultSet.getString("name"));
-//            model.setDeptid(resultSet.getString("deptid"));
-//            model.setDeptname(resultSet.getString("deptname"));
-//            model.setComid(resultSet.getString("comid"));
-//            model.setComname(resultSet.getString("comname"));
-//            model.setStatus(resultSet.getString("status"));
-//            return model;
-//        }
-//    }
-//
-//    @Override
-//    public SysUser selectByPk(String id) {
-//        String sql = "select t.id, t.name, t.password, t.salt, t.email, t.mobile, t.status, t.dept_id, t.create_by, t.create_time, t.last_update_by, t.last_update_time, t.del_flag, t.usertype, t.tenant_id, t.sex, t.job_code from sys_user t  where id=?";
-//
-//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-//
-//        List<SysUser> ls = jdbcTemplate.query(sql, new BeanPropertyRowMapper<SysUser>(SysUser.class), new Object[]{id});
-//
-//        if (ls != null && ls.size() > 0) {
-//            return ls.get(0);
-//        }
-//
-//        return null;
-//    }
-//
-//    @Override
-//    public SysUserVO selectById(String id) {
-//        String sql = "select t.id,t.name,t.dept_id deptid,t2.name deptname,t3.id comid,t3.name comname,t.status " +
-//                "from sys_user t left join sys_dept t2 on t.dept_id=t2.id " +
-//                "left join sys_dept t3 on t2.parent_id=t3.id " +
-//                "left join esm_user_internal a on t.id=a.id " +
-//                "where t.id=?";
-//
-//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-//
-//        List<SysUserVO> ls = jdbcTemplate.query(sql, new BeanPropertyRowMapper<SysUserVO>(SysUserVO.class), new Object[]{id});
-//
-//        if (ls != null && ls.size() > 0) {
-//            return ls.get(0);
-//        }
-//
-//        return null;
-//    }
-//
-//    /**
-//     * 根据部门ID查询该部门下的团队长信息
-//     *
-//     * @param deptId
-//     * @return
-//     */
-//    @Override
-//    public SysUserVO selectByDeptId(String deptId) {
-//        String sql = "select t1.id,t1.name,t1.dept_id deptid,sd.name deptname,sd2.id comid,sd2.name comname,t2.status " +
-//                "from sys_user t1 left join esm_user_internal t2 on t1.id=t2.id " +
-//                "LEFT JOIN sys_dept sd ON t1.dept_id=sd.id " +
-//                "LEFT JOIN sys_dept sd2 ON sd2.id=sd.parent_id " +
-//                "where 1=1  and t2.isteamleader = '1' and t1.dept_id=?";
-//
-//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-//
-//        List<SysUserVO> ls = jdbcTemplate.query(sql, new BeanPropertyRowMapper<SysUserVO>(SysUserVO.class), new Object[]{deptId});
-//
-//        if (ls != null && ls.size() > 0) {
-//            return ls.get(0);
-//        }
-//
-//        return null;
-//    }
-//
-//    @Override
-//    public List<SysUser> selectAll() {
-//        String sql = "select t.id, t.name, t.password, t.salt, t.email, t.mobile, t.status, t.dept_id, t.create_by, t.create_time, t.last_update_by, t.last_update_time, t.del_flag, t.usertype, t.tenant_id, t.sex, t.job_code from sys_user t  ";
-//
-//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-//
-//        return jdbcTemplate.query(sql, new SysUserRowMapper());
-//    }
-//
-//    public List<SysUser> selectList(String whereCase, Object[] paramValues) {
-//        String sql = "select t.id, t.name, t.password, t.salt, t.email, t.mobile, t.status, t.dept_id, t.create_by, t.create_time, t.last_update_by, t.last_update_time, t.del_flag, t.usertype, t.tenant_id, t.sex, t.job_code from sys_user t  " + whereCase;
-//
-//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-//
-//        return jdbcTemplate.query(sql, paramValues, new SysUserRowMapper());
-//    }
-//
-//    public Integer count(String whereCase, Object[] paramValues) {
-//        String sql = "select count(1) from sys_user t " + whereCase;
-//
-//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-//
-//        return jdbcTemplate.queryForObject(sql, paramValues, Integer.class);
-//    }
-//
-//    public PageResult selectPaging(int pageNumber, int pageSize, String whereCase, Object[] paramValues) {
-//
-//        Dialect dialect = Dialect.guessDialect(dataSource);
-//        String sql = dialect.pagin(pageNumber, pageSize, "select t.id, t.name, t.password, t.salt, t.email, t.mobile, t.status, t.dept_id, t.create_by, t.create_time, t.last_update_by, t.last_update_time, t.del_flag, t.usertype, t.tenant_id, t.sex, t.job_code from sys_user t  " + whereCase);
-//
-//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-//        List<SysUser> recordList = jdbcTemplate.query(sql, paramValues, new SysUserRowMapper());
-//
-//        int totalCount = count(whereCase, paramValues);
-//
-//        PageResult PageResult = new PageResult(pageNumber, pageSize, totalCount, recordList);
-//
-//        return PageResult;
-//    }
-//
-//
-//    @Override
-//    public Integer insert(SysUser model) {
-//
-//        String sql = "insert into sys_user ( id, name, password, salt, email, mobile, status, dept_id, create_by, create_time, last_update_by, last_update_time, del_flag, usertype, tenant_id, sex, job_code) values ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ";
-//
-//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-//
-//        Object[] params = new Object[]{model.getId(), model.getName(), model.getPassword(), model.getSalt(), model.getEmail(), model.getMobile(), model.getStatus(), model.getDeptId(), model.getCreateBy(), model.getCreateTime(), model.getUpdateBy(), model.getUpdateTime(), model.getDelFlag(), model.getUsertype(), model.getTenantId(), model.getSex(), model.getJobCode()};
-//
-//        int out = jdbcTemplate.update(sql, params);
-//
-//        out = 0;
-//
-//        return out;
-//    }
-//
-//    @Override
-//    public Integer insertReturnPk(SysUser model) {
-//
-//        String sql = "insert into sys_user ( id, name, password, salt, email, mobile, status, dept_id, create_by, create_time, last_update_by, last_update_time, del_flag, usertype, tenant_id, sex, job_code) values ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ";
-//
-//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-//
-//        KeyHolder keyHolder = new GeneratedKeyHolder();
-//        jdbcTemplate.update(new PreparedStatementCreator() {
-//            @Override
-//            public PreparedStatement createPreparedStatement(Connection conn) throws SQLException {
-//                PreparedStatement ps = conn.prepareStatement(sql, PreparedStatement.RETURN_GENERATED_KEYS);
-////                ps.setObject(1, model.getId());
-////                ps.setObject(2, model.getName());
-////                ps.setObject(3, model.getPassword());
-////                ps.setObject(4, model.getSalt());
-////                ps.setObject(5, model.getEmail());
-////                ps.setObject(6, model.getMobile());
-////                ps.setObject(7, model.getStatus());
-////                ps.setObject(8, model.getDeptId());
-////                ps.setObject(9, model.getCreateBy());
-////                ps.setObject(10, model.getCreateTime());
-////                ps.setObject(11, model.getLastUpdateBy());
-////                ps.setObject(12, model.getLastUpdateTime());
-////                ps.setObject(13, model.getDelFlag());
-////                ps.setObject(14, model.getUsertype());
-////                ps.setObject(15, model.getTenantId());
-////                ps.setObject(16, model.getSex());
-////                ps.setObject(17, model.getJobCode());
-//                return ps;
-//            }
-//        }, keyHolder);
-//
-//        return keyHolder.getKey().intValue();
-//    }
-//
-//
-//    @Override
-//    public Integer insertSelective(SysUser model) {
-//
-//        StringBuffer sbSql = new StringBuffer();
-//        StringBuffer sbParams = new StringBuffer();
-//        ArrayList<Object> alParamsValues = new ArrayList<Object>();
-//
-//        String pre = "";
-//
-//        if (model.getId() != null) {
-//            sbSql.append(pre + "id");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getId());
-//            pre = ",";
-//        }
-//        if (model.getName() != null) {
-//            sbSql.append(pre + "name");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getName());
-//            pre = ",";
-//        }
-//        if (model.getPassword() != null) {
-//            sbSql.append(pre + "password");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getPassword());
-//            pre = ",";
-//        }
-//        if (model.getSalt() != null) {
-//            sbSql.append(pre + "salt");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getSalt());
-//            pre = ",";
-//        }
-//        if (model.getEmail() != null) {
-//            sbSql.append(pre + "email");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getEmail());
-//            pre = ",";
-//        }
-//        if (model.getMobile() != null) {
-//            sbSql.append(pre + "mobile");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getMobile());
-//            pre = ",";
-//        }
-//        if (model.getStatus() != null) {
-//            sbSql.append(pre + "status");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getStatus());
-//            pre = ",";
-//        }
-//        if (model.getDeptId() != null) {
-//            sbSql.append(pre + "dept_id");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getDeptId());
-//            pre = ",";
-//        }
-//        if (model.getCreateBy() != null) {
-//            sbSql.append(pre + "create_by");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getCreateBy());
-//            pre = ",";
-//        }
-//        if (model.getCreateTime() != null) {
-//            sbSql.append(pre + "create_time");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getCreateTime());
-//            pre = ",";
-//        }
-//        if (model.getLastUpdateBy() != null) {
-//            sbSql.append(pre + "last_update_by");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getLastUpdateBy());
-//            pre = ",";
-//        }
-//        if (model.getLastUpdateTime() != null) {
-//            sbSql.append(pre + "last_update_time");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getLastUpdateTime());
-//            pre = ",";
-//        }
-//        if (model.getDelFlag() != null) {
-//            sbSql.append(pre + "del_flag");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getDelFlag());
-//            pre = ",";
-//        }
-//        if (model.getUsertype() != null) {
-//            sbSql.append(pre + "usertype");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getUsertype());
-//            pre = ",";
-//        }
-//        if (model.getTenantId() != null) {
-//            sbSql.append(pre + "tenant_id");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getTenantId());
-//            pre = ",";
-//        }
-//        if (model.getSex() != null) {
-//            sbSql.append(pre + "sex");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getSex());
-//            pre = ",";
-//        }
-//        if (model.getJobCode() != null) {
-//            sbSql.append(pre + "job_code");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getJobCode());
-//            pre = ",";
-//        }
-//        if (model.getOpenid() != null) {
-//            sbSql.append(pre + "openid");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getOpenid());
-//            pre = ",";
-//        }
-//
-//        String sql = "INSERT INTO sys_user (" + sbSql.toString() + ") VALUES (" + sbParams.toString() + ")";
-//
-//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-//
-//        Object[] params = alParamsValues.toArray();
-//
-//        int out = jdbcTemplate.update(sql, params);
-//
-//        return out;
-//    }
-//
-//    @Override
-//    public Integer update(SysUser model) {
-//
-//        String sql = "update sys_user set name=?, password=?, salt=?, email=?, mobile=?, status=?, dept_id=?, create_by=?, create_time=?, last_update_by=?, last_update_time=?, del_flag=?, usertype=?, tenant_id=?, sex=?, job_code=? where id=?";
-//
-//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-//
-//        Object[] params = new Object[]{model.getName(), model.getPassword(), model.getSalt(), model.getEmail(), model.getMobile(), model.getStatus(), model.getDeptId(), model.getCreateBy(), model.getCreateTime(), model.getLastUpdateBy(), model.getLastUpdateTime(), model.getDelFlag(), model.getUsertype(), model.getTenantId(), model.getSex(), model.getJobCode(), model.getId()};
-//
-//        return jdbcTemplate.update(sql, params);
-//    }
-//
-//    @Override
-//    public Integer updateSelective(SysUser model) {
-//
-//        StringBuffer sbSql = new StringBuffer();
-//        StringBuffer sbParams = new StringBuffer();
-//        ArrayList<Object> alParamsValues = new ArrayList<Object>();
-//
-//        String pre = "";
-//        String preWhere = "";
-//
-//        if (model.getName() != null) {
-//            sbSql.append(pre + "name=?");
-//            alParamsValues.add(model.getName());
-//            pre = ",";
-//        }
-//        if (model.getPassword() != null) {
-//            sbSql.append(pre + "password=?");
-//            alParamsValues.add(model.getPassword());
-//            pre = ",";
-//        }
-//        if (model.getSalt() != null) {
-//            sbSql.append(pre + "salt=?");
-//            alParamsValues.add(model.getSalt());
-//            pre = ",";
-//        }
-//        if (model.getEmail() != null) {
-//            sbSql.append(pre + "email=?");
-//            alParamsValues.add(model.getEmail());
-//            pre = ",";
-//        }
-//        if (model.getMobile() != null) {
-//            sbSql.append(pre + "mobile=?");
-//            alParamsValues.add(model.getMobile());
-//            pre = ",";
-//        }
-//        if (model.getStatus() != null) {
-//            sbSql.append(pre + "status=?");
-//            alParamsValues.add(model.getStatus());
-//            pre = ",";
-//        }
-//        if (model.getDeptId() != null) {
-//            sbSql.append(pre + "dept_id=?");
-//            alParamsValues.add(model.getDeptId());
-//            pre = ",";
-//        }
-//        if (model.getCreateBy() != null) {
-//            sbSql.append(pre + "create_by=?");
-//            alParamsValues.add(model.getCreateBy());
-//            pre = ",";
-//        }
-//        if (model.getCreateTime() != null) {
-//            sbSql.append(pre + "create_time=?");
-//            alParamsValues.add(model.getCreateTime());
-//            pre = ",";
-//        }
-//        if (model.getLastUpdateBy() != null) {
-//            sbSql.append(pre + "last_update_by=?");
-//            alParamsValues.add(model.getLastUpdateBy());
-//            pre = ",";
-//        }
-//        if (model.getLastUpdateTime() != null) {
-//            sbSql.append(pre + "last_update_time=?");
-//            alParamsValues.add(model.getLastUpdateTime());
-//            pre = ",";
-//        }
-//        if (model.getDelFlag() != null) {
-//            sbSql.append(pre + "del_flag=?");
-//            alParamsValues.add(model.getDelFlag());
-//            pre = ",";
-//        }
-//        if (model.getUsertype() != null) {
-//            sbSql.append(pre + "usertype=?");
-//            alParamsValues.add(model.getUsertype());
-//            pre = ",";
-//        }
-//        if (model.getTenantId() != null) {
-//            sbSql.append(pre + "tenant_id=?");
-//            alParamsValues.add(model.getTenantId());
-//            pre = ",";
-//        }
-//        if (model.getSex() != null) {
-//            sbSql.append(pre + "sex=?");
-//            alParamsValues.add(model.getSex());
-//            pre = ",";
-//        }
-//        if (model.getJobCode() != null) {
-//            sbSql.append(pre + "job_code=?");
-//            alParamsValues.add(model.getJobCode());
-//            pre = ",";
-//        }
-//        if (model.getId() != null) {
-//            sbParams.append(preWhere + "id=?");
-//            alParamsValues.add(model.getId());
-//            preWhere = ",";
-//        }
-//
-//
-//        if (!sbSql.toString().equalsIgnoreCase("")) {
-//            String sql = "update sys_user set " + sbSql.toString() + " where " + sbParams.toString();
-//
-//            JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-//
-//            Object[] params = alParamsValues.toArray();
-//
-//            return jdbcTemplate.update(sql, params);
-//        }
-//
-//        return 0;
-//    }
-//
-//    @Override
-//    public Integer delete(String id) {
-//
-//        String sql = "delete from sys_user where id=?";
-//
-//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-//
-//        return jdbcTemplate.update(sql, id);
-//    }
-//
-//    @Override
-//    public Integer delete(List<SysUser> lsSysUser) {
-//        String sql = "delete from sys_user where id=?";
-//
-//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-//
-//        return jdbcTemplate.batchUpdate(sql, new BatchPreparedStatementSetter() {
-//            @Override
-//            public void setValues(PreparedStatement preparedStatement, int i) throws SQLException {
-//                preparedStatement.setString(1, lsSysUser.get(i).getId());
-//            }
-//
-//            @Override
-//            public int getBatchSize() {
-//                return lsSysUser.size();
-//            }
-//        }).length;
-//    }
-//}
-//
-//
-//
-//

+ 0 - 518
src/main/java/com/ydtech/modules/esm/controller/EsmUserInternalCheckController.java

@@ -1,518 +0,0 @@
-//package com.ydtech.modules.esm.controller;
-//
-//
-//import com.ydtech.core.page.HttpResult;
-//import com.ydtech.core.page.PageRequest;
-//import com.ydtech.modules.admin.model.SysUser;
-//import com.ydtech.modules.admin.model.SysUserRole;
-//import com.ydtech.modules.admin.service.SysMsgLogService;
-//import com.ydtech.modules.admin.service.SysUserRoleService;
-//import com.ydtech.modules.admin.service.SysUserService;
-//import com.ydtech.modules.base.controller.BaseController;
-//import com.ydtech.modules.esm.model.EsmUserInternal;
-//import com.ydtech.modules.esm.model.vo.UserRegistVO;
-//import com.ydtech.modules.esm.service.EsmUserInternalService;
-//import com.ydtech.modules.esm.service.SysUserCheckService;
-//import com.ydtech.security.utils.PasswordUtils;
-//import com.ydtech.utils.StringUtils;
-//import com.ydtech.utils.idgen.IdGenerate;
-//import io.swagger.annotations.ApiOperation;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.data.redis.core.StringRedisTemplate;
-//import org.springframework.web.bind.annotation.*;
-//
-//import javax.servlet.http.HttpServletRequest;
-//import java.util.Date;
-//
-//import static com.ydtech.constants.RedisConstant.PHONE_VERIFICATION_CODE_KEY;
-//
-///**
-// * ---------------------------
-// * 人员管理 (EsmUserController)
-// * ---------------------------
-// * 作者:qfl
-// * ---------------------------
-// */
-//@RestController
-//@RequestMapping("esmUserInternalcheck")
-//public class EsmUserInternalCheckController extends BaseController {
-//
-//
-//    @Autowired
-//    private SysUserCheckService sysUserCheckService;
-//
-//    @Autowired
-//    private SysUserService sysUserService;
-//
-////    @Autowired
-////    private EsmUserInternalCheckService esmUserInternalCheckService;
-//
-//    @Autowired
-//    private EsmUserInternalService esmUserInternalService;
-//
-////    @Autowired
-////    private EsmUserAgentCheckService esmUserAgentCheckService;
-//
-//    @Autowired
-//    private SysMsgLogService sysMsgLogService;
-//
-//    @Autowired
-//    private SysUserRoleService sysUserRoleService;
-//
-//    @Autowired
-//    private StringRedisTemplate stringRedisTemplate;
-//
-////    /**
-////     * 保存人员信息, 返回人员编码
-////     *
-////     * @param record
-////     * @return
-////     */
-//////    @PreAuthorize("hasAuthority('sys:user:edit')")
-////    @PostMapping(value = "/saveUser")
-////    public HttpResult save(@RequestBody VoEsmUserInternalCheck record) {
-////        int noCount = 3;//顺序号是几位的
-////
-////        Integer result = 0;
-////        String resultStr = "";
-////        String msg = "保存成功";
-////        SysUserCheck sysUserCheck = record.getSysUser();
-////        EsmUserInternalCheck esmUserInternalCheck = record.getEsmUserInternal();
-////
-////        String nextPK = "001";
-////        if (sysUserCheck != null) {
-////            if (StringUtils.isNullOrEmpty(sysUserCheck.getId())) {//新增
-////                //手机号和身份证号都不可以重复
-////                if (!StringUtils.isNullOrEmpty(sysUserCheck.getMobile())) {
-////                    SysUser sysUser = sysUserService.findByPhone(sysUserCheck.getMobile());
-////                    if (sysUser != null) {
-////                        return HttpResult.error("手机号已存在");
-////                    }
-////                }
-////            /*    if(!StringUtils.isNullOrEmpty(esmUserInternalCheck.getIdentity())){
-////                    List<EsmUserInternalCheck> users = esmUserInternalCheckService.selectList(" where identity=?",new Object[]{esmUserInternalCheck.getIdentity()});
-////                    if(users != null && users.size()>0){
-////                        return HttpResult.error("身份证号已存在");
-////                    }
-////                }*/
-////
-////                //生成临时表主键 checkid
-////                String checkid = String.valueOf(new Date().getTime());
-////                sysUserCheck.setCheckid(checkid);
-////                //根据机构号获取userid最大值,不需要加人员类型判断  从sys_user获取
-////                String maxId = esmUserInternalService.findMaxId(sysUserCheck.getDeptId());
-////                if (StringUtils.isNullOrEmpty(maxId)) {
-////                    nextPK = sysUserCheck.getDeptId() + "001";
-////                } else {
-////                    nextPK = IdGenerate.nextCode(maxId, noCount);
-////                }
-////                sysUserCheck.setId(nextPK);
-////                //密码加密
-////                String salt = PasswordUtils.getSalt();
-////                String password = PasswordUtils.encode(sysUserCheck.getPassword(), salt);
-////                sysUserCheck.setPassword(password);
-////                sysUserCheck.setSalt(salt);
-////                sysUserCheck.setStatus(0); //初始化为0  审核后为1 有效
-////
-////                sysUserCheck.setCreateBy(getUserName());
-////                sysUserCheck.setCreateTime(new Date());
-////                sysUserCheck.setLastUpdateBy(getUserName());
-////                sysUserCheck.setLastUpdateTime(new Date());
-////                result = sysUserCheckService.insertSelective(sysUserCheck);
-////
-////                // 插入正式表
-////                SysUser sysUser = new SysUser();
-////                BeanUtils.copyProperties(sysUserCheck, sysUser);
-////                result = sysUserService.save(sysUser)==true?1:0;
-////
-////                //角色配置
-////                SysUserRole userRole = new SysUserRole();
-////                userRole.setUserId(nextPK);
-////                userRole.setRoleId(2L);
-////                sysUserRoleService.save(userRole);
-////
-////                if (esmUserInternalCheck != null) {
-////                    esmUserInternalCheck.setCheckid(checkid);
-////                    esmUserInternalCheck.setId(nextPK);
-////                    esmUserInternalCheck.setStatus("0");  //0 申请审核 1 审核通过 2 审核不通过 3 退回修改
-////                    result = esmUserInternalCheckService.insertSelective(esmUserInternalCheck);
-////                }
-////                EsmUserAgentCheck esmUserAgentCheck = record.getEsmUserAgent();
-////                if (esmUserAgentCheck != null) {
-////                    esmUserAgentCheck.setCheckid(checkid);
-////                    esmUserAgentCheck.setId(nextPK);
-////                    result = esmUserAgentCheckService.insertSelective(esmUserAgentCheck);
-////                }
-////            } else if (StringUtils.isNullOrEmpty(sysUserCheck.getCheckid())) { //修改正式信息后提交
-////                if (!StringUtils.isNullOrEmpty(sysUserCheck.getMobile())) {
-//////                    List<SysUser> users = sysUserService.selectList(" where id != ? and mobile=?", new Object[]{sysUserCheck.getId(), sysUserCheck.getMobile()});
-////                    LambdaQueryWrapper<SysUser> lqw = new LambdaQueryWrapper<>();
-////                    lqw.ne(SysUser::getId,sysUserCheck.getId());
-////                    lqw.eq(SysUser::getMobile,sysUserCheck.getMobile());
-////                    List<SysUser> users = sysUserService.list(lqw);
-////                    if (users != null && users.size() > 0) {
-////                        return HttpResult.error("手机号已存在");
-////                    }
-////                }
-////                if (!StringUtils.isNullOrEmpty(esmUserInternalCheck.getIdentity())) {
-////                    List<EsmUserInternalCheck> users = esmUserInternalCheckService.selectList(" where id != ? and identity=?", new Object[]{sysUserCheck.getId(), esmUserInternalCheck.getIdentity()});
-////                    if (users != null && users.size() > 0) {
-////                        return HttpResult.error("身份证号已存在");
-////                    }
-////                }
-////                //生成临时表主键 checkid
-////                String checkid = String.valueOf(new Date().getTime());
-////                sysUserCheck.setCheckid(checkid);
-////
-////                sysUserCheck.setStatus(0); //初始化为0  审核后为1 有效
-////
-////                sysUserCheck.setCreateBy(getUserName());
-////                sysUserCheck.setCreateTime(new Date());
-////                sysUserCheck.setLastUpdateBy(getUserName());
-////                sysUserCheck.setLastUpdateTime(new Date());
-////                result = sysUserCheckService.insertSelective(sysUserCheck);
-////
-////                if (esmUserInternalCheck != null) {
-////                    esmUserInternalCheck.setCheckid(checkid);
-////                    esmUserInternalCheck.setStatus("0");  //0 申请审核 1 审核通过 2 审核不通过 3 退回修改
-////                    result = esmUserInternalCheckService.insertSelective(esmUserInternalCheck);
-////                }
-////                EsmUserAgentCheck esmUserAgentCheck = record.getEsmUserAgent();
-////                if (esmUserAgentCheck != null) {
-////                    esmUserAgentCheck.setCheckid(checkid);
-////                    result = esmUserAgentCheckService.insertSelective(esmUserAgentCheck);
-////                }
-////            } else {// 退回修改后重新提交
-////                if (!StringUtils.isNullOrEmpty(sysUserCheck.getMobile())) {
-////                    LambdaQueryWrapper<SysUser> lqw = new LambdaQueryWrapper<>();
-////                    lqw.ne(SysUser::getId,sysUserCheck.getId());
-////                    lqw.eq(SysUser::getMobile,sysUserCheck.getMobile());
-////                    List<SysUser> users = sysUserService.list(lqw);
-//////                    List<SysUser> users = sysUserService.selectList(" where id != ? and mobile=?", new Object[]{sysUserCheck.getId(), sysUserCheck.getMobile()});
-////                    if (users != null && users.size() > 0) {
-////                        return HttpResult.error("手机号已存在");
-////                    }
-////                }
-////                if (!StringUtils.isNullOrEmpty(esmUserInternalCheck.getIdentity())) {
-////                    List<EsmUserInternalCheck> users = esmUserInternalCheckService.selectList(" where id != ? and identity=?", new Object[]{sysUserCheck.getId(), esmUserInternalCheck.getIdentity()});
-////                    if (users != null && users.size() > 0) {
-////                        return HttpResult.error("身份证号已存在");
-////                    }
-////                }
-////                sysUserCheck.setStatus(0); //初始化为0  审核后为1 有效
-////                sysUserCheck.setLastUpdateBy(getUserName());
-////                sysUserCheck.setLastUpdateTime(new Date());
-////                result = sysUserCheckService.updateSelective(sysUserCheck);
-////
-////
-////                if (esmUserInternalCheck != null) {
-////                    esmUserInternalCheck.setStatus("0");  //0 申请审核 1 审核通过 2 审核不通过 3 退回修改
-////                    result = esmUserInternalCheckService.updateSelective(esmUserInternalCheck);
-////                }
-////                EsmUserAgentCheck esmUserAgentCheck = record.getEsmUserAgent();
-////                if (esmUserAgentCheck != null) {
-////                    result = esmUserAgentCheckService.updateSelective(esmUserAgentCheck);
-////                }
-////            }
-////
-////        }
-////        //返回人员编号给前端 20200506
-////        if (result == 1) {
-////            resultStr = sysUserCheck.getId();
-////        }
-////
-////        return HttpResult.ok(msg, resultStr);
-////    }
-//
-//    @ApiOperation("人员审核 传入人员编码和审核状态: 0 申请审核 1 审核通过 2 审核不通过 3 退回修改")
-//    @GetMapping(value = "/check")
-//    public HttpResult check(@RequestParam String checkid, @RequestParam String status, String remark) {
-//        //得到操作用户
-//        String userName = getUserName();
-//
-//        String res = "更新成功";
-//        boolean boo = sysUserService.check(checkid, Integer.parseInt(status), remark);
-//
-//        if (!boo) {
-//            res = "更新失败";
-//        }
-//
-//        return HttpResult.ok(res);
-//    }
-//
-//    /**
-//     * 基础分页查询
-//     *
-//     * @param pageRequest
-//     * @return
-//     */
-//    @PostMapping(value = "/findPage")
-//    public HttpResult findPage(@RequestBody PageRequest pageRequest) {
-//
-//        return HttpResult.ok(sysUserService.gainUserPage(pageRequest));
-//    }
-//
-////    /**
-////     * 根据主键查询
-////     *
-////     * @param checkid
-////     * @return
-////     */
-////    @ApiOperation("根据主键查询需要审核的人员信息")
-////    @GetMapping(value = "/findById")
-////    public HttpResult findById(@RequestParam String checkid) {
-////        SysUserCheck sysUser = sysUserCheckService.selectByPk(checkid);
-////        if (sysUser != null) {
-////            sysUser.setPassword("");
-////            sysUser.setSalt("");
-////        }
-////        EsmUserInternalCheck esmUserInternal = esmUserInternalCheckService.selectByPk(checkid);
-////        EsmUserAgentCheck esmUserAgent = esmUserAgentCheckService.selectByPk(checkid);
-////
-////        VoEsmUserInternalCheck voEsmUserInternal = new VoEsmUserInternalCheck();
-////        voEsmUserInternal.setSysUser(sysUser);
-////        voEsmUserInternal.setEsmUserInternal(esmUserInternal);
-////        voEsmUserInternal.setEsmUserAgent(esmUserAgent);
-////
-////        return HttpResult.ok(voEsmUserInternal);
-////    }
-////
-//
-//    /**
-//     * 个代注册
-//     *
-//     * @param record
-//     * @return
-//     */
-//    @PostMapping(value = "/userRegist")
-//    public HttpResult userRegist(HttpServletRequest request, @RequestBody UserRegistVO record) {
-//        int noCount = 3;//顺序号是几位的
-//        Integer result = 0;
-//        String resultStr = "";
-//
-//        String phoneMsg = record.getPhoneMsg();
-//        if (StringUtils.isNullOrEmpty(phoneMsg)) {
-//            return HttpResult.error("短信验证码不能为空");
-//        }
-//        // 从session中获取之前保存的短信验证码跟前台传来的验证码进行匹配
-////        Object msg = request.getSession().getAttribute("PHONE_SESSION_KEY");
-//        //从数据库获取最新验证码
-//        String msg = stringRedisTemplate.opsForValue().get(PHONE_VERIFICATION_CODE_KEY + record.getPhone());
-//
-//        if (msg == null || msg.length() == 0) {
-//            return HttpResult.error("短信验证码发送失败");
-//        }
-//
-//        if (!phoneMsg.equals(msg)) {
-//            return HttpResult.error("短信验证码不正确");
-//        }
-//        String recommenderid = record.getRecommenderid();
-//        if (StringUtils.isNullOrEmpty(recommenderid)) {
-//            return HttpResult.error("推荐人ID不能为空");
-//        }
-//        SysUser recommender = sysUserService.getById(recommenderid);
-//        if (recommender == null) {
-//            return HttpResult.error("推荐人信息不存在");
-//        }
-//
-//        SysUser sysUser = sysUserService.findByPhone(record.getPhone());
-//        if (sysUser != null) {
-//            return HttpResult.error("手机号已存在");
-//        }
-////        SysUserCheck sysUserCheck = new SysUserCheck();
-////        EsmUserInternalCheck esmUserInternalCheck = new EsmUserInternalCheck();
-//        EsmUserInternal esmUserInternal = new EsmUserInternal();
-//        String nextPK = "001";
-//        //生成临时表主键 checkid
-////        String checkid = String.valueOf(new Date().getTime());
-////        sysUserCheck.setCheckid(checkid);
-//        //根据机构号获取userid最大值,不需要加人员类型判断  从sys_user获取
-//        String maxId = sysUserService.findMaxId(recommender.getDeptId());
-//        if (StringUtils.isNullOrEmpty(maxId)) {
-//            nextPK = recommender.getDeptId() + "001";
-//        } else {
-//            nextPK = IdGenerate.nextCode(maxId, noCount);
-//        }
-////        sysUserCheck.setId(nextPK);
-//        if (record.getName() != null && !record.getName().equals("")) {
-////            sysUserCheck.setName(record.getName());
-//
-//            esmUserInternal.setAddressnow(record.getAddressnow());
-//            esmUserInternal.setIdentity(record.getIdentity());
-//            esmUserInternal.setId(nextPK);
-////            esmUserInternalCheck.setAddressnow(record.getAddressnow());
-////            esmUserInternalCheck.setIdentity(record.getIdentity());
-//        } else {
-//            sysUser.setName("游客");
-//        }
-//        sysUser.setUsertype("2"); //个代
-//        sysUser.setMobile(record.getPhone());
-//        sysUser.setDeptId(recommender.getDeptId());
-//        //密码加密
-//        String salt = PasswordUtils.getSalt();
-//        String password = PasswordUtils.encode(record.getPassword(), salt);
-//        sysUser.setPassword(password);
-//        sysUser.setSalt(salt);
-//        sysUser.setStatus(2); //1:正常   0:离司 2:新注册    审核后为1
-//
-//        sysUser.setCreateBy(nextPK);
-//        sysUser.setCreateTime(new Date());
-//        sysUser.setLastUpdateBy(nextPK);
-//        sysUser.setLastUpdateTime(new Date());
-//
-//        result = sysUserService.save(sysUser) == true ? 1 : 0;
-//
-//        //角色配置
-//        SysUserRole userRole = new SysUserRole();
-//        userRole.setUserId(nextPK);
-//        userRole.setRoleId(2L);
-//        sysUserRoleService.save(userRole);
-//
-//
-//        //返回人员编号给前端 20200506
-//        if (result == 1) {
-//            resultStr = sysUser.getId();
-//        }
-//
-//        return HttpResult.ok("保存成功", resultStr);
-//    }
-////    /**
-////     * 个代注册
-////     *
-////     * @param record
-////     * @return
-////     */
-////    @PostMapping(value = "/userRegist")
-////    public HttpResult userRegist(HttpServletRequest request, @RequestBody UserRegistVO record) {
-////        int noCount = 3;//顺序号是几位的
-////        Integer result = 0;
-////        String resultStr = "";
-////
-////        String phoneMsg = record.getPhoneMsg();
-////        if (StringUtils.isNullOrEmpty(phoneMsg)) {
-////            return HttpResult.error("短信验证码不能为空");
-////        }
-////        // 从session中获取之前保存的短信验证码跟前台传来的验证码进行匹配
-//////        Object msg = request.getSession().getAttribute("PHONE_SESSION_KEY");
-////        //从数据库获取最新验证码
-////        String msg = stringRedisTemplate.opsForValue().get(PHONE_VERIFICATION_CODE_KEY + record.getPhone());
-////
-////        if (msg == null || msg.length() == 0) {
-////            return HttpResult.error("短信验证码发送失败");
-////        }
-////
-////        if (!phoneMsg.equals(msg)) {
-////            return HttpResult.error("短信验证码不正确");
-////        }
-////        String recommenderid = record.getRecommenderid();
-////        if (StringUtils.isNullOrEmpty(recommenderid)) {
-////            return HttpResult.error("推荐人ID不能为空");
-////        }
-////        SysUser recommender = sysUserService.getById(recommenderid);
-////        if (recommender == null) {
-////            return HttpResult.error("推荐人信息不存在");
-////        }
-////
-////        SysUser sysUser = sysUserService.findByPhone(record.getPhone());
-////        if (sysUser != null) {
-////            return HttpResult.error("手机号已存在");
-////        }
-////        SysUserCheck sysUserCheck = new SysUserCheck();
-////        EsmUserInternalCheck esmUserInternalCheck = new EsmUserInternalCheck();
-////        EsmUserInternal esmUserInternal = new EsmUserInternal();
-////        String nextPK = "001";
-////        //生成临时表主键 checkid
-////        String checkid = String.valueOf(new Date().getTime());
-////        sysUserCheck.setCheckid(checkid);
-////        //根据机构号获取userid最大值,不需要加人员类型判断  从sys_user获取
-////        String maxId = esmUserInternalService.findMaxId(recommender.getDeptId());
-////        if (StringUtils.isNullOrEmpty(maxId)) {
-////            nextPK = recommender.getDeptId() + "001";
-////        } else {
-////            nextPK = IdGenerate.nextCode(maxId, noCount);
-////        }
-////        sysUserCheck.setId(nextPK);
-////        if (record.getName() != null && !record.getName().equals("")) {
-////            sysUserCheck.setName(record.getName());
-////
-////            esmUserInternal.setAddressnow(record.getAddressnow());
-////            esmUserInternal.setIdentity(record.getIdentity());
-////            esmUserInternal.setId(sysUserCheck.getId());
-////            esmUserInternalCheck.setAddressnow(record.getAddressnow());
-////            esmUserInternalCheck.setIdentity(record.getIdentity());
-////        } else {
-////            sysUserCheck.setName("游客");
-////        }
-////        sysUserCheck.setUsertype("B"); //个代
-////        sysUserCheck.setMobile(record.getPhone());
-////        sysUserCheck.setDeptId(recommender.getDeptId());
-////        //密码加密
-////        String salt = PasswordUtils.getSalt();
-////        String password = PasswordUtils.encode(record.getPassword(), salt);
-////        sysUserCheck.setPassword(password);
-////        sysUserCheck.setSalt(salt);
-////        sysUserCheck.setStatus(2); //1:正常   0:离司 2:新注册    审核后为1
-////
-////        sysUserCheck.setCreateBy(nextPK);
-////        sysUserCheck.setCreateTime(new Date());
-////        sysUserCheck.setLastUpdateBy(nextPK);
-////        sysUserCheck.setLastUpdateTime(new Date());
-////        result = sysUserCheckService.insertSelective(sysUserCheck);
-////
-////        // 插入正式表
-////        sysUser = new SysUser();
-////        BeanUtils.copyProperties(sysUserCheck, sysUser);
-////        result = sysUserService.save(sysUser)==true?1:0;
-////
-////        //角色配置
-////        SysUserRole userRole = new SysUserRole();
-////        userRole.setUserId(nextPK);
-////        userRole.setRoleId(2L);
-////        sysUserRoleService.save(userRole);
-////
-////        esmUserInternalCheck.setCheckid(checkid);
-////        esmUserInternalCheck.setId(nextPK);
-////        esmUserInternalCheck.setIsteamleader("0");
-////        esmUserInternalCheck.setStatus("0");  //0 申请审核 1 审核通过 2 审核不通过 3 退回修改
-////        result = esmUserInternalCheckService.insertSelective(esmUserInternalCheck);
-////
-////        EsmUserAgentCheck esmUserAgentCheck = new EsmUserAgentCheck();
-////        esmUserAgentCheck.setCheckid(checkid);
-////        esmUserAgentCheck.setId(nextPK);
-////        esmUserAgentCheck.setRecommenderid(recommenderid);
-////        esmUserAgentCheck.setRecommendername(record.getRecommendername());
-////        result = esmUserAgentCheckService.insertSelective(esmUserAgentCheck);
-////        if (record.getName() != null && !record.getName().equals("")) {
-////            esmUserInternal.setId(sysUserCheck.getId());
-////            esmUserInternalService.updateSelective(esmUserInternal);
-////
-////        }
-////        //返回人员编号给前端 20200506
-////        if (result == 1) {
-////            resultStr = sysUserCheck.getId();
-////        }
-////
-////        return HttpResult.ok("保存成功", resultStr);
-////    }
-////
-////    @PostMapping(value = "/updateName")
-////    public HttpResult updateName(HttpServletRequest request, @RequestBody EsmUserCheck record) {
-////        //得到操作用户
-////        String res = "更新成功";
-////        SysUser sysUser = sysUserService.getById(record.getId());
-////        EsmUserInternal esmUserInternal = new EsmUserInternal();
-////        esmUserInternal.setAddressnow(record.getAddressnow());
-////        esmUserInternal.setIdentity(record.getIdentity());
-////        esmUserInternal.setId(record.getId());
-////
-////        sysUser.setName(record.getNamespecial());
-////        sysUser.setId(record.getId());
-////        sysUserService.updateById(sysUser);
-////        Integer integer = esmUserInternalService.updateSelective(esmUserInternal);
-////        if (integer != 1) {
-////            res = "更新失败";
-////        }
-////
-////        return HttpResult.ok("200", res);
-////    }
-//}

+ 0 - 923
src/main/java/com/ydtech/modules/esm/controller/EsmUserInternalController.java

@@ -1,923 +0,0 @@
-//package com.ydtech.modules.esm.controller;
-//
-//
-//import com.alibaba.fastjson.JSONArray;
-//import com.alibaba.fastjson.JSONObject;
-//import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-//import com.ydtech.constants.SysConstants;
-//import com.ydtech.constants.enums.dict.ApprovalStatusEnum;
-//import com.ydtech.core.page.HttpResult;
-//import com.ydtech.modules.admin.model.SysUser;
-//import com.ydtech.modules.admin.model.dto.SysUserDto;
-//import com.ydtech.modules.admin.service.SysUserService;
-//import com.ydtech.modules.base.controller.BaseController;
-//import com.ydtech.modules.base.model.dto.PageDto;
-//import com.ydtech.modules.esm.model.*;
-//import com.ydtech.modules.esm.model.vo.*;
-//import com.ydtech.modules.esm.service.EsmUserAgentCheckService;
-//import com.ydtech.modules.esm.service.EsmUserAgentService;
-//import com.ydtech.modules.esm.service.EsmUserInternalService;
-//import com.ydtech.modules.esm.service.SysUserCheckService;
-//import com.ydtech.modules.ins.model.InsOrder;
-//import com.ydtech.modules.ins.service.InsOrderService;
-//import com.ydtech.utils.StringUtils;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.web.bind.annotation.*;
-//
-//import java.math.BigDecimal;
-//import java.util.ArrayList;
-//import java.util.HashMap;
-//import java.util.List;
-//import java.util.Map;
-//import java.util.stream.Collectors;
-//
-///**
-// * ---------------------------
-// * 人员管理 (EsmUserController)
-// * ---------------------------
-// * 作者:qfl
-// * ---------------------------
-// */
-//@RestController
-//@RequestMapping("esmUserInternal")
-//public class EsmUserInternalController extends BaseController {
-//
-//
-//    @Autowired
-//    private SysUserService sysUserService;
-//
-//    @Autowired
-//    private EsmUserInternalService esmUserInternalService;
-//
-//    @Autowired
-//    private EsmUserAgentService esmUserAgentService;
-//
-//    @Autowired
-//    private SysUserCheckService sysUserCheckService;
-//
-////    @Autowired
-////    private EsmUserInternalCheckService esmUserInternalCheckService;
-//
-//    @Autowired
-//    private EsmUserAgentCheckService esmUserAgentCheckService;
-//
-//    @Autowired
-//    InsOrderService insOrderService;
-//
-//    /**
-//     * 更新人员银行卡等信息
-//     *
-//     * @param record
-//     * @return
-//     */
-//    @PostMapping(value = "/saveUser")
-//    public HttpResult save(@RequestBody EsmUserInternal record) {
-//        if (StringUtils.isNullOrEmpty(record.getId())) {
-//            return HttpResult.error("id不能为空");
-//        }
-//        esmUserInternalService.updateById(record);
-////        esmUserInternalService.updateSelective(record);
-//        return HttpResult.ok("保存成功");
-//    }
-//
-////    @PreAuthorize("hasAuthority('sys:user:delete')")
-//    @PostMapping(value = "/delete")
-//    public HttpResult delete(@RequestBody List<SysUser> records) {
-//
-//        List<EsmUserInternal> esmUserInternals = new ArrayList<>();
-//        List<EsmUserAgent> esmUserAgents = new ArrayList<>();
-//        List<String> esmUserAgentIds = new ArrayList<>();
-//
-//        List<SysUserCheck> sysUserChecks = new ArrayList<>();
-//        List<EsmUserInternalCheck> esmUserInternalChecks = new ArrayList<>();
-//        List<EsmUserAgentCheck> esmUserAgentChecks = new ArrayList<>();
-//
-//        for (SysUser record : records) {
-//            SysUser sysUser = sysUserService.getById(record.getId());
-//            if (sysUser != null && SysConstants.ADMIN.equalsIgnoreCase(sysUser.getName())) {
-//                return HttpResult.error("超级管理员不允许删除!");
-//            }
-//
-//            EsmUserInternal esmUserInternal = new EsmUserInternal();
-//            esmUserInternal.setId(record.getId());
-//            esmUserInternals.add(esmUserInternal);
-//
-//            EsmUserAgent esmUserAgent = new EsmUserAgent();
-//            esmUserAgent.setId(record.getId());
-//            esmUserAgents.add(esmUserAgent);
-////            esmUserAgentIds.add(esmUserAgent.getId());
-//
-//            EsmUserInternalCheck esmUserInternalCheck = new EsmUserInternalCheck();
-//            esmUserInternalCheck.setId(record.getId());
-//            esmUserInternalChecks.add(esmUserInternalCheck);
-//
-//            EsmUserAgentCheck esmUserAgentCheck = new EsmUserAgentCheck();
-//            esmUserAgentCheck.setId(record.getId());
-//            esmUserAgentChecks.add(esmUserAgentCheck);
-//
-//            SysUserCheck sysUserCheck = new SysUserCheck();
-//            sysUserCheck.setId(record.getId());
-//            sysUserChecks.add(sysUserCheck);
-//        }
-//
-//        //EsmUserInternal esmUserInternal = esmUserInternalService.selectByPk(record.getId());
-//        records.stream().forEach(a -> {
-//            sysUserService.removeById(a);
-//        });
-////            sysUserService.delete(records);
-//
-////        esmUserInternalService.remove(esmUserInternals);
-////        esmUserInternalService.delete(esmUserInternals);
-//
-//        esmUserAgentService.removeBatchByIds(esmUserAgentIds);
-////        esmUserAgentService.delete(esmUserAgents);
-//
-//        sysUserCheckService.delete(sysUserChecks);
-////        esmUserInternalCheckService.delete(esmUserInternalChecks);
-//        esmUserAgentCheckService.delete(esmUserAgentChecks);
-//
-//        return HttpResult.ok("删除成功");
-//    }
-//
-//    /**
-//     * 基础分页查询
-//     *
-//     * @param pageRequest
-//     * @return
-//     */
-//    @PostMapping(value = "/findPage")
-//    public HttpResult findPage(@RequestBody PageDto<SysUserDto> pageDto) {
-//
-//
-//        return HttpResult.ok(sysUserService.gainUserPage(pageDto));
-//
-//
-//
-////        int pageNum = pageRequest.getPageNum();
-////        int pageSize = pageRequest.getPageSize();
-////        String name = pageRequest.getColumnFilterValue(pageRequest, "name");
-////        String deptId = pageRequest.getColumnFilterValue(pageRequest, "deptId");
-////        String usertype = pageRequest.getColumnFilterValue(pageRequest, "usertype");
-////        String status = pageRequest.getColumnFilterValue(pageRequest, "status");
-////        String isteamleader = pageRequest.getColumnFilterValue(pageRequest, "isteamleader");
-////        String mobile = pageRequest.getColumnFilterValue(pageRequest, "mobile");
-////        String id = pageRequest.getColumnFilterValue(pageRequest, "id");
-////        String startdate = pageRequest.getColumnFilterValue(pageRequest, "startdate");
-////        String enddate = pageRequest.getColumnFilterValue(pageRequest, "enddate");
-////
-////        StringBuffer whereStr = new StringBuffer(" where 1=1 ");
-////        ArrayList<Object> params = new ArrayList<Object>();
-////        if (!StringUtils.isNullOrEmpty(name)) {
-////            whereStr.append(" and t1.name like ?");
-////            params.add("%" + name + "%");
-////        }
-////        if (!StringUtils.isNullOrEmpty(mobile)) {
-////            whereStr.append(" and t1.mobile = ?");
-////            params.add(mobile);
-////        }
-////        if (!StringUtils.isNullOrEmpty(id)) {
-////            whereStr.append(" and t1.id = ?");
-////            params.add(id);
-////        }
-////
-////        if (deptId != null) {
-////            String containsSubDept = pageRequest.getColumnFilterValue(pageRequest, "containsSubDept");
-////            if (containsSubDept != null && containsSubDept.equalsIgnoreCase("1")) {
-////                whereStr.append(" and t1.dept_id like ?");
-////                params.add(deptId + "%");
-////            } else {
-////                whereStr.append(" and t1.dept_id = ?");
-////                params.add(deptId);
-////            }
-////        }
-////
-////        if (status != null) {
-////
-////            //ArrayList<String> ls = new ArrayList<>();
-////            String andStr = " and t2.status in (";
-////            String pre = "";
-////            String[] sa = status.split(",");
-////            for (String s : sa) {
-////                andStr += pre + "'" + s.trim() + "'";
-////                pre = ",";
-////            }
-////            andStr += ")";
-////            whereStr.append(andStr);
-////        }
-////
-////        if (!StringUtils.isNullOrEmpty(isteamleader)) {
-////            whereStr.append(" and t2.isteamleader = ?");
-////            params.add(isteamleader.trim());
-////        }
-////        if (!StringUtils.isNullOrEmpty(startdate)) {
-////            whereStr.append(" and DATE_FORMAT(t2.intime,'%Y-%m-%d') >= date ?");
-////            params.add(startdate);
-////        }
-////        if (!StringUtils.isNullOrEmpty(enddate)) {
-////            whereStr.append(" and DATE_FORMAT(t2.intime,'%Y-%m-%d') <= date ?");
-////            params.add(enddate);
-////        }
-////
-////        //后线人员 usertype为A
-////        if (usertype != null) {
-////            whereStr.append(" and usertype = ?");
-////            params.add(usertype.trim());
-////        }
-////        //过滤离司人员  这里del_flag用作离司
-////        whereStr.append(" and t1.del_flag <> ?");
-////        params.add("1");
-////
-////        //传入查询条件
-////        PageResult pageResult = esmUserInternalService.selectPagingCustom(pageNum, pageSize, whereStr.toString(), params.toArray());
-////
-////        return HttpResult.ok(pageResult);
-//    }
-//
-//    /**
-//     * 根据机构查询推荐人列表
-//     */
-//    @PostMapping("/queryRecommender")
-//    public HttpResult queryRecommender(@RequestParam String comcode) {
-//        LambdaQueryWrapper<SysUser> lqw = new LambdaQueryWrapper<>();
-//        lqw.eq(StringUtils.isNotEmpty(comcode), SysUser::getDeptId, comcode);
-//        List<SysUser> list = sysUserService.list(lqw);
-//
-////        List<SysUser> list = sysUserService.selectList(whereStr.toString(), params.toArray());
-//        return HttpResult.ok(list);
-//    }
-//
-//    /**
-//     * 根据选择的推荐人代码,查询推荐人的上三级信息返回
-//     */
-//    @GetMapping("/getSuperior")
-//    public HttpResult getSuperior(@RequestParam String id) {
-//        List<SysUser> userList = new ArrayList<SysUser>();
-////        for(int i=0;i<3;i++){
-////            StringBuffer whereStr = new StringBuffer(" where 1=1 ");
-////            ArrayList<String> params = new ArrayList<String>();
-////            if(id != null){
-////                whereStr.append(" and id = ?");
-////                params.add(id);
-////            }
-////            List<EsmUserAgent> list = esmUserAgentService.selectList(whereStr.toString(),params.toArray());
-////            if(list != null && list.size()>0){
-////                id = list.get(0).getRecommenderid(); //上级推荐人代码
-////                if(StringUtils.isNullOrEmpty(id)){
-////                    break;
-////                }
-////                SysUser user = sysUserService.selectByPk(id);
-////                userList.add(user);
-////            }
-////        }
-//        userList = esmUserInternalService.getSuperior(id);
-//
-//        return HttpResult.ok(userList);
-//    }
-//
-////    /**
-////     * 查询团队人数:我的团队人数,一级团队人数,二级团队人数,三级团队人数,临时用户人数
-////     *
-////     * @param record
-////     * @return
-////     */
-////    @PostMapping("/queryTeamNum")
-////    public HttpResult queryTeamNum(@RequestBody TeamUserQryVO record) {
-////        List<TeamUserVO> teamList = new ArrayList<TeamUserVO>();
-////        StringBuffer sbStr = new StringBuffer(" where 1=1 ");
-////        ArrayList<String> paramList = new ArrayList<String>();
-//////        if (!StringUtils.isNullOrEmpty(record.getId())) {
-//////            sbStr.append(" and id = ?");
-//////            paramList.add(record.getId());
-//////        }
-//////        if (!StringUtils.isNullOrEmpty(record.getName())) {
-//////            sbStr.append(" and name = ?");
-//////            paramList.add(record.getName());
-//////        }
-//////        if (!StringUtils.isNullOrEmpty(record.getMobile())) {
-//////            sbStr.append(" and mobile = ?");
-//////            paramList.add(record.getMobile());
-//////        }
-////
-////        String dateStr = "";
-////        if (!StringUtils.isNullOrEmpty(record.getStartdate()) && !StringUtils.isNullOrEmpty(record.getEnddate())) {
-////
-////        }
-////        LambdaQueryWrapper<SysUser> lqw = new LambdaQueryWrapper<>();
-////        lqw.eq(StringUtils.isNotEmpty(record.getId()),SysUser::getId,record.getId());
-////        lqw.eq(StringUtils.isNotEmpty(record.getName()),SysUser::getName,record.getName());
-////        lqw.eq(StringUtils.isNotEmpty(record.getMobile()),SysUser::getMobile,record.getMobile());
-////
-////        List<SysUser> users = sysUserService.list(lqw);
-//////        List<SysUser> users = sysUserService.selectList(sbStr.toString(), paramList.toArray());
-////        for (SysUser user : users) {
-////            TeamUserVO teamUserVO = new TeamUserVO();
-////            teamUserVO.setId(user.getId());
-////            teamUserVO.setName(user.getName());
-////            teamUserVO.setDeptid(user.getDeptId());
-////            teamUserVO.setDeptname("");
-////            teamUserVO.setSex(user.getSex());
-////            teamUserVO.setMobile(user.getMobile());
-////            teamUserVO.setJobcode(user.getJobCode());
-////            //判断是否团队长
-//////            EsmUserInternal userInternal = esmUserInternalService.selectByPk(user.getId());
-//////            if("1".equals(userInternal.getIsteamleader())){
-//////                // 查询团队人数
-//////                ArrayList<String> param = new ArrayList<>();
-//////                param.add(user.getDeptId());
-//////                List<SysUser> ls = sysUserService.selectList(" where dept_id=?", param.toArray());
-//////                teamUserVO.setTeamnum(ls==null?0:ls.size());
-//////                //临时用户人数
-//////                teamUserVO.setTempnum(esmUserInternalService.queryTempNum(user.getDeptId()));
-//////            }
-////            //一级人数
-////            StringBuffer whereStr = new StringBuffer();
-////            ArrayList<String> params = new ArrayList<String>();
-////            whereStr.append(" where recommenderid=? ");
-////            params.add(user.getId());
-////
-////            if (!StringUtils.isNullOrEmpty(record.getStartdate()) && !StringUtils.isNullOrEmpty(record.getEnddate())) {
-////                whereStr.append("and exists (select 1 from esm_user_internal a where t.id=a.id and DATE_FORMAT(a.intime,'%Y-%m-%d') >= date ? and DATE_FORMAT(a.intime,'%Y-%m-%d') <= date ?)");
-////                params.add(record.getStartdate());
-////                params.add(record.getEnddate());
-////            }
-////
-////            List<EsmUserAgent> list = esmUserAgentService.selectList(whereStr.toString(), params.toArray());
-////            JSONArray objects = JSONObject.parseArray(JSONObject.toJSONString(list));
-////            System.out.println("一级用户" + objects);
-////            double sum1 = 0;
-////            int outSingle1 = 0;
-////            if (list != null && list.size() > 0) {
-////                Map map = queryPrice(record, list);
-////                sum1 = (double) map.get("sum");
-////                outSingle1 = (int) map.get("OutSingle");
-////
-////            }
-////            BigDecimal bs = new BigDecimal(sum1);
-////            double f = bs.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
-////
-////            teamUserVO.setList1Premium(f);
-////            teamUserVO.setOutSingle1(outSingle1);
-////            teamUserVO.setLevel1num(list == null ? 0 : list.size());
-////            //二级人数
-////            List<EsmUserAgent> list2 = new ArrayList<>();
-////            double sum2 = 0;
-////            int outSingle2 = 0;
-////            List<EsmUserAgent> ls = null;
-////            for (EsmUserAgent agent : list) {
-////                whereStr = new StringBuffer();
-////                params = new ArrayList<String>();
-////                whereStr.append(" where recommenderid=? ");
-////                params.add(agent.getId());
-////                if (!StringUtils.isNullOrEmpty(record.getStartdate()) && !StringUtils.isNullOrEmpty(record.getEnddate())) {
-////                    whereStr.append("and exists (select 1 from esm_user_internal a where t.id=a.id and DATE_FORMAT(a.intime,'%Y-%m-%d') >= date ? and DATE_FORMAT(a.intime,'%Y-%m-%d') <= date ?)");
-////                    params.add(record.getStartdate());
-////                    params.add(record.getEnddate());
-////                }
-////                ls = esmUserAgentService.selectList(whereStr.toString(), params.toArray());
-////
-////
-////                list2.addAll(ls);
-////
-////            }
-////
-////            if (list2 != null && list2.size() > 0) {
-////                Map map = queryPrice(record, list2);
-////                sum2 = (double) map.get("sum");
-////                outSingle2 = (int) map.get("OutSingle");
-////            }
-////            JSONArray objects1 = JSONObject.parseArray(JSONObject.toJSONString(list2));
-////            BigDecimal b = new BigDecimal(sum2);
-////            double f1 = b.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
-////            System.out.println("二级用户" + objects1);
-////            teamUserVO.setLevel2num(list2.size());
-////            teamUserVO.setList2Premium(f1);
-////            teamUserVO.setOutSingle2(outSingle2);
-////            double sum3 = 0;
-////            int outSingle3 = 0;
-////            //三级人数
-////            List<EsmUserAgent> list3 = new ArrayList<>();
-////            for (EsmUserAgent agent : list2) {
-////                whereStr = new StringBuffer();
-////                params = new ArrayList<String>();
-////                whereStr.append(" where recommenderid=? ");
-////                params.add(agent.getId());
-////                if (!StringUtils.isNullOrEmpty(record.getStartdate()) && !StringUtils.isNullOrEmpty(record.getEnddate())) {
-////                    whereStr.append("and exists (select 1 from esm_user_internal a where t.id=a.id and DATE_FORMAT(a.intime,'%Y-%m-%d') >= date ? and DATE_FORMAT(a.intime,'%Y-%m-%d') <= date ?)");
-////                    params.add(record.getStartdate());
-////                    params.add(record.getEnddate());
-////                }
-////                ls = esmUserAgentService.selectList(whereStr.toString(), params.toArray());
-////
-////
-////                list3.addAll(ls);
-////            }
-////            JSONArray objects3 = JSONObject.parseArray(JSONObject.toJSONString(list3));
-////
-////            System.out.println("三级用户" + objects3);
-////
-////            if (list3 != null && list3.size() > 0) {
-////                Map map = queryPrice(record, list3);
-////                sum3 = (double) map.get("sum");
-////                outSingle3 = (int) map.get("OutSingle");
-////
-////            }
-////            BigDecimal bs3 = new BigDecimal(sum3);
-////            double f3 = bs3.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
-////
-////            teamUserVO.setLevel3num(list3.size());
-////            teamUserVO.setList3Premium(f3);
-////            teamUserVO.setOutSingle3(outSingle3);
-////            //临时用户:推荐的未生效人员
-////            List<String> lss = esmUserInternalService.queryTeamUser(user.getId());
-////            teamUserVO.setTempnum(lss == null ? 0 : lss.size());
-////            int teamnum = teamUserVO.getLevel1num() + teamUserVO.getLevel2num() + teamUserVO.getLevel3num() + teamUserVO.getTempnum();
-////            teamUserVO.setTeamnum(teamnum);
-////
-////            BigDecimal countPre = new BigDecimal(teamUserVO.getList1Premium() + teamUserVO.getList2Premium() + teamUserVO.getList3Premium());
-////            double countPremium = countPre.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
-////            teamUserVO.setCountPremium(countPremium);
-////
-////            teamUserVO.setCountSingle(teamUserVO.getOutSingle1() + teamUserVO.getOutSingle2() + teamUserVO.getOutSingle3());
-////
-////            teamList.add(teamUserVO);
-////        }
-////
-////        return HttpResult.ok(teamList);
-////    }
-//    /**
-//     * 查询团队人数:我的团队人数,一级团队人数,二级团队人数,三级团队人数,临时用户人数
-//     *
-//     * @param record
-//     * @return
-//     */
-//    @PostMapping("/queryTeamNum")
-//    public HttpResult queryTeamNum(@RequestBody TeamUserQryVO record) {
-//        List<TeamUserVO> teamList = new ArrayList<TeamUserVO>();
-//        StringBuffer sbStr = new StringBuffer(" where 1=1 ");
-//        ArrayList<String> paramList = new ArrayList<String>();
-////        if (!StringUtils.isNullOrEmpty(record.getId())) {
-////            sbStr.append(" and id = ?");
-////            paramList.add(record.getId());
-////        }
-////        if (!StringUtils.isNullOrEmpty(record.getName())) {
-////            sbStr.append(" and name = ?");
-////            paramList.add(record.getName());
-////        }
-////        if (!StringUtils.isNullOrEmpty(record.getMobile())) {
-////            sbStr.append(" and mobile = ?");
-////            paramList.add(record.getMobile());
-////        }
-//
-//        String dateStr = "";
-//        if (!StringUtils.isNullOrEmpty(record.getStartdate()) && !StringUtils.isNullOrEmpty(record.getEnddate())) {
-//
-//        }
-//        LambdaQueryWrapper<SysUser> lqw = new LambdaQueryWrapper<>();
-//        lqw.eq(StringUtils.isNotEmpty(record.getId()), SysUser::getId, record.getId());
-//        lqw.eq(StringUtils.isNotEmpty(record.getName()), SysUser::getName, record.getName());
-//        lqw.eq(StringUtils.isNotEmpty(record.getMobile()), SysUser::getMobile, record.getMobile());
-//
-//        List<SysUser> users = sysUserService.list(lqw);
-////        List<SysUser> users = sysUserService.selectList(sbStr.toString(), paramList.toArray());
-//        for (SysUser user : users) {
-//            TeamUserVO teamUserVO = new TeamUserVO();
-//            teamUserVO.setId(user.getId());
-//            teamUserVO.setName(user.getName());
-//            teamUserVO.setDeptid(user.getDeptId());
-//            teamUserVO.setDeptname("");
-//            teamUserVO.setSex(user.getSex());
-//            teamUserVO.setMobile(user.getMobile());
-////            teamUserVO.setJobcode(user.getJobCode());
-//            //判断是否团队长
-////            EsmUserInternal userInternal = esmUserInternalService.selectByPk(user.getId());
-////            if("1".equals(userInternal.getIsteamleader())){
-////                // 查询团队人数
-////                ArrayList<String> param = new ArrayList<>();
-////                param.add(user.getDeptId());
-////                List<SysUser> ls = sysUserService.selectList(" where dept_id=?", param.toArray());
-////                teamUserVO.setTeamnum(ls==null?0:ls.size());
-////                //临时用户人数
-////                teamUserVO.setTempnum(esmUserInternalService.queryTempNum(user.getDeptId()));
-////            }
-//
-//            //一级人数
-////            StringBuffer whereStr = new StringBuffer();
-////            ArrayList<String> params = new ArrayList<String>();
-////            whereStr.append(" where recommenderid=? ");
-////            params.add(user.getId());
-////
-////            if (!StringUtils.isNullOrEmpty(record.getStartdate()) && !StringUtils.isNullOrEmpty(record.getEnddate())) {
-////                whereStr.append("and exists (select 1 from esm_user_internal a where t.id=a.id and DATE_FORMAT(a.intime,'%Y-%m-%d') >= date ? and DATE_FORMAT(a.intime,'%Y-%m-%d') <= date ?)");
-////                params.add(record.getStartdate());
-////                params.add(record.getEnddate());
-////            }
-////            List<EsmUserAgent> list = esmUserAgentService.selectList(whereStr.toString(), params.toArray());
-//
-//            //临时用户:推荐的未生效人员
-////            List<String> lss = esmUserInternalService.queryTeamUser(user.getId());
-//            List<TeamUserVONew> lss = new ArrayList<>();
-//
-//
-//
-//            TeamUserQryVO vo = record;
-//            List<TeamUserVONew> list = esmUserAgentService.gainBelowUserByUserId(vo);
-//
-//            JSONArray objects = JSONObject.parseArray(JSONObject.toJSONString(list));
-//            System.out.println("一级用户" + objects);
-//            double sum1 = 0;
-//            int outSingle1 = 0;
-//            if (list != null && list.size() > 0) {
-//                Map map = queryPrice(record, list);
-//                sum1 = (double) map.get("sum");
-//                outSingle1 = (int) map.get("OutSingle");
-//
-//                List lsList = list.stream().map(s -> s.getStatus()).filter(s -> !s.equals("1")).collect(Collectors.toList());
-//                lss.addAll(lsList);
-//
-//            }
-//            BigDecimal bs = new BigDecimal(sum1);
-//            double f = bs.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
-//
-//            teamUserVO.setList1Premium(f);
-//            teamUserVO.setOutSingle1(outSingle1);
-//            teamUserVO.setLevel1num(list == null ? 0 : list.size());
-//            //二级人数
-//            List<TeamUserVONew> list2 = new ArrayList<>();
-//            double sum2 = 0;
-//            int outSingle2 = 0;
-//            for (TeamUserVONew oneUser : list) {
-//                vo.setId(oneUser.getUserId());
-//                list2.addAll(esmUserAgentService.gainBelowUserByUserId(vo));
-//
-////                list2.addAll(ls);
-//
-//            }
-//
-//            if (list2 != null && list2.size() > 0) {
-//                Map map = queryPrice(record, list2);
-//                sum2 = (double) map.get("sum");
-//                outSingle2 = (int) map.get("OutSingle");
-//                List lsList2 = list2.stream().map(s -> s.getStatus()).filter(s -> !s.equals("1")).collect(Collectors.toList());
-//                lss.addAll(lsList2);
-//            }
-//            JSONArray objects1 = JSONObject.parseArray(JSONObject.toJSONString(list2));
-//            BigDecimal b = new BigDecimal(sum2);
-//            double f1 = b.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
-//            System.out.println("二级用户" + objects1);
-//            teamUserVO.setLevel2num(list2.size());
-//            teamUserVO.setList2Premium(f1);
-//            teamUserVO.setOutSingle2(outSingle2);
-//            double sum3 = 0;
-//            int outSingle3 = 0;
-//            //三级人数
-//            List<TeamUserVONew> list3 = new ArrayList<>();
-//            for (TeamUserVONew twoUser : list2) {
-//
-//                vo.setId(twoUser.getUserId());
-//                list3.addAll(esmUserAgentService.gainBelowUserByUserId(vo));
-//
-//            }
-//            JSONArray objects3 = JSONObject.parseArray(JSONObject.toJSONString(list3));
-//
-//            System.out.println("三级用户" + objects3);
-//
-//            if (list3 != null && list3.size() > 0) {
-//                Map map = queryPrice(record, list3);
-//                sum3 = (double) map.get("sum");
-//                outSingle3 = (int) map.get("OutSingle");
-//                List lsList3 = list3.stream().map(s -> s.getStatus()).filter(s -> !s.equals("1")).collect(Collectors.toList());
-//                lss.addAll(lsList3);
-//
-//            }
-//            BigDecimal bs3 = new BigDecimal(sum3);
-//            double f3 = bs3.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
-//
-//            teamUserVO.setLevel3num(list3.size());
-//            teamUserVO.setList3Premium(f3);
-//            teamUserVO.setOutSingle3(outSingle3);
-////
-//
-//            teamUserVO.setTempnum(lss == null ? 0 : lss.size());
-//            int teamnum = teamUserVO.getLevel1num() + teamUserVO.getLevel2num() + teamUserVO.getLevel3num() + teamUserVO.getTempnum();
-//            teamUserVO.setTeamnum(teamnum);
-//
-//            BigDecimal countPre = new BigDecimal(teamUserVO.getList1Premium() + teamUserVO.getList2Premium() + teamUserVO.getList3Premium());
-//            double countPremium = countPre.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
-//            teamUserVO.setCountPremium(countPremium);
-//
-//            teamUserVO.setCountSingle(teamUserVO.getOutSingle1() + teamUserVO.getOutSingle2() + teamUserVO.getOutSingle3());
-//
-//            teamList.add(teamUserVO);
-//        }
-//
-//        return HttpResult.ok(teamList);
-//    }
-//
-////    /**
-////     * 通过工号查询该人员所有下级人员信息(一级、二级、三级、临时团队)
-////     *
-////     * @param record
-////     * @return
-////     */
-////    @PostMapping("/queryTeamUser")
-////    public HttpResult queryTeamUser(@RequestBody TeamUserQryVO record) {
-////        List<VoEsmUserInternal> level1List = new ArrayList<VoEsmUserInternal>();
-////        List<VoEsmUserInternal> level2List = new ArrayList<VoEsmUserInternal>();
-////        List<VoEsmUserInternal> level3List = new ArrayList<VoEsmUserInternal>();
-////        List<VoEsmUserInternalCheck> tempList = new ArrayList<VoEsmUserInternalCheck>();
-////        SysUser user = sysUserService.getById(record.getId());
-////        //一级人数
-//////        List<EsmUserAgent> list = esmUserAgentService.selectList(" where recommenderid=?",new Object[]{id});
-////        StringBuffer whereStr = new StringBuffer();
-////        ArrayList<String> params = new ArrayList<String>();
-////        whereStr.append(" where recommenderid=? ");
-////        params.add(user.getId());
-////        if (!StringUtils.isNullOrEmpty(record.getStartdate()) && !StringUtils.isNullOrEmpty(record.getEnddate())) {
-////            whereStr.append("and exists (select 1 from esm_user_internal a where t.id=a.id and DATE_FORMAT(a.intime,'%Y-%m-%d') >= date ? and DATE_FORMAT(a.intime,'%Y-%m-%d') <= date ?)");
-////            params.add(record.getStartdate());
-////            params.add(record.getEnddate());
-////        }
-////        List<EsmUserAgent> list = esmUserAgentService.selectList(whereStr.toString(), params.toArray());
-////
-////
-////        //二级人数
-////        List<EsmUserAgent> list2 = new ArrayList<>();
-////        for (EsmUserAgent agent : list) {
-////            //  level1List.add(findUserById(agent.getId()));
-////            level1List.add(findUserBy(agent.getId(), record, list));
-////            whereStr = new StringBuffer();
-////            params = new ArrayList<String>();
-////            whereStr.append(" where recommenderid=? ");
-////            params.add(agent.getId());
-////            if (!StringUtils.isNullOrEmpty(record.getStartdate()) && !StringUtils.isNullOrEmpty(record.getEnddate())) {
-////                whereStr.append("and exists (select 1 from esm_user_internal a where t.id=a.id and DATE_FORMAT(a.intime,'%Y-%m-%d') >= date ? and DATE_FORMAT(a.intime,'%Y-%m-%d') <= date ?)");
-////                params.add(record.getStartdate());
-////                params.add(record.getEnddate());
-////            }
-////            List<EsmUserAgent> ls = esmUserAgentService.selectList(whereStr.toString(), params.toArray());
-//////            List<EsmUserAgent> ls = esmUserAgentService.selectList(" where recommenderid=?",new Object[]{agent.getId()});
-////            list2.addAll(ls);
-////        }
-////        //三级人数
-////        List<EsmUserAgent> list3 = new ArrayList<>();
-////        for (EsmUserAgent agent : list2) {
-////            // level2List.add(findUserById(agent.getId()));
-////            level2List.add(findUserBy(agent.getId(), record, list2));
-////            whereStr = new StringBuffer();
-////            params = new ArrayList<String>();
-////            whereStr.append(" where recommenderid=? ");
-////            params.add(agent.getId());
-////            if (!StringUtils.isNullOrEmpty(record.getStartdate()) && !StringUtils.isNullOrEmpty(record.getEnddate())) {
-////                whereStr.append("and exists (select 1 from esm_user_internal a where t.id=a.id and DATE_FORMAT(a.intime,'%Y-%m-%d') >= date ? and DATE_FORMAT(a.intime,'%Y-%m-%d') <= date ?)");
-////                params.add(record.getStartdate());
-////                params.add(record.getEnddate());
-////            }
-////            List<EsmUserAgent> ls = esmUserAgentService.selectList(whereStr.toString(), params.toArray());
-//////            List<EsmUserAgent> ls = esmUserAgentService.selectList(" where recommenderid=?",new Object[]{agent.getId()});
-////            list3.addAll(ls);
-////        }
-////        //三级人员信息
-////        for (EsmUserAgent agent : list3) {
-////            // level3List.add(findUserById(agent.getId()));
-////            level3List.add(findUserBy(agent.getId(), record, list3));
-////
-////        }
-////
-////        //临时用户:推荐的未生效人员
-////        List<String> ls = esmUserInternalService.queryTeamUser(record.getId());
-////        for (String userId : ls) {
-////            SysUserCheck sysUser = sysUserCheckService.selectByPk(userId);
-////            if (sysUser != null) {
-////                sysUser.setPassword("");
-////                sysUser.setSalt("");
-////            }
-////            EsmUserInternalCheck esmUserInternal = esmUserInternalCheckService.selectByPk(userId);
-////            EsmUserAgentCheck esmUserAgent = esmUserAgentCheckService.selectByPk(userId);
-////
-////            VoEsmUserInternalCheck voEsmUserInternal = new VoEsmUserInternalCheck();
-////            voEsmUserInternal.setSysUser(sysUser);
-////            voEsmUserInternal.setEsmUserInternal(esmUserInternal);
-////            voEsmUserInternal.setEsmUserAgent(esmUserAgent);
-////            tempList.add(voEsmUserInternal);
-////        }
-////
-////        Map map = new HashMap<>();
-////        map.put("level1", level1List);
-////        map.put("level2", level2List);
-////        map.put("level3", level3List);
-////        map.put("temp", tempList);
-////        return HttpResult.ok(map);
-////    }
-//
-//    /**
-//     * 根据主键查询
-//     *
-//     * @param id
-//     * @return
-//     */
-//    @GetMapping(value = "/findById")
-//    public HttpResult findById(@RequestParam String id) {
-//
-//        VoEsmUserInternal voEsmUserInternal = findUserById(id);
-//
-//        return HttpResult.ok(voEsmUserInternal);
-//    }
-//
-//
-//    public VoEsmUserInternal findUserById(String id) {
-//        SysUser sysUser = getUser();
-//        if(StringUtils.isNotEmpty(id)){
-//            sysUser = sysUserService.getById(id);
-//        }
-//        sysUser.setPassword("");
-//        sysUser.setSalt("");
-//        EsmUserInternal esmUserInternal = esmUserInternalService.getById(id);
-//        EsmUserAgent esmUserAgent = esmUserAgentService.getById(id);
-//
-//        VoEsmUserInternal voEsmUserInternal = new VoEsmUserInternal();
-//        voEsmUserInternal.setSysUser(sysUser);
-//        voEsmUserInternal.setEsmUserInternal(esmUserInternal);
-//        voEsmUserInternal.setEsmUserAgent(esmUserAgent);
-//
-//        return voEsmUserInternal;
-//    }
-//
-//    public Map queryPrice(TeamUserQryVO record, List<TeamUserVONew> list) {
-//        Map map = new HashMap();
-//        List<InsOrder> orderList = null;
-//        double sum = 0;
-//        int count = 0;
-//        if (list != null && list.size() > 0) {
-//            for (int i = 0; i < list.size(); i++) {
-//
-//                StringBuffer whereStrs = new StringBuffer();
-//                ArrayList<String> param = new ArrayList<String>();
-//                whereStrs = new StringBuffer();
-//                param = new ArrayList<String>();
-//                whereStrs.append(" where orderstatus=7 ");
-//                whereStrs.append(" and userid=? ");
-//                param.add(list.get(i).getUserId());
-//                if (!StringUtils.isNullOrEmpty(record.getStartdate()) && !StringUtils.isNullOrEmpty(record.getEnddate())) {
-//                    whereStrs.append("and exists (select 1 from esm_user_internal a where t.userid=a.id and DATE_FORMAT(a.intime,'%Y-%m-%d') >= date ? and DATE_FORMAT(a.intime,'%Y-%m-%d') <= date ?)");
-//                    param.add(record.getStartdate());
-//                    param.add(record.getEnddate());
-//                }
-//                orderList = insOrderService.selectList(whereStrs.toString(), param.toArray());
-//                if (orderList != null && orderList.size() > 0) {
-//                    count = count + 1;
-//                    for (int j = 0; j < orderList.size(); j++) {
-//                        double sumpremium = orderList.get(j).getSumpremium();
-//                        double taxamount = orderList.get(j).getTaxamount();
-//                        if (sumpremium > 0) {
-//                            sum = sum + sumpremium - taxamount;
-//
-//                        }
-//
-//                    }
-//                    System.out.println("大小" + orderList.size());
-//
-//                }
-//            }
-//        }
-//        map.put("OutSingle", count);
-//        map.put("sum", sum);
-//        System.out.println("总共===" + count);
-//
-//
-//        return map;
-//    }
-////    public Map queryPrice(TeamUserQryVO record, List<EsmUserAgent> list) {
-////        Map map = new HashMap();
-////        List<InsOrder> orderList = null;
-////        double sum = 0;
-////        int count = 0;
-////        if (list != null && list.size() > 0) {
-////            for (int i = 0; i < list.size(); i++) {
-////
-////                StringBuffer whereStrs = new StringBuffer();
-////                ArrayList<String> param = new ArrayList<String>();
-////                whereStrs = new StringBuffer();
-////                param = new ArrayList<String>();
-////                whereStrs.append(" where orderstatus=7 ");
-////                whereStrs.append(" and userid=? ");
-////                param.add(list.get(i).getId());
-////                if (!StringUtils.isNullOrEmpty(record.getStartdate()) && !StringUtils.isNullOrEmpty(record.getEnddate())) {
-////                    whereStrs.append("and exists (select 1 from esm_user_internal a where t.userid=a.id and DATE_FORMAT(a.intime,'%Y-%m-%d') >= date ? and DATE_FORMAT(a.intime,'%Y-%m-%d') <= date ?)");
-////                    param.add(record.getStartdate());
-////                    param.add(record.getEnddate());
-////                }
-////                orderList = insOrderService.selectList(whereStrs.toString(), param.toArray());
-////                if (orderList != null && orderList.size() > 0) {
-////                    count = count + 1;
-////                    for (int j = 0; j < orderList.size(); j++) {
-////                        double sumpremium = orderList.get(j).getSumpremium();
-////                        double taxamount = orderList.get(j).getTaxamount();
-////                        if (sumpremium > 0) {
-////                            sum = sum + sumpremium - taxamount;
-////
-////                        }
-////
-////                    }
-////                    System.out.println("大小" + orderList.size());
-////
-////                }
-////            }
-////        }
-////        map.put("OutSingle", count);
-////        map.put("sum", sum);
-////        System.out.println("总共===" + count);
-////
-////
-////        return map;
-////    }
-//
-//    private TeamUserCountPriceVO queryBillPrice(TeamUserQryVO record, String id) {
-//        Map map = new HashMap();
-//        List<InsOrder> orderList = null;
-//        int count = 0;
-//        TeamUserCountPriceVO teamUserCountPriceVO = new TeamUserCountPriceVO();
-//
-//        List listteam = new ArrayList();
-//
-//
-//        StringBuffer whereStrs = new StringBuffer();
-//        ArrayList<String> param = new ArrayList<String>();
-//        whereStrs = new StringBuffer();
-//        param = new ArrayList<String>();
-//        whereStrs.append(" where orderstatus=7 ");
-//        whereStrs.append(" and userid=? ");
-//        param.add(id);
-//        if (!StringUtils.isNullOrEmpty(record.getStartdate()) && !StringUtils.isNullOrEmpty(record.getEnddate())) {
-//            whereStrs.append("and exists (select 1 from esm_user_internal a where t.userid=a.id and DATE_FORMAT(a.intime,'%Y-%m-%d') >= date ? and DATE_FORMAT(a.intime,'%Y-%m-%d') <= date ?)");
-//            param.add(record.getStartdate());
-//            param.add(record.getEnddate());
-//        }
-//        //查询签单保费
-//        orderList = insOrderService.selectList(whereStrs.toString(), param.toArray());
-//        if (orderList != null && orderList.size() > 0) {
-//            double sum = 0;
-//            whereStrs = new StringBuffer();
-//            param = new ArrayList<String>();
-//            whereStrs.append(" where orderstatus=7 ");
-//            whereStrs.append(" and userid=? ");
-//            param.add(id);
-//            if (!StringUtils.isNullOrEmpty(record.getStartdate()) && !StringUtils.isNullOrEmpty(record.getEnddate())) {
-//                whereStrs.append("and exists (select 1 from esm_user_internal a where t.userid=a.id and DATE_FORMAT(a.intime,'%Y-%m-%d') >= date ? and DATE_FORMAT(a.intime,'%Y-%m-%d') <= date ?)");
-//                param.add(record.getStartdate());
-//                param.add(record.getEnddate());
-//            }
-//            //查询出单笔数
-//            Integer count1 = insOrderService.count(whereStrs.toString(), param.toArray());
-//            whereStrs.replace(19, 20, "5");
-//            //查询核保笔数
-//            Integer underwriting = insOrderService.count(whereStrs.toString(), param.toArray());
-//
-//            teamUserCountPriceVO.setId(id);
-//            teamUserCountPriceVO.setIssue(count1);
-//            teamUserCountPriceVO.setUnderwriting(underwriting);
-//            count = count + 1;
-//            for (int j = 0; j < orderList.size(); j++) {
-//                double sumpremium = orderList.get(j).getSumpremium();
-//                double taxamount = orderList.get(j).getTaxamount();
-//
-//                if (sumpremium > 0) {
-//                    sum = sum + sumpremium - taxamount;
-//                }
-//
-//            }
-//            BigDecimal b = new BigDecimal(sum);
-//            double price = b.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
-//
-//            teamUserCountPriceVO.setBillPrice(price);
-//            //  listteam.add(teamUserCountPriceVO);
-//            System.out.println("大小" + orderList.size());
-//        }
-//
-//        JSONArray objects3 = JSONObject.parseArray(JSONObject.toJSONString(listteam));
-//
-//        System.out.println("listteam==================" + objects3);
-//
-//
-//        return teamUserCountPriceVO;
-//    }
-//
-//    public VoEsmUserInternal findUserBy(String id, TeamUserQryVO record, List<EsmUserAgent> list) {
-//        SysUser sysUser = sysUserService.getById(id);
-//        sysUser.setPassword("");
-//        sysUser.setSalt("");
-//        EsmUserInternal esmUserInternal = esmUserInternalService.getById(id);
-//        EsmUserAgent esmUserAgent = esmUserAgentService.getById(id);
-//        TeamUserCountPriceVO teamUserCountPriceVO = queryBillPrice(record, id);
-//        VoEsmUserInternal voEsmUserInternal = new VoEsmUserInternal();
-//        voEsmUserInternal.setSysUser(sysUser);
-//        voEsmUserInternal.setEsmUserInternal(esmUserInternal);
-//        voEsmUserInternal.setEsmUserAgent(esmUserAgent);
-//        voEsmUserInternal.setTeamUserCountPriceVO(teamUserCountPriceVO);
-//
-//        return voEsmUserInternal;
-//    }
-//
-//
-//
-//
-//}

+ 0 - 17
src/main/java/com/ydtech/modules/esm/convert/EsmUserInternalConvert.java

@@ -1,17 +0,0 @@
-//package com.ydtech.modules.esm.convert;
-//
-//import com.ydtech.modules.esm.model.EsmUserInternal;
-//import com.ydtech.modules.esm.model.vo.EsmUserInternalVo;
-//import org.mapstruct.Mapper;
-//import org.mapstruct.factory.Mappers;
-//
-//@Mapper
-//public interface EsmUserInternalConvert {
-//
-//    EsmUserInternalConvert INSTANCE = Mappers.getMapper(EsmUserInternalConvert.class);
-//
-//    EsmUserInternal vo2Dto(EsmUserInternalVo esmUserInternalVo);
-//
-//    EsmUserInternalVo dto2Vo(EsmUserInternal esmUserInternal);
-//
-//}

+ 0 - 37
src/main/java/com/ydtech/modules/esm/dao/EsmInsCompanyDao.java

@@ -1,37 +0,0 @@
-//package com.ydtech.modules.esm.dao;
-//
-//
-//import com.ydtech.core.page.PageResult;
-//import com.ydtech.modules.esm.model.EsmInsCompany;
-//
-//import java.util.List;
-//
-//public interface EsmInsCompanyDao {
-//
-//    public EsmInsCompany selectByPk(String id);
-//
-//    public List<EsmInsCompany> selectAll();
-//
-//    public List<EsmInsCompany> selectList(String whereCase, Object[] paramValues);
-//
-//    public Integer count(String whereCase, Object[] paramValues);
-//
-//    public PageResult selectPaging(int pageNumber, int pageSize, String whereCase, Object[] paramValues);
-//
-//    public Integer insert(EsmInsCompany model);
-//
-//    public Integer insertReturnPk(EsmInsCompany model);
-//
-//    public Integer insertSelective(EsmInsCompany model);
-//
-//    public Integer update(EsmInsCompany model);
-//
-//    public Integer updateSelective(EsmInsCompany model);
-//
-//    public Integer delete(String id);
-//
-//    public Integer delete(List<String> idList);
-//}
-//
-//
-//

+ 0 - 35
src/main/java/com/ydtech/modules/esm/dao/EsmUserAgentDao.java

@@ -1,35 +0,0 @@
-//package com.ydtech.modules.esm.dao;
-//
-//import com.ydtech.modules.esm.model.EsmUserAgent;
-//import com.ydtech.core.page.PageResult;
-//
-//import java.util.List;
-//
-//
-//public interface EsmUserAgentDao {
-//
-//
-//    public EsmUserAgent selectByPk(String id);
-//
-//    public List<EsmUserAgent> selectAll();
-//
-//    public List<EsmUserAgent> selectList(String whereCase, Object[] paramValues);
-//
-//    public Integer count(String whereCase, Object[] paramValues);
-//
-//    public PageResult selectPaging(int pageNumber, int pageSize, String whereCase, Object[] paramValues);
-//
-//    public Integer insert(EsmUserAgent model);
-//
-//
-//    public Integer insertSelective(EsmUserAgent model);
-//
-//    public Integer update(EsmUserAgent model);
-//
-//    public Integer updateSelective(EsmUserAgent model);
-//
-//    public Integer delete(String id);
-//
-//    public Integer delete(List<EsmUserAgent> lsEsmUserAgent);
-//
-//}

+ 0 - 37
src/main/java/com/ydtech/modules/esm/dao/EsmUserInternalCheckDao.java

@@ -1,37 +0,0 @@
-//package com.ydtech.modules.esm.dao;
-//
-//import com.ydtech.modules.esm.model.EsmUserInternalCheck;
-//import com.ydtech.core.page.PageResult;
-//
-//import java.util.List;
-//
-//import java.util.Date;
-//
-//
-//public interface EsmUserInternalCheckDao {
-//
-//
-//    public EsmUserInternalCheck selectByPk(String id);
-//
-//    public List<EsmUserInternalCheck> selectAll();
-//
-//    public List<EsmUserInternalCheck> selectList(String whereCase, Object[] paramValues);
-//
-//    public Integer count(String whereCase, Object[] paramValues);
-//
-//    public PageResult selectPaging(int pageNumber, int pageSize, String whereCase, Object[] paramValues);
-//
-//    public Integer insert(EsmUserInternalCheck model);
-//
-//
-//    public Integer insertSelective(EsmUserInternalCheck model);
-//
-//    public Integer update(EsmUserInternalCheck model);
-//
-//    public Integer updateSelective(EsmUserInternalCheck model);
-//
-//    public Integer delete(String id);
-//
-//    public Integer delete(List<EsmUserInternalCheck> lsEsmUserInternalCheck);
-//
-//}

+ 0 - 37
src/main/java/com/ydtech/modules/esm/dao/EsmUserInternalDao.java

@@ -1,37 +0,0 @@
-//package com.ydtech.modules.esm.dao;
-//
-//import com.ydtech.modules.esm.model.EsmUserInternal;
-//import com.ydtech.core.page.PageResult;
-//
-//import java.util.List;
-//
-//import java.util.Date;
-//
-//
-//public interface EsmUserInternalDao {
-//
-//
-//    public EsmUserInternal selectByPk(String id);
-//
-//    public List<EsmUserInternal> selectAll();
-//
-//    public List<EsmUserInternal> selectList(String whereCase, Object[] paramValues);
-//
-//    public Integer count(String whereCase, Object[] paramValues);
-//
-//    public PageResult selectPaging(int pageNumber, int pageSize, String whereCase, Object[] paramValues);
-//
-//    public Integer insert(EsmUserInternal model);
-//
-//
-//    public Integer insertSelective(EsmUserInternal model);
-//
-//    public Integer update(EsmUserInternal model);
-//
-//    public Integer updateSelective(EsmUserInternal model);
-//
-//    public Integer delete(String id);
-//
-//    public Integer delete(List<EsmUserInternal> lsEsmUserInternal);
-//
-//}

+ 0 - 101
src/main/java/com/ydtech/modules/esm/dao/EsmUserInternalMapper.java

@@ -1,101 +0,0 @@
-//package com.ydtech.modules.esm.dao;
-//
-//import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-//import com.ydtech.modules.esm.model.EsmUserInternal;
-//import org.springframework.stereotype.Repository;
-//
-//@Repository
-//public interface EsmUserInternalMapper extends BaseMapper<EsmUserInternal> {
-//
-////    String internalUserSql = "select t.id,t.name,t.dept_id deptid,t2.name deptname,t3.id comid,t3.name comname,t.status " +
-////            "from sys_user t left join sys_dept t2 on t.dept_id=t2.id " +
-////            "left join sys_dept t3 on t2.parent_id=t3.id " +
-////            "left join esm_user_internal a on t.id=a.id " +
-////            "where t.id=#{userId}";
-////
-////    String internalUserByDeptIdSql = "select t1.id,t1.name,t1.dept_id deptid,sd.name deptname,sd2.id comid,sd2.name comname,t2.status " +
-////            "from sys_user t1 left join esm_user_internal t2 on t1.id=t2.id " +
-////            "LEFT JOIN sys_dept sd ON t1.dept_id=sd.id " +
-////            "LEFT JOIN sys_dept sd2 ON sd2.id=sd.parent_id " +
-////            "where 1=1  and t2.isteamleader = '1' and t1.dept_id=#{deptId}";
-////
-////
-////    String selectUserParamSql = "select su.id as userId,su.name,su.sex,su.mobile,su.status\n" +
-////            ",sd.id as deptId,sd.name as deptName\n" +
-////            ",psd.id as pDeptId,psd.name as pDeptName\n" +
-////            ",dict.label as jobName\n" +
-////            ",dict2.label as approvalStatus";
-////
-////
-////    String selectUserFromSql = " from sys_user su \n" +
-////            "left JOIN sys_dept sd on su.dept_id=sd.id\n" +
-////            "left join sys_dept psd on sd.parent_id=psd.id\n" +
-////            "left join sys_dict dict on dict.value=su.job_code\n" +
-////            "left join sys_dict dict2 on dict2.value=su.approval_status\n" +
-////            "where 1=1\n" +
-////            "and sd.id &lt;&gt; '' \n" +
-////            "AND dict.itemname = 'jobcode'\n" +
-////            "AND dict2.itemname = 'approval'";
-////
-////    String selectUserFromWhereSql = " " +
-////            "<if test='page.columnFilters.usertype !=null and page.columnFilters.usertype.value!=\"\" and page.columnFilters.usertype.value!=null '>" +
-////            "  and su.usertype = #{page.columnFilters.usertype.value}" +
-////            "</if> " +
-////            "<if test='page.columnFilters.approvalStatus !=null and page.columnFilters.approvalStatus.value!=\"\" and page.columnFilters.approvalStatus.value!=null '>" +
-////            " and su.approval_status = #{page.columnFilters.approvalStatus.value}" +
-////            "</if> " +
-////            "<if test='page.columnFilters.realName !=null and page.columnFilters.realName.value!=\"\" and page.columnFilters.realName.value!=null '> " +
-////            " and su.name like concat('%',#{page.columnFilters.realName.value},'%')" +
-////            "</if> " +
-////            "<if test='page.columnFilters.userId !=null and page.columnFilters.userId.value!=\"\" and page.columnFilters.userId.value!=null '>" +
-////            " and su.id = #{page.columnFilters.userId.value}" +
-////            "</if> " +
-////            "<if test='page.columnFilters.mobile !=null and page.columnFilters.mobile.value!=\"\" and page.columnFilters.mobile.value!=null '>" +
-////            " and su.mobile = #{page.columnFilters.mobile.value}" +
-////            "</if> " +
-////            "<if test='page.columnFilters.delFlag !=null and page.columnFilters.delFlag.value!=\"\" and page.columnFilters.delFlag.value!=null '>" +
-////            " and su.del_flag = #{page.columnFilters.delFlag.value}" +
-////            "</if> " +
-////            "<if test='page.columnFilters.deptId !=null and page.columnFilters.deptId.value!=\"\" and page.columnFilters.deptId.value!=null '>" +
-////            " and su.dept_id like concat('%',#{page.columnFilters.deptId.value},'%')" +
-////            "</if> " +
-////            "";
-////
-////
-//////    String selectUserFromWhereSql = " " +
-//////            " and su.usertype = #{page.columnFilters.usertype.value}" +
-//////            " and su.status = #{page.columnFilters.status.value}" +
-//////            " and su.name like concat('%',#{page.columnFilters.name.value},'%')" +
-//////            " and su.id = #{page.columnFilters.userId.value}" +
-//////            " and su.mobile = #{page.columnFilters.mobile.value}" +
-//////            "";
-////
-////
-////    @Select(internalUserSql)
-////    SysUserVO gainInternalUser(@Param("userId") String userId);
-////
-////
-////    @Select(internalUserByDeptIdSql)
-////    SysUserVO gainInternalUserByDeptId(@Param("deptId") String deptId);
-////
-////
-////    //    @Select("select * from (" + selectUserParamSql + selectUserFromSql + selectUserFromWhereSql + " limit #{page.pageNum},#{page.pageSize} ) aaa")
-////    @Select({"<script>",
-////            "select * from (",
-////            selectUserParamSql,
-////            selectUserFromSql,
-////            selectUserFromWhereSql,
-////            " limit #{page.pageNum},#{page.pageSize} ) aaa",
-////            "</script>"})
-////    List<SysUserBaseVO> gainUserBaseInfo(@Param("page") PageRequest pageRequest);
-////
-////
-////    //    @Select("select count(1) " + selectUserFromSql + selectUserFromWhereSql)
-////    @Select({"<script>","select count(1) ",selectUserFromSql,selectUserFromWhereSql,"</script>"})
-////    int gainUserBaseInfoCount(@Param("page") PageRequest pageRequest);
-//
-//}
-//
-//
-//
-//

+ 0 - 370
src/main/java/com/ydtech/modules/esm/dao/impl/EsmInsCompanyDaoImpl.java

@@ -1,370 +0,0 @@
-//package com.ydtech.modules.esm.dao.impl;
-//
-//
-//import com.github.drinkjava2.jdialects.Dialect;
-//import com.ydtech.core.page.PageResult;
-//import com.ydtech.modules.esm.dao.EsmInsCompanyDao;
-//import com.ydtech.modules.esm.model.EsmInsCompany;
-//import net.bytebuddy.implementation.bind.ArgumentTypeResolver;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.jdbc.core.BatchPreparedStatementSetter;
-//import org.springframework.jdbc.core.JdbcTemplate;
-//import org.springframework.jdbc.core.PreparedStatementCreator;
-//import org.springframework.jdbc.core.RowMapper;
-//import org.springframework.jdbc.support.GeneratedKeyHolder;
-//import org.springframework.jdbc.support.KeyHolder;
-//import org.springframework.stereotype.Repository;
-//
-//import javax.sql.DataSource;
-//import java.sql.Connection;
-//import java.sql.PreparedStatement;
-//import java.sql.ResultSet;
-//import java.sql.SQLException;
-//import java.util.ArrayList;
-//import java.util.List;
-//
-//
-//@Repository
-//public class EsmInsCompanyDaoImpl implements EsmInsCompanyDao {
-//
-//    @Autowired
-//    public DataSource dataSource;
-//
-//    public static class EsmInsCompanyRowMapper implements RowMapper {
-//        public EsmInsCompany mapRow(ResultSet resultSet, int rowNum) throws SQLException {
-//            EsmInsCompany model = new EsmInsCompany();
-//
-//            model.setId(resultSet.getString("id"));
-//            model.setName(resultSet.getString("name"));
-//            model.setParentId(resultSet.getString("parent_id"));
-//            model.setNamesimple(resultSet.getString("namesimple"));
-//            model.setRemark(resultSet.getString("remark"));
-//            model.setOrderNum(resultSet.getInt("order_num"));
-//            model.setCreateBy(resultSet.getString("create_by"));
-//            model.setCreateTime(resultSet.getDate("create_time"));
-//            model.setLastUpdateBy(resultSet.getString("last_update_by"));
-//            model.setLastUpdateTime(resultSet.getDate("last_update_time"));
-//            model.setLogo(resultSet.getString("logo"));
-//            return model;
-//        }
-//    }
-//
-//    @Override
-//    public EsmInsCompany selectByPk(String id) {
-//        String sql = "select t.id, t.name, t.parent_id, t.namesimple, t.remark, t.order_num, t.create_by, t.create_time, t.last_update_by, t.last_update_time, t.del_flag, t.logo from esm_ins_company t  where id=?";
-//
-//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-//
-//        return (EsmInsCompany) jdbcTemplate.queryForObject(sql,
-//                new Object[]{id}, new EsmInsCompanyRowMapper());
-//    }
-//
-//    @Override
-//    public List<EsmInsCompany> selectAll() {
-//        String sql = "select t.id, t.name, t.parent_id, t.namesimple, t.remark, t.order_num, t.create_by, t.create_time, t.last_update_by, t.last_update_time, t.del_flag, '' logo from esm_ins_company t  ";
-//
-//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-//
-//        return jdbcTemplate.query(sql, new EsmInsCompanyRowMapper());
-//    }
-//
-//    public List<EsmInsCompany> selectList(String whereCase, Object[] paramValues) {
-//        String sql = "select t.id, t.name, t.parent_id, t.namesimple, t.remark, t.order_num, t.create_by, t.create_time, t.last_update_by, t.last_update_time, t.del_flag, '' logo from esm_ins_company t  " + whereCase;
-//
-//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-//
-//        return jdbcTemplate.query(sql, paramValues, new EsmInsCompanyRowMapper());
-//    }
-//
-//    public Integer count(String whereCase, Object[] paramValues) {
-//        String sql = "select count(1) from esm_ins_company t " + whereCase;
-//
-//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-//
-//        return jdbcTemplate.queryForObject(sql, paramValues, Integer.class);
-//    }
-//
-//    public PageResult selectPaging(int pageNumber, int pageSize, String whereCase, Object[] paramValues) {
-//
-//        Dialect dialect = Dialect.guessDialect(dataSource);
-//        String sql = dialect.pagin(pageNumber, pageSize, "select t.id, t.name, t.parent_id, t.namesimple, t.remark, t.order_num, t.create_by, t.create_time, t.last_update_by, t.last_update_time, t.del_flag, '' logo from esm_ins_company t  " + whereCase);
-//
-//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-//        List<EsmInsCompany> recordList = jdbcTemplate.query(sql, paramValues, new EsmInsCompanyRowMapper());
-//
-//        int totalCount = count(whereCase, paramValues);
-//
-//        PageResult PageResult = new PageResult(pageNumber, pageSize, totalCount, recordList);
-//
-//        return PageResult;
-//    }
-//
-//
-//    @Override
-//    public Integer insert(EsmInsCompany model) {
-//
-//        String sql = "insert into esm_ins_company ( id, name, parent_id, namesimple, remark, order_num, create_by, create_time, last_update_by, last_update_time, del_flag, logo) values ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ";
-//
-//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-//
-//        Object[] params = new Object[]{model.getId(), model.getName(), model.getParentId(), model.getNamesimple(), model.getRemark(), model.getOrderNum(), model.getCreateBy(), model.getCreateTime(), model.getLastUpdateBy(), model.getLastUpdateTime(), model.getDelFlag(), model.getLogo()};
-//
-//        int out = jdbcTemplate.update(sql, params);
-//
-//        return out;
-//    }
-//
-//    @Override
-//    public Integer insertReturnPk(EsmInsCompany model) {
-//
-//        String sql = "insert into esm_ins_company ( id, name, parent_id, namesimple, remark, order_num, create_by, create_time, last_update_by, last_update_time, del_flag, logo) values ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ";
-//
-//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-//
-//        KeyHolder keyHolder = new GeneratedKeyHolder();
-//        jdbcTemplate.update(new PreparedStatementCreator() {
-//            @Override
-//            public PreparedStatement createPreparedStatement(Connection conn) throws SQLException {
-//                PreparedStatement ps = conn.prepareStatement(sql, PreparedStatement.RETURN_GENERATED_KEYS);
-//                ps.setObject(1, model.getId());
-//                ps.setObject(2, model.getName());
-//                ps.setObject(3, model.getParentId());
-//                ps.setObject(4, model.getNamesimple());
-//                ps.setObject(5, model.getRemark());
-//                ps.setObject(6, model.getOrderNum());
-//                ps.setObject(7, model.getCreateBy());
-//                ps.setObject(8, model.getCreateTime());
-//                ps.setObject(9, model.getLastUpdateBy());
-//                ps.setObject(10, model.getLastUpdateTime());
-//                ps.setObject(11, model.getDelFlag());
-//                ps.setObject(12, model.getLogo());
-//                return ps;
-//            }
-//        }, keyHolder);
-//
-//        return keyHolder.getKey().intValue();
-//    }
-//
-//
-//    @Override
-//    public Integer insertSelective(EsmInsCompany model) {
-//
-//        StringBuffer sbSql = new StringBuffer();
-//        StringBuffer sbParams = new StringBuffer();
-//        ArrayList<Object> alParamsValues = new ArrayList<Object>();
-//
-//        String pre = "";
-//
-//        if (model.getId() != null) {
-//            sbSql.append(pre + "id");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getId());
-//            pre = ",";
-//        }
-//        if (model.getName() != null) {
-//            sbSql.append(pre + "name");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getName());
-//            pre = ",";
-//        }
-//        if (model.getParentId() != null) {
-//            sbSql.append(pre + "parent_id");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getParentId());
-//            pre = ",";
-//        }
-//        if (model.getNamesimple() != null) {
-//            sbSql.append(pre + "namesimple");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getNamesimple());
-//            pre = ",";
-//        }
-//        if (model.getRemark() != null) {
-//            sbSql.append(pre + "remark");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getRemark());
-//            pre = ",";
-//        }
-//        if (model.getOrderNum() != null) {
-//            sbSql.append(pre + "order_num");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getOrderNum());
-//            pre = ",";
-//        }
-//        if (model.getCreateBy() != null) {
-//            sbSql.append(pre + "create_by");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getCreateBy());
-//            pre = ",";
-//        }
-//        if (model.getCreateTime() != null) {
-//            sbSql.append(pre + "create_time");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getCreateTime());
-//            pre = ",";
-//        }
-//        if (model.getLastUpdateBy() != null) {
-//            sbSql.append(pre + "last_update_by");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getLastUpdateBy());
-//            pre = ",";
-//        }
-//        if (model.getLastUpdateTime() != null) {
-//            sbSql.append(pre + "last_update_time");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getLastUpdateTime());
-//            pre = ",";
-//        }
-//        if (model.getDelFlag() != null) {
-//            sbSql.append(pre + "del_flag");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getDelFlag());
-//            pre = ",";
-//        }
-//        if (model.getLogo() != null) {
-//            sbSql.append(pre + "logo");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getLogo());
-//            pre = ",";
-//        }
-//
-//        String sql = "INSERT INTO esm_ins_company (" + sbSql.toString() + ") VALUES (" + sbParams.toString() + ")";
-//
-//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-//
-//        Object[] params = alParamsValues.toArray();
-//
-//        int out = jdbcTemplate.update(sql, params);
-//
-//        return out;
-//    }
-//
-//    @Override
-//    public Integer update(EsmInsCompany model) {
-//
-//        String sql = "update esm_ins_company set name=?, parent_id=?, namesimple=?, remark=?, order_num=?, create_by=?, create_time=?, last_update_by=?, last_update_time=?, del_flag=?, logo=? where id=?";
-//
-//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-//
-//        Object[] params = new Object[]{model.getName(), model.getParentId(), model.getNamesimple(), model.getRemark(), model.getOrderNum(), model.getCreateBy(), model.getCreateTime(), model.getLastUpdateBy(), model.getLastUpdateTime(), model.getDelFlag(), model.getLogo(), model.getId()};
-//
-//        return jdbcTemplate.update(sql, params);
-//    }
-//
-//    @Override
-//    public Integer updateSelective(EsmInsCompany model) {
-//
-//        StringBuffer sbSql = new StringBuffer();
-//        StringBuffer sbParams = new StringBuffer();
-//        ArrayList<Object> alParamsValues = new ArrayList<Object>();
-//
-//        String pre = "";
-//        String preWhere = "";
-//
-//        if (model.getName() != null) {
-//            sbSql.append(pre + "name=?");
-//            alParamsValues.add(model.getName());
-//            pre = ",";
-//        }
-//        if (model.getParentId() != null) {
-//            sbSql.append(pre + "parent_id=?");
-//            alParamsValues.add(model.getParentId());
-//            pre = ",";
-//        }
-//        if (model.getNamesimple() != null) {
-//            sbSql.append(pre + "namesimple=?");
-//            alParamsValues.add(model.getNamesimple());
-//            pre = ",";
-//        }
-//        if (model.getRemark() != null) {
-//            sbSql.append(pre + "remark=?");
-//            alParamsValues.add(model.getRemark());
-//            pre = ",";
-//        }
-//        if (model.getOrderNum() != null) {
-//            sbSql.append(pre + "order_num=?");
-//            alParamsValues.add(model.getOrderNum());
-//            pre = ",";
-//        }
-//        if (model.getCreateBy() != null) {
-//            sbSql.append(pre + "create_by=?");
-//            alParamsValues.add(model.getCreateBy());
-//            pre = ",";
-//        }
-//        if (model.getCreateTime() != null) {
-//            sbSql.append(pre + "create_time=?");
-//            alParamsValues.add(model.getCreateTime());
-//            pre = ",";
-//        }
-//        if (model.getLastUpdateBy() != null) {
-//            sbSql.append(pre + "last_update_by=?");
-//            alParamsValues.add(model.getLastUpdateBy());
-//            pre = ",";
-//        }
-//        if (model.getLastUpdateTime() != null) {
-//            sbSql.append(pre + "last_update_time=?");
-//            alParamsValues.add(model.getLastUpdateTime());
-//            pre = ",";
-//        }
-//        if (model.getDelFlag() != null) {
-//            sbSql.append(pre + "del_flag=?");
-//            alParamsValues.add(model.getDelFlag());
-//            pre = ",";
-//        }
-//        if (model.getLogo() != null) {
-//            sbSql.append(pre + "logo=?");
-//            alParamsValues.add(model.getLogo());
-//            pre = ",";
-//        }
-//        if (model.getId() != null) {
-//            sbParams.append(preWhere + "id=?");
-//            alParamsValues.add(model.getId());
-//            preWhere = ",";
-//        }
-//
-//
-//        if (!sbSql.toString().equalsIgnoreCase("")) {
-//            String sql = "update esm_ins_company set " + sbSql.toString() + " where " + sbParams.toString();
-//
-//            JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-//
-//            Object[] params = alParamsValues.toArray();
-//
-//            return jdbcTemplate.update(sql, params);
-//        }
-//
-//        return 0;
-//    }
-//
-//    @Override
-//    public Integer delete(String id) {
-//
-//        String sql = "delete from esm_ins_company where id=?";
-//
-//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-//
-//        return jdbcTemplate.update(sql, id);
-//    }
-//
-//    @Override
-//    public Integer delete(List<String> idList) {
-//        String sql = "delete from esm_ins_company where id=?";
-//
-//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-//
-//        return jdbcTemplate.batchUpdate(sql, new BatchPreparedStatementSetter() {
-//            @Override
-//            public void setValues(PreparedStatement preparedStatement, int i) throws SQLException {
-//                preparedStatement.setString(1, idList.get(i));
-//            }
-//
-//            @Override
-//            public int getBatchSize() {
-//                return idList.size();
-//            }
-//        }).length;
-//    }
-//}
-//
-//
-//

+ 0 - 345
src/main/java/com/ydtech/modules/esm/dao/impl/EsmUserAgentDaoImpl.java

@@ -1,345 +0,0 @@
-//package com.ydtech.modules.esm.dao.impl;
-//
-//import com.ydtech.modules.esm.dao.EsmUserAgentDao;
-//import com.ydtech.modules.esm.model.EsmUserAgent;
-//import com.ydtech.core.page.PageResult;
-//import com.github.drinkjava2.jdialects.Dialect;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.jdbc.core.JdbcTemplate;
-//import org.springframework.jdbc.core.PreparedStatementCreator;
-//import org.springframework.jdbc.core.RowMapper;
-//import org.springframework.jdbc.support.GeneratedKeyHolder;
-//import org.springframework.jdbc.support.KeyHolder;
-//import org.springframework.stereotype.Repository;
-//import org.springframework.jdbc.core.BatchPreparedStatementSetter;
-//
-//
-//import javax.sql.DataSource;
-//import java.sql.Connection;
-//import java.sql.PreparedStatement;
-//import java.sql.ResultSet;
-//import java.sql.SQLException;
-//
-//
-//import java.util.List;
-//import java.util.ArrayList;
-//
-//
-//@Repository
-//public class EsmUserAgentDaoImpl implements EsmUserAgentDao {
-//
-//    @Autowired
-//    public DataSource dataSource;
-//
-//
-//    public static class EsmUserAgentRowMapper implements RowMapper {
-//        public EsmUserAgent mapRow(ResultSet resultSet, int rowNum) throws SQLException {
-//            EsmUserAgent model = new EsmUserAgent();
-//
-//            model.setId(resultSet.getString("id"));
-//            model.setRecommenderid(resultSet.getString("recommenderid"));
-//            model.setRecommendername(resultSet.getString("recommendername"));
-//            model.setLeaderupid(resultSet.getString("leaderupid"));
-//            model.setLeaderupname(resultSet.getString("leaderupname"));
-//            model.setGrouppersonid(resultSet.getString("grouppersonid"));
-//            model.setGrouppersonname(resultSet.getString("grouppersonname"));
-//            model.setDeppersonid(resultSet.getString("deppersonid"));
-//            model.setDeppersonname(resultSet.getString("deppersonname"));
-//            model.setIsshowteam(resultSet.getString("isshowteam"));
-//            model.setIsshowsalesroom(resultSet.getString("isshowsalesroom"));
-//
-//            return model;
-//        }
-//    }
-//
-//
-//    @Override
-//    public EsmUserAgent selectByPk(String id) {
-//        String sql = " select t.id, t.recommenderid, t.recommendername, t.leaderupid, t.leaderupname, t.grouppersonid, t.grouppersonname, t.deppersonid, t.deppersonname, t.isshowteam, t.isshowsalesroom from esm_user_agent t  where id=? ";
-//
-//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-//
-//        List<EsmUserAgent> ls = jdbcTemplate.query(sql, new Object[]{id}, new EsmUserAgentRowMapper());
-//
-//        if (ls != null && ls.size() > 0) {
-//            return ls.get(0);
-//        }
-//
-//        return null;
-//    }
-//
-//
-//    @Override
-//    public List<EsmUserAgent> selectAll() {
-//        String sql = "select t.id, t.recommenderid, t.recommendername, t.leaderupid, t.leaderupname, t.grouppersonid, t.grouppersonname, t.deppersonid, t.deppersonname, t.isshowteam, t.isshowsalesroom from esm_user_agent t ";
-//
-//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-//
-//        return jdbcTemplate.query(sql, new EsmUserAgentRowMapper());
-//    }
-//
-//
-//    public List<EsmUserAgent> selectList(String whereCase, Object[] paramValues) {
-//        String sql = "select t.id, t.recommenderid, t.recommendername, t.leaderupid, t.leaderupname, t.grouppersonid, t.grouppersonname, t.deppersonid, t.deppersonname, t.isshowteam, t.isshowsalesroom from esm_user_agent t  " + whereCase;
-//
-//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-//
-//        return jdbcTemplate.query(sql, paramValues, new EsmUserAgentRowMapper());
-//    }
-//
-//
-//    public Integer count(String whereCase, Object[] paramValues) {
-//        String sql = "select count(1) from esm_user_agent t " + whereCase;
-//
-//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-//
-//        return jdbcTemplate.queryForObject(sql, paramValues, Integer.class);
-//    }
-//
-//
-//    public PageResult selectPaging(int pageNumber, int pageSize, String whereCase, Object[] paramValues) {
-//
-//        Dialect dialect = Dialect.guessDialect(dataSource);
-//        String sql = dialect.pagin(pageNumber, pageSize, "select t.id, t.recommenderid, t.recommendername, t.leaderupid, t.leaderupname, t.grouppersonid, t.grouppersonname, t.deppersonid, t.deppersonname, t.isshowteam, t.isshowsalesroom from esm_user_agent t  " + whereCase);
-//
-//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-//        List<EsmUserAgent> recordList = jdbcTemplate.query(sql, paramValues, new EsmUserAgentRowMapper());
-//
-//        int totalCount = count(whereCase, paramValues);
-//
-//        PageResult pageResult = new PageResult(pageNumber, pageSize, totalCount, recordList);
-//
-//        return pageResult;
-//    }
-//
-//
-//    @Override
-//    public Integer insert(EsmUserAgent model) {
-//
-//        String sql = "insert into esm_user_agent ( id, recommenderid, recommendername, leaderupid, leaderupname, grouppersonid, grouppersonname, deppersonid, deppersonname, isshowteam, isshowsalesroom) values ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ";
-//
-//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-//
-//        Object[] params = new Object[]{model.getId(), model.getRecommenderid(), model.getRecommendername(), model.getLeaderupid(), model.getLeaderupname(), model.getGrouppersonid(), model.getGrouppersonname(), model.getDeppersonid(), model.getDeppersonname(), model.getIsshowteam(), model.getIsshowsalesroom()};
-//
-//        int out = jdbcTemplate.update(sql, params);
-//
-//        return out;
-//    }
-//
-//
-//    @Override
-//    public Integer insertSelective(EsmUserAgent model) {
-//
-//        StringBuffer sbSql = new StringBuffer();
-//        StringBuffer sbParams = new StringBuffer();
-//        ArrayList<Object> alParamsValues = new ArrayList<Object>();
-//
-//        String pre = "";
-//
-//        if (model.getId() != null) {
-//            sbSql.append(pre + "id");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getId());
-//            pre = ",";
-//        }
-//        if (model.getRecommenderid() != null) {
-//            sbSql.append(pre + "recommenderid");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getRecommenderid());
-//            pre = ",";
-//        }
-//        if (model.getRecommendername() != null) {
-//            sbSql.append(pre + "recommendername");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getRecommendername());
-//            pre = ",";
-//        }
-//        if (model.getLeaderupid() != null) {
-//            sbSql.append(pre + "leaderupid");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getLeaderupid());
-//            pre = ",";
-//        }
-//        if (model.getLeaderupname() != null) {
-//            sbSql.append(pre + "leaderupname");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getLeaderupname());
-//            pre = ",";
-//        }
-//        if (model.getGrouppersonid() != null) {
-//            sbSql.append(pre + "grouppersonid");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getGrouppersonid());
-//            pre = ",";
-//        }
-//        if (model.getGrouppersonname() != null) {
-//            sbSql.append(pre + "grouppersonname");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getGrouppersonname());
-//            pre = ",";
-//        }
-//        if (model.getDeppersonid() != null) {
-//            sbSql.append(pre + "deppersonid");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getDeppersonid());
-//            pre = ",";
-//        }
-//        if (model.getDeppersonname() != null) {
-//            sbSql.append(pre + "deppersonname");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getDeppersonname());
-//            pre = ",";
-//        }
-//        if (model.getIsshowteam() != null) {
-//            sbSql.append(pre + "isshowteam");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getIsshowteam());
-//            pre = ",";
-//        }
-//        if (model.getIsshowsalesroom() != null) {
-//            sbSql.append(pre + "isshowsalesroom");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getIsshowsalesroom());
-//            pre = ",";
-//        }
-//
-//
-//        String sql = "INSERT INTO esm_user_agent (" + sbSql.toString() + ") VALUES (" + sbParams.toString() + ")";
-//
-//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-//
-//        Object[] params = alParamsValues.toArray();
-//
-//        int out = jdbcTemplate.update(sql, params);
-//
-//        return out;
-//    }
-//
-//
-//    @Override
-//    public Integer update(EsmUserAgent model) {
-//
-//        String sql = "update esm_user_agent set recommenderid=?, recommendername=?, leaderupid=?, leaderupname=?, grouppersonid=?, grouppersonname=?, deppersonid=?, deppersonname=?, isshowteam=?, isshowsalesroom=? where id=?";
-//
-//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-//
-//        Object[] params = new Object[]{model.getRecommenderid(), model.getRecommendername(), model.getLeaderupid(), model.getLeaderupname(), model.getGrouppersonid(), model.getGrouppersonname(), model.getDeppersonid(), model.getDeppersonname(), model.getIsshowteam(), model.getIsshowsalesroom(), model.getId()};
-//
-//        return jdbcTemplate.update(sql, params);
-//    }
-//
-//
-//    @Override
-//    public Integer updateSelective(EsmUserAgent model) {
-//
-//        StringBuffer sbSql = new StringBuffer();
-//        StringBuffer sbParams = new StringBuffer();
-//        ArrayList<Object> alParamsValues = new ArrayList<Object>();
-//
-//        String pre = "";
-//        String preWhere = "";
-//
-//        if (model.getRecommenderid() != null) {
-//            sbSql.append(pre + "recommenderid=?");
-//            alParamsValues.add(model.getRecommenderid());
-//            pre = ",";
-//        }
-//        if (model.getRecommendername() != null) {
-//            sbSql.append(pre + "recommendername=?");
-//            alParamsValues.add(model.getRecommendername());
-//            pre = ",";
-//        }
-//        if (model.getLeaderupid() != null) {
-//            sbSql.append(pre + "leaderupid=?");
-//            alParamsValues.add(model.getLeaderupid());
-//            pre = ",";
-//        }
-//        if (model.getLeaderupname() != null) {
-//            sbSql.append(pre + "leaderupname=?");
-//            alParamsValues.add(model.getLeaderupname());
-//            pre = ",";
-//        }
-//        if (model.getGrouppersonid() != null) {
-//            sbSql.append(pre + "grouppersonid=?");
-//            alParamsValues.add(model.getGrouppersonid());
-//            pre = ",";
-//        }
-//        if (model.getGrouppersonname() != null) {
-//            sbSql.append(pre + "grouppersonname=?");
-//            alParamsValues.add(model.getGrouppersonname());
-//            pre = ",";
-//        }
-//        if (model.getDeppersonid() != null) {
-//            sbSql.append(pre + "deppersonid=?");
-//            alParamsValues.add(model.getDeppersonid());
-//            pre = ",";
-//        }
-//        if (model.getDeppersonname() != null) {
-//            sbSql.append(pre + "deppersonname=?");
-//            alParamsValues.add(model.getDeppersonname());
-//            pre = ",";
-//        }
-//        if (model.getIsshowteam() != null) {
-//            sbSql.append(pre + "isshowteam=?");
-//            alParamsValues.add(model.getIsshowteam());
-//            pre = ",";
-//        }
-//        if (model.getIsshowsalesroom() != null) {
-//            sbSql.append(pre + "isshowsalesroom=?");
-//            alParamsValues.add(model.getIsshowsalesroom());
-//            pre = ",";
-//        }
-//        if (model.getId() != null) {
-//            sbParams.append(preWhere + "id=?");
-//            alParamsValues.add(model.getId());
-//            preWhere = ",";
-//        }
-//
-//
-//        if (!sbSql.toString().equalsIgnoreCase("")) {
-//            String sql = "update esm_user_agent set " + sbSql.toString() + " where " + sbParams.toString();
-//
-//            JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-//
-//            Object[] params = alParamsValues.toArray();
-//
-//            return jdbcTemplate.update(sql, params);
-//        }
-//
-//        return 0;
-//
-//    }
-//
-//
-//    @Override
-//    public Integer delete(String id) {
-//
-//        String sql = "delete from esm_user_agent where id=?";
-//
-//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-//
-//        return jdbcTemplate.update(sql, id);
-//    }
-//
-//
-//    @Override
-//    public Integer delete(List<EsmUserAgent> lsEsmUserAgent) {
-//        String sql = "delete from esm_user_agent where id=?";
-//
-//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-//
-//        return jdbcTemplate.batchUpdate(sql, new BatchPreparedStatementSetter() {
-//            @Override
-//            public void setValues(PreparedStatement preparedStatement, int i) throws SQLException {
-//                preparedStatement.setString(1, lsEsmUserAgent.get(i).getId());
-//            }
-//
-//            @Override
-//            public int getBatchSize() {
-//                return lsEsmUserAgent.size();
-//            }
-//        }).length;
-//    }
-//
-//}

+ 0 - 664
src/main/java/com/ydtech/modules/esm/dao/impl/EsmUserInternalCheckDaoImpl.java

@@ -1,664 +0,0 @@
-//package com.ydtech.modules.esm.dao.impl;
-//
-//import com.ydtech.modules.esm.dao.EsmUserInternalCheckDao;
-//import com.ydtech.modules.esm.model.EsmUserInternalCheck;
-//import com.ydtech.core.page.PageResult;
-//import com.github.drinkjava2.jdialects.Dialect;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.jdbc.core.JdbcTemplate;
-//import org.springframework.jdbc.core.PreparedStatementCreator;
-//import org.springframework.jdbc.core.RowMapper;
-//import org.springframework.jdbc.support.GeneratedKeyHolder;
-//import org.springframework.jdbc.support.KeyHolder;
-//import org.springframework.stereotype.Repository;
-//import org.springframework.jdbc.core.BatchPreparedStatementSetter;
-//
-//
-//import javax.sql.DataSource;
-//import java.sql.Connection;
-//import java.sql.PreparedStatement;
-//import java.sql.ResultSet;
-//import java.sql.SQLException;
-//
-//import java.util.Date;
-//import java.util.List;
-//import java.util.ArrayList;
-//
-//
-//@Repository
-//public class EsmUserInternalCheckDaoImpl implements EsmUserInternalCheckDao {
-//
-//    @Autowired
-//    public DataSource dataSource;
-//
-//
-//    public static class EsmUserInternalCheckRowMapper implements RowMapper {
-//        public EsmUserInternalCheck mapRow(ResultSet resultSet, int rowNum) throws SQLException {
-//            EsmUserInternalCheck model = new EsmUserInternalCheck();
-//
-//            model.setCheckid(resultSet.getString("checkid"));
-//            model.setId(resultSet.getString("id"));
-//            model.setAddressnow(resultSet.getString("addressnow"));
-//            model.setNations(resultSet.getString("nations"));
-//            model.setPoliticalstatus(resultSet.getString("politicalstatus"));
-//            model.setCollege(resultSet.getString("college"));
-//            model.setIdentity(resultSet.getString("identity"));
-//            model.setEducation(resultSet.getString("education"));
-//            model.setBankname(resultSet.getString("bankname"));
-//            model.setAccountno(resultSet.getString("accountno"));
-//            model.setAddressresident(resultSet.getString("addressresident"));
-//            model.setHealth(resultSet.getString("health"));
-//            model.setPostalcode(resultSet.getString("postalcode"));
-//            model.setPhonehouse(resultSet.getString("phonehouse"));
-//            model.setCollegetm(resultSet.getDate("collegetm"));
-//            model.setSpeciality(resultSet.getString("speciality"));
-//            model.setNativeplace(resultSet.getString("nativeplace"));
-//            model.setWorktype(resultSet.getString("worktype"));
-//            model.setBlood(resultSet.getString("blood"));
-//            model.setSaleno(resultSet.getString("saleno"));
-//            model.setOrglast(resultSet.getString("orglast"));
-//            model.setJoblast(resultSet.getString("joblast"));
-//            model.setHobby(resultSet.getString("hobby"));
-//            model.setNamespecial(resultSet.getString("namespecial"));
-//            model.setPhonespecial(resultSet.getString("phonespecial"));
-//            model.setIntimes(resultSet.getString("intimes"));
-//            model.setContracttime(resultSet.getDate("contracttime"));
-//            model.setIsteamleader(resultSet.getString("isteamleader"));
-//            model.setDocumentno(resultSet.getString("documentno"));
-//            model.setHrcode(resultSet.getString("hrcode"));
-//            model.setRegulartm(resultSet.getDate("regulartm"));
-//            model.setIntime(resultSet.getDate("intime"));
-//            model.setSalarycode(resultSet.getString("salarycode"));
-//            model.setBirthday(resultSet.getDate("birthday"));
-//            model.setMarrycode(resultSet.getString("marrycode"));
-//            model.setStatus(resultSet.getString("status"));
-//            model.setWhichteam(resultSet.getString("whichteam"));
-//            model.setRemark(resultSet.getString("remark"));
-//
-//            return model;
-//        }
-//    }
-//
-//
-//    @Override
-//    public EsmUserInternalCheck selectByPk(String id) {
-//        String sql = " select t.checkid, t.id, t.addressnow, t.nations, t.politicalstatus, t.college, t.identity, t.education, t.bankname, t.accountno, t.addressresident, t.health, t.postalcode, t.phonehouse, t.collegetm, t.speciality, t.nativeplace, t.worktype, t.blood, t.saleno, t.orglast, t.joblast, t.hobby, t.namespecial, t.phonespecial, t.intimes, t.contracttime, t.isteamleader, t.documentno, t.hrcode, t.regulartm, t.intime, t.salarycode, t.birthday, t.marrycode, t.status, t.whichteam, t.remark from esm_user_internal_check t  where checkid=? or id=?";
-//
-//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-//
-//        List<EsmUserInternalCheck> ls = jdbcTemplate.query(sql, new Object[]{id, id}, new EsmUserInternalCheckRowMapper());
-//
-//        if (ls != null && ls.size() > 0) {
-//            return ls.get(0);
-//        }
-//
-//        return null;
-//    }
-//
-//
-//    @Override
-//    public List<EsmUserInternalCheck> selectAll() {
-//        String sql = "select t.checkid, t.id, t.addressnow, t.nations, t.politicalstatus, t.college, t.identity, t.education, t.bankname, t.accountno, t.addressresident, t.health, t.postalcode, t.phonehouse, t.collegetm, t.speciality, t.nativeplace, t.worktype, t.blood, t.saleno, t.orglast, t.joblast, t.hobby, t.namespecial, t.phonespecial, t.intimes, t.contracttime, t.isteamleader, t.documentno, t.hrcode, t.regulartm, t.intime, t.salarycode, t.birthday, t.marrycode, t.status, t.whichteam, t.remark from esm_user_internal_check t ";
-//
-//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-//
-//        return jdbcTemplate.query(sql, new EsmUserInternalCheckRowMapper());
-//    }
-//
-//
-//    public List<EsmUserInternalCheck> selectList(String whereCase, Object[] paramValues) {
-//        String sql = "select t.checkid, t.id, t.addressnow, t.nations, t.politicalstatus, t.college, t.identity, t.education, t.bankname, t.accountno, t.addressresident, t.health, t.postalcode, t.phonehouse, t.collegetm, t.speciality, t.nativeplace, t.worktype, t.blood, t.saleno, t.orglast, t.joblast, t.hobby, t.namespecial, t.phonespecial, t.intimes, t.contracttime, t.isteamleader, t.documentno, t.hrcode, t.regulartm, t.intime, t.salarycode, t.birthday, t.marrycode, t.status, t.whichteam, t.remark from esm_user_internal_check t  " + whereCase;
-//
-//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-//
-//        return jdbcTemplate.query(sql, paramValues, new EsmUserInternalCheckRowMapper());
-//    }
-//
-//
-//    public Integer count(String whereCase, Object[] paramValues) {
-//        String sql = "select count(1) from esm_user_internal_check t " + whereCase;
-//
-//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-//
-//        return jdbcTemplate.queryForObject(sql, paramValues, Integer.class);
-//    }
-//
-//
-//    public PageResult selectPaging(int pageNumber, int pageSize, String whereCase, Object[] paramValues) {
-//
-//        Dialect dialect = Dialect.guessDialect(dataSource);
-//        String sql = dialect.pagin(pageNumber, pageSize, "select t.checkid, t.id, t.addressnow, t.nations, t.politicalstatus, t.college, t.identity, t.education, t.bankname, t.accountno, t.addressresident, t.health, t.postalcode, t.phonehouse, t.collegetm, t.speciality, t.nativeplace, t.worktype, t.blood, t.saleno, t.orglast, t.joblast, t.hobby, t.namespecial, t.phonespecial, t.intimes, t.contracttime, t.isteamleader, t.documentno, t.hrcode, t.regulartm, t.intime, t.salarycode, t.birthday, t.marrycode, t.status, t.whichteam, t.remark from esm_user_internal_check t  " + whereCase);
-//
-//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-//        List<EsmUserInternalCheck> recordList = jdbcTemplate.query(sql, paramValues, new EsmUserInternalCheckRowMapper());
-//
-//        int totalCount = count(whereCase, paramValues);
-//
-//        PageResult pageResult = new PageResult(pageNumber, pageSize, totalCount, recordList);
-//
-//        return pageResult;
-//    }
-//
-//
-//    @Override
-//    public Integer insert(EsmUserInternalCheck model) {
-//
-//        String sql = "insert into esm_user_internal_check (checkid, id, addressnow, nations, politicalstatus, college, identity, education, bankname, accountno, addressresident, health, postalcode, phonehouse, collegetm, speciality, nativeplace, worktype, blood, saleno, orglast, joblast, hobby, namespecial, phonespecial, intimes, contracttime, isteamleader, documentno, hrcode, regulartm, intime, salarycode, birthday, marrycode, status, whichteam, remark) values ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ";
-//
-//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-//
-//        Object[] params = new Object[]{model.getCheckid(), model.getId(), model.getAddressnow(), model.getNations(), model.getPoliticalstatus(), model.getCollege(), model.getIdentity(), model.getEducation(), model.getBankname(), model.getAccountno(), model.getAddressresident(), model.getHealth(), model.getPostalcode(), model.getPhonehouse(), model.getCollegetm(), model.getSpeciality(), model.getNativeplace(), model.getWorktype(), model.getBlood(), model.getSaleno(), model.getOrglast(), model.getJoblast(), model.getHobby(), model.getNamespecial(), model.getPhonespecial(), model.getIntimes(), model.getContracttime(), model.getIsteamleader(), model.getDocumentno(), model.getHrcode(), model.getRegulartm(), model.getIntime(), model.getSalarycode(), model.getBirthday(), model.getMarrycode(), model.getStatus(), model.getWhichteam(), model.getRemark()};
-//
-//        int out = jdbcTemplate.update(sql, params);
-//
-//        return out;
-//    }
-//
-//
-//    @Override
-//    public Integer insertSelective(EsmUserInternalCheck model) {
-//
-//        StringBuffer sbSql = new StringBuffer();
-//        StringBuffer sbParams = new StringBuffer();
-//        ArrayList<Object> alParamsValues = new ArrayList<Object>();
-//
-//        String pre = "";
-//
-//        if (model.getCheckid() != null) {
-//            sbSql.append(pre + "checkid");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getCheckid());
-//            pre = ",";
-//        }
-//        if (model.getId() != null) {
-//            sbSql.append(pre + "id");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getId());
-//            pre = ",";
-//        }
-//        if (model.getAddressnow() != null) {
-//            sbSql.append(pre + "addressnow");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getAddressnow());
-//            pre = ",";
-//        }
-//        if (model.getNations() != null) {
-//            sbSql.append(pre + "nations");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getNations());
-//            pre = ",";
-//        }
-//        if (model.getPoliticalstatus() != null) {
-//            sbSql.append(pre + "politicalstatus");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getPoliticalstatus());
-//            pre = ",";
-//        }
-//        if (model.getCollege() != null) {
-//            sbSql.append(pre + "college");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getCollege());
-//            pre = ",";
-//        }
-//        if (model.getIdentity() != null) {
-//            sbSql.append(pre + "identity");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getIdentity());
-//            pre = ",";
-//        }
-//        if (model.getEducation() != null) {
-//            sbSql.append(pre + "education");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getEducation());
-//            pre = ",";
-//        }
-//        if (model.getBankname() != null) {
-//            sbSql.append(pre + "bankname");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getBankname());
-//            pre = ",";
-//        }
-//        if (model.getAccountno() != null) {
-//            sbSql.append(pre + "accountno");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getAccountno());
-//            pre = ",";
-//        }
-//        if (model.getAddressresident() != null) {
-//            sbSql.append(pre + "addressresident");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getAddressresident());
-//            pre = ",";
-//        }
-//        if (model.getHealth() != null) {
-//            sbSql.append(pre + "health");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getHealth());
-//            pre = ",";
-//        }
-//        if (model.getPostalcode() != null) {
-//            sbSql.append(pre + "postalcode");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getPostalcode());
-//            pre = ",";
-//        }
-//        if (model.getPhonehouse() != null) {
-//            sbSql.append(pre + "phonehouse");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getPhonehouse());
-//            pre = ",";
-//        }
-//        if (model.getCollegetm() != null) {
-//            sbSql.append(pre + "collegetm");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getCollegetm());
-//            pre = ",";
-//        }
-//        if (model.getSpeciality() != null) {
-//            sbSql.append(pre + "speciality");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getSpeciality());
-//            pre = ",";
-//        }
-//        if (model.getNativeplace() != null) {
-//            sbSql.append(pre + "nativeplace");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getNativeplace());
-//            pre = ",";
-//        }
-//        if (model.getWorktype() != null) {
-//            sbSql.append(pre + "worktype");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getWorktype());
-//            pre = ",";
-//        }
-//        if (model.getBlood() != null) {
-//            sbSql.append(pre + "blood");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getBlood());
-//            pre = ",";
-//        }
-//        if (model.getSaleno() != null) {
-//            sbSql.append(pre + "saleno");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getSaleno());
-//            pre = ",";
-//        }
-//        if (model.getOrglast() != null) {
-//            sbSql.append(pre + "orglast");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getOrglast());
-//            pre = ",";
-//        }
-//        if (model.getJoblast() != null) {
-//            sbSql.append(pre + "joblast");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getJoblast());
-//            pre = ",";
-//        }
-//        if (model.getHobby() != null) {
-//            sbSql.append(pre + "hobby");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getHobby());
-//            pre = ",";
-//        }
-//        if (model.getNamespecial() != null) {
-//            sbSql.append(pre + "namespecial");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getNamespecial());
-//            pre = ",";
-//        }
-//        if (model.getPhonespecial() != null) {
-//            sbSql.append(pre + "phonespecial");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getPhonespecial());
-//            pre = ",";
-//        }
-//        if (model.getIntimes() != null) {
-//            sbSql.append(pre + "intimes");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getIntimes());
-//            pre = ",";
-//        }
-//        if (model.getContracttime() != null) {
-//            sbSql.append(pre + "contracttime");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getContracttime());
-//            pre = ",";
-//        }
-//        if (model.getIsteamleader() != null) {
-//            sbSql.append(pre + "isteamleader");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getIsteamleader());
-//            pre = ",";
-//        }
-//        if (model.getDocumentno() != null) {
-//            sbSql.append(pre + "documentno");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getDocumentno());
-//            pre = ",";
-//        }
-//        if (model.getHrcode() != null) {
-//            sbSql.append(pre + "hrcode");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getHrcode());
-//            pre = ",";
-//        }
-//        if (model.getRegulartm() != null) {
-//            sbSql.append(pre + "regulartm");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getRegulartm());
-//            pre = ",";
-//        }
-//        if (model.getIntime() != null) {
-//            sbSql.append(pre + "intime");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getIntime());
-//            pre = ",";
-//        }
-//        if (model.getSalarycode() != null) {
-//            sbSql.append(pre + "salarycode");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getSalarycode());
-//            pre = ",";
-//        }
-//        if (model.getBirthday() != null) {
-//            sbSql.append(pre + "birthday");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getBirthday());
-//            pre = ",";
-//        }
-//        if (model.getMarrycode() != null) {
-//            sbSql.append(pre + "marrycode");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getMarrycode());
-//            pre = ",";
-//        }
-//        if (model.getStatus() != null) {
-//            sbSql.append(pre + "status");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getStatus());
-//            pre = ",";
-//        }
-//        if (model.getWhichteam() != null) {
-//            sbSql.append(pre + "whichteam");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getWhichteam());
-//            pre = ",";
-//        }
-//        if (model.getRemark() != null) {
-//            sbSql.append(pre + "remark");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getRemark());
-//            pre = ",";
-//        }
-//
-//
-//        String sql = "INSERT INTO esm_user_internal_check (" + sbSql.toString() + ") VALUES (" + sbParams.toString() + ")";
-//
-//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-//
-//        Object[] params = alParamsValues.toArray();
-//
-//        int out = jdbcTemplate.update(sql, params);
-//
-//        return out;
-//    }
-//
-//
-//    @Override
-//    public Integer update(EsmUserInternalCheck model) {
-//
-//        String sql = "update esm_user_internal_check set id=?, addressnow=?, nations=?, politicalstatus=?, college=?, identity=?, education=?, bankname=?, accountno=?, addressresident=?, health=?, postalcode=?, phonehouse=?, collegetm=?, speciality=?, nativeplace=?, worktype=?, blood=?, saleno=?, orglast=?, joblast=?, hobby=?, namespecial=?, phonespecial=?, intimes=?, contracttime=?, isteamleader=?, documentno=?, hrcode=?, regulartm=?, intime=?, salarycode=?, birthday=?, marrycode=?, status=?, whichteam=?, remark=? where checkid=?";
-//
-//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-//
-//        Object[] params = new Object[]{model.getId(), model.getAddressnow(), model.getNations(), model.getPoliticalstatus(), model.getCollege(), model.getIdentity(), model.getEducation(), model.getBankname(), model.getAccountno(), model.getAddressresident(), model.getHealth(), model.getPostalcode(), model.getPhonehouse(), model.getCollegetm(), model.getSpeciality(), model.getNativeplace(), model.getWorktype(), model.getBlood(), model.getSaleno(), model.getOrglast(), model.getJoblast(), model.getHobby(), model.getNamespecial(), model.getPhonespecial(), model.getIntimes(), model.getContracttime(), model.getIsteamleader(), model.getDocumentno(), model.getHrcode(), model.getRegulartm(), model.getIntime(), model.getSalarycode(), model.getBirthday(), model.getMarrycode(), model.getStatus(), model.getWhichteam(), model.getRemark(), model.getCheckid()};
-//
-//        return jdbcTemplate.update(sql, params);
-//    }
-//
-//
-//    @Override
-//    public Integer updateSelective(EsmUserInternalCheck model) {
-//
-//        StringBuffer sbSql = new StringBuffer();
-//        StringBuffer sbParams = new StringBuffer();
-//        ArrayList<Object> alParamsValues = new ArrayList<Object>();
-//
-//        String pre = "";
-//        String preWhere = "";
-//
-//        if (model.getAddressnow() != null) {
-//            sbSql.append(pre + "addressnow=?");
-//            alParamsValues.add(model.getAddressnow());
-//            pre = ",";
-//        }
-//        if (model.getNations() != null) {
-//            sbSql.append(pre + "nations=?");
-//            alParamsValues.add(model.getNations());
-//            pre = ",";
-//        }
-//        if (model.getPoliticalstatus() != null) {
-//            sbSql.append(pre + "politicalstatus=?");
-//            alParamsValues.add(model.getPoliticalstatus());
-//            pre = ",";
-//        }
-//        if (model.getCollege() != null) {
-//            sbSql.append(pre + "college=?");
-//            alParamsValues.add(model.getCollege());
-//            pre = ",";
-//        }
-//        if (model.getIdentity() != null) {
-//            sbSql.append(pre + "identity=?");
-//            alParamsValues.add(model.getIdentity());
-//            pre = ",";
-//        }
-//        if (model.getEducation() != null) {
-//            sbSql.append(pre + "education=?");
-//            alParamsValues.add(model.getEducation());
-//            pre = ",";
-//        }
-//        if (model.getBankname() != null) {
-//            sbSql.append(pre + "bankname=?");
-//            alParamsValues.add(model.getBankname());
-//            pre = ",";
-//        }
-//        if (model.getAccountno() != null) {
-//            sbSql.append(pre + "accountno=?");
-//            alParamsValues.add(model.getAccountno());
-//            pre = ",";
-//        }
-//        if (model.getAddressresident() != null) {
-//            sbSql.append(pre + "addressresident=?");
-//            alParamsValues.add(model.getAddressresident());
-//            pre = ",";
-//        }
-//        if (model.getHealth() != null) {
-//            sbSql.append(pre + "health=?");
-//            alParamsValues.add(model.getHealth());
-//            pre = ",";
-//        }
-//        if (model.getPostalcode() != null) {
-//            sbSql.append(pre + "postalcode=?");
-//            alParamsValues.add(model.getPostalcode());
-//            pre = ",";
-//        }
-//        if (model.getPhonehouse() != null) {
-//            sbSql.append(pre + "phonehouse=?");
-//            alParamsValues.add(model.getPhonehouse());
-//            pre = ",";
-//        }
-//        if (model.getCollegetm() != null) {
-//            sbSql.append(pre + "collegetm=?");
-//            alParamsValues.add(model.getCollegetm());
-//            pre = ",";
-//        }
-//        if (model.getSpeciality() != null) {
-//            sbSql.append(pre + "speciality=?");
-//            alParamsValues.add(model.getSpeciality());
-//            pre = ",";
-//        }
-//        if (model.getNativeplace() != null) {
-//            sbSql.append(pre + "nativeplace=?");
-//            alParamsValues.add(model.getNativeplace());
-//            pre = ",";
-//        }
-//        if (model.getWorktype() != null) {
-//            sbSql.append(pre + "worktype=?");
-//            alParamsValues.add(model.getWorktype());
-//            pre = ",";
-//        }
-//        if (model.getBlood() != null) {
-//            sbSql.append(pre + "blood=?");
-//            alParamsValues.add(model.getBlood());
-//            pre = ",";
-//        }
-//        if (model.getSaleno() != null) {
-//            sbSql.append(pre + "saleno=?");
-//            alParamsValues.add(model.getSaleno());
-//            pre = ",";
-//        }
-//        if (model.getOrglast() != null) {
-//            sbSql.append(pre + "orglast=?");
-//            alParamsValues.add(model.getOrglast());
-//            pre = ",";
-//        }
-//        if (model.getJoblast() != null) {
-//            sbSql.append(pre + "joblast=?");
-//            alParamsValues.add(model.getJoblast());
-//            pre = ",";
-//        }
-//        if (model.getHobby() != null) {
-//            sbSql.append(pre + "hobby=?");
-//            alParamsValues.add(model.getHobby());
-//            pre = ",";
-//        }
-//        if (model.getNamespecial() != null) {
-//            sbSql.append(pre + "namespecial=?");
-//            alParamsValues.add(model.getNamespecial());
-//            pre = ",";
-//        }
-//        if (model.getPhonespecial() != null) {
-//            sbSql.append(pre + "phonespecial=?");
-//            alParamsValues.add(model.getPhonespecial());
-//            pre = ",";
-//        }
-//        if (model.getIntimes() != null) {
-//            sbSql.append(pre + "intimes=?");
-//            alParamsValues.add(model.getIntimes());
-//            pre = ",";
-//        }
-//        if (model.getContracttime() != null) {
-//            sbSql.append(pre + "contracttime=?");
-//            alParamsValues.add(model.getContracttime());
-//            pre = ",";
-//        }
-//        if (model.getIsteamleader() != null) {
-//            sbSql.append(pre + "isteamleader=?");
-//            alParamsValues.add(model.getIsteamleader());
-//            pre = ",";
-//        }
-//        if (model.getDocumentno() != null) {
-//            sbSql.append(pre + "documentno=?");
-//            alParamsValues.add(model.getDocumentno());
-//            pre = ",";
-//        }
-//        if (model.getHrcode() != null) {
-//            sbSql.append(pre + "hrcode=?");
-//            alParamsValues.add(model.getHrcode());
-//            pre = ",";
-//        }
-//        if (model.getRegulartm() != null) {
-//            sbSql.append(pre + "regulartm=?");
-//            alParamsValues.add(model.getRegulartm());
-//            pre = ",";
-//        }
-//        if (model.getIntime() != null) {
-//            sbSql.append(pre + "intime=?");
-//            alParamsValues.add(model.getIntime());
-//            pre = ",";
-//        }
-//        if (model.getSalarycode() != null) {
-//            sbSql.append(pre + "salarycode=?");
-//            alParamsValues.add(model.getSalarycode());
-//            pre = ",";
-//        }
-//        if (model.getBirthday() != null) {
-//            sbSql.append(pre + "birthday=?");
-//            alParamsValues.add(model.getBirthday());
-//            pre = ",";
-//        }
-//        if (model.getMarrycode() != null) {
-//            sbSql.append(pre + "marrycode=?");
-//            alParamsValues.add(model.getMarrycode());
-//            pre = ",";
-//        }
-//        if (model.getStatus() != null) {
-//            sbSql.append(pre + "status=?");
-//            alParamsValues.add(model.getStatus());
-//            pre = ",";
-//        }
-//        if (model.getWhichteam() != null) {
-//            sbSql.append(pre + "whichteam=?");
-//            alParamsValues.add(model.getWhichteam());
-//            pre = ",";
-//        }
-//        if (model.getRemark() != null) {
-//            sbSql.append(pre + "remark=?");
-//            alParamsValues.add(model.getRemark());
-//            pre = ",";
-//        }
-//        if (model.getCheckid() != null) {
-//            sbParams.append(preWhere + "checkid=?");
-//            alParamsValues.add(model.getCheckid());
-//            preWhere = ",";
-//        }
-//
-//
-//        if (!sbSql.toString().equalsIgnoreCase("")) {
-//            String sql = "update esm_user_internal_check set " + sbSql.toString() + " where " + sbParams.toString();
-//
-//            JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-//
-//            Object[] params = alParamsValues.toArray();
-//
-//            return jdbcTemplate.update(sql, params);
-//        }
-//
-//        return 0;
-//
-//    }
-//
-//
-//    @Override
-//    public Integer delete(String id) {
-//
-//        String sql = "delete from esm_user_internal_check where checkid=?";
-//
-//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-//
-//        return jdbcTemplate.update(sql, id);
-//    }
-//
-//
-//    @Override
-//    public Integer delete(List<EsmUserInternalCheck> lsEsmUserInternalCheck) {
-//        String sql = "delete from esm_user_internal_check where id=?";
-//
-//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-//
-//        return jdbcTemplate.batchUpdate(sql, new BatchPreparedStatementSetter() {
-//            @Override
-//            public void setValues(PreparedStatement preparedStatement, int i) throws SQLException {
-//                preparedStatement.setString(1, lsEsmUserInternalCheck.get(i).getId());
-//            }
-//
-//            @Override
-//            public int getBatchSize() {
-//                return lsEsmUserInternalCheck.size();
-//            }
-//        }).length;
-//    }
-//
-//}

+ 0 - 657
src/main/java/com/ydtech/modules/esm/dao/impl/EsmUserInternalDaoImpl.java

@@ -1,657 +0,0 @@
-//package com.ydtech.modules.esm.dao.impl;
-//
-//import com.ydtech.modules.esm.dao.EsmUserInternalDao;
-//import com.ydtech.modules.esm.model.EsmUserInternal;
-//import com.ydtech.core.page.PageResult;
-//import com.github.drinkjava2.jdialects.Dialect;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.jdbc.core.JdbcTemplate;
-//import org.springframework.jdbc.core.PreparedStatementCreator;
-//import org.springframework.jdbc.core.RowMapper;
-//import org.springframework.jdbc.support.GeneratedKeyHolder;
-//import org.springframework.jdbc.support.KeyHolder;
-//import org.springframework.stereotype.Repository;
-//import org.springframework.jdbc.core.BatchPreparedStatementSetter;
-//
-//
-//import javax.sql.DataSource;
-//import java.sql.Connection;
-//import java.sql.PreparedStatement;
-//import java.sql.ResultSet;
-//import java.sql.SQLException;
-//
-//import java.util.Date;
-//import java.util.List;
-//import java.util.ArrayList;
-//
-//
-//@Repository
-//public class EsmUserInternalDaoImpl implements EsmUserInternalDao {
-//
-//    @Autowired
-//    public DataSource dataSource;
-//
-//
-//    public static class EsmUserInternalRowMapper implements RowMapper {
-//        public EsmUserInternal mapRow(ResultSet resultSet, int rowNum) throws SQLException {
-//            EsmUserInternal model = new EsmUserInternal();
-//
-//            model.setId(resultSet.getString("id"));
-//            model.setAddressnow(resultSet.getString("addressnow"));
-//            model.setNations(resultSet.getString("nations"));
-//            model.setPoliticalstatus(resultSet.getString("politicalstatus"));
-//            model.setCollege(resultSet.getString("college"));
-//            model.setIdentity(resultSet.getString("identity"));
-//            model.setEducation(resultSet.getString("education"));
-//            model.setBankname(resultSet.getString("bankname"));
-//            model.setAccountno(resultSet.getString("accountno"));
-//            model.setAddressresident(resultSet.getString("addressresident"));
-//            model.setHealth(resultSet.getString("health"));
-//            model.setPostalcode(resultSet.getString("postalcode"));
-//            model.setPhonehouse(resultSet.getString("phonehouse"));
-//            model.setCollegetm(resultSet.getDate("collegetm"));
-//            model.setSpeciality(resultSet.getString("speciality"));
-//            model.setNativeplace(resultSet.getString("nativeplace"));
-//            model.setWorktype(resultSet.getString("worktype"));
-//            model.setBlood(resultSet.getString("blood"));
-//            model.setSaleno(resultSet.getString("saleno"));
-//            model.setOrglast(resultSet.getString("orglast"));
-//            model.setJoblast(resultSet.getString("joblast"));
-//            model.setHobby(resultSet.getString("hobby"));
-//            model.setNamespecial(resultSet.getString("namespecial"));
-//            model.setPhonespecial(resultSet.getString("phonespecial"));
-//            model.setIntimes(resultSet.getString("intimes"));
-//            model.setContracttime(resultSet.getDate("contracttime"));
-//            model.setIsteamleader(resultSet.getString("isteamleader"));
-//            model.setDocumentno(resultSet.getString("documentno"));
-//            model.setHrcode(resultSet.getString("hrcode"));
-//            model.setRegulartm(resultSet.getDate("regulartm"));
-//            model.setIntime(resultSet.getDate("intime"));
-//            model.setSalarycode(resultSet.getString("salarycode"));
-//            model.setBirthday(resultSet.getDate("birthday"));
-//            model.setMarrycode(resultSet.getString("marrycode"));
-//            model.setStatus(resultSet.getString("status"));
-//            model.setWhichteam(resultSet.getString("whichteam"));
-//            model.setRemark(resultSet.getString("remark"));
-//
-//            return model;
-//        }
-//    }
-//
-//
-//    @Override
-//    public EsmUserInternal selectByPk(String id) {
-//        String sql = " select t.id, t.addressnow, t.nations, t.politicalstatus, t.college, t.identity, t.education, t.bankname, t.accountno, t.addressresident, t.health, t.postalcode, t.phonehouse, t.collegetm, t.speciality, t.nativeplace, t.worktype, t.blood, t.saleno, t.orglast, t.joblast, t.hobby, t.namespecial, t.phonespecial, t.intimes, t.contracttime, t.isteamleader, t.documentno, t.hrcode, t.regulartm, t.intime, t.salarycode, t.birthday, t.marrycode, t.status, t.whichteam, t.remark from esm_user_internal t  where id=? ";
-//
-//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-//
-//        List<EsmUserInternal> ls = jdbcTemplate.query(sql, new Object[]{id}, new EsmUserInternalRowMapper());
-//
-//        if (ls != null && ls.size() > 0) {
-//            return ls.get(0);
-//        }
-//
-//        return null;
-//    }
-//
-//
-//    @Override
-//    public List<EsmUserInternal> selectAll() {
-//        String sql = "select t.id, t.addressnow, t.nations, t.politicalstatus, t.college, t.identity, t.education, t.bankname, t.accountno, t.addressresident, t.health, t.postalcode, t.phonehouse, t.collegetm, t.speciality, t.nativeplace, t.worktype, t.blood, t.saleno, t.orglast, t.joblast, t.hobby, t.namespecial, t.phonespecial, t.intimes, t.contracttime, t.isteamleader, t.documentno, t.hrcode, t.regulartm, t.intime, t.salarycode, t.birthday, t.marrycode, t.status, t.whichteam, t.remark from esm_user_internal t ";
-//
-//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-//
-//        return jdbcTemplate.query(sql, new EsmUserInternalRowMapper());
-//    }
-//
-//
-//    public List<EsmUserInternal> selectList(String whereCase, Object[] paramValues) {
-//        String sql = "select t.id, t.addressnow, t.nations, t.politicalstatus, t.college, t.identity, t.education, t.bankname, t.accountno, t.addressresident, t.health, t.postalcode, t.phonehouse, t.collegetm, t.speciality, t.nativeplace, t.worktype, t.blood, t.saleno, t.orglast, t.joblast, t.hobby, t.namespecial, t.phonespecial, t.intimes, t.contracttime, t.isteamleader, t.documentno, t.hrcode, t.regulartm, t.intime, t.salarycode, t.birthday, t.marrycode, t.status, t.whichteam, t.remark from esm_user_internal t  " + whereCase;
-//
-//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-//
-//        return jdbcTemplate.query(sql, paramValues, new EsmUserInternalRowMapper());
-//    }
-//
-//
-//    public Integer count(String whereCase, Object[] paramValues) {
-//        String sql = "select count(1) from esm_user_internal t " + whereCase;
-//
-//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-//
-//        return jdbcTemplate.queryForObject(sql, paramValues, Integer.class);
-//    }
-//
-//
-//    public PageResult selectPaging(int pageNumber, int pageSize, String whereCase, Object[] paramValues) {
-//
-//        Dialect dialect = Dialect.guessDialect(dataSource);
-//        String sql = dialect.pagin(pageNumber, pageSize, "select t.id, t.addressnow, t.nations, t.politicalstatus, t.college, t.identity, t.education, t.bankname, t.accountno, t.addressresident, t.health, t.postalcode, t.phonehouse, t.collegetm, t.speciality, t.nativeplace, t.worktype, t.blood, t.saleno, t.orglast, t.joblast, t.hobby, t.namespecial, t.phonespecial, t.intimes, t.contracttime, t.isteamleader, t.documentno, t.hrcode, t.regulartm, t.intime, t.salarycode, t.birthday, t.marrycode, t.status, t.whichteam, t.remark from esm_user_internal t  " + whereCase);
-//
-//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-//        List<EsmUserInternal> recordList = jdbcTemplate.query(sql, paramValues, new EsmUserInternalRowMapper());
-//
-//        int totalCount = count(whereCase, paramValues);
-//
-//        PageResult pageResult = new PageResult(pageNumber, pageSize, totalCount, recordList);
-//
-//        return pageResult;
-//    }
-//
-//
-//    @Override
-//    public Integer insert(EsmUserInternal model) {
-//
-//        String sql = "insert into esm_user_internal ( id, addressnow, nations, politicalstatus, college, identity, education, bankname, accountno, addressresident, health, postalcode, phonehouse, collegetm, speciality, nativeplace, worktype, blood, saleno, orglast, joblast, hobby, namespecial, phonespecial, intimes, contracttime, isteamleader, documentno, hrcode, regulartm, intime, salarycode, birthday, marrycode, status, whichteam, remark) values ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ";
-//
-//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-//
-//        Object[] params = new Object[]{model.getId(), model.getAddressnow(), model.getNations(), model.getPoliticalstatus(), model.getCollege(), model.getIdentity(), model.getEducation(), model.getBankname(), model.getAccountno(), model.getAddressresident(), model.getHealth(), model.getPostalcode(), model.getPhonehouse(), model.getCollegetm(), model.getSpeciality(), model.getNativeplace(), model.getWorktype(), model.getBlood(), model.getSaleno(), model.getOrglast(), model.getJoblast(), model.getHobby(), model.getNamespecial(), model.getPhonespecial(), model.getIntimes(), model.getContracttime(), model.getIsteamleader(), model.getDocumentno(), model.getHrcode(), model.getRegulartm(), model.getIntime(), model.getSalarycode(), model.getBirthday(), model.getMarrycode(), model.getStatus(), model.getWhichteam(), model.getRemark()};
-//
-//        int out = jdbcTemplate.update(sql, params);
-//
-//        return out;
-//    }
-//
-//
-//    @Override
-//    public Integer insertSelective(EsmUserInternal model) {
-//
-//        StringBuffer sbSql = new StringBuffer();
-//        StringBuffer sbParams = new StringBuffer();
-//        ArrayList<Object> alParamsValues = new ArrayList<Object>();
-//
-//        String pre = "";
-//
-//        if (model.getId() != null) {
-//            sbSql.append(pre + "id");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getId());
-//            pre = ",";
-//        }
-//        if (model.getAddressnow() != null) {
-//            sbSql.append(pre + "addressnow");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getAddressnow());
-//            pre = ",";
-//        }
-//        if (model.getNations() != null) {
-//            sbSql.append(pre + "nations");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getNations());
-//            pre = ",";
-//        }
-//        if (model.getPoliticalstatus() != null) {
-//            sbSql.append(pre + "politicalstatus");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getPoliticalstatus());
-//            pre = ",";
-//        }
-//        if (model.getCollege() != null) {
-//            sbSql.append(pre + "college");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getCollege());
-//            pre = ",";
-//        }
-//        if (model.getIdentity() != null) {
-//            sbSql.append(pre + "identity");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getIdentity());
-//            pre = ",";
-//        }
-//        if (model.getEducation() != null) {
-//            sbSql.append(pre + "education");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getEducation());
-//            pre = ",";
-//        }
-//        if (model.getBankname() != null) {
-//            sbSql.append(pre + "bankname");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getBankname());
-//            pre = ",";
-//        }
-//        if (model.getAccountno() != null) {
-//            sbSql.append(pre + "accountno");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getAccountno());
-//            pre = ",";
-//        }
-//        if (model.getAddressresident() != null) {
-//            sbSql.append(pre + "addressresident");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getAddressresident());
-//            pre = ",";
-//        }
-//        if (model.getHealth() != null) {
-//            sbSql.append(pre + "health");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getHealth());
-//            pre = ",";
-//        }
-//        if (model.getPostalcode() != null) {
-//            sbSql.append(pre + "postalcode");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getPostalcode());
-//            pre = ",";
-//        }
-//        if (model.getPhonehouse() != null) {
-//            sbSql.append(pre + "phonehouse");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getPhonehouse());
-//            pre = ",";
-//        }
-//        if (model.getCollegetm() != null) {
-//            sbSql.append(pre + "collegetm");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getCollegetm());
-//            pre = ",";
-//        }
-//        if (model.getSpeciality() != null) {
-//            sbSql.append(pre + "speciality");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getSpeciality());
-//            pre = ",";
-//        }
-//        if (model.getNativeplace() != null) {
-//            sbSql.append(pre + "nativeplace");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getNativeplace());
-//            pre = ",";
-//        }
-//        if (model.getWorktype() != null) {
-//            sbSql.append(pre + "worktype");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getWorktype());
-//            pre = ",";
-//        }
-//        if (model.getBlood() != null) {
-//            sbSql.append(pre + "blood");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getBlood());
-//            pre = ",";
-//        }
-//        if (model.getSaleno() != null) {
-//            sbSql.append(pre + "saleno");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getSaleno());
-//            pre = ",";
-//        }
-//        if (model.getOrglast() != null) {
-//            sbSql.append(pre + "orglast");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getOrglast());
-//            pre = ",";
-//        }
-//        if (model.getJoblast() != null) {
-//            sbSql.append(pre + "joblast");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getJoblast());
-//            pre = ",";
-//        }
-//        if (model.getHobby() != null) {
-//            sbSql.append(pre + "hobby");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getHobby());
-//            pre = ",";
-//        }
-//        if (model.getNamespecial() != null) {
-//            sbSql.append(pre + "namespecial");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getNamespecial());
-//            pre = ",";
-//        }
-//        if (model.getPhonespecial() != null) {
-//            sbSql.append(pre + "phonespecial");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getPhonespecial());
-//            pre = ",";
-//        }
-//        if (model.getIntimes() != null) {
-//            sbSql.append(pre + "intimes");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getIntimes());
-//            pre = ",";
-//        }
-//        if (model.getContracttime() != null) {
-//            sbSql.append(pre + "contracttime");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getContracttime());
-//            pre = ",";
-//        }
-//        if (model.getIsteamleader() != null) {
-//            sbSql.append(pre + "isteamleader");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getIsteamleader());
-//            pre = ",";
-//        }
-//        if (model.getDocumentno() != null) {
-//            sbSql.append(pre + "documentno");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getDocumentno());
-//            pre = ",";
-//        }
-//        if (model.getHrcode() != null) {
-//            sbSql.append(pre + "hrcode");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getHrcode());
-//            pre = ",";
-//        }
-//        if (model.getRegulartm() != null) {
-//            sbSql.append(pre + "regulartm");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getRegulartm());
-//            pre = ",";
-//        }
-//        if (model.getIntime() != null) {
-//            sbSql.append(pre + "intime");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getIntime());
-//            pre = ",";
-//        }
-//        if (model.getSalarycode() != null) {
-//            sbSql.append(pre + "salarycode");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getSalarycode());
-//            pre = ",";
-//        }
-//        if (model.getBirthday() != null) {
-//            sbSql.append(pre + "birthday");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getBirthday());
-//            pre = ",";
-//        }
-//        if (model.getMarrycode() != null) {
-//            sbSql.append(pre + "marrycode");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getMarrycode());
-//            pre = ",";
-//        }
-//        if (model.getStatus() != null) {
-//            sbSql.append(pre + "status");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getStatus());
-//            pre = ",";
-//        }
-//        if (model.getWhichteam() != null) {
-//            sbSql.append(pre + "whichteam");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getWhichteam());
-//            pre = ",";
-//        }
-//        if (model.getRemark() != null) {
-//            sbSql.append(pre + "remark");
-//            sbParams.append(pre + "?");
-//            alParamsValues.add(model.getRemark());
-//            pre = ",";
-//        }
-//
-//
-//        String sql = "INSERT INTO esm_user_internal (" + sbSql.toString() + ") VALUES (" + sbParams.toString() + ")";
-//
-//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-//
-//        Object[] params = alParamsValues.toArray();
-//
-//        int out = jdbcTemplate.update(sql, params);
-//
-//        return out;
-//    }
-//
-//
-//    @Override
-//    public Integer update(EsmUserInternal model) {
-//
-//        String sql = "update esm_user_internal set addressnow=?, nations=?, politicalstatus=?, college=?, identity=?, education=?, bankname=?, accountno=?, addressresident=?, health=?, postalcode=?, phonehouse=?, collegetm=?, speciality=?, nativeplace=?, worktype=?, blood=?, saleno=?, orglast=?, joblast=?, hobby=?, namespecial=?, phonespecial=?, intimes=?, contracttime=?, isteamleader=?, documentno=?, hrcode=?, regulartm=?, intime=?, salarycode=?, birthday=?, marrycode=?, status=?, whichteam=?, remark=? where id=?";
-//
-//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-//
-//        Object[] params = new Object[]{model.getAddressnow(), model.getNations(), model.getPoliticalstatus(), model.getCollege(), model.getIdentity(), model.getEducation(), model.getBankname(), model.getAccountno(), model.getAddressresident(), model.getHealth(), model.getPostalcode(), model.getPhonehouse(), model.getCollegetm(), model.getSpeciality(), model.getNativeplace(), model.getWorktype(), model.getBlood(), model.getSaleno(), model.getOrglast(), model.getJoblast(), model.getHobby(), model.getNamespecial(), model.getPhonespecial(), model.getIntimes(), model.getContracttime(), model.getIsteamleader(), model.getDocumentno(), model.getHrcode(), model.getRegulartm(), model.getIntime(), model.getSalarycode(), model.getBirthday(), model.getMarrycode(), model.getStatus(), model.getWhichteam(), model.getRemark(), model.getId()};
-//
-//        return jdbcTemplate.update(sql, params);
-//    }
-//
-//
-//    @Override
-//    public Integer updateSelective(EsmUserInternal model) {
-//
-//        StringBuffer sbSql = new StringBuffer();
-//        StringBuffer sbParams = new StringBuffer();
-//        ArrayList<Object> alParamsValues = new ArrayList<Object>();
-//
-//        String pre = "";
-//        String preWhere = "";
-//
-//        if (model.getAddressnow() != null) {
-//            sbSql.append(pre + "addressnow=?");
-//            alParamsValues.add(model.getAddressnow());
-//            pre = ",";
-//        }
-//        if (model.getNations() != null) {
-//            sbSql.append(pre + "nations=?");
-//            alParamsValues.add(model.getNations());
-//            pre = ",";
-//        }
-//        if (model.getPoliticalstatus() != null) {
-//            sbSql.append(pre + "politicalstatus=?");
-//            alParamsValues.add(model.getPoliticalstatus());
-//            pre = ",";
-//        }
-//        if (model.getCollege() != null) {
-//            sbSql.append(pre + "college=?");
-//            alParamsValues.add(model.getCollege());
-//            pre = ",";
-//        }
-//        if (model.getIdentity() != null) {
-//            sbSql.append(pre + "identity=?");
-//            alParamsValues.add(model.getIdentity());
-//            pre = ",";
-//        }
-//        if (model.getEducation() != null) {
-//            sbSql.append(pre + "education=?");
-//            alParamsValues.add(model.getEducation());
-//            pre = ",";
-//        }
-//        if (model.getBankname() != null) {
-//            sbSql.append(pre + "bankname=?");
-//            alParamsValues.add(model.getBankname());
-//            pre = ",";
-//        }
-//        if (model.getAccountno() != null) {
-//            sbSql.append(pre + "accountno=?");
-//            alParamsValues.add(model.getAccountno());
-//            pre = ",";
-//        }
-//        if (model.getAddressresident() != null) {
-//            sbSql.append(pre + "addressresident=?");
-//            alParamsValues.add(model.getAddressresident());
-//            pre = ",";
-//        }
-//        if (model.getHealth() != null) {
-//            sbSql.append(pre + "health=?");
-//            alParamsValues.add(model.getHealth());
-//            pre = ",";
-//        }
-//        if (model.getPostalcode() != null) {
-//            sbSql.append(pre + "postalcode=?");
-//            alParamsValues.add(model.getPostalcode());
-//            pre = ",";
-//        }
-//        if (model.getPhonehouse() != null) {
-//            sbSql.append(pre + "phonehouse=?");
-//            alParamsValues.add(model.getPhonehouse());
-//            pre = ",";
-//        }
-//        if (model.getCollegetm() != null) {
-//            sbSql.append(pre + "collegetm=?");
-//            alParamsValues.add(model.getCollegetm());
-//            pre = ",";
-//        }
-//        if (model.getSpeciality() != null) {
-//            sbSql.append(pre + "speciality=?");
-//            alParamsValues.add(model.getSpeciality());
-//            pre = ",";
-//        }
-//        if (model.getNativeplace() != null) {
-//            sbSql.append(pre + "nativeplace=?");
-//            alParamsValues.add(model.getNativeplace());
-//            pre = ",";
-//        }
-//        if (model.getWorktype() != null) {
-//            sbSql.append(pre + "worktype=?");
-//            alParamsValues.add(model.getWorktype());
-//            pre = ",";
-//        }
-//        if (model.getBlood() != null) {
-//            sbSql.append(pre + "blood=?");
-//            alParamsValues.add(model.getBlood());
-//            pre = ",";
-//        }
-//        if (model.getSaleno() != null) {
-//            sbSql.append(pre + "saleno=?");
-//            alParamsValues.add(model.getSaleno());
-//            pre = ",";
-//        }
-//        if (model.getOrglast() != null) {
-//            sbSql.append(pre + "orglast=?");
-//            alParamsValues.add(model.getOrglast());
-//            pre = ",";
-//        }
-//        if (model.getJoblast() != null) {
-//            sbSql.append(pre + "joblast=?");
-//            alParamsValues.add(model.getJoblast());
-//            pre = ",";
-//        }
-//        if (model.getHobby() != null) {
-//            sbSql.append(pre + "hobby=?");
-//            alParamsValues.add(model.getHobby());
-//            pre = ",";
-//        }
-//        if (model.getNamespecial() != null) {
-//            sbSql.append(pre + "namespecial=?");
-//            alParamsValues.add(model.getNamespecial());
-//            pre = ",";
-//        }
-//        if (model.getPhonespecial() != null) {
-//            sbSql.append(pre + "phonespecial=?");
-//            alParamsValues.add(model.getPhonespecial());
-//            pre = ",";
-//        }
-//        if (model.getIntimes() != null) {
-//            sbSql.append(pre + "intimes=?");
-//            alParamsValues.add(model.getIntimes());
-//            pre = ",";
-//        }
-//        if (model.getContracttime() != null) {
-//            sbSql.append(pre + "contracttime=?");
-//            alParamsValues.add(model.getContracttime());
-//            pre = ",";
-//        }
-//        if (model.getIsteamleader() != null) {
-//            sbSql.append(pre + "isteamleader=?");
-//            alParamsValues.add(model.getIsteamleader());
-//            pre = ",";
-//        }
-//        if (model.getDocumentno() != null) {
-//            sbSql.append(pre + "documentno=?");
-//            alParamsValues.add(model.getDocumentno());
-//            pre = ",";
-//        }
-//        if (model.getHrcode() != null) {
-//            sbSql.append(pre + "hrcode=?");
-//            alParamsValues.add(model.getHrcode());
-//            pre = ",";
-//        }
-//        if (model.getRegulartm() != null) {
-//            sbSql.append(pre + "regulartm=?");
-//            alParamsValues.add(model.getRegulartm());
-//            pre = ",";
-//        }
-//        if (model.getIntime() != null) {
-//            sbSql.append(pre + "intime=?");
-//            alParamsValues.add(model.getIntime());
-//            pre = ",";
-//        }
-//        if (model.getSalarycode() != null) {
-//            sbSql.append(pre + "salarycode=?");
-//            alParamsValues.add(model.getSalarycode());
-//            pre = ",";
-//        }
-//        if (model.getBirthday() != null) {
-//            sbSql.append(pre + "birthday=?");
-//            alParamsValues.add(model.getBirthday());
-//            pre = ",";
-//        }
-//        if (model.getMarrycode() != null) {
-//            sbSql.append(pre + "marrycode=?");
-//            alParamsValues.add(model.getMarrycode());
-//            pre = ",";
-//        }
-//        if (model.getStatus() != null) {
-//            sbSql.append(pre + "status=?");
-//            alParamsValues.add(model.getStatus());
-//            pre = ",";
-//        }
-//        if (model.getWhichteam() != null) {
-//            sbSql.append(pre + "whichteam=?");
-//            alParamsValues.add(model.getWhichteam());
-//            pre = ",";
-//        }
-//        if (model.getRemark() != null) {
-//            sbSql.append(pre + "remark=?");
-//            alParamsValues.add(model.getRemark());
-//            pre = ",";
-//        }
-//        if (model.getId() != null) {
-//            sbParams.append(preWhere + "id=?");
-//            alParamsValues.add(model.getId());
-//            preWhere = ",";
-//        }
-//
-//
-//        if (!sbSql.toString().equalsIgnoreCase("")) {
-//            String sql = "update esm_user_internal set " + sbSql.toString() + " where " + sbParams.toString();
-//
-//            JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-//
-//            Object[] params = alParamsValues.toArray();
-//
-//            return jdbcTemplate.update(sql, params);
-//        }
-//
-//        return 0;
-//
-//    }
-//
-//
-//    @Override
-//    public Integer delete(String id) {
-//
-//        String sql = "delete from esm_user_internal where id=?";
-//
-//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-//
-//        return jdbcTemplate.update(sql, id);
-//    }
-//
-//
-//    @Override
-//    public Integer delete(List<EsmUserInternal> lsEsmUserInternal) {
-//        String sql = "delete from esm_user_internal where id=?";
-//
-//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-//
-//        return jdbcTemplate.batchUpdate(sql, new BatchPreparedStatementSetter() {
-//            @Override
-//            public void setValues(PreparedStatement preparedStatement, int i) throws SQLException {
-//                preparedStatement.setString(1, lsEsmUserInternal.get(i).getId());
-//            }
-//
-//            @Override
-//            public int getBatchSize() {
-//                return lsEsmUserInternal.size();
-//            }
-//        }).length;
-//    }
-//
-//}

+ 0 - 50
src/main/java/com/ydtech/modules/esm/model/EsmUserCheck.java

@@ -1,50 +0,0 @@
-//package com.ydtech.modules.esm.model;
-//
-//import java.util.Date;
-//
-///**
-// * @ClassName EsmUserCheck
-// * @Description: TODO
-// * @Author
-// * @Date 2021/6/24
-// **/
-//public class EsmUserCheck {
-//
-//    private String id;
-//    private String identity;
-//    private String namespecial;
-//
-//    private String addressnow;
-//
-//    public String getId() {
-//        return id;
-//    }
-//
-//    public void setId(String id) {
-//        this.id = id;
-//    }
-//
-//    public String getIdentity() {
-//        return identity;
-//    }
-//
-//    public void setIdentity(String identity) {
-//        this.identity = identity;
-//    }
-//
-//    public String getNamespecial() {
-//        return namespecial;
-//    }
-//
-//    public void setNamespecial(String namespecial) {
-//        this.namespecial = namespecial;
-//    }
-//
-//    public String getAddressnow() {
-//        return addressnow;
-//    }
-//
-//    public void setAddressnow(String addressnow) {
-//        this.addressnow = addressnow;
-//    }
-//}

+ 0 - 66
src/main/java/com/ydtech/modules/esm/model/EsmUserInternal.java

@@ -1,66 +0,0 @@
-//package com.ydtech.modules.esm.model;
-//
-//import cn.afterturn.easypoi.excel.annotation.Excel;
-//import com.baomidou.mybatisplus.annotation.TableField;
-//import com.baomidou.mybatisplus.annotation.TableId;
-//import com.baomidou.mybatisplus.annotation.TableName;
-//import io.swagger.annotations.ApiModel;
-//import io.swagger.annotations.ApiModelProperty;
-//import lombok.Data;
-//
-//import java.io.Serializable;
-//import java.util.Date;
-//
-//
-//@TableName(value = "esm_user_internal")
-//@Data
-//@ApiModel
-//public class EsmUserInternal implements Serializable {
-//
-//    private static final long serialVersionUID = 5053893395186078389L;
-//
-//    @TableId(value = "id")
-//    private String id;
-//    private String addressnow;
-//    private String nations;
-//    private String politicalstatus;
-//    private String college;
-//    private String identity;
-//    private String education;
-//    private String bankname;
-//    private String accountno;
-//    private String addressresident;
-//    private String health;
-//    private String postalcode;
-//    private String phonehouse;
-//    private Date collegetm;
-//    private String speciality;
-//    private String nativeplace;
-//    private String worktype;
-//    private String blood;
-//    private String saleno;
-//    private String orglast;
-//    private String joblast;
-//    private String hobby;
-//    private String namespecial;
-//    private String phonespecial;
-//    private String intimes;
-//    private Date contracttime;
-//    private String isteamleader;
-//    private String documentno;
-//    private String hrcode;
-//    private Date regulartm;
-//    private Date intime;
-//    private String salarycode;
-//    private Date birthday;
-//    private String marrycode;
-//    private String status;
-//    private String whichteam;
-//    private String remark;
-//
-//
-//
-//
-//
-//
-//}

+ 0 - 355
src/main/java/com/ydtech/modules/esm/model/EsmUserInternalCheck.java

@@ -1,355 +0,0 @@
-//package com.ydtech.modules.esm.model;
-//
-//import java.io.Serializable;
-//import java.util.Date;
-//
-//
-//public class EsmUserInternalCheck implements Serializable {
-//
-//    private static final long serialVersionUID = 5086594541373584430L;
-//
-//    private String checkid;
-//    private String id;
-//    private String addressnow;
-//    private String nations;
-//    private String politicalstatus;
-//    private String college;
-//    private String identity;
-//    private String education;
-//    private String bankname;
-//    private String accountno;
-//    private String addressresident;
-//    private String health;
-//    private String postalcode;
-//    private String phonehouse;
-//    private Date collegetm;
-//    private String speciality;
-//    private String nativeplace;
-//    private String worktype;
-//    private String blood;
-//    private String saleno;
-//    private String orglast;
-//    private String joblast;
-//    private String hobby;
-//    private String namespecial;
-//    private String phonespecial;
-//    private String intimes;
-//    private Date contracttime;
-//    private String isteamleader;
-//    private String documentno;
-//    private String hrcode;
-//    private Date regulartm;
-//    private Date intime;
-//    private String salarycode;
-//    private Date birthday;
-//    private String marrycode;
-//    private String status;
-//    private String whichteam;
-//    private String remark;
-//
-//    public String getCheckid() {
-//        return checkid;
-//    }
-//
-//    public void setCheckid(String checkid) {
-//        this.checkid = checkid;
-//    }
-//
-//    public String getId() {
-//        return id;
-//    }
-//
-//    public void setId(String id) {
-//        this.id = id;
-//    }
-//
-//    public String getAddressnow() {
-//        return addressnow;
-//    }
-//
-//    public void setAddressnow(String addressnow) {
-//        this.addressnow = addressnow;
-//    }
-//
-//    public String getNations() {
-//        return nations;
-//    }
-//
-//    public void setNations(String nations) {
-//        this.nations = nations;
-//    }
-//
-//    public String getPoliticalstatus() {
-//        return politicalstatus;
-//    }
-//
-//    public void setPoliticalstatus(String politicalstatus) {
-//        this.politicalstatus = politicalstatus;
-//    }
-//
-//    public String getCollege() {
-//        return college;
-//    }
-//
-//    public void setCollege(String college) {
-//        this.college = college;
-//    }
-//
-//    public String getIdentity() {
-//        return identity;
-//    }
-//
-//    public void setIdentity(String identity) {
-//        this.identity = identity;
-//    }
-//
-//    public String getEducation() {
-//        return education;
-//    }
-//
-//    public void setEducation(String education) {
-//        this.education = education;
-//    }
-//
-//    public String getBankname() {
-//        return bankname;
-//    }
-//
-//    public void setBankname(String bankname) {
-//        this.bankname = bankname;
-//    }
-//
-//    public String getAccountno() {
-//        return accountno;
-//    }
-//
-//    public void setAccountno(String accountno) {
-//        this.accountno = accountno;
-//    }
-//
-//    public String getAddressresident() {
-//        return addressresident;
-//    }
-//
-//    public void setAddressresident(String addressresident) {
-//        this.addressresident = addressresident;
-//    }
-//
-//    public String getHealth() {
-//        return health;
-//    }
-//
-//    public void setHealth(String health) {
-//        this.health = health;
-//    }
-//
-//    public String getPostalcode() {
-//        return postalcode;
-//    }
-//
-//    public void setPostalcode(String postalcode) {
-//        this.postalcode = postalcode;
-//    }
-//
-//    public String getPhonehouse() {
-//        return phonehouse;
-//    }
-//
-//    public void setPhonehouse(String phonehouse) {
-//        this.phonehouse = phonehouse;
-//    }
-//
-//    public Date getCollegetm() {
-//        return collegetm;
-//    }
-//
-//    public void setCollegetm(Date collegetm) {
-//        this.collegetm = collegetm;
-//    }
-//
-//    public String getSpeciality() {
-//        return speciality;
-//    }
-//
-//    public void setSpeciality(String speciality) {
-//        this.speciality = speciality;
-//    }
-//
-//    public String getNativeplace() {
-//        return nativeplace;
-//    }
-//
-//    public void setNativeplace(String nativeplace) {
-//        this.nativeplace = nativeplace;
-//    }
-//
-//    public String getWorktype() {
-//        return worktype;
-//    }
-//
-//    public void setWorktype(String worktype) {
-//        this.worktype = worktype;
-//    }
-//
-//    public String getBlood() {
-//        return blood;
-//    }
-//
-//    public void setBlood(String blood) {
-//        this.blood = blood;
-//    }
-//
-//    public String getSaleno() {
-//        return saleno;
-//    }
-//
-//    public void setSaleno(String saleno) {
-//        this.saleno = saleno;
-//    }
-//
-//    public String getOrglast() {
-//        return orglast;
-//    }
-//
-//    public void setOrglast(String orglast) {
-//        this.orglast = orglast;
-//    }
-//
-//    public String getJoblast() {
-//        return joblast;
-//    }
-//
-//    public void setJoblast(String joblast) {
-//        this.joblast = joblast;
-//    }
-//
-//    public String getHobby() {
-//        return hobby;
-//    }
-//
-//    public void setHobby(String hobby) {
-//        this.hobby = hobby;
-//    }
-//
-//    public String getNamespecial() {
-//        return namespecial;
-//    }
-//
-//    public void setNamespecial(String namespecial) {
-//        this.namespecial = namespecial;
-//    }
-//
-//    public String getPhonespecial() {
-//        return phonespecial;
-//    }
-//
-//    public void setPhonespecial(String phonespecial) {
-//        this.phonespecial = phonespecial;
-//    }
-//
-//    public String getIntimes() {
-//        return intimes;
-//    }
-//
-//    public void setIntimes(String intimes) {
-//        this.intimes = intimes;
-//    }
-//
-//    public Date getContracttime() {
-//        return contracttime;
-//    }
-//
-//    public void setContracttime(Date contracttime) {
-//        this.contracttime = contracttime;
-//    }
-//
-//    public String getIsteamleader() {
-//        return isteamleader;
-//    }
-//
-//    public void setIsteamleader(String isteamleader) {
-//        this.isteamleader = isteamleader;
-//    }
-//
-//    public String getDocumentno() {
-//        return documentno;
-//    }
-//
-//    public void setDocumentno(String documentno) {
-//        this.documentno = documentno;
-//    }
-//
-//    public String getHrcode() {
-//        return hrcode;
-//    }
-//
-//    public void setHrcode(String hrcode) {
-//        this.hrcode = hrcode;
-//    }
-//
-//    public Date getRegulartm() {
-//        return regulartm;
-//    }
-//
-//    public void setRegulartm(Date regulartm) {
-//        this.regulartm = regulartm;
-//    }
-//
-//    public Date getIntime() {
-//        return intime;
-//    }
-//
-//    public void setIntime(Date intime) {
-//        this.intime = intime;
-//    }
-//
-//    public String getSalarycode() {
-//        return salarycode;
-//    }
-//
-//    public void setSalarycode(String salarycode) {
-//        this.salarycode = salarycode;
-//    }
-//
-//    public Date getBirthday() {
-//        return birthday;
-//    }
-//
-//    public void setBirthday(Date birthday) {
-//        this.birthday = birthday;
-//    }
-//
-//    public String getMarrycode() {
-//        return marrycode;
-//    }
-//
-//    public void setMarrycode(String marrycode) {
-//        this.marrycode = marrycode;
-//    }
-//
-//    public String getStatus() {
-//        return status;
-//    }
-//
-//    public void setStatus(String status) {
-//        this.status = status;
-//    }
-//
-//    public String getWhichteam() {
-//        return whichteam;
-//    }
-//
-//    public void setWhichteam(String whichteam) {
-//        this.whichteam = whichteam;
-//    }
-//
-//    public String getRemark() {
-//        return remark;
-//    }
-//
-//    public void setRemark(String remark) {
-//        this.remark = remark;
-//    }
-//
-//
-//}

+ 0 - 87
src/main/java/com/ydtech/modules/esm/model/vo/EsmUserInternalVo.java

@@ -1,87 +0,0 @@
-//package com.ydtech.modules.esm.model.vo;
-//
-//import lombok.Data;
-//
-//import java.io.Serializable;
-//import java.util.Date;
-//
-//@Data
-//public class EsmUserInternalVo implements Serializable {
-//    /**
-//     *
-//     */
-//    private String id;
-//    /**
-//     * 姓名
-//     */
-//    private String name;
-//    /**
-//     * 性别
-//     */
-//    private String sex;
-//    /**
-//     * 出生日期
-//     */
-//    private Date birthday;
-//    /**
-//     * 户口地址
-//     */
-//    private String addressresident;
-//    /**
-//     * 邮箱
-//     */
-//    private String email;
-//    /**
-//     * 身份证号
-//     */
-//    private String identity;
-//    /**
-//     * 毕业院校
-//     */
-//    private String college;
-//    /**
-//     * 开户账号
-//     */
-//    private String accountno;
-//    /**
-//     * 开户行
-//     */
-//    private String bankname;
-//    /**
-//     * 紧急联系人姓名
-//     */
-//    private String namespecial;
-//    /**
-//     * 紧急联系人电话
-//     */
-//    private String phonespecial;
-//    /**
-//     * 婚姻状况
-//     */
-//    private String marrycode;
-//    /**
-//     * 血型
-//     */
-//    private String blood;
-//    /**
-//     * 学历
-//     */
-//    private String education;
-//    /**
-//     * 居住地址
-//     */
-//    private String addressnow;
-//    /**
-//     * 民族
-//     */
-//    private String nations;
-//    /**
-//     * 政治面貌
-//     */
-//    private String politicalstatus;
-//
-//
-//    private static final long serialVersionUID = 1L;
-//
-//
-//}

+ 0 - 45
src/main/java/com/ydtech/modules/esm/model/vo/VoEsmUserInternal.java

@@ -1,45 +0,0 @@
-//package com.ydtech.modules.esm.model.vo;
-//
-//import com.ydtech.modules.admin.model.SysUser;
-//import com.ydtech.modules.esm.model.EsmUserAgent;
-//import com.ydtech.modules.esm.model.EsmUserInternal;
-//
-//public class VoEsmUserInternal {
-//    private SysUser sysUser;
-//    private EsmUserInternal esmUserInternal;
-//
-//    private EsmUserAgent esmUserAgent;
-//    private TeamUserCountPriceVO teamUserCountPriceVO;
-//
-//    public SysUser getSysUser() {
-//        return sysUser;
-//    }
-//
-//    public void setSysUser(SysUser sysUser) {
-//        this.sysUser = sysUser;
-//    }
-//
-//    public EsmUserInternal getEsmUserInternal() {
-//        return esmUserInternal;
-//    }
-//
-//    public void setEsmUserInternal(EsmUserInternal esmUserInternal) {
-//        this.esmUserInternal = esmUserInternal;
-//    }
-//
-//    public EsmUserAgent getEsmUserAgent() {
-//        return esmUserAgent;
-//    }
-//
-//    public void setEsmUserAgent(EsmUserAgent esmUserAgent) {
-//        this.esmUserAgent = esmUserAgent;
-//    }
-//
-//    public TeamUserCountPriceVO getTeamUserCountPriceVO() {
-//        return teamUserCountPriceVO;
-//    }
-//
-//    public void setTeamUserCountPriceVO(TeamUserCountPriceVO teamUserCountPriceVO) {
-//        this.teamUserCountPriceVO = teamUserCountPriceVO;
-//    }
-//}

+ 0 - 36
src/main/java/com/ydtech/modules/esm/model/vo/VoEsmUserInternalCheck.java

@@ -1,36 +0,0 @@
-//package com.ydtech.modules.esm.model.vo;
-//
-//import com.ydtech.modules.esm.model.EsmUserAgentCheck;
-//import com.ydtech.modules.esm.model.EsmUserInternalCheck;
-//import com.ydtech.modules.esm.model.SysUserCheck;
-//
-//public class VoEsmUserInternalCheck {
-//    private SysUserCheck sysUser;
-//    private EsmUserInternalCheck esmUserInternal;
-//
-//    private EsmUserAgentCheck esmUserAgent;
-//
-//    public SysUserCheck getSysUser() {
-//        return sysUser;
-//    }
-//
-//    public void setSysUser(SysUserCheck sysUser) {
-//        this.sysUser = sysUser;
-//    }
-//
-//    public EsmUserInternalCheck getEsmUserInternal() {
-//        return esmUserInternal;
-//    }
-//
-//    public void setEsmUserInternal(EsmUserInternalCheck esmUserInternal) {
-//        this.esmUserInternal = esmUserInternal;
-//    }
-//
-//    public EsmUserAgentCheck getEsmUserAgent() {
-//        return esmUserAgent;
-//    }
-//
-//    public void setEsmUserAgent(EsmUserAgentCheck esmUserAgent) {
-//        this.esmUserAgent = esmUserAgent;
-//    }
-//}

+ 0 - 11
src/main/java/com/ydtech/modules/esm/service/EsmUserInternalCheckService.java

@@ -1,11 +0,0 @@
-//package com.ydtech.modules.esm.service;
-//
-//import com.ydtech.core.page.PageResult;
-//import com.ydtech.modules.esm.dao.EsmUserInternalCheckDao;
-//
-//
-//public interface EsmUserInternalCheckService extends EsmUserInternalCheckDao {
-//    Integer check(String username, String id, String status, String remark);
-//
-//    PageResult selectPagingCustom(int pageNumber, int pageSize, String whereCase, Object[] paramValues);
-//}

+ 0 - 30
src/main/java/com/ydtech/modules/esm/service/EsmUserInternalService.java

@@ -1,30 +0,0 @@
-//package com.ydtech.modules.esm.service;
-//
-//
-//import com.baomidou.mybatisplus.extension.service.IService;
-//import com.ydtech.core.page.PageResult;
-//import com.ydtech.modules.admin.model.SysUser;
-//import com.ydtech.modules.esm.model.EsmUserInternal;
-//
-//import java.util.List;
-//
-//public interface EsmUserInternalService extends IService<EsmUserInternal> {
-////public interface EsmUserInternalService extends EsmUserInternalDao {
-//
-////    public PageResult selectPagingCustom(int pageNumber, int pageSize, String whereCase, Object[] paramValues);
-//
-//    //替换为sysUserService里
-////    public String findMaxId(String deptId);
-//
-////    public int queryTempNum(String deptId);
-//
-////    public List<String> queryTeamUser(String id);
-//
-//    public Integer check(String id, String status);
-//
-//    public List<SysUser> getSuperior(String id);
-//
-//}
-//
-//
-//

+ 0 - 300
src/main/java/com/ydtech/modules/esm/service/impl/EsmEasyepcServiceImpl.java

@@ -1,300 +0,0 @@
-//package com.ydtech.modules.esm.service.impl;
-//
-//import com.alibaba.fastjson.JSON;
-//import com.alibaba.fastjson.JSONArray;
-//import com.alibaba.fastjson.JSONObject;
-//import com.ydtech.modules.esm.service.EsmEasyepcService;
-//import com.ydtech.modules.esm.vo.res.EsmEasyepcVehicleVo;
-//import org.apache.http.conn.ssl.NoopHostnameVerifier;
-//import org.springframework.beans.factory.annotation.Value;
-//import org.springframework.stereotype.Service;
-//
-//import java.util.HashMap;
-//import java.util.List;
-//import java.util.Map;
-//
-//import javax.net.ssl.HttpsURLConnection;
-//import javax.net.ssl.SSLContext;
-//import javax.net.ssl.TrustManager;
-//import javax.net.ssl.X509TrustManager;
-//import java.io.BufferedReader;
-//import java.io.IOException;
-//import java.io.InputStreamReader;
-//import java.io.OutputStreamWriter;
-//import java.net.HttpURLConnection;
-//import java.net.MalformedURLException;
-//import java.net.URL;
-//import java.security.cert.CertificateException;
-//
-//
-//@Service
-//public class EsmEasyepcServiceImpl implements EsmEasyepcService {
-//
-//
-//    @Value("${easyepc.host}")
-//    private String easyepcHost;
-//    @Value("${easyepc.username}")
-//    private String easyepcUsername;
-//    @Value("${easyepc.password}")
-//    private String easyepcPassword;
-//
-//    @Override
-//    public List<EsmEasyepcVehicleVo> vinQuery(String vinCode) {
-//
-//        String host = easyepcHost;
-//        String path = "/api/";
-//        String apiCode = "111002";
-//        String url = host + path + apiCode;
-//
-//
-//        try {
-//            String returnData = getData(url, vinCode);
-//            System.out.println(returnData);
-//            return buildResult(returnData);
-//
-//
-//
-//        } catch (Exception e) {
-//            System.err.println("接口"+apiCode+"调用出现异常,信息为:"+e.getMessage());
-//        }
-//
-//
-////        return _head.toString();
-//        return null;
-//
-//    }
-//
-//
-//    /**
-//     *
-//     * @Title:          main
-//     * @Description:    示例代码的执行入口
-//     *                  1、根据接口文档和参数进行修改即可复用
-//     *                  2、username和password只是一个示例,需要修改成真实username和password
-//     * @param args
-//     * @return:         void
-//     * @throws:
-//     */
-//    public static void main(String[] args) {
-////        String host = "https://www.easyepc.com";
-////        String path = "/api/";
-////        String apiCode = "111002";
-////        String url = host + path + apiCode;
-////        //请求头信息
-////        Map<String, String> head = new HashMap<String, String>();
-////        head.put("username", "test");
-////        head.put("password", "1551ca07d83e784ff94eff59487bdc123");
-////        //请求参数
-////        Map<String, String> body = new HashMap<String, String>();
-////        body.put("vinCode", "LHGCP260498017030");
-////
-////        try {
-////            String returnData = getData(url, head, body);
-////            System.out.println(returnData);
-////        } catch (Exception e) {
-////            System.err.println("接口"+apiCode+"调用出现异常,信息为:"+e.getMessage());
-////        }
-//
-//        String str = "{\n" +
-//                "    \"code\": \"000000\",\n" +
-//                "    \"message\": \"成功\",\n" +
-//                "    \"result\": {\n" +
-//                "        \"analysisDesc\": \"实码解析,结果仅供参考\",\n" +
-//                "        \"vehicleList\": [\n" +
-//                "            {\n" +
-//                "                \"brandId\": \"402880ef0ca4b73f010ca88d84000002\",\n" +
-//                "                \"brandCode\": \"BTA1\",\n" +
-//                "                \"brandName\": \"广汽本田\",\n" +
-//                "                \"importFlag\": \"合资\",\n" +
-//                "                \"familyName\": \"雅阁\",\n" +
-//                "                \"clzl\": \"乘用车\",\n" +
-//                "                \"productType\": \"轿车\"\n" +
-//                "            }\n" +
-//                "        ]\n" +
-//                "    }\n" +
-//                "}";
-//
-//
-//        JSONObject strJson = JSON.parseObject(str);
-//
-//        JSONObject resultJson = (JSONObject) strJson.get("result");
-//        JSONArray vehicleListJson= resultJson.getJSONArray("vehicleList");
-//        List<EsmEasyepcVehicleVo> vehicleListVo = JSON.parseArray(vehicleListJson.toJSONString(), EsmEasyepcVehicleVo.class);
-//        System.out.println(vehicleListVo.get(0).getBrandName());
-//        System.out.println(strJson.get("result").toString());
-//
-//
-//
-//    }
-//
-//    /**
-//     * 获取数据入口
-//     *
-//     * @param requestUrl 请求地址
-//     * @return
-//     */
-//    public String getData(String requestUrl,String vinCode) {
-//        //请求头信息
-//        Map<String, String> head = new HashMap<>();
-//        head.put("username", easyepcUsername);
-//        head.put("password", easyepcPassword);
-//
-//        //请求参数
-//        Map<String, String> body = new HashMap<>();
-//        body.put("vinCode", vinCode);
-//
-//        String requestParams = getRequestParams(head, body);
-//        String data = "";
-//        if (!isEmpty(requestParams)) {
-//            System.out.println("请求URL---requestUrl:" + requestUrl);
-//            System.out.println("请求参数---requestParams:" + requestParams);
-//            data = sendPostRequest(requestUrl, requestParams);
-//        }
-//        return data;
-//    }
-//
-//
-//    /**
-//     * 返回参数封装
-//     *
-//     * @return
-//     */
-//    public static List<EsmEasyepcVehicleVo> buildResult(String str) {
-//        JSONObject strJson = JSON.parseObject(str);
-//        if(strJson.get("code").toString() != "000000"){
-//            System.err.println("精友数据VIN码查询失败");
-//            System.err.println("精友数据VIN码查询失败 code:"+strJson.get("code").toString());
-//            System.err.println("精友数据VIN码查询失败 message:"+strJson.get("message").toString());
-//            return null;
-//
-//        }
-//
-//        JSONObject resultJson = (JSONObject) strJson.get("result");
-//        JSONArray vehicleListJson= resultJson.getJSONArray("vehicleList");
-//        List<EsmEasyepcVehicleVo> vehicleListVo = JSON.parseArray(vehicleListJson.toJSONString(), EsmEasyepcVehicleVo.class);
-//        return vehicleListVo;
-//    }
-//
-//    /**
-//     * 请求参数分装
-//     *
-//     * @param  head 请求头信息
-//     * @param  body 请求参数
-//     * @return
-//     */
-//    public static String getRequestParams(Map<String, String> head, Map<String, String> body) {
-//        JSONObject _head = new JSONObject();
-//        JSONObject _body = new JSONObject();
-//        _head.put("username", head.get("username"));//账号
-//        _head.put("password", head.get("password"));//密码
-//
-//        for (String key : body.keySet()) {
-//            _body.put(key, body.get(key));
-//        }
-//
-//        _head.put("data", _body);
-//        return _head.toString();
-//    }
-//
-//    /**
-//     * 判断字符串是否为空
-//     *
-//     * @param s
-//     * @return
-//     */
-//    public static boolean isEmpty(String s) {
-//        return s == null || s.length() == 0 || s.trim().length() == 0;
-//    }
-//
-//    /**
-//     * HTTP_POST 请求
-//     *
-//     * @param requestUrl 请求地址
-//     * @param jsonStr    请求参数JSON字符创
-//     * @return
-//     */
-//    public static String sendPostRequest(String requestUrl, String jsonStr) {
-//        String result = "";
-//        if (isEmpty(requestUrl)) {
-//            System.out.println("参数requestUrl(请求地址)为空!");
-//            return "请求地址为空!";
-//        }
-//        if (isEmpty(jsonStr)) {
-//            System.out.println("参数jsonStr(请求参数)为空!");
-//            return "请求参数为空!";
-//        }
-//        try {
-//            // 跳过https证书,可以进行无证书访问
-//            trustAllHosts();
-//            URL url = new URL(requestUrl);
-//            HttpURLConnection conn = (HttpURLConnection) url.openConnection();
-//            conn.setRequestMethod("POST");//提交模式
-//            //是否允许输入输出
-//            conn.setDoInput(true);
-//            conn.setDoOutput(true);
-//            //是否允许缓存
-//            conn.setUseCaches(false);
-//            //设置超时时间(毫秒)
-//            conn.setConnectTimeout(30000);
-//            //设置请求头信息
-//            conn.setRequestProperty("Content-Type", "application/json");
-//            //连接地址
-//            conn.connect();
-//            OutputStreamWriter writer = new OutputStreamWriter(conn.getOutputStream());
-//            //发送参数
-//            writer.write(jsonStr);
-//            //清理当前编辑器的左右缓冲区,并使缓冲区数据写入基础流
-//            writer.flush();
-//            //关闭输出流
-//            writer.close();
-//            //读取返回结果
-//            BufferedReader reader = new BufferedReader(new InputStreamReader(conn.getInputStream()));
-//            //读取返回结果
-//            String lines = reader.readLine();
-//            //关闭流
-//            reader.close();
-//            JSONObject jsonObject = JSONObject.parseObject(lines);
-//            result = jsonObject.toString();
-//        } catch (MalformedURLException e) {
-//            e.printStackTrace();
-//            System.out.println("请求失败,信息为:" + e.getMessage());
-//        } catch (IOException e) {
-//            e.printStackTrace();
-//            System.out.println("请求失败,信息为:" + e.getMessage());
-//        }
-//        return result;
-//    }
-//
-//    /**
-//     * 解决HTTPS证书的问题
-//     * 跳过https证书,可以进行无证书访问
-//     */
-//    private static void trustAllHosts() {
-//        TrustManager[] trustAllCerts = new TrustManager[] { new X509TrustManager() {
-//            @Override
-//            public java.security.cert.X509Certificate[] getAcceptedIssuers() {
-//                return new java.security.cert.X509Certificate[] {};
-//            }
-//
-//            @Override
-//            public void checkClientTrusted(java.security.cert.X509Certificate[] chain, String authType)
-//                    throws CertificateException {
-//            }
-//
-//            @Override
-//            public void checkServerTrusted(java.security.cert.X509Certificate[] chain, String authType)
-//                    throws CertificateException {
-//            }
-//        } };
-//
-//        // Install the all-trusting trust manager
-//        try {
-//            SSLContext sc = SSLContext.getInstance("SSL", "SunJSSE");
-//            sc.init(null, trustAllCerts, new java.security.SecureRandom());
-//            HttpsURLConnection.setDefaultSSLSocketFactory(sc.getSocketFactory());
-//            HttpsURLConnection.setDefaultHostnameVerifier(NoopHostnameVerifier.INSTANCE);
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//        }
-//    }
-//}

+ 0 - 428
src/main/java/com/ydtech/modules/esm/service/impl/EsmUserInternalCheckServiceImpl.java

@@ -1,428 +0,0 @@
-//package com.ydtech.modules.esm.service.impl;
-//
-//import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-//import com.github.drinkjava2.jdialects.Dialect;
-//import com.ydtech.core.page.PageResult;
-//import com.ydtech.modules.admin.model.SysUser;
-//import com.ydtech.modules.admin.model.SysUserRole;
-//import com.ydtech.modules.admin.service.SysUserRoleService;
-//import com.ydtech.modules.admin.service.SysUserService;
-//import com.ydtech.modules.esm.dao.impl.EsmUserInternalCheckDaoImpl;
-//import com.ydtech.modules.esm.model.*;
-//import com.ydtech.modules.esm.service.*;
-//import com.ydtech.utils.StringUtils;
-//import org.springframework.beans.BeanUtils;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.jdbc.core.JdbcTemplate;
-//import org.springframework.jdbc.core.RowCallbackHandler;
-//import org.springframework.stereotype.Service;
-//import org.springframework.transaction.annotation.Transactional;
-//
-//import java.io.Serializable;
-//import java.sql.ResultSet;
-//import java.sql.SQLException;
-//import java.util.ArrayList;
-//import java.util.Date;
-//import java.util.List;
-//
-//
-//@Service
-//public class EsmUserInternalCheckServiceImpl extends EsmUserInternalCheckDaoImpl
-//        implements EsmUserInternalCheckService {
-//
-//    @Autowired
-//    SysUserCheckService sysUserCheckService;
-//
-////    @Autowired
-////    EsmUserInternalCheckService esmUserInternalCheckService;
-//
-//    @Autowired
-//    EsmUserAgentCheckService esmUserAgentCheckService;
-//
-//    @Autowired
-//    SysUserService sysUserService;
-//
-//    @Autowired
-//    EsmUserInternalService esmUserInternalService;
-//
-//    @Autowired
-//    EsmUserAgentService esmUserAgentService;
-//
-//    @Autowired
-//    SysUserRoleService sysUserRoleService;
-//
-//    //"人员审核 传入人员编码和审核状态: 0 申请审核 1 审核通过 2 审核不通过 3 退回修改"
-//    @Override
-//    @Transactional
-//    public Integer check(String username, String checkid, String status, String remark) {
-//
-//        //1. 审核通过 sys_user status变为1
-//        //2. 审核不通过 原表中的数据不变,status变为2,本表中的 status变为2
-//        //3. 退回修改 原表中的数据不变,status变为3,本表中的 status变为3
-//        try {
-//            //1. 审核通过
-//            if (status.equalsIgnoreCase("1")) {
-//                SysUserCheck sysUserCheck = sysUserCheckService.selectByPk(checkid);
-//                // 运营人员更新状态
-//                updateOperationAuthority(sysUserCheck.getId());
-//                String id = sysUserCheck.getId();
-//                // sys_user 状态变为有效1
-////                JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-////                String sql = " UPDATE sys_user SET STATUS=1 WHERE id =? ";
-////                int out = jdbcTemplate.update(sql, new Object[]{id});
-//
-////                sql = " UPDATE esm_user_internal SET id=CONCAT(id,'_1'),STATUS=?,remark=? WHERE id =? ";
-////                out = jdbcTemplate.update(sql, new Object[]{status, remark, id});
-////                sql = " UPDATE esm_user_agent SET id=CONCAT(id,'_1') WHERE id =? ";
-////                out = jdbcTemplate.update(sql, new Object[]{id});
-//
-//                EsmUserInternalCheck esmUserInternalCheck = selectByPk(checkid);
-//                EsmUserAgentCheck esmUserAgentCheck = esmUserAgentCheckService.selectByPk(checkid);
-//
-//                sysUserCheck.setLastUpdateBy(username);
-//                sysUserCheck.setLastUpdateTime(new Date());
-//                sysUserCheck.setStatus(StringUtils.toInt(status, -1)); // 状态  -1 出错了 0 申请审核 1 审核通过 2 审核不通过 3 退回修改   99:离司
-//                sysUserCheckService.updateSelective(sysUserCheck);
-//
-//                SysUser sysUser = new SysUser();
-//                BeanUtils.copyProperties(sysUserCheck, sysUser);
-//                sysUser.setSalt(null);
-//                sysUser.setPassword(null);
-//                sysUser.setStatus(1);
-//                sysUserService.updateById(sysUser);
-//
-//                if (esmUserInternalCheck.getIntime() == null) {
-//                    esmUserInternalCheck.setIntime(new Date());// 入司时间取审核通过时间
-//                }
-//                esmUserInternalCheck.setStatus(status); // 状态  -1 出错了 0 申请审核 1 审核通过 2 审核不通过 3 退回修改   99:离司
-//                esmUserInternalCheck.setRemark(remark);
-//                updateSelective(esmUserInternalCheck);
-//
-//                EsmUserInternal esmUserInternal = new EsmUserInternal();
-//                BeanUtils.copyProperties(esmUserInternalCheck, esmUserInternal);
-//                EsmUserInternal internal = esmUserInternalService.selectByPk(id);
-//                if (internal == null) {
-//                    esmUserInternalService.insertSelective(esmUserInternal);
-//                } else {
-//                    esmUserInternalService.updateSelective(esmUserInternal);
-//                }
-//
-////            esmUserAgentCheck.setLastUpdateBy(username);
-////            esmUserAgentCheck.setLastUpdateTime(new Date());
-////            esmUserAgentCheck.setStatus(StringUtils.toInt(status,-1)); // 状态  -1 出错了 0 申请审核 1 审核通过 2 审核不通过 3 退回修改   99:离司
-////            esmUserAgentCheckService.updateSelective(esmUserAgentCheck);
-//
-//                if (esmUserAgentCheck != null) {
-//                    EsmUserAgent esmUserAgent = new EsmUserAgent();
-//                    BeanUtils.copyProperties(esmUserAgentCheck, esmUserAgent);
-//                    EsmUserAgent agent = esmUserAgentService.selectByPk(id);
-//                    if (agent == null) {
-//                        esmUserAgentService.insertSelective(esmUserAgent);
-//                    } else {
-//                        esmUserAgentService.updateSelective(esmUserAgent);
-//                    }
-//
-//                }
-//            }
-//            //2. 审核不通过 原表中的数据不变,status变为2,本表中的 status变为2
-//            //3. 退回修改 原表中的数据不变,status变为3,本表中的 status变为3
-//            else if (status.equalsIgnoreCase("2") || status.equalsIgnoreCase("3")) {
-//                JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-////                String sql = " UPDATE sys_user_check SET STATUS=? WHERE checkid =? ";
-////                int out = jdbcTemplate.update(sql, new Object[]{status, checkid});
-//                String sql = " UPDATE esm_user_internal_check SET STATUS=?,remark=? WHERE checkid =? ";
-//                int out = jdbcTemplate.update(sql, new Object[]{status, remark, checkid});
-//
-//                if (status.equalsIgnoreCase("2")){
-//                    SysUserCheck sysUserCheck = sysUserCheckService.selectByPk(checkid);
-//                    String id = sysUserCheck.getId();
-//                    SysUser sysUser = new SysUser();
-//                    sysUser.setId(id);
-//                    sysUser.setDeptId("1");
-//                    sysUserService.updateById(sysUser);
-//                }
-////
-////                sql = " UPDATE sys_user SET STATUS=? WHERE id =? ";
-////                out = jdbcTemplate.update(sql, new Object[]{status, id});
-////                sql = " UPDATE esm_user_internal SET STATUS=?,remark=? WHERE id =? ";
-////                out = jdbcTemplate.update(sql, new Object[]{status, remark, id});
-//
-//            }
-//
-//            return 1;
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//            return 0;
-//        }
-//    }
-//
-//    /**
-//     * 推荐人为运营人员,审核成功以后也是运营人员
-//     */
-//    public void updateOperationAuthority(String jobNumber) {
-//        // 报错后不影响正常审核
-//        try {
-//            EsmUserAgentCheck esmUserAgent = esmUserAgentCheckService.selectByPk(jobNumber);
-//            SysUserRole sysUserRole = sysUserRoleService.selectByUserId(esmUserAgent.getRecommenderid());
-//
-//            if (sysUserRole.getRoleId().equals(20L)) {
-//                SysUserRole sysUserRole1 = sysUserRoleService.selectByUserId(jobNumber);
-//                if (sysUserRole1 != null) {
-//                    sysUserRole1.setRoleId(sysUserRole.getRoleId());
-//                    sysUserRoleService.updateById(sysUserRole1);
-//                } else {
-//                    SysUserRole sysUserRole2 = new SysUserRole();
-//                    sysUserRole2.setUserId(jobNumber);
-//                    sysUserRole2.setRoleId(sysUserRole.getRoleId());
-//                    sysUserRoleService.save(sysUserRole2);
-//                }
-//            }
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//        }
-//    }
-//
-//
-//    public Integer countPagingCustom(String whereCase, Object[] paramValues) {
-//        String sql = "select count(1)  from sys_user_check t1 left join esm_user_internal_check t2 on t1.checkid=t2.checkid " + whereCase;
-//
-//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-//
-//        return jdbcTemplate.queryForObject(sql, paramValues, Integer.class);
-//    }
-//
-//    @Override
-//    public PageResult selectPagingCustom(int pageNumber, int pageSize, String whereCase, Object[] paramValues) {
-//
-//        Dialect dialect = Dialect.guessDialect(dataSource);
-//        String oriSql = "SELECT t1.last_update_time, t2.status, t1.job_code , t1.checkid, t1.id, t1.name,  t1.email, t1.mobile, t1.dept_id, sd.name as dept_name, t1.usertype, t1.del_flag, t2.identity, t1.sex, t2.documentno, t2.regulartm, t2.hrcode, t2.saleno  " +
-//                "FROM  sys_user_check t1 LEFT JOIN esm_user_internal_check t2 ON t1.checkid=t2.checkid " +
-//                "LEFT JOIN sys_dept sd ON t1.dept_id=sd.id " + whereCase;
-//        String sql = dialect.pagin(pageNumber, pageSize, oriSql);
-//
-//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-////		NamedParameterJdbcTemplate jdbc = new NamedParameterJdbcTemplate(jdbcTemplate);
-//
-//        List<SysUseresmUserInternalVO> recordList = new ArrayList<SysUseresmUserInternalVO>();
-//
-//        jdbcTemplate.query(sql, paramValues,
-//                new RowCallbackHandler() {
-//                    @Override
-//                    public void processRow(ResultSet resultSet) throws SQLException {
-//                        SysUseresmUserInternalVO model = new SysUseresmUserInternalVO();
-//                        model.setLastUpdateTime(resultSet.getString("last_update_time"));
-//                        model.setStatus(resultSet.getString("status"));
-//                        model.setJobCode(resultSet.getString("job_code"));
-//                        model.setCheckid(resultSet.getString("checkid"));
-//                        model.setId(resultSet.getString("id"));
-//                        model.setName(resultSet.getString("name"));
-//                        model.setEmail(resultSet.getString("email"));
-//                        model.setMobile(resultSet.getString("mobile"));
-//                        model.setDeptId(resultSet.getString("dept_id"));
-//                        model.setDeptName(resultSet.getString("dept_name"));
-//                        model.setUsertype(resultSet.getString("usertype"));
-//                        model.setDelFlag(resultSet.getInt("del_flag"));
-//                        model.setIdentity(resultSet.getString("identity"));
-//                        model.setSex(resultSet.getString("sex"));
-//                        model.setDocumentno(resultSet.getString("documentno"));
-//                        model.setRegulartm(resultSet.getDate("regulartm"));
-//                        model.setHrcode(resultSet.getString("hrcode"));
-//                        model.setSaleno(resultSet.getString("saleno"));
-//
-//                        recordList.add(model);
-//                    }
-//                });
-//
-//        int totalCount = countPagingCustom(whereCase, paramValues);
-//
-//        PageResult PageResult = new PageResult(pageNumber, pageSize, totalCount, recordList);
-//
-//        return PageResult;
-//    }
-//
-//    public class SysUseresmUserInternalVO implements Serializable {
-//        private static final long serialVersionUID = 5445785034406404908L;
-//
-//        private String lastUpdateTime;
-//
-//        public String getLastUpdateTime() {
-//            return lastUpdateTime;
-//        }
-//
-//        public void setLastUpdateTime(String lastUpdateTime) {
-//            this.lastUpdateTime = lastUpdateTime;
-//        }
-//
-//        private String status;
-//
-//        public String getStatus() {
-//            return status;
-//        }
-//
-//        public void setStatus(String status) {
-//            this.status = status;
-//        }
-//
-//        private String jobCode;
-//
-//        public String getJobCode() {
-//            return jobCode;
-//        }
-//
-//        public void setJobCode(String jobCode) {
-//            this.jobCode = jobCode;
-//        }
-//
-//        private String deptName;
-//
-//        public String getDeptName() {
-//            return deptName;
-//        }
-//
-//        public void setDeptName(String deptName) {
-//            this.deptName = deptName;
-//        }
-//
-//        private String checkid;
-//        //编号
-//        private String id;
-//        //用户名
-//        private String name;
-//        //邮箱
-//        private String email;
-//        //手机号
-//        private String mobile;
-//        //机构ID
-//        private String deptId;
-//        //用户类型:0:系统用户 1:后线人员 2:代理人员
-//        private String usertype;
-//        //是否删除  -1:已删除  0:正常
-//        private Integer delFlag;
-//        //身份证号
-//        private String identity;
-//        //性别
-//        private String sex;
-//        //后线人员档案号
-//        private String documentno;
-//        //转正时间
-//        private Date regulartm;
-//        //后线人员HR编码
-//        private String hrcode;
-//        //业务员职业证书号:
-//        private String saleno;
-//
-//        public String getId() {
-//            return id;
-//        }
-//
-//        public void setId(String id) {
-//            this.id = id;
-//        }
-//
-//        public String getName() {
-//            return name;
-//        }
-//
-//        public void setName(String name) {
-//            this.name = name;
-//        }
-//
-//
-//        public String getEmail() {
-//            return email;
-//        }
-//
-//        public void setEmail(String email) {
-//            this.email = email;
-//        }
-//
-//        public String getMobile() {
-//            return mobile;
-//        }
-//
-//        public void setMobile(String mobile) {
-//            this.mobile = mobile;
-//        }
-//
-//        public String getDeptId() {
-//            return deptId;
-//        }
-//
-//        public void setDeptId(String deptId) {
-//            this.deptId = deptId;
-//        }
-//
-//        public String getUsertype() {
-//            return usertype;
-//        }
-//
-//        public void setUsertype(String usertype) {
-//            this.usertype = usertype;
-//        }
-//
-//        public Integer getDelFlag() {
-//            return delFlag;
-//        }
-//
-//        public void setDelFlag(Integer delFlag) {
-//            this.delFlag = delFlag;
-//        }
-//
-//        public String getIdentity() {
-//            return identity;
-//        }
-//
-//        public void setIdentity(String identity) {
-//            this.identity = identity;
-//        }
-//
-//        public String getSex() {
-//            return sex;
-//        }
-//
-//        public void setSex(String sex) {
-//            this.sex = sex;
-//        }
-//
-//        public String getDocumentno() {
-//            return documentno;
-//        }
-//
-//        public void setDocumentno(String documentno) {
-//            this.documentno = documentno;
-//        }
-//
-//        public Date getRegulartm() {
-//            return regulartm;
-//        }
-//
-//        public void setRegulartm(Date regulartm) {
-//            this.regulartm = regulartm;
-//        }
-//
-//        public String getHrcode() {
-//            return hrcode;
-//        }
-//
-//        public void setHrcode(String hrcode) {
-//            this.hrcode = hrcode;
-//        }
-//
-//        public String getSaleno() {
-//            return saleno;
-//        }
-//
-//        public void setSaleno(String saleno) {
-//            this.saleno = saleno;
-//        }
-//
-//        public String getCheckid() {
-//            return checkid;
-//        }
-//
-//        public void setCheckid(String checkid) {
-//            this.checkid = checkid;
-//        }
-//    }
-//
-//}

+ 0 - 364
src/main/java/com/ydtech/modules/esm/service/impl/EsmUserInternalServiceImpl.java

@@ -1,364 +0,0 @@
-//package com.ydtech.modules.esm.service.impl;
-//
-//import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-//import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-//import com.ydtech.modules.admin.model.SysUser;
-//import com.ydtech.modules.admin.service.SysUserService;
-//import com.ydtech.modules.esm.dao.EsmUserInternalMapper;
-//import com.ydtech.modules.esm.model.EsmUserInternal;
-//import com.ydtech.modules.esm.service.EsmUserAgentService;
-//import com.ydtech.modules.esm.service.EsmUserInternalService;
-//import com.ydtech.modules.esm.model.vo.TeamUserQryVO;
-//import com.ydtech.modules.esm.model.vo.TeamUserVONew;
-//import com.ydtech.utils.StringUtils;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.stereotype.Service;
-//
-//import java.io.Serializable;
-//import java.util.ArrayList;
-//import java.util.Date;
-//import java.util.List;
-//
-//
-//@Service
-//public class EsmUserInternalServiceImpl extends ServiceImpl<EsmUserInternalMapper, EsmUserInternal>
-//        implements EsmUserInternalService  {
-////public class EsmUserInternalServiceImpl extends EsmUserInternalDaoImpl
-////        implements EsmUserInternalService {
-//
-//    @Autowired
-//    EsmUserAgentService esmUserAgentService;
-//    @Autowired
-//    SysUserService sysUserService;
-//
-//
-//    //人员审核
-//    public Integer check(String id, String status) {
-//        LambdaUpdateWrapper<EsmUserInternal> luw = new LambdaUpdateWrapper();
-//        luw.set(EsmUserInternal::getStatus,status);
-//        luw.eq(EsmUserInternal::getId,id);
-//        return update(luw) == true ?1:0;
-//    }
-////    //人员审核
-////    public Integer check(String id, String status) {
-////        String sql = " update esm_user_internal set status=? where id=? ";
-////
-////        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-////
-////        return jdbcTemplate.update(sql, new Object[]{status, id});
-////    }
-//
-//
-////    public Integer countPagingCustom(String whereCase, Object[] paramValues) {
-////        String sql = "select count(1)  from sys_user t1 left join esm_user_internal t2 on t1.id=t2.id " + whereCase;
-////        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-////        return jdbcTemplate.queryForObject(sql, paramValues, Integer.class);
-////    }
-//
-////    @Override
-////    public PageResult selectPagingCustom(int pageNumber, int pageSize, String whereCase, Object[] paramValues) {
-////
-////
-////
-////        String oriSql = "SELECT t1.status, t1.job_code , t1.id, t1.name,  t1.email, t1.mobile, t1.dept_id, sd.name as dept_name, t1.usertype, t1.del_flag, t2.identity, t1.sex, t2.documentno, t2.regulartm, t2.hrcode, t2.saleno  " +
-////                "FROM  sys_user t1 LEFT JOIN esm_user_internal t2 ON t1.id=t2.id " +
-////                "LEFT JOIN sys_dept sd ON t1.dept_id=sd.id " + whereCase;
-////
-////        Dialect dialect = Dialect.guessDialect(dataSource);
-////        String sql = dialect.pagin(pageNumber, pageSize, oriSql);
-////
-////        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-//////		NamedParameterJdbcTemplate jdbc = new NamedParameterJdbcTemplate(jdbcTemplate);
-////
-////        List<SysUseresmUserInternalVO> recordList = new ArrayList<SysUseresmUserInternalVO>();
-////
-////        jdbcTemplate.query(sql, paramValues,
-////                new RowCallbackHandler() {
-////                    @Override
-////                    public void processRow(ResultSet resultSet) throws SQLException {
-////                        SysUseresmUserInternalVO model = new SysUseresmUserInternalVO();
-////                        model.setStatus(resultSet.getString("status"));
-////                        model.setJobCode(resultSet.getString("job_code"));
-////                        model.setId(resultSet.getString("id"));
-////                        model.setName(resultSet.getString("name"));
-////                        model.setEmail(resultSet.getString("email"));
-////                        model.setMobile(resultSet.getString("mobile"));
-////                        model.setDeptId(resultSet.getString("dept_id"));
-////                        model.setDeptName(resultSet.getString("dept_name"));
-////                        model.setUsertype(resultSet.getString("usertype"));
-////                        model.setDelFlag(resultSet.getInt("del_flag"));
-////                        model.setIdentity(resultSet.getString("identity"));
-////                        model.setSex(resultSet.getString("sex"));
-////                        model.setDocumentno(resultSet.getString("documentno"));
-////                        model.setRegulartm(resultSet.getDate("regulartm"));
-////                        model.setHrcode(resultSet.getString("hrcode"));
-////                        model.setSaleno(resultSet.getString("saleno"));
-////
-////                        recordList.add(model);
-////                    }
-////                });
-////
-////        int totalCount = countPagingCustom(whereCase, paramValues);
-////
-////        PageResult PageResult = new PageResult(pageNumber, pageSize, totalCount, recordList);
-////
-////        return PageResult;
-////    }
-//
-////    @Override
-////    public String findMaxId(String deptId) {
-////        QueryWrapper<EsmUserInternal> qw = new QueryWrapper<>();
-////        qw.select("IFNULL(MAX(id),0) maxId");
-////        Map<String,Object> m = getMap(qw);
-////        String maxId = m.get("maxId").toString();
-////        return maxId;
-////
-////    }
-////    @Override
-////    public String findMaxId(String deptId) {
-////        String sql = "SELECT MAX(id) FROM sys_user t  WHERE dept_id=?"; // AND usertype=?";
-////        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-////        return jdbcTemplate.queryForObject(sql, String.class, new Object[]{deptId});
-////    }
-//
-////    // 统计临时人员
-////    @Override
-////    public int queryTempNum(String deptId) {
-////        LambdaQueryWrapper<EsmUserInternal> lqw = new LambdaQueryWrapper<>();
-////        return (int)count(lqw);
-////        String sql = "select count(*) from sys_user a,esm_user_internal_check b where a.id=b.id and a.dept_id=? and b.status != '1'";
-////        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-////        String num = jdbcTemplate.queryForObject(sql, String.class, new Object[]{deptId});
-////        return Integer.valueOf(num);
-////    }
-////    // 统计临时人员
-////    @Override
-////    public int queryTempNum(String deptId) {
-////        String sql = "select count(*) from sys_user a,esm_user_internal_check b where a.id=b.id and a.dept_id=? and b.status != '1'";
-////        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-////        String num = jdbcTemplate.queryForObject(sql, String.class, new Object[]{deptId});
-////        return Integer.valueOf(num);
-////    }
-//
-////    @Override
-////    public List<String> queryTeamUser(String id) {
-////
-////
-////        List<String> recordList = new ArrayList<String>();
-////        String sql = "select id from esm_user_agent_check a where a.recommenderid=? and not exists (select 1 from esm_user_agent t where t.id=a.id)";
-////        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-////        jdbcTemplate.query(sql, new Object[]{id},
-////                new RowCallbackHandler() {
-////                    @Override
-////                    public void processRow(ResultSet resultSet) throws SQLException {
-////                        recordList.add(resultSet.getString("id"));
-////                    }
-////                });
-////        return recordList;
-////    }
-//
-//
-//    public class SysUseresmUserInternalVO implements Serializable {
-//        private static final long serialVersionUID = 5445785034406404908L;
-//
-//        private String status;
-//
-//        public String getStatus() {
-//            return status;
-//        }
-//
-//        public void setStatus(String status) {
-//            this.status = status;
-//        }
-//
-//        private String jobCode;
-//
-//        public String getJobCode() {
-//            return jobCode;
-//        }
-//
-//        public void setJobCode(String jobCode) {
-//            this.jobCode = jobCode;
-//        }
-//
-//        private String deptName;
-//
-//        public String getDeptName() {
-//            return deptName;
-//        }
-//
-//        public void setDeptName(String deptName) {
-//            this.deptName = deptName;
-//        }
-//
-//        //编号
-//        private String id;
-//        //用户名
-//        private String name;
-//        //邮箱
-//        private String email;
-//        //手机号
-//        private String mobile;
-//        //机构ID
-//        private String deptId;
-//        //用户类型:0:系统用户 1:后线人员 2:代理人员
-//        private String usertype;
-//        //是否删除  -1:已删除  0:正常
-//        private Integer delFlag;
-//        //身份证号
-//        private String identity;
-//        //性别
-//        private String sex;
-//        //后线人员档案号
-//        private String documentno;
-//        //转正时间
-//        private Date regulartm;
-//        //后线人员HR编码
-//        private String hrcode;
-//        //业务员职业证书号:
-//        private String saleno;
-//
-//        public String getId() {
-//            return id;
-//        }
-//
-//        public void setId(String id) {
-//            this.id = id;
-//        }
-//
-//        public String getName() {
-//            return name;
-//        }
-//
-//        public void setName(String name) {
-//            this.name = name;
-//        }
-//
-//
-//        public String getEmail() {
-//            return email;
-//        }
-//
-//        public void setEmail(String email) {
-//            this.email = email;
-//        }
-//
-//        public String getMobile() {
-//            return mobile;
-//        }
-//
-//        public void setMobile(String mobile) {
-//            this.mobile = mobile;
-//        }
-//
-//        public String getDeptId() {
-//            return deptId;
-//        }
-//
-//        public void setDeptId(String deptId) {
-//            this.deptId = deptId;
-//        }
-//
-//        public String getUsertype() {
-//            return usertype;
-//        }
-//
-//        public void setUsertype(String usertype) {
-//            this.usertype = usertype;
-//        }
-//
-//        public Integer getDelFlag() {
-//            return delFlag;
-//        }
-//
-//        public void setDelFlag(Integer delFlag) {
-//            this.delFlag = delFlag;
-//        }
-//
-//        public String getIdentity() {
-//            return identity;
-//        }
-//
-//        public void setIdentity(String identity) {
-//            this.identity = identity;
-//        }
-//
-//        public String getSex() {
-//            return sex;
-//        }
-//
-//        public void setSex(String sex) {
-//            this.sex = sex;
-//        }
-//
-//        public String getDocumentno() {
-//            return documentno;
-//        }
-//
-//        public void setDocumentno(String documentno) {
-//            this.documentno = documentno;
-//        }
-//
-//        public Date getRegulartm() {
-//            return regulartm;
-//        }
-//
-//        public void setRegulartm(Date regulartm) {
-//            this.regulartm = regulartm;
-//        }
-//
-//        public String getHrcode() {
-//            return hrcode;
-//        }
-//
-//        public void setHrcode(String hrcode) {
-//            this.hrcode = hrcode;
-//        }
-//
-//        public String getSaleno() {
-//            return saleno;
-//        }
-//
-//        public void setSaleno(String saleno) {
-//            this.saleno = saleno;
-//        }
-//
-//
-//    }
-//
-//    public List<SysUser> getSuperior(String id) {
-//        List<SysUser> userList = new ArrayList<SysUser>();
-//        for (int i = 0; i < 3; i++) {
-////            StringBuffer whereStr = new StringBuffer(" where 1=1 ");
-////            ArrayList<String> params = new ArrayList<String>();
-////            if (id != null) {
-////                whereStr.append(" and id = ?");
-////                params.add(id);
-////            }
-////
-////            List<EsmUserAgent> list = esmUserAgentService.selectList(whereStr.toString(), params.toArray());
-//
-//
-//            TeamUserQryVO vo = new TeamUserQryVO();
-//            if (id != null) {
-//                vo.setId(id);
-//            }
-//            List<TeamUserVONew> list = esmUserAgentService.gainBelowUserByUserId(vo);
-//
-//            if (list != null && list.size() > 0) {
-//                id = list.get(0).getRecommenderId(); //上级推荐人代码
-//                if (StringUtils.isNullOrEmpty(id)) {
-//                    break;
-//                }
-//                SysUser user = sysUserService.getById(id);
-//                userList.add(user);
-//            }
-//        }
-//
-//        return userList;
-//    }
-//
-//}
-//
-//
-//

+ 0 - 73
src/main/java/com/ydtech/modules/ins/controller/HengbangController.java

@@ -1,73 +0,0 @@
-//package com.ydtech.modules.ins.controller;
-//
-//import com.fasterxml.jackson.core.JsonProcessingException;
-//import com.ydtech.aop.request.RequestSingleParam;
-//import com.ydtech.core.page.HttpResult;
-//import com.ydtech.exception.SystemException;
-//import com.ydtech.modules.ins.model.InsOrder;
-//import com.ydtech.modules.ins.model.hb.HengbangPolicyPrintResponse;
-//import com.ydtech.modules.ins.model.ya.YaQuoteInfoVo;
-//import com.ydtech.modules.ins.service.InsHengbangService;
-//import io.swagger.annotations.Api;
-//import io.swagger.annotations.ApiOperation;
-//import org.springframework.web.bind.annotation.PostMapping;
-//import org.springframework.web.bind.annotation.RequestBody;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.RestController;
-//import org.springframework.web.client.RestClientException;
-//
-//import java.io.IOException;
-//
-//@Api(tags = "恒邦财险")
-//@RestController
-//@RequestMapping("/ins/hengbang")
-//public class HengbangController {
-//    private final InsHengbangService insHengbangService;
-//
-//    public HengbangController(InsHengbangService insHengbangService) {
-//        this.insHengbangService = insHengbangService;
-//    }
-//
-//    @PostMapping("/quote")
-//    @ApiOperation(value = "报价")
-////    @MethodLogAnnotation(title = "恒邦-报价")
-//    public HttpResult quote(@RequestBody YaQuoteInfoVo yaQuoteInfoVo) throws JsonProcessingException {
-//        try {
-//            return insHengbangService.quote(yaQuoteInfoVo);
-//        } catch (RestClientException e) {
-//            throw new SystemException("恒邦接口调用失败");
-//        }
-//    }
-//
-//    @PostMapping("/audit")
-//    @ApiOperation(value = "核保")
-////    @MethodLogAnnotation(title = "恒邦-核保")
-//    public HttpResult audit(@RequestSingleParam(value = "orderno") String orderno) throws IOException {
-//        try {
-//            return insHengbangService.audit(orderno);
-//        } catch (RestClientException e) {
-//            throw new SystemException("恒邦接口调用失败");
-//        }
-//    }
-//
-//    @PostMapping(value = "/submitImage")
-//    @ApiOperation(value = "提交影像信息")
-//    public HttpResult submitImage(@RequestSingleParam(value = "orderno") String orderno) {
-//        try {
-//            return insHengbangService.submitImage(orderno);
-//        } catch (Exception e) {
-//            throw new SystemException("提交影像失败");
-//        }
-//    }
-//
-//    @PostMapping(value = "/getPolicyPrint")
-//    @ApiOperation(value = "获取电子保单")
-//    public HengbangPolicyPrintResponse getPolicyPrint(@RequestSingleParam(value = "orderno") String orderno) {
-//        try {
-//            return insHengbangService.getPolicyPrint(orderno);
-//        } catch (Exception e) {
-//            throw new SystemException("获取电子保单失败");
-//        }
-//    }
-//
-//}

+ 0 - 58
src/main/java/com/ydtech/modules/ins/controller/InsYongchengController.java

@@ -1,58 +0,0 @@
-//package com.ydtech.modules.ins.controller;
-//
-//import com.fasterxml.jackson.core.JsonProcessingException;
-//import com.ydtech.aop.request.RequestSingleParam;
-//import com.ydtech.core.page.HttpResult;
-//import com.ydtech.exception.SystemException;
-//import com.ydtech.modules.ins.model.ya.YaQuoteInfoVo;
-//import com.ydtech.modules.ins.model.yc.YongchengPolicyPrintResponse;
-//import com.ydtech.modules.ins.service.InsYongchengService;
-//import io.swagger.annotations.Api;
-//import io.swagger.annotations.ApiOperation;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.util.StringUtils;
-//import org.springframework.web.bind.annotation.PostMapping;
-//import org.springframework.web.bind.annotation.RequestBody;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.RestController;
-//
-//import java.io.IOException;
-//
-//
-//@Api(tags = "永诚财险 Spider")
-//@RestController
-//@RequestMapping("/ins/yongcheng")
-//public class InsYongchengController {
-//
-//    private final InsYongchengService insYongchengService;
-//
-//    public InsYongchengController(InsYongchengService insYongchengService) {
-//        this.insYongchengService = insYongchengService;
-//    }
-//
-//    @PostMapping("/quote")
-//    @ApiOperation("报价")
-//    public HttpResult quote(@RequestBody YaQuoteInfoVo yaQuoteInfoVo) throws JsonProcessingException {
-//        return insYongchengService.quote(yaQuoteInfoVo);
-//    }
-//
-//    @PostMapping("/audit")
-//    @ApiOperation("核保")
-//    public HttpResult audit(@RequestSingleParam("orderno") String orderNo) throws IOException {
-//        return insYongchengService.audit(orderNo);
-//    }
-//
-//    @PostMapping("/submitImage")
-//    @ApiOperation("提交影像")
-//    public HttpResult submitImage(@RequestSingleParam("orderno") String orderNo) throws IOException {
-//        return insYongchengService.submitImage(orderNo);
-//    }
-//
-//    @ApiOperation(value = "电子保单")
-//    @PostMapping("/getPolicyPrint")
-//    public YongchengPolicyPrintResponse getPolicyPrint(@RequestSingleParam(value = "orderno") String orderno) throws IOException {
-//        return insYongchengService.getPolicyPrint(orderno);
-//    }
-//
-//
-//}

+ 0 - 92
src/main/java/com/ydtech/modules/ins/controller/InsZhongmeiController.java

@@ -2,15 +2,12 @@ package com.ydtech.modules.ins.controller;
 
 
 import com.ydtech.aop.request.RequestSingleParam;
-import com.ydtech.components.ZhongmeiRequestComponents;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.exception.SystemException;
-import com.ydtech.modules.admin.dao.SysMethodLogDao;
 import com.ydtech.modules.ins.model.ya.CarModel_Req;
 import com.ydtech.modules.ins.service.InsZhongmeiService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
@@ -19,12 +16,6 @@ import org.springframework.web.bind.annotation.*;
 @RequestMapping("/insZhongmei")
 public class InsZhongmeiController {
 
-//    @Autowired
-//    private SysMethodLogDao sysMethodLogDao;
-//
-//    @Autowired
-//    private ZhongmeiRequestComponents zhongmeiRequestComponents;
-
     private final InsZhongmeiService insZhongmeiService;
 
 
@@ -40,8 +31,6 @@ public class InsZhongmeiController {
         }
         CarModel_Req carModelReq = new CarModel_Req();
         carModelReq.setModelName(modelName);
-
-//        return yongAnService.modelsQuery(carModelReq);
         return insZhongmeiService.modelQuery(modelName);
     }
 
@@ -52,86 +41,5 @@ public class InsZhongmeiController {
         return insZhongmeiService.vinSearch(frameNo);
     }
 
-
-//    @GetMapping("/hi")
-//    @ApiOperation("测试一下")
-//    @MethodLogAnnotation(title = "中煤-报价")
-//    public HttpResult test(String a,String b) {
-//        try {
-//            // 这个方法需要调用500毫秒
-//            Thread.sleep(500);
-//        } catch (InterruptedException e) {
-//            e.printStackTrace();
-//        }
-//        return HttpResult.ok();
-//    }
-
-
-//    @PostMapping("/quote")
-//    @ApiOperation(value = "报价")
-//    @MethodLogAnnotation(title = "中煤-报价")
-//    public HttpResult quote(@RequestBody YaQuoteInfoVo yaQuoteInfoVo) throws JsonProcessingException {
-//        try {
-//            return insZhongmeiService.quote(yaQuoteInfoVo);
-//        } catch (RestClientException e) {
-//            throw new SystemException("中煤接口调用失败");
-//        }
-//    }
-
-//    @PostMapping("/audit")
-//    @ApiOperation(value = "核保")
-//    @MethodLogAnnotation(title = "中煤-核保")
-//    public HttpResult audit(@RequestSingleParam(value = "orderno") String orderno) throws IOException {
-//        try {
-//            return insZhongmeiService.audit(orderno);
-//        } catch (RestClientException e) {
-//            throw new SystemException("中煤接口调用失败");
-//        }
-//    }
-//
-//    @PostMapping(value = "/uploadImage")
-//    @ApiOperation(value = "上传影像")
-//    public HttpResult UploadImage(@RequestBody InsTaskImage record) {
-//        return insZhongmeiService.UploadImage(record);
-//    }
-//
-//    @PostMapping(value = "/submitImage")
-//    @ApiOperation(value = "提交影像信息")
-//    public HttpResult submitImage(@RequestSingleParam(value = "orderno") String orderno) throws IOException {
-//        try {
-//            return insZhongmeiService.submitImage(orderno);
-//        } catch (RestClientException e) {
-//            e.printStackTrace();
-//            throw new SystemException("提交影像失败");
-//        }
-//    }
-//
-//    @PostMapping(value = "/verifyPayment")
-//    @ApiOperation(value = "验证是否支付")
-//    public HttpResult VerifyPayment(@RequestSingleParam(value = "orderno") String orderno) throws IOException {
-//        return insZhongmeiService.VerifyPayment(orderno);
-//    }
-//
-//    @ApiOperation(value = "电子保单")
-//    @PostMapping("/getPolicyPrint")
-//    public HttpResult getPolicyPrint(@RequestSingleParam(value = "orderno") String orderno) throws IOException {
-//        return insZhongmeiService.getPolicyPrint(orderno);
-//    }
-//
-////    @PostMapping("/quoteMq")
-////    @ApiOperation(value = "消息队列报价")
-////    public HttpResult quoteMq(@RequestBody YaQuoteInfoVo yaQuoteInfoVo) {
-////        return insZhongmeiService.quoteMq(yaQuoteInfoVo);
-////    }
-//
-//    @PostMapping("/getQuoteResult")
-//    @ApiOperation(value = "获取报价结果")
-//    public HttpResult getQuoteResult(@RequestSingleParam(value = "orderno") String orderNo) {
-//        if(StringUtils.isEmpty(orderNo)){
-//            throw new SystemException("订单号不能为空");
-//        }
-//        return insZhongmeiService.getQuoteResult(orderNo);
-//    }
-
 }
 

+ 0 - 64
src/main/java/com/ydtech/modules/ins/controller/RenbaoController.java

@@ -1,64 +0,0 @@
-//package com.ydtech.modules.ins.controller;
-//
-//import com.fasterxml.jackson.core.JsonProcessingException;
-//import com.ydtech.core.page.HttpResult;
-//import com.ydtech.exception.SystemException;
-//import com.ydtech.modules.ins.model.InsOrder;
-//import com.ydtech.modules.ins.model.ya.CarModel_Req;
-//import com.ydtech.modules.ins.model.ya.YaQuoteInfoVo;
-//import com.ydtech.modules.ins.service.InsRenbaoService;
-//import io.swagger.annotations.Api;
-//import io.swagger.annotations.ApiOperation;
-//import org.springframework.web.bind.annotation.*;
-//import org.springframework.web.client.RestClientException;
-//import org.springframework.web.client.RestTemplate;
-//
-//import java.io.IOException;
-//
-//@Api(tags = "人保报价")
-//@RestController
-//@RequestMapping("/api/insRenbao")
-//public class RenbaoController {
-//
-//    private final InsRenbaoService insRenbaoService;
-//
-//    public RenbaoController(InsRenbaoService insRenbaoService) {
-//        this.insRenbaoService = insRenbaoService;
-//    }
-//
-//    @GetMapping("/licensePlateQuery")
-//    @ApiOperation("车牌号查询车辆信息接口")
-//    public HttpResult licensePlateQuery(@RequestParam(value = "licensePlate") String licensePlate) throws Exception {
-//        return insRenbaoService.licensePlateQuery(licensePlate);
-//    }
-//
-//    @PostMapping("/modelsQuery")
-//    @ApiOperation("车型查询接口")
-//    public HttpResult modelsQuery(@RequestBody CarModel_Req carModelReq) {
-//        return insRenbaoService.modelsQuery(carModelReq);
-//    }
-//
-//    @PostMapping("/quote")
-//    @ApiOperation(value = "报价")
-////    @MethodLogAnnotation(title = "人保-报价")
-//    public HttpResult quote(@RequestBody YaQuoteInfoVo yaQuoteInfoVo) throws JsonProcessingException {
-//        try {
-//            return insRenbaoService.quote(yaQuoteInfoVo);
-//        } catch (RestClientException e) {
-//            throw new SystemException("人保接口调用失败");
-//        }
-//    }
-//
-//    @PostMapping("/audit")
-//    @ApiOperation(value = "核保")
-////    @MethodLogAnnotation(title = "人保-核保")
-//    public HttpResult audit(@RequestBody InsOrder orderno) throws IOException {
-//        try {
-//            return insRenbaoService.audit(orderno.getOrderno());
-//        } catch (RestClientException e) {
-//            throw new SystemException("人保接口调用失败");
-//        }
-//    }
-//
-//
-//}

+ 0 - 108
src/main/java/com/ydtech/modules/ins/model/yc/callbackAnOrder/response/CallbackAnOrderResponse.java

@@ -1,108 +0,0 @@
-//package com.ydtech.modules.ins.model.yc.callbackAnOrder.response;
-//
-//import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
-//import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
-//import lombok.Data;
-//
-//
-///**
-// * 补传回调及订单信息查询接口
-// *
-// * @author: lig
-// * @date: 2023-04-06
-// */
-//@Data
-//@JacksonXmlRootElement(localName = "thirdPartycallBackResponse")
-//public class CallbackAnOrderResponse {
-//
-//
-//    /**
-//     *
-//     * 返回字符串  需要解析
-//     */
-//    @JacksonXmlProperty(localName = "return")
-//    private String returnStr;
-////    /**
-////     * 交易流水号
-////     * 与支付时相同  支付使用
-////     */
-////    @JacksonXmlProperty(localName = "transNo")
-////    private String transNo;
-////
-////    /**
-////     * 回调类型
-////     * 0 支付回调 1核保回调 5直接返回
-////     */
-////    @JacksonXmlProperty(localName = "type")
-////    private String type;
-////
-////    /**
-////     * 回调结果
-////     * 0 成功,1 失败
-////     */
-////    @JacksonXmlProperty(localName = "result")
-////    private String result;
-////
-////    /**
-////     * 商业险保单号
-////     * Type为1 且投保商业险时有值
-////     */
-////    @JacksonXmlProperty(localName = "bizPolicyNo")
-////    private String bizPolicyNo;
-////
-////    /**
-////     * 交强险保单号
-////     * Type为1 且投保交强险时有值
-////     */
-////    @JacksonXmlProperty(localName = "ciPolicyNo")
-////    private String ciPolicyNo;
-////
-////    /**
-////     * 失败原因
-////     * 回调结果失败时有值
-////     */
-////    @JacksonXmlProperty(localName = "message")
-////    private String message;
-////
-////    /**
-////     * 商业险投保单号
-////     * 申请核保时产生
-////     */
-////    @JacksonXmlProperty(localName = "bizPolicyAppNo")
-////    private String bizPolicyAppNo;
-////
-////    /**
-////     * 交强险投保单号
-////     * 申请核保时产生
-////     */
-////    @JacksonXmlProperty(localName = "ciPolicyAppNo")
-////    private String ciPolicyAppNo;
-////
-////    /**
-////     * 交强保单状态
-////     * 0待核保   5上报复核   9已核保未交费   3退回修改    1已核保且交费
-////     */
-////    @JacksonXmlProperty(localName = "jqstatus")
-////    private String jqstatus;
-////
-////    /**
-////     * 商业投保单状态
-////     * 0待核保   5上报复核   9已核保未交费   3退回修改    1已核保且交费
-////     */
-////    @JacksonXmlProperty(localName = "systatus")
-////    private String systatus;
-////
-////    /**
-////     * 交强险核保备注
-////     */
-////    @JacksonXmlProperty(localName = "jqmessage")
-////    private String jqmessage;
-////
-////    /**
-////     * 商业性核保备注
-////     */
-////    @JacksonXmlProperty(localName = "symessage")
-////    private String symessage;
-//
-//
-//}

+ 0 - 45
src/main/java/com/ydtech/modules/ins/service/InsHengbangService.java

@@ -1,45 +0,0 @@
-//package com.ydtech.modules.ins.service;
-//
-//import com.fasterxml.jackson.core.JsonProcessingException;
-//import com.ydtech.core.page.HttpResult;
-//import com.ydtech.modules.ins.model.hb.HengbangPolicyPrintResponse;
-//import com.ydtech.modules.ins.model.ya.YaQuoteInfoVo;
-//
-//import java.io.IOException;
-//
-//public interface InsHengbangService {
-//
-//    /**
-//     * 报价
-//     *
-//     * @param yaQuoteInfoVo
-//     * @return
-//     */
-//    HttpResult quote(YaQuoteInfoVo yaQuoteInfoVo) throws JsonProcessingException;
-//
-//    /**
-//     * 核保
-//     *
-//     * @param orderNo
-//     * @return
-//     * @throws IOException
-//     */
-//    HttpResult audit(String orderNo) throws IOException;
-//
-//    /**
-//     * 上传影像
-//     *
-//     * @param orderId
-//     * @return
-//     * @throws IOException
-//     */
-//    HttpResult submitImage(String orderId) throws IOException;
-//
-//    /**
-//     * 获取报价订单
-//     *
-//     * @param orderNo
-//     * @return
-//     */
-//    HengbangPolicyPrintResponse getPolicyPrint(String orderNo);
-//}

+ 0 - 43
src/main/java/com/ydtech/modules/ins/service/InsRenbaoService.java

@@ -1,43 +0,0 @@
-//package com.ydtech.modules.ins.service;
-//
-//import com.fasterxml.jackson.core.JsonProcessingException;
-//import com.ydtech.core.page.HttpResult;
-//import com.ydtech.modules.ins.model.ya.CarModel_Req;
-//import com.ydtech.modules.ins.model.ya.YaQuoteInfoVo;
-//
-//import java.io.IOException;
-//
-//public interface InsRenbaoService {
-//
-//    /**
-//     * 投保
-//     *
-//     * @param yaQuoteInfoVo
-//     * @return HttpResult
-//     */
-//    HttpResult quote(YaQuoteInfoVo yaQuoteInfoVo) throws JsonProcessingException;
-//
-//    /**
-//     * 核保
-//     *
-//     * @param orderno
-//     * @return HttpResult
-//     */
-//    HttpResult audit(String orderno) throws IOException;
-//
-//    /**
-//     * 车辆型号
-//     *
-//     * @param carModelReq
-//     * @return
-//     */
-//    HttpResult modelsQuery(CarModel_Req carModelReq);
-//
-//    /**
-//     * 车牌号
-//     *
-//     * @param licensePlate
-//     * @return
-//     */
-//    HttpResult licensePlateQuery(String licensePlate) throws Exception;
-//}

+ 0 - 21
src/main/java/com/ydtech/modules/ins/service/InsYongchengService.java

@@ -1,21 +0,0 @@
-//package com.ydtech.modules.ins.service;
-//
-//import com.fasterxml.jackson.core.JsonProcessingException;
-//import com.ydtech.core.page.HttpResult;
-//import com.ydtech.modules.esm.model.InsTaskImage;
-//import com.ydtech.modules.ins.model.ya.CarModel_Req;
-//import com.ydtech.modules.ins.model.ya.YaQuoteInfoVo;
-//import com.ydtech.modules.ins.model.yc.CallBackRequest;
-//import com.ydtech.modules.ins.model.yc.YongchengPolicyPrintResponse;
-//
-//import java.io.IOException;
-//import java.util.List;
-//import java.util.Map;
-//
-//public interface InsYongchengService extends InsBaseService {
-//
-//    HttpResult submitImage(String orderId) throws IOException;
-//
-//    YongchengPolicyPrintResponse getPolicyPrint(String orderno);
-//
-//}

+ 0 - 61
src/main/java/com/ydtech/modules/ins/service/YongAnService.java

@@ -1,61 +0,0 @@
-//package com.ydtech.modules.ins.service;
-//
-//import com.ydtech.core.page.HttpResult;
-//import com.ydtech.modules.esm.model.InsTaskImage;
-//import com.ydtech.modules.ins.model.ya.CarModel_Req;
-//import com.ydtech.modules.ins.model.ya.ResponseDataC1;
-//import com.ydtech.modules.ins.model.ya.YaQuoteInfoVo;
-//import org.springframework.web.bind.annotation.RequestBody;
-//
-//import javax.servlet.http.HttpServletRequest;
-//import java.util.Map;
-//
-//public interface YongAnService {
-//
-//    /**
-//     * 1 车型查询接口
-//     */
-//    HttpResult modelsQuery(CarModel_Req carModelReq);
-//
-//    /**
-//     * 2 报价
-//     */
-//    HttpResult quote(YaQuoteInfoVo yaQuoteInfoVo);
-//
-//    /**
-//     * 3 核保
-//     */
-//    HttpResult audit(String orderno);
-//
-//    /**
-//     * 影像上传
-//     *
-//     * @param record
-//     * @return
-//     */
-//    HttpResult UploadImage(InsTaskImage record);
-//
-//    /**
-//     * 4 获取短信验证码
-//     */
-//    HttpResult getMessage(String orderno);
-//
-//    /**
-//     * 5 获取支付url(提交短信验证码)
-//     */
-//    HttpResult getPayUrl(String orderno, String verificationCode);
-//
-//    /**
-//     * 6 保单信息同步
-//     */
-//    String updatePolicy(Map<String, String> paramMap);
-//
-//    /**
-//     * 7 电子投保单获取
-//     */
-//    HttpResult getPolicyPrint(String orderno, String policytype, String flag);
-//
-//
-//    ResponseDataC1 getResponseDataC1(CarModel_Req carModelReq) throws Exception;
-//
-//}

+ 0 - 225
src/main/java/com/ydtech/modules/ins/service/impl/InsHengbangServiceImpl.java

@@ -1,225 +0,0 @@
-//package com.ydtech.modules.ins.service.impl;
-//
-//import com.alibaba.fastjson.JSON;
-//import com.alibaba.fastjson.JSONObject;
-//import com.fasterxml.jackson.core.JsonProcessingException;
-//import com.ydtech.components.HengbangRequestComponents;
-//import com.ydtech.components.InsTaskHistoryComponents;
-//import com.ydtech.components.OrderComponents;
-//import com.ydtech.constants.InsTaskHistoryEnum;
-//import com.ydtech.core.page.HttpResult;
-//import com.ydtech.exception.SystemException;
-//import com.ydtech.modules.esm.model.InsTaskImage;
-//import com.ydtech.modules.esm.service.InsTaskImageService;
-//import com.ydtech.modules.ins.model.InsOrder;
-//import com.ydtech.modules.ins.model.hb.HengbangAuditResponse;
-//import com.ydtech.modules.ins.model.hb.HengbangLoginInfo;
-//import com.ydtech.modules.ins.model.hb.HengbangPolicyPrintResponse;
-//import com.ydtech.modules.ins.model.request.BaseResponse;
-//import com.ydtech.modules.ins.model.hb.HengbangQuoteResponse;
-//import com.ydtech.modules.ins.model.vo.*;
-//import com.ydtech.modules.ins.model.ya.YaQuoteInfoVo;
-//import com.ydtech.modules.ins.service.InsHengbangService;
-//import com.ydtech.modules.ins.service.InsOrderService;
-//import com.ydtech.modules.ins.model.vo.req.InsZmUploadImageVo;
-//import com.ydtech.utils.CalculateUtils;
-//import org.springframework.data.redis.core.StringRedisTemplate;
-//import org.springframework.stereotype.Service;
-//import org.springframework.transaction.annotation.Transactional;
-//import org.springframework.util.ObjectUtils;
-//
-//import java.io.IOException;
-//import java.text.SimpleDateFormat;
-//import java.util.*;
-//
-//import static com.ydtech.constants.RedisConstant.INS_HENGBANG_KEY;
-//
-//@Service
-//public class InsHengbangServiceImpl implements InsHengbangService {
-//
-//    private final HengbangRequestComponents hengbangRequestComponents;
-//    private final OrderComponents orderComponents;
-//    private final StringRedisTemplate redisTemplate;
-//    private final InsTaskHistoryComponents insTaskHistoryComponents;
-//    private final InsOrderService insOrderService;
-//
-//    private final InsTaskImageService insTaskImageService;
-//
-//    public InsHengbangServiceImpl(HengbangRequestComponents hengbangRequestComponents, OrderComponents orderComponents, StringRedisTemplate redisTemplate, InsTaskHistoryComponents insTaskHistoryComponents, InsOrderService insOrderService, InsTaskImageService insTaskImageService) {
-//        this.hengbangRequestComponents = hengbangRequestComponents;
-//        this.orderComponents = orderComponents;
-//        this.redisTemplate = redisTemplate;
-//        this.insTaskHistoryComponents = insTaskHistoryComponents;
-//        this.insOrderService = insOrderService;
-//        this.insTaskImageService = insTaskImageService;
-//    }
-//
-//    @Override
-//    public HttpResult quote(YaQuoteInfoVo yaQuoteInfoVo) throws JsonProcessingException {
-//        // 1.请求报价接口
-//        InsOrder insOrder = orderComponents.geneOrder(yaQuoteInfoVo, "恒邦财险", "000003");
-//        HengbangQuoteResponse body = hengbangRequestComponents.quote(yaQuoteInfoVo, HengbangQuoteResponse.class);
-//        if (body.getCode() == 400) {
-//            throw new SystemException(body.getMessage());
-//        }
-//        // 2.将恒邦的的token存入redis
-//        HengbangLoginInfo hengbangLoginInfo = new HengbangLoginInfo(body.getPlyappno(), body.getRisktype(), body.getToken());
-//        String s = JSON.toJSONString(hengbangLoginInfo);
-//        // 3.将恒邦登录token存入redis
-//        redisTemplate.opsForValue().set(INS_HENGBANG_KEY + insOrder.getOrderno(), s);
-//        QuoteRespVo quoteRespVo = getQuoteRespVo(insOrder.getOrderno(), body, yaQuoteInfoVo);
-//        // 4.插入订单
-//        return responseOrder(insOrder, body, quoteRespVo);
-//    }
-//
-//    @Override
-//    @Transactional
-//    public HttpResult audit(String orderNo) throws IOException {
-//        // 1. 获取登录token
-//        HengbangLoginInfo loginInfo = getLoginInfo(orderNo);
-//        HengbangAuditResponse body = hengbangRequestComponents.audit(loginInfo, HengbangAuditResponse.class);
-//        // 2. 获取订单
-//        InsOrder order = insOrderService.selectByPk(orderNo);
-//        if (body.getCode() == 400) {
-//            insTaskHistoryComponents.modifyStatus(InsTaskHistoryEnum.UNDERWRITING_FAILED, order);
-//            return HttpResult.error("恒邦--核保失败:" + body.getMessage());
-//        }
-//        // 4. 更新订单表
-//        order.setAuditid(order.getUserid());
-//        order.setPaymenttype(body.getPay_url());
-//        order.setJqapplyno(body.getEfcProposalNo());
-//        order.setSyapplyno(body.getBizProposalNo());
-//        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-//        order.setSubmittime(sdf.format(new Date()));
-////        order.setJqapplyno(jqApplyno == null ? "" : jqApplyno);
-////        order.setSyapplyno(syApplyno == null ? "" : syApplyno);
-//        order.setJqappoint(""); //交强特别约定
-//        order.setSyappoint(""); //商业特别约定
-//        order.setOrderstatus("5");
-//        insOrderService.update(order);
-//
-//        // 5.成功插入轨迹表
-//        insTaskHistoryComponents.modifyStatus(InsTaskHistoryEnum.UNDERWRITTEN_TO_BE_PAID, order);
-//        return HttpResult.ok();
-//    }
-//
-//    @Override
-//    public HttpResult submitImage(String orderId) throws IOException {
-//        HengbangLoginInfo loginInfo = getLoginInfo(orderId);
-//
-//        List<InsTaskImage> insTaskImages = insTaskImageService.selectByTaskId(orderId);
-//        if (insTaskImages.size() > 0) {
-//            InsZmUploadImageVo insZmUploadImageVo = new InsZmUploadImageVo(loginInfo.getBusiNo(), loginInfo.getToken(), insTaskImages);
-//            BaseResponse body = hengbangRequestComponents.submitImage(insZmUploadImageVo, BaseResponse.class);
-//            if (body.getCode() == 200) {
-//                return HttpResult.ok("成功");
-//            }
-//            throw new SystemException("上传失败");
-//        }
-//        throw new SystemException("没有上传成功的影像");
-//    }
-//
-//
-//    private QuoteRespVo getQuoteRespVo(String orderNo, HengbangQuoteResponse response, YaQuoteInfoVo yaQuoteInfoVo) {
-//        double jqPremium = response.getForceCarInsureRisk();
-//        double syPremium = response.getBusiTotalPremium();
-//
-//        QuoteRespVo quoteRespVo = new QuoteRespVo();
-//        List<QuoteRiskRespVo> riskList1 = new ArrayList<>();
-//        List<QuoteKindRespVo> kindList1 = new ArrayList<>();
-//        List<RiskInfoVo> riskList = yaQuoteInfoVo.getRiskList();
-//        for (RiskInfoVo riskInfoVo : riskList) {
-//            if ("0507".equals(riskInfoVo.getRiskCode()) && jqPremium != 0) {
-//                QuoteRiskRespVo risk = new QuoteRiskRespVo();
-//                risk.setRiskCode("0507");
-//                risk.setRiskName("机动车交通事故责任强制保险");
-//                risk.setPremium(jqPremium);
-//                risk.setStartDate(riskInfoVo.getStartDate());
-//                risk.setEndDate(riskInfoVo.getEndDate());
-//                riskList1.add(risk);
-//            }
-//            if ("0510".equals(riskInfoVo.getRiskCode()) && syPremium != 0) {
-//                QuoteRiskRespVo risk = new QuoteRiskRespVo();
-//                risk.setRiskCode("0510");
-//                risk.setRiskName("机动车商业保险");
-//                risk.setPremium(syPremium);
-//                risk.setStartDate(riskInfoVo.getStartDate());
-//                risk.setEndDate(riskInfoVo.getEndDate());
-//                riskList1.add(risk);
-//            }
-//        }
-//
-//        QuoteKindRespVo kind;
-//        Map<String, Double> map = response.getInsurance_type();
-//        List<KindInfoVo> kindList = yaQuoteInfoVo.getKindList();
-//
-//        for (KindInfoVo kindInfoVo : kindList) {
-//            kind = new QuoteKindRespVo();
-//            kind.setKindCode(kindInfoVo.getKindCode());
-//            kind.setKindName(kindInfoVo.getKindName());
-//            kind.setAmount(kindInfoVo.getAmount());
-//            kind.setCoveragePremium(map.get(kindInfoVo.getKindCode()));
-//            kind.setUnitAmount(kindInfoVo.getUnitAmount());
-//            if (!ObjectUtils.isEmpty(kindInfoVo.getDeductibleRate())) {
-//                kind.setDeductibleRate(Double.parseDouble(kindInfoVo.getDeductibleRate()));
-//            }
-//            kindList1.add(kind);
-//        }
-//
-//        quoteRespVo.setRiskList(riskList1);
-//        quoteRespVo.setKindList(kindList1);
-//
-//        quoteRespVo.setCiSumPermium(CalculateUtils.add(response.getForceCarInsureRisk(), response.getCarInsureShiptax())); // 交强险和车船税合计
-//        quoteRespVo.setSumPermium(response.getCarInsureMain()); // 保费合计
-//        quoteRespVo.setTaxAmount(response.getCarInsureShiptax()); // 车船税
-//        quoteRespVo.setTotalAdjustRate(1);
-//        quoteRespVo.setILogPreUdwMess("0");//评分
-//        quoteRespVo.setOrderno(orderNo); //订单号
-//        return quoteRespVo;
-//    }
-//
-//    private HttpResult responseOrder(InsOrder insOrder, HengbangQuoteResponse response, QuoteRespVo quoteRespVo) {
-//        //保存订单信息
-//        insOrder.setJqpremium(response.getForceCarInsureRisk());
-//        insOrder.setSypremium(response.getBusiTotalPremium());
-//        insOrder.setTaxamount(response.getCarInsureShiptax());
-//        insOrder.setSumpremium(response.getCarInsureMain());
-//        insOrder.setQuotestatus("1");
-//        insOrder.setRiskinfo(JSONObject.parseArray(JSONObject.toJSONString(quoteRespVo.getRiskList())));
-//        insOrder.setKindinfo(JSONObject.parseArray(JSONObject.toJSONString(quoteRespVo.getKindList())));
-//        insOrderService.insert(insOrder);
-//        //插入轨迹表 报价中
-//        insTaskHistoryComponents.modifyStatus(InsTaskHistoryEnum.IN_QUOTATION, insOrder);
-//        return HttpResult.ok("成功", quoteRespVo);
-//    }
-//
-//    @Override
-//    @Transactional
-//    public HengbangPolicyPrintResponse getPolicyPrint(String orderNo) {
-//        InsOrder insOrder = orderComponents.orderExists(orderNo);
-//        String licenseNo = insOrder.getLicenseNo();
-//        Map<String, Object> map = new HashMap<>();
-//        map.put("license", licenseNo);
-//        HengbangPolicyPrintResponse response = hengbangRequestComponents.getPolicyPrint(map, HengbangPolicyPrintResponse.class);
-//        if (response.getCode() == 200) {
-//            insOrder.setJqpolicyno(response.getJqxBusiNo());
-//            insOrder.setSypolicyno(response.getSyxBusiNo());
-//            insOrder.setOrderstatus(String.valueOf(InsTaskHistoryEnum.COVERED.getState()));//已承保
-////        order.setPaytype(payAppNo);
-////        order.setPaytime(payTime);
-//            insOrderService.update(insOrder);
-//            insTaskHistoryComponents.modifyStatus(InsTaskHistoryEnum.PAID, insOrder);
-//            insTaskHistoryComponents.modifyStatus(InsTaskHistoryEnum.COVERED, insOrder);
-//            return response;
-//        }
-//
-//        throw new SystemException("没有查询到保单信息");
-//    }
-//
-//    public HengbangLoginInfo getLoginInfo(String orderNo) {
-//        String s = redisTemplate.opsForValue().get(INS_HENGBANG_KEY + orderNo);
-//        return JSONObject.parseObject(s, HengbangLoginInfo.class);
-//    }
-//
-//
-//}

+ 0 - 504
src/main/java/com/ydtech/modules/ins/service/impl/InsRenbaoServiceImpl.java

@@ -1,504 +0,0 @@
-//package com.ydtech.modules.ins.service.impl;
-//
-//import com.alibaba.fastjson.JSONObject;
-//import com.fasterxml.jackson.core.JsonProcessingException;
-//import com.fasterxml.jackson.databind.ObjectMapper;
-//import com.ydtech.components.OrderComponents;
-//import com.ydtech.components.RenbaoRequestComponents;
-//import com.ydtech.core.page.HttpResult;
-//import com.ydtech.exception.SystemException;
-//import com.ydtech.modules.admin.model.SysDept;
-//import com.ydtech.modules.admin.model.SysUser;
-//import com.ydtech.modules.admin.service.SysDeptService;
-//import com.ydtech.modules.admin.service.SysUserService;
-//import com.ydtech.modules.esm.model.EsmAgreement;
-//import com.ydtech.modules.esm.model.EsmAgreementProd;
-//import com.ydtech.modules.esm.service.*;
-//import com.ydtech.modules.ins.convert.RenbaoCarModelConvert;
-//import com.ydtech.modules.ins.convert.RenbaoQuoteResponseConvert;
-//import com.ydtech.modules.ins.model.InsOrder;
-//import com.ydtech.modules.ins.model.InsTaskHistory;
-//import com.ydtech.modules.ins.model.request.*;
-//import com.ydtech.modules.ins.model.vo.*;
-//import com.ydtech.modules.ins.model.ya.*;
-//import com.ydtech.modules.ins.service.*;
-//import com.ydtech.utils.idgen.IdGenerate;
-//import lombok.extern.slf4j.Slf4j;
-//import org.springframework.data.redis.core.StringRedisTemplate;
-//import org.springframework.stereotype.Service;
-//import org.springframework.util.StringUtils;
-//
-//import java.io.IOException;
-//import java.text.SimpleDateFormat;
-//import java.util.*;
-//
-//import static com.ydtech.constants.RedisConstant.INS_RENBAO_KEY;
-//
-//
-//@Slf4j
-//@Service
-//public class InsRenbaoServiceImpl implements InsRenbaoService {
-//
-//    private final StringRedisTemplate redisTemplate;
-//    private final InsOrderService insOrderService;
-//    private final SysUserService sysUserService;
-//    private final SysDeptService sysDeptService;
-//    private final EsmAgreementService esmAgreementService;
-//    private final EsmAgreementProdService esmAgreementProdService;
-//    private final InsTaskHistoryService insTaskHistoryService;
-//    private static final ObjectMapper objectMapper = new ObjectMapper();
-//    private final OrderComponents orderComponents;
-//    private final RenbaoRequestComponents renbaoRequestComponents;
-//
-//    public InsRenbaoServiceImpl(StringRedisTemplate redisTemplate, InsOrderService insOrderService, SysUserService sysUserService, SysDeptService sysDeptService, EsmAgreementService esmAgreementService, EsmAgreementProdService esmAgreementProdService, InsTaskHistoryService insTaskHistoryService, OrderComponents orderComponents, RenbaoRequestComponents renbaoRequestComponents) {
-//        this.redisTemplate = redisTemplate;
-//        this.insOrderService = insOrderService;
-//        this.sysUserService = sysUserService;
-//        this.sysDeptService = sysDeptService;
-//        this.esmAgreementService = esmAgreementService;
-//        this.esmAgreementProdService = esmAgreementProdService;
-//        this.renbaoRequestComponents = renbaoRequestComponents;
-//        this.insTaskHistoryService = insTaskHistoryService;
-//        this.orderComponents = orderComponents;
-//    }
-//
-//    @Override
-//    public HttpResult licensePlateQuery(String licensePlate) throws Exception {
-//        Map<String, Object> map = new HashMap<>();
-//        map.put("license", licensePlate);
-//        RenbaoCarSearchResponse body = renbaoRequestComponents.licensePlateQuery(map, RenbaoCarSearchResponse.class);
-//        if (body == null) {
-//            throw new SystemException("人保接口请求失败");
-//        }
-//        if (body.getError() != null) {
-//            throw new SystemException("人保查询车型失败");
-//        }
-//        RenbaoCarInfos carInfos = body.getCarInfos();
-//        RenbaoCarModel result = carInfos.getResult().get(0);
-//
-//        // 调用永安车型具体查询
-//        CarModelDTO carModelDTO = RenbaoCarModelConvert.INSTANCE.renbaoCar2YonganCar(result);
-//        Map<String, Object> map1 = new HashMap<>();
-//        map1.put("licenseNo", carInfos.getLicenseNo());
-//        map1.put("frameNo", carInfos.getFrameNo());
-//        map1.put("engineNo", carInfos.getEngineNo());
-//        map1.put("carModel", carModelDTO);
-//        return HttpResult.ok(map1);
-//    }
-//
-//    @Override
-//    public HttpResult modelsQuery(CarModel_Req carModelReq) {
-//        if (StringUtils.isEmpty(carModelReq.getModelName())) {
-//            throw new SystemException("车辆信息不能为空");
-//        }
-//        String modelName = carModelReq.getModelName();
-//        Map<String, Object> map = new HashMap<>();
-//        map.put("brandname", modelName);
-//        RenbaoBrandSearchResponse body = renbaoRequestComponents.modelsQuery(map, RenbaoBrandSearchResponse.class);
-//        if (body == null) {
-//            throw new SystemException("人保接口请求失败");
-//        }
-//        if (body.getError() != null) {
-//            throw new SystemException("人保查询车型失败");
-//        }
-//        List<RenbaoCarModel> result = body.getResult();
-//        List<CarModelDTO> carModel = RenbaoCarModelConvert.INSTANCE.map(result);
-//        return HttpResult.ok(carModel);
-//    }
-//
-//    @Override
-//    public HttpResult quote(YaQuoteInfoVo yaQuoteInfoVo) throws JsonProcessingException {
-//
-//        // 1.生成订单信息
-//        InsOrder insOrder = geneOrder(yaQuoteInfoVo);
-//        // 2.封装人保请求
-//        RenbaoQuoteResponse body = renbaoRequestComponents.quote(yaQuoteInfoVo, RenbaoQuoteResponse.class);
-//        if (body == null) {
-//            throw new SystemException("人保接口请求失败");
-//        }
-//        log.info(body.toString());
-//        if (body.getToken() == null) {
-//            String message = "人保--报价失败:" + body.getError();
-//            log.info(message);
-//            return HttpResult.error(message);
-//        }
-//        // 3.将人保的token存入redis
-//        RenbaoAuditBody renbaoAuditBody = RenbaoQuoteResponseConvert.INSTANCE.quote2Audit(body);
-//        String s = objectMapper.writeValueAsString(renbaoAuditBody);
-//        redisTemplate.opsForValue().set(INS_RENBAO_KEY + insOrder.getOrderno(), s);
-//
-//        RenbaoQuoteRespVo quoteRespVo = getQuoteRespVo(insOrder.getOrderno(), Integer.parseInt(yaQuoteInfoVo.getCarInfo().getSeatCount()), body, yaQuoteInfoVo);
-//        // 4.插入订单
-//        return responseOrder(insOrder, body, quoteRespVo);
-//    }
-//
-//
-//    @Override
-//    public HttpResult audit(String orderno) throws IOException {
-//        InsOrder order = insOrderService.selectByPk(orderno);
-//        if (order == null) {
-//            return HttpResult.error("订单不存在");
-//        }
-//
-//        // 1.通过redis获取请求人保参数token
-//        String s = redisTemplate.opsForValue().get(INS_RENBAO_KEY + order.getOrderno());
-//        RenbaoAuditBody response = objectMapper.readValue(s, RenbaoAuditBody.class);
-//        // 2.请求人保核保接口
-////        List<InsTaskImage> insTaskImages = insTaskImageService.selectByTaskId(orderno);
-////        response.setInsTaskImageList(insTaskImages);
-//        Map body = renbaoRequestComponents.audit(response, Map.class);
-//        if (body == null) {
-//            throw new SystemException("人保接口请求失败");
-//        }
-//
-//        // 3.核保不通过插入轨迹表
-//        if (StringUtils.isEmpty(body.get("epolicyUrlImg"))) {
-//            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-//            InsTaskHistory history = new InsTaskHistory();
-//            history.setId(String.valueOf(new Date().getTime()));
-//            history.setCompany(order.getInscompany());
-//            history.setTaskid(order.getOrderno());
-//            history.setOperatorid(order.getUserid());
-//            history.setOperator(order.getUsername());
-//            history.setCreatetime(sdf.format(new Date()));
-//            history.setStatus("4");
-//            history.setRemark("核保不通过");
-//            insTaskHistoryService.insert(history);
-//            return HttpResult.error("人保--核保失败:" + body.get("error"));
-//        }
-//
-//        // 4. 更新订单表
-//        String epolicyUrlImg = (String) body.get("epolicyUrlImg");
-//        order.setAuditid(order.getUserid());
-//        order.setPaymenttype(epolicyUrlImg);
-////        order.setOrderstatus(orderstatus);
-//        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-//        order.setSubmittime(sdf.format(new Date()));
-////        order.setJqapplyno(jqApplyno == null ? "" : jqApplyno);
-////        order.setSyapplyno(syApplyno == null ? "" : syApplyno);
-//        order.setJqappoint(""); //交强特别约定
-//        order.setSyappoint(""); //商业特别约定
-//        order.setOrderstatus("5");
-//        insOrderService.update(order);
-//
-//        // 5.成功插入轨迹表
-//        InsTaskHistory history = new InsTaskHistory();
-//        history.setId(String.valueOf(new Date().getTime()));
-//        history.setCompany(order.getInscompany());
-//        history.setTaskid(order.getOrderno());
-//        history.setOperatorid(order.getUserid());
-//        history.setOperator(order.getUsername());
-//        history.setCreatetime(sdf.format(new Date()));
-//        history.setStatus(order.getOrderstatus());
-//        history.setRemark("已核保待缴费");
-//        insTaskHistoryService.insert(history);
-//        return HttpResult.ok();
-//    }
-//
-//    /**
-//     * 生成订单信息
-//     *
-//     * @param record
-//     * @return InsOrder
-//     */
-//    protected InsOrder geneOrder(YaQuoteInfoVo record) {
-//        InsOrder insOrder = new InsOrder();
-//        String orderno = IdGenerate.nextId();
-//        insOrder.setOrderno(orderno);
-//        insOrder.setQuoteno(String.valueOf(record.getQuoteno()));
-//        insOrder.setOrderstatus("0");  // 0 报价 1 待核保 2 已核保待缴费 3 核保退回 4 核保不通过
-//        insOrder.setFrameNo(record.getCarInfo().getFrameNo());
-//        insOrder.setLicenseNo(record.getCarInfo().getLicenseNo());
-//
-//        insOrder.setCarinfo(JSONObject.parseObject(JSONObject.toJSONString(record.getCarInfo())));
-//        SysUser user = sysUserService.getById(record.getUserId());
-//        if (user == null) {
-//            throw new SystemException("userId不存在");
-//        }
-//        if (StringUtils.isEmpty(record.getCarInfo().getFrameNo())) {
-//            throw new SystemException("车架号不能为空");
-//        }
-//        // 关闭订单 不含当前报价号
-//        InsOrder orderObj = insOrderService.queryQuoteno(new Object[]{record.getUserId(), record.getCarInfo().getFrameNo(), record.getQuoteno()});
-//        if (orderObj != null) {
-//            List<InsOrder> listo = insOrderService.selectList(" where quoteno=?", new Object[]{orderObj.getQuoteno()});
-//            String status = "0";
-//            for (InsOrder order : listo) {
-//                if (!"0".equals(order.getOrderstatus())) {
-//                    status = order.getOrderstatus();
-//                }
-//            }
-//            //0报价中 1待核保 2已核保 3核保退回 4核保不通过 5已核保待缴费 6已缴费 7已承保 99已关闭
-//            if ("0".equals(status)) {//关闭订单
-//                insOrderService.closeOrder(orderObj.getOrderno(), "99");
-//            } else if (!"99".equals(status)) {
-//                throw new SystemException("此车辆已提交核保,重新报价请先关闭订单,任务号:" + orderObj.getQuoteno());
-//            }
-//        }
-//        insOrder.setUserid(user.getId());
-//        insOrder.setUsername(user.getName());
-//        insOrder.setDeptid(user.getDeptId());
-//        SysDept dept = sysDeptService.getById(user.getDeptId());
-//        insOrder.setDeptname(dept == null ? "" : dept.getName());
-//
-//        double retailRate = orderComponents.countRetail(user.getDeptId(), user.getId());
-//
-//        insOrder.setOwnerinfo(JSONObject.parseObject(JSONObject.toJSONString(record.getOwnerInfo())));
-//        insOrder.setApplyinfo(JSONObject.parseObject(JSONObject.toJSONString(record.getPolicyHolderInfo())));
-//        insOrder.setInsureinfo(JSONObject.parseObject(JSONObject.toJSONString(record.getInsuredPersonInfo())));
-//
-//        insOrder.setInsuredname(record.getPolicyHolderInfo().getName());
-//
-//        List<RiskInfoVo> risks = record.getRiskList();
-//        for (RiskInfoVo risk : risks) {
-//            if ("0507".equals(risk.getRiskCode())) {//交强
-//                insOrder.setJqstartdate(risk.getStartDate());
-//                insOrder.setJqenddate(risk.getEndDate());
-//            }
-//            if ("0510".equals(risk.getRiskCode())) {//商业
-//                insOrder.setSystartdate(risk.getStartDate());
-//                insOrder.setSyenddate(risk.getEndDate());
-//            }
-//        }
-//
-//        List<KindInfoVo> kinds = record.getKindList();
-//        String productId = "";
-//        String productname = "";
-//
-//        List<EsmAgreement> agreements = esmAgreementService.selectList(" where t.agreestatus='1' and t.insure1 like ? " + "and exists (select 1 from esm_agreement_prod t2 where t.id=t2.agreeid and t2.authcomcode like ?)", new Object[]{"000001%", "%" + user.getDeptId() + "%"});
-//        if (agreements.size() == 0) {
-//            throw new SystemException("不存在有效协议或机构" + user.getDeptId() + "未授权");
-//        }
-//        String agreeid = agreements.get(0).getId();
-//        insOrder.setAgreeid(agreeid);
-//        //匹配协议,获取费用
-//        StringBuffer whereStr = new StringBuffer();
-//        List params = new ArrayList();// where t.agreeid=? and t.productid in ()
-//        whereStr.append("where t.agreeid=? ");
-//        params.add(agreeid);
-//        if (risks.size() == 1 && "0507".equals(risks.get(0).getRiskCode())) {
-//            productId = "ZG01001";
-//            productname = "单交强";
-//            whereStr.append(" and t.productid=?");
-//            params.add(productId);
-//        } else if (risks.size() == 1 && kinds.size() == 1 && "B".equals(kinds.get(0).getKindCode())) {
-//            productId = "ZG01002";
-//            productname = "单三者";
-//            whereStr.append(" and t.productid=?");
-//            params.add(productId);
-//        } else if (risks.size() == 1) {
-//            productId = "ZG01003";
-//            productname = "单商业";
-//            whereStr.append(" and t.productid=?");
-//            params.add(productId);
-//        } else if (risks.size() == 2 && kinds.size() == 1 && "B".equals(kinds.get(0).getKindCode())) {
-//            productId = "ZG01004";
-//            productname = "交强+三者";
-//            whereStr.append(" and t.productid in (?,?)");
-//            params.add("ZG01004");
-//            params.add("ZG01005");
-//        } else {
-//            productId = "ZG01006";
-//            productname = "交强+商业";
-//            whereStr.append(" and t.productid in (?,?)");
-//            params.add("ZG01006");
-//            params.add("ZG01007");
-//        }
-//
-//        insOrder.setProductid(productId);
-//        insOrder.setProduct(productname);
-//        List<EsmAgreementProd> agreementProds = esmAgreementProdService.selectList(whereStr.toString(), params.toArray());
-//        for (EsmAgreementProd prod : agreementProds) {
-//            if ("ZG01001".equals(prod.getProductid()) || "ZG01004".equals(prod.getProductid()) || "ZG01006".equals(prod.getProductid())) {
-//                insOrder.setFeerate(prod.getProductrate());//交强手续费比例
-//                insOrder.setJqdiscountrate(prod.getFeerate() - retailRate); //交强优惠比例=业务员绩效-分销费用
-//            } else {
-//                insOrder.setDisrate(prod.getProductrate()); //商业手续费比例
-//                insOrder.setSydiscountrate(prod.getFeerate() - retailRate); //商业优惠比例=业务员绩效-分销费用
-//            }
-//            insOrder.setProductid(prod.getId());
-//        }
-//
-//        insOrder.setRiskinfo(JSONObject.parseArray(JSONObject.toJSONString(record.getRiskList())));
-//        insOrder.setKindinfo(JSONObject.parseArray(JSONObject.toJSONString(record.getKindList())));
-//        SimpleDateFormat sdfm = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-//
-//        insOrder.setInscompany("人保财险");
-//        insOrder.setCreatetime(sdfm.format(new Date()));
-//
-//        return insOrder;
-//
-//    }
-//
-//
-//    private RenbaoQuoteRespVo getQuoteRespVo(String orderNo, int seatCount, RenbaoQuoteResponse response, YaQuoteInfoVo yaQuoteInfoVo) {
-//
-//        double jqPremium = response.getKindCode_jiaoqiang();
-//        double syPremium = response.getKindCode_shangye();
-//
-//        RenbaoQuoteRespVo quoteRespVo = new RenbaoQuoteRespVo();
-//
-//        List<QuoteRiskRespVo> riskList1 = new ArrayList<>();
-//        List<QuoteKindRespVo> kindList1 = new ArrayList<>();
-//        List<RiskInfoVo> riskList = yaQuoteInfoVo.getRiskList();
-//        for (RiskInfoVo riskInfoVo : riskList) {
-//
-//            if ("0507".equals(riskInfoVo.getRiskCode()) && jqPremium != 0) {
-//                QuoteRiskRespVo risk = new QuoteRiskRespVo();
-//                risk.setRiskCode("0507");
-//                risk.setRiskName("机动车交通事故责任强制保险");
-//                risk.setPremium(jqPremium);
-//                risk.setStartDate(riskInfoVo.getStartDate());
-//                risk.setEndDate(riskInfoVo.getEndDate());
-//                riskList1.add(risk);
-//            }
-//            if ("0510".equals(riskInfoVo.getRiskCode()) && syPremium != 0) {
-//                QuoteRiskRespVo risk = new QuoteRiskRespVo();
-//                risk.setRiskCode("0510");
-//                risk.setRiskName("机动车商业保险");
-//                risk.setPremium(syPremium);
-//                risk.setStartDate(riskInfoVo.getStartDate());
-//                risk.setEndDate(riskInfoVo.getEndDate());
-//                riskList1.add(risk);
-//            }
-//        }
-//
-//        QuoteKindRespVo kind;
-//        List<KindInfoVo> kindList = yaQuoteInfoVo.getKindList();
-//        for (KindInfoVo kindInfoVo : kindList) {
-//            if ("A".equals(kindInfoVo.getKindCode())) {
-//                kind = new QuoteKindRespVo();
-//                kind.setKindCode("A");
-//                kind.setKindName("车辆损失保险");
-//                kind.setAmount(kindInfoVo.getAmount());
-//                kind.setCoveragePremium(response.getKindCode_csx());
-//                kindList1.add(kind);
-//            }
-//            if ("B".equals(kindInfoVo.getKindCode())) {
-//                kind = new QuoteKindRespVo();
-//                kind.setKindCode("B");
-//                kind.setKindName("第三者责任险");
-//                kind.setAmount(kindInfoVo.getAmount());
-//                kind.setCoveragePremium(response.getKindCode_dsz());
-//                kindList1.add(kind);
-//            }
-//            if ("D3".equals(kindInfoVo.getKindCode())) {
-//                kind = new QuoteKindRespVo();
-//                kind.setKindCode("D3");
-//                kind.setKindName("司机责任险");
-//                kind.setAmount(kindInfoVo.getAmount());
-//                kind.setCoveragePremium(response.getKindCode_cssj());
-//                kind.setUnitAmount(kindInfoVo.getUnitAmount());
-//                kindList1.add(kind);
-//            }
-//            if ("D4".equals(kindInfoVo.getKindCode())) {
-//                int seat = seatCount - 1;
-//                kind = new QuoteKindRespVo();
-//                kind.setKindCode("D4");
-//                kind.setKindName("乘客责任险");
-//                kind.setAmount(kindInfoVo.getAmount() / seat);
-//                kind.setAmount(kindInfoVo.getAmount());
-//                kind.setCoveragePremium(response.getKindCode_csck());
-//                kind.setQuantity(String.valueOf(seat));
-//                kind.setUnitAmount(kindInfoVo.getUnitAmount());
-//                kindList1.add(kind);
-//            }
-//            if ("MJ1".equals(kindInfoVo.getKindCode())) {
-//                kind = new QuoteKindRespVo();
-//                kind.setKindCode("MJ1");
-//                kind.setKindName("绝对免赔率特约险(车损)");
-//                kind.setAmount(kindInfoVo.getAmount());
-//                kind.setCoveragePremium(response.getKindCode_mplcs());
-//                kind.setDeductibleRate(Double.parseDouble(kindInfoVo.getDeductibleRate()));
-//                kindList1.add(kind);
-//            }
-//            if ("MJ2".equals(kindInfoVo.getKindCode())) {
-//                kind = new QuoteKindRespVo();
-//                kind.setKindCode("MJ2");
-//                kind.setKindName("绝对免赔率特约险(三者)");
-//                kind.setAmount(kindInfoVo.getAmount());
-//                kind.setCoveragePremium(response.getKindCode_dsz());
-//                kind.setDeductibleRate(Double.parseDouble(kindInfoVo.getDeductibleRate()));
-//                kindList1.add(kind);
-//            }
-//            if ("MJ3".equals(kindInfoVo.getKindCode())) {
-//                kind = new QuoteKindRespVo();
-//                kind.setKindCode("MJ3");
-//                kind.setKindName("绝对免赔率特约险(司机)");
-//                kind.setAmount(kindInfoVo.getAmount());
-//                kind.setCoveragePremium(response.getKindCode_sj());
-//                kind.setDeductibleRate(Double.parseDouble(kindInfoVo.getDeductibleRate()));
-//                kindList1.add(kind);
-//            }
-//            if ("MJ4".equals(kindInfoVo.getKindCode())) {
-//                kind = new QuoteKindRespVo();
-//                kind.setKindCode("MJ4");
-//                kind.setKindName("绝对免赔率特约险(乘客)");
-//                kind.setAmount(kindInfoVo.getAmount());
-//                kind.setCoveragePremium(response.getKindCode_ck());
-//                kind.setDeductibleRate(Double.parseDouble(kindInfoVo.getDeductibleRate()));
-//                kindList1.add(kind);
-//            }
-//            if ("L".equals(kindInfoVo.getKindCode())) {
-//                kind = new QuoteKindRespVo();
-//                kind.setKindCode("L");
-//                kind.setKindName("车身划痕损失险");
-//                kind.setAmount(kindInfoVo.getAmount());
-//                kind.setCoveragePremium(response.getKindCode_huahen());
-//                kindList1.add(kind);
-//            }
-//            if ("BD".equals(kindInfoVo.getKindCode())) {
-//                kind = new QuoteKindRespVo();
-//                kind.setKindCode("BD");
-//                kind.setKindName("法定节假日限额翻倍险");
-//                kind.setAmount(kindInfoVo.getAmount());
-//                kind.setCoveragePremium(response.getKindCode_fdfb());
-//                kindList1.add(kind);
-//            }
-//        }
-//
-//        quoteRespVo.setDrivingAccidentPremium(response.getKindCode_EAD());
-//        quoteRespVo.setRiskList(riskList1);
-//        quoteRespVo.setKindList(kindList1);
-//
-//        quoteRespVo.setCiSumPermium(response.getKindCode_jiaoqiang() + response.getKindCode_chechuan());//交强险和车船税合计
-//        quoteRespVo.setSumPermium(response.getAll_price());//保费合计
-//        quoteRespVo.setTaxAmount(response.getKindCode_chechuan());//车船税
-//        quoteRespVo.setTotalAdjustRate(1);
-//        quoteRespVo.setILogPreUdwMess("0");//评分
-//        quoteRespVo.setOrderno(orderNo); //订单号
-//        return quoteRespVo;
-//    }
-//
-//
-//    private HttpResult responseOrder(InsOrder insOrder, RenbaoQuoteResponse response, QuoteRespVo quoteRespVo) {
-//        //保存订单信息
-//        insOrder.setJqpremium(response.getKindCode_jiaoqiang());
-//        insOrder.setSypremium(response.getKindCode_shangye());
-//        insOrder.setTaxamount(response.getKindCode_chechuan());
-//        insOrder.setSumpremium(response.getAll_price());
-//        insOrder.setQuotestatus("1");
-//        insOrder.setRiskinfo(JSONObject.parseArray(JSONObject.toJSONString(quoteRespVo.getRiskList())));
-//        insOrder.setKindinfo(JSONObject.parseArray(JSONObject.toJSONString(quoteRespVo.getKindList())));
-//        insOrder.setJypremium(response.getKindCode_EAD());
-//        insOrderService.insert(insOrder);
-//
-//        //插入轨迹表
-//        InsTaskHistory history = new InsTaskHistory();
-//        history.setId(String.valueOf(new Date().getTime()));
-//        history.setCompany(insOrder.getInscompany());
-//        history.setTaskid(insOrder.getOrderno());
-//        history.setOperatorid(insOrder.getUserid());
-//        history.setOperator(insOrder.getUsername());
-//        SimpleDateFormat sdfm = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-//        history.setCreatetime(sdfm.format(new Date()));
-//        history.setOperator(insOrder.getUsername());
-//        history.setStatus("0");
-//        history.setRemark("报价中");
-//        insTaskHistoryService.insert(history);
-//
-//        return HttpResult.ok("成功", quoteRespVo);
-//    }
-//
-//
-//}

+ 0 - 285
src/main/java/com/ydtech/modules/ins/service/impl/InsYongchengServiceImpl.java

@@ -1,285 +0,0 @@
-//package com.ydtech.modules.ins.service.impl;
-//
-//import com.alibaba.fastjson.JSON;
-//import com.alibaba.fastjson.JSONObject;
-//import com.fasterxml.jackson.core.JsonProcessingException;
-//import com.ydtech.components.InsTaskHistoryComponents;
-//import com.ydtech.components.OrderComponents;
-//import com.ydtech.components.YongchengRequestComponents;
-//import com.ydtech.constants.InsTaskHistoryEnum;
-//import com.ydtech.constants.RedisConstant;
-//import com.ydtech.core.page.HttpResult;
-//import com.ydtech.exception.SystemException;
-//import com.ydtech.modules.admin.service.SysDeptService;
-//import com.ydtech.modules.admin.service.SysUserService;
-//import com.ydtech.modules.esm.model.InsTaskImage;
-//import com.ydtech.modules.esm.service.*;
-//import com.ydtech.modules.ins.model.InsOrder;
-//import com.ydtech.modules.ins.model.request.BaseResponse;
-//import com.ydtech.modules.ins.model.vo.*;
-//import com.ydtech.modules.ins.model.ya.*;
-//import com.ydtech.modules.ins.model.yc.*;
-//import com.ydtech.modules.ins.service.InsOrderService;
-//import com.ydtech.modules.ins.service.InsTaskHistoryService;
-//import com.ydtech.modules.ins.service.InsYongchengService;
-//import com.ydtech.modules.order.service.InsAreaCompanyService;
-//import com.ydtech.modules.order.service.InsOrdersService;
-//import com.ydtech.utils.CalculateUtils;
-//import com.ydtech.utils.StringUtils;
-//import lombok.extern.slf4j.Slf4j;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.data.redis.core.StringRedisTemplate;
-//import org.springframework.stereotype.Service;
-//import org.springframework.util.ObjectUtils;
-//
-//import java.io.IOException;
-//import java.text.SimpleDateFormat;
-//import java.util.*;
-//
-//
-//@Slf4j
-//@Service
-//public class InsYongchengServiceImpl implements InsYongchengService {
-//
-//
-//    @Autowired
-//    private YcBuildData ycBuildData;
-//    @Autowired
-//    private SysUserService sysUserService;
-//    @Autowired
-//    private SysDeptService sysDeptService;
-//    @Autowired
-//    private EsmRetailService esmRetailService;
-//    @Autowired
-//    private EsmAgreementService esmAgreementService;
-//    @Autowired
-//    private EsmAgreementProdService esmAgreementProdService;
-//    @Autowired
-//    private EsmUserInternalService esmUserInternalService;
-//    @Autowired
-//    private InsTaskHistoryService insTaskHistoryService;
-//    @Autowired
-//    private InsAreaCompanyService insAreaCompanyService;
-//    @Autowired
-//    private InsOrdersService insOrdersService;
-//
-//
-//    private final YongchengRequestComponents yongchengRequestComponents;
-//
-//    private final OrderComponents orderComponents;
-//
-//    private final StringRedisTemplate redisTemplate;
-//
-//    private final InsOrderService insOrderService;
-//
-//    private final InsTaskHistoryComponents insTaskHistoryComponents;
-//
-//    private final InsTaskImageService insTaskImageService;
-//
-//    public InsYongchengServiceImpl(YongchengRequestComponents yongchengRequestComponents, OrderComponents orderComponents, StringRedisTemplate redisTemplate, InsOrderService insOrderService, InsTaskHistoryComponents insTaskHistoryComponents, InsTaskImageService insTaskImageService) {
-//        this.yongchengRequestComponents = yongchengRequestComponents;
-//        this.orderComponents = orderComponents;
-//        this.redisTemplate = redisTemplate;
-//        this.insOrderService = insOrderService;
-//        this.insTaskHistoryComponents = insTaskHistoryComponents;
-//        this.insTaskImageService = insTaskImageService;
-//    }
-//
-//
-//    @Override
-//    public HttpResult quote(YaQuoteInfoVo yaQuoteInfoVo) throws JsonProcessingException {
-//        // 1.生成订单信息
-//        InsOrder insOrder = orderComponents.geneOrder(yaQuoteInfoVo, "永诚财险", "000008");
-//        YongchengQuoteResponse body = yongchengRequestComponents.quote(yaQuoteInfoVo, YongchengQuoteResponse.class);
-//        if (body.getCode() == 400) {
-//            throw new SystemException(body.getResultMsg());
-//        }
-//        String orderno = insOrder.getOrderno();
-//        // 2.将数据存入redis中
-//        YongchengLoginInfo yongchengLoginInfo = new YongchengLoginInfo(
-//                body.getCookies(), body.getLicenseNo(), body.getJqFee(), body.getSyFee(), body.getData(), insOrder.getFrameNo()
-//        );
-//        String s = JSON.toJSONString(yongchengLoginInfo);
-//        redisTemplate.opsForValue().set(RedisConstant.INS_YONGCHENG_KEY + orderno, s);
-//        QuoteRespVo quoteRespVo = getQuoteRespVo(insOrder.getOrderno(), body, yaQuoteInfoVo);
-//        // 4.插入订单
-//        return responseOrder(insOrder, body, quoteRespVo);
-//    }
-//
-//    @Override
-//    public HttpResult audit(String orderNo) throws IOException {
-//        // 1. 获取登录token
-//        YongchengAuditRequest loginInfo = getLoginInfo(orderNo);
-//        YongchengAuditResponse body = yongchengRequestComponents.audit(loginInfo, YongchengAuditResponse.class);
-//        // 2. 获取订单
-//        InsOrder order = insOrderService.selectByPk(orderNo);
-//        if (body.getCode() == 400) {
-//            insTaskHistoryComponents.modifyStatus(InsTaskHistoryEnum.UNDERWRITING_FAILED, order);
-//            return HttpResult.error("永城--核保失败:" + body.getMessage());
-//        }
-//        // 4. 更新订单表
-//        InsTaskHistoryEnum underwrittenToBePaid = InsTaskHistoryEnum.UNDERWRITTEN_TO_BE_PAID;
-//        order.setAuditid(order.getUserid());
-//        order.setPaymenttype(body.getUrl());
-////        order.setJqapplyno();
-////        order.setSyapplyno();
-//        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-//        order.setSubmittime(sdf.format(new Date()));
-////        order.setJqapplyno(jqApplyno == null ? "" : jqApplyno);
-////        order.setSyapplyno(syApplyno == null ? "" : syApplyno);
-//        order.setJqappoint(""); //交强特别约定
-//        order.setSyappoint(""); //商业特别约定
-//        order.setOrderstatus(String.valueOf(underwrittenToBePaid.getState()));
-//        insOrderService.update(order);
-//
-//        // 5.成功插入轨迹表
-//        insTaskHistoryComponents.modifyStatus(underwrittenToBePaid, order);
-//        return HttpResult.ok();
-//    }
-//
-//
-//    @Override
-//    public HttpResult submitImage(String orderId) throws IOException {
-//        YongchengLoginInfo loginInfo = getLoginInfo(orderId);
-//
-//        List<InsTaskImage> insTaskImages = insTaskImageService.selectByTaskId(orderId);
-//        if (insTaskImages.size() > 0) {
-//            InsYcSubmitImageResponse insYcSubmitImageResponse = new InsYcSubmitImageResponse(loginInfo.getFrameNo(), loginInfo.getCookies(), insTaskImages);
-//            BaseResponse body = yongchengRequestComponents.submitImage(insYcSubmitImageResponse, BaseResponse.class);
-//            if (body.getCode() == 200) {
-//                return HttpResult.ok("成功");
-//            }
-//            throw new SystemException("上传失败");
-//        }
-//        throw new SystemException("没有上传成功的影像");
-//    }
-//
-//    @Override
-//    public YongchengPolicyPrintResponse getPolicyPrint(String orderno) {
-//        InsOrder insOrder = insOrderService.selectByPk(orderno);
-//        String policytype = insOrder.getPolicytype();
-//        CustomerInfoVo customerInfoVo = JSONObject.parseObject(policytype, CustomerInfoVo.class);
-//        YongchengPolicyPrintRequest yongchengPolicyPrintRequest = new YongchengPolicyPrintRequest(customerInfoVo.getIdentifyNumber(), insOrder.getLicenseNo());
-//        YongchengPolicyPrintResponse body = yongchengRequestComponents.getPolicyPrint(yongchengPolicyPrintRequest, YongchengPolicyPrintResponse.class);
-//        if (body.getCode() == 200) {
-//            insOrder.setJqpolicyno(body.getJqNumber());
-//            insOrder.setSypolicyno(body.getSyNumber());
-//            insOrder.setOrderstatus(String.valueOf(InsTaskHistoryEnum.COVERED.getState()));//已承保
-//            insOrderService.update(insOrder);
-//            insTaskHistoryComponents.modifyStatus(InsTaskHistoryEnum.PAID, insOrder);
-//            insTaskHistoryComponents.modifyStatus(InsTaskHistoryEnum.COVERED, insOrder);
-//            return body;
-//        }
-//        throw new SystemException("没有查询到保单信息");
-//    }
-//
-//    private QuoteRespVo getQuoteRespVo(String orderNo, YongchengQuoteResponse response, YaQuoteInfoVo yaQuoteInfoVo) {
-//        double jqPremium = parseDouble(response.getForceCarInsureRisk());
-//        double syPremium = parseDouble(response.getBusiTotalPremium());
-//        QuoteRespVo quoteRespVo = new QuoteRespVo();
-//        List<QuoteRiskRespVo> riskList1 = new ArrayList<>();
-//        List<QuoteKindRespVo> kindList1 = new ArrayList<>();
-//        List<RiskInfoVo> riskList = yaQuoteInfoVo.getRiskList();
-//        for (RiskInfoVo riskInfoVo : riskList) {
-//            if ("0507".equals(riskInfoVo.getRiskCode()) && jqPremium != 0) {
-//                QuoteRiskRespVo risk = new QuoteRiskRespVo();
-//                risk.setRiskCode("0507");
-//                risk.setRiskName("机动车交通事故责任强制保险");
-//                risk.setPremium(jqPremium);
-//                risk.setStartDate(riskInfoVo.getStartDate());
-//                risk.setEndDate(riskInfoVo.getEndDate());
-//                riskList1.add(risk);
-//            }
-//            if ("0510".equals(riskInfoVo.getRiskCode()) && syPremium != 0) {
-//                QuoteRiskRespVo risk = new QuoteRiskRespVo();
-//                risk.setRiskCode("0510");
-//                risk.setRiskName("机动车商业保险");
-//                risk.setPremium(syPremium);
-//                risk.setStartDate(riskInfoVo.getStartDate());
-//                risk.setEndDate(riskInfoVo.getEndDate());
-//                riskList1.add(risk);
-//            }
-//        }
-//
-//        QuoteKindRespVo kind;
-//        Map<String, String> map = response.getInsuranceType();
-//        List<KindInfoVo> kindList = yaQuoteInfoVo.getKindList();
-//
-//        for (KindInfoVo kindInfoVo : kindList) {
-//            kind = new QuoteKindRespVo();
-//            kind.setKindCode(kindInfoVo.getKindCode());
-//            kind.setKindName(kindInfoVo.getKindName());
-//            kind.setAmount(kindInfoVo.getAmount());
-//            kind.setCoveragePremium(parseDouble(map.get(kindInfoVo.getKindCode())));
-//            kind.setUnitAmount(kindInfoVo.getUnitAmount());
-//            if (!ObjectUtils.isEmpty(kindInfoVo.getDeductibleRate())) {
-//                kind.setDeductibleRate(parseDouble(kindInfoVo.getDeductibleRate()));
-//            }
-//            kindList1.add(kind);
-//        }
-//
-//        quoteRespVo.setRiskList(riskList1);
-//        quoteRespVo.setKindList(kindList1);
-//
-//        quoteRespVo.setCiSumPermium(CalculateUtils.add(parseDouble(response.getForceCarInsureRisk()), parseDouble(response.getCarInsureShiptax())));//交强险和车船税合计
-//        quoteRespVo.setSumPermium(parseDouble(response.getCarInsureMain()));//保费合计
-//        quoteRespVo.setTaxAmount(parseDouble(response.getCarInsureShiptax()));//车船税
-//        quoteRespVo.setTotalAdjustRate(1);
-//        quoteRespVo.setILogPreUdwMess("0");//评分
-//        quoteRespVo.setOrderno(orderNo); //订单号
-//        return quoteRespVo;
-//    }
-//
-//    private HttpResult responseOrder(InsOrder insOrder, YongchengQuoteResponse response, QuoteRespVo quoteRespVo) {
-//        //保存订单信息
-//        insOrder.setJqpremium(parseDouble(response.getForceCarInsureRisk()));
-//        insOrder.setSypremium(parseDouble(response.getBusiTotalPremium()));
-//        insOrder.setTaxamount(parseDouble(response.getCarInsureShiptax()));
-//        insOrder.setSumpremium(parseDouble(response.getCarInsureMain()));
-//        insOrder.setQuotestatus("1");
-//        insOrder.setRiskinfo(JSONObject.parseArray(JSONObject.toJSONString(quoteRespVo.getRiskList())));
-//        insOrder.setKindinfo(JSONObject.parseArray(JSONObject.toJSONString(quoteRespVo.getKindList())));
-//        insOrderService.insert(insOrder);
-//        //插入轨迹表 报价中
-//        insTaskHistoryComponents.modifyStatus(InsTaskHistoryEnum.IN_QUOTATION, insOrder);
-//        return HttpResult.ok("成功", quoteRespVo);
-//    }
-//
-//    public YongchengLoginInfo getLoginInfo(String orderNo) {
-//        String s = redisTemplate.opsForValue().get(RedisConstant.INS_YONGCHENG_KEY + orderNo);
-//        return JSONObject.parseObject(s, YongchengLoginInfo.class);
-//    }
-//
-//    public double parseDouble(String s) {
-//        if (StringUtils.isNullOrEmpty(s)) {
-//            return 0;
-//        }
-//        return Double.parseDouble(s);
-//    }
-//
-//
-////    public static double add(double v1, double v2) {
-////
-////        BigDecimal b1 = new BigDecimal(Double.toString(v1));
-////
-////        BigDecimal b2 = new BigDecimal(Double.toString(v2));
-////
-////        return b1.add(b2).doubleValue();
-////
-////    }
-//
-//
-////    public static String getUserName() {
-////        String userName = null;
-////        Object principal = SecurityContextHolder.getContext().getAuthentication().getPrincipal();
-////
-////        if (principal instanceof UserDetails) {
-////            userName = ((UserDetails) principal).getUsername();
-////        } else {
-////            userName = principal.toString();
-////        }
-////        return userName;
-////    }
-//
-//
-//}

File diff suppressed because it is too large
+ 0 - 565
src/main/java/com/ydtech/modules/ins/service/impl/YongAnServiceImpl.java


+ 0 - 112
src/main/java/com/ydtech/modules/inv/controller/InvPayableStatementController.java

@@ -1,112 +0,0 @@
-//package com.ydtech.modules.inv.controller;
-//
-//import cn.afterturn.easypoi.excel.ExcelImportUtil;
-//import cn.afterturn.easypoi.excel.entity.ImportParams;
-//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-//import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-//import com.ydtech.core.page.HttpResult;
-//import com.ydtech.core.page.PageResult;
-//import com.ydtech.exception.SystemException;
-//import com.ydtech.modules.inv.convert.InvPayableStatementConvert;
-//import com.ydtech.modules.inv.model.InvPayableStatement;
-//import com.ydtech.modules.inv.model.vo.InvPayableStatementVo;
-//import com.ydtech.modules.inv.model.vo.PayableStatementSearchVo;
-//import com.ydtech.modules.inv.service.InvPayableStatementService;
-//import com.ydtech.utils.JudgeUtils;
-//import com.ydtech.utils.StringUtils;
-//import io.swagger.annotations.Api;
-//import io.swagger.annotations.ApiOperation;
-//import org.springframework.web.bind.annotation.*;
-//import org.springframework.web.multipart.MultipartFile;
-//
-//import java.util.Arrays;
-//import java.util.List;
-//import java.util.stream.Collectors;
-//
-//@Api("应付明细表")
-//@RestController
-//@RequestMapping("/inv")
-//public class InvPayableStatementController {
-//
-//    private final InvPayableStatementService invPayableStatementService;
-//
-//    public InvPayableStatementController(InvPayableStatementService invPayableStatementService) {
-//        this.invPayableStatementService = invPayableStatementService;
-//    }
-//
-//    @PostMapping("/payableStatement/import")
-//    @ApiOperation("导入excal")
-//    public HttpResult importStudentList(@RequestParam(name = "file") MultipartFile file) throws Exception {
-//        /*使用easypoi获取文件数据*/
-//        ImportParams params = new ImportParams();
-//        params.setTitleRows(2);
-//        params.setHeadRows(2);
-//        /*主键设置,如果该单元格无值则被认为无效数据*/
-//        params.setKeyIndex(0);
-//        /*获取excel表格中数据,并封装为一个结果对象*/
-//        List<InvPayableStatement> students = ExcelImportUtil.importExcel(file.getInputStream(), InvPayableStatement.class, params);
-//        List<InvPayableStatement> collect = students.stream().parallel().filter(a -> a.getSigningDate() != null).collect(Collectors.toList());
-//        boolean b = invPayableStatementService.insertBatch(collect);
-//        return JudgeUtils.save(b);
-//    }
-//
-//
-//    @GetMapping("/payableStatement")
-//    @ApiOperation("查询信息")
-//    public HttpResult query(PayableStatementSearchVo basePageVO) {
-//
-//        Page<InvPayableStatement> page = new Page<>(basePageVO.getPageNum(), basePageVO.getPageSize());
-//        QueryWrapper<InvPayableStatement> wrapper = new QueryWrapper<>();
-//
-//        String businessChannel = basePageVO.getBusinessChannel();
-//        if (!StringUtils.isNullOrEmpty(businessChannel)) {
-//            wrapper.like("business_channel", businessChannel);
-//        }
-//
-//        String numberPlate = basePageVO.getNumberPlate();
-//        if (!StringUtils.isNullOrEmpty(numberPlate)) {
-//            wrapper.eq("number_plate", numberPlate);
-//        }
-//
-//        String startDate = basePageVO.getStartDate();
-//        String endDate = basePageVO.getEndDate();
-//        if (!StringUtils.isNullOrEmpty(startDate) && !StringUtils.isNullOrEmpty(endDate)) {
-//            wrapper.between("signing_date", startDate, endDate);
-//        }
-//
-//        Page<InvPayableStatement> invPayableStatementIPage = invPayableStatementService.page(page, wrapper);
-//        PageResult<InvPayableStatement> convert = new PageResult<>();
-//        convert.setContent(invPayableStatementIPage.getRecords());
-//        convert.setPageNum((int) invPayableStatementIPage.getCurrent());
-//        convert.setPageSize((int) invPayableStatementIPage.getSize());
-//        convert.setTotalPages((int) invPayableStatementIPage.getPages());
-//        convert.setTotalSize(invPayableStatementIPage.getTotal());
-//        return HttpResult.ok(convert);
-//
-//    }
-//
-//    @PostMapping("/payableStatement")
-//    @ApiOperation("添加")
-//    public HttpResult add(@RequestBody InvPayableStatementVo invPayableStatementVo) {
-//        InvPayableStatement invPayableStatement = InvPayableStatementConvert.INSTANCE.Vo2Dto(invPayableStatementVo);
-//        boolean save = invPayableStatementService.save(invPayableStatement);
-//        return JudgeUtils.add(save);
-//    }
-//
-//    @DeleteMapping("/payableStatement/{id}")
-//    @ApiOperation("删除")
-//    public HttpResult delete(@PathVariable Integer[] id) {
-//        boolean b = invPayableStatementService.removeByIds(Arrays.asList(id));
-//        return JudgeUtils.delete(b);
-//    }
-//
-//    @PutMapping("/payableStatement/{id}")
-//    @ApiOperation("修改")
-//    public HttpResult modify(@PathVariable Integer id, @RequestBody InvPayableStatementVo invPayableStatementVo) {
-//        InvPayableStatement invPayableStatement = InvPayableStatementConvert.INSTANCE.Vo2Dto(invPayableStatementVo);
-//        invPayableStatement.setId(id);
-//        boolean b = invPayableStatementService.updateById(invPayableStatement);
-//        return JudgeUtils.modify(b);
-//    }
-//
-//}

+ 0 - 69
src/main/java/com/ydtech/modules/inv/controller/InvoiceController.java

@@ -1,69 +0,0 @@
-//package com.ydtech.modules.inv.controller;
-//
-//import com.ydtech.core.page.HttpResult;
-//import com.ydtech.modules.inv.service.InvoiceService;
-//import com.ydtech.modules.inv.vo.req.InvoiceReq;
-//import io.swagger.annotations.ApiOperation;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.web.bind.annotation.PostMapping;
-//import org.springframework.web.bind.annotation.RequestBody;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.RestController;
-//
-//import javax.servlet.http.HttpServletRequest;
-//import java.util.List;
-//
-///**
-// * @Author: shixk
-// * @create: 2022/2/9 17:21
-// * description: 发票管理
-// */
-//@RequestMapping("inv")
-//@RestController
-//public class InvoiceController {
-//
-//    @Autowired
-//    private InvoiceService invoiceService;
-//
-//    @ApiOperation("保存发票信息")
-//    //@PreAuthorize("hasAuthority('sys:inv:save')")
-//    @PostMapping(value = "/saveInvoice")
-//    public HttpResult save(@RequestBody InvoiceReq req, HttpServletRequest request) {
-//        HttpResult result = null;
-//        try {
-//            result = invoiceService.save(req, request);
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//            return HttpResult.error("发票信息保存失败!" + e.getMessage());
-//        }
-//        return HttpResult.ok(result);
-//    }
-//
-//    @ApiOperation("保存多条发票信息")
-//    //@PreAuthorize("hasAuthority('sys:inv:save')")
-//    @PostMapping(value = "/saveInvoiceList")
-//    public HttpResult saveList(@RequestBody List<InvoiceReq> reqList, HttpServletRequest request) {
-//        HttpResult result = null;
-//        try {
-//            result = invoiceService.saveList(reqList, request);
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//            return HttpResult.error("发票信息保存失败!" + e.getMessage());
-//        }
-//        return HttpResult.ok(result);
-//    }
-//
-//    @ApiOperation("查询发票信息")
-//    // @PreAuthorize("hasAuthority('sys:inv:view')")
-//    @PostMapping(value = "/selelctInvoice")
-//    public HttpResult selelctInvoice(@RequestBody InvoiceReq req) {
-//        HttpResult result = null;
-//        try {
-//            result = invoiceService.select(req);
-//        } catch (Exception e) {
-//            result = HttpResult.error("查询发票信息失败!" + e.getMessage());
-//            e.printStackTrace();
-//        }
-//        return result;
-//    }
-//}

+ 0 - 29
src/main/java/com/ydtech/security/GrantedAuthorityImpl.java

@@ -1,29 +0,0 @@
-//package com.ydtech.security;
-//
-//import org.springframework.security.core.GrantedAuthority;
-//
-///**
-// * 权限封装
-// *
-// * @author Louis
-// * @date Jun 29, 2019
-// */
-//public class GrantedAuthorityImpl implements GrantedAuthority {
-//
-//    private static final long serialVersionUID = 1L;
-//
-//    private String authority;
-//
-//    public GrantedAuthorityImpl(String authority) {
-//        this.authority = authority;
-//    }
-//
-//    public void setAuthority(String authority) {
-//        this.authority = authority;
-//    }
-//
-//    @Override
-//    public String getAuthority() {
-//        return this.authority;
-//    }
-//}

+ 0 - 44
src/main/java/com/ydtech/security/JwtAuthenticatioToken.java

@@ -1,44 +0,0 @@
-//package com.ydtech.security;
-//
-//
-//import java.util.Collection;
-//
-///**
-// * 自定义令牌对象
-// *
-// * @author Louis
-// * @date Jun 29, 2019
-// */
-//public class JwtAuthenticatioToken extends UsernamePasswordAuthenticationToken {
-//
-//    private static final long serialVersionUID = 1L;
-//
-//    private String token;
-//
-//    public JwtAuthenticatioToken(Object principal, Object credentials) {
-//        super(principal, credentials);
-//    }
-//
-//    public JwtAuthenticatioToken(Object principal, Object credentials, String token) {
-//        super(principal, credentials);
-//        this.token = token;
-//    }
-//
-//    public JwtAuthenticatioToken(Object principal, Object credentials, Collection<? extends GrantedAuthority> authorities, String token) {
-//        super(principal, credentials, authorities);
-//        this.token = token;
-//    }
-//
-//    public String getToken() {
-//        return token;
-//    }
-//
-//    public void setToken(String token) {
-//        this.token = token;
-//    }
-//
-//    public static long getSerialversionuid() {
-//        return serialVersionUID;
-//    }
-//
-//}

+ 0 - 35
src/main/java/com/ydtech/security/JwtAuthenticationFilter.java

@@ -1,35 +0,0 @@
-//package com.ydtech.security;
-//
-//import com.ydtech.security.utils.SecurityUtils;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.security.authentication.AuthenticationManager;
-//import org.springframework.security.web.authentication.www.BasicAuthenticationFilter;
-//
-//import javax.servlet.FilterChain;
-//import javax.servlet.ServletException;
-//import javax.servlet.http.HttpServletRequest;
-//import javax.servlet.http.HttpServletResponse;
-//import java.io.IOException;
-//
-//
-///**
-// * 登录认证检查过滤器
-// *
-// * @author Louis
-// * @date Jun 29, 2019
-// */
-//public class JwtAuthenticationFilter extends BasicAuthenticationFilter {
-//
-//    @Autowired
-//    public JwtAuthenticationFilter(AuthenticationManager authenticationManager) {
-//        super(authenticationManager);
-//    }
-//
-//    @Override
-//    protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain) throws IOException, ServletException {
-//        // 获取token, 并检查登录状态
-//        SecurityUtils.checkAuthentication(request);
-//        chain.doFilter(request, response);
-//    }
-//
-//}

+ 0 - 59
src/main/java/com/ydtech/security/JwtAuthenticationProvider.java

@@ -1,59 +0,0 @@
-//package com.ydtech.security;
-//
-//import com.ydtech.config.MasterPasswordConfig;
-//import com.ydtech.security.utils.PasswordEncoder;
-//import com.ydtech.security.utils.PasswordUtils;
-//import lombok.extern.slf4j.Slf4j;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.security.authentication.BadCredentialsException;
-//import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
-//import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
-//import org.springframework.security.core.AuthenticationException;
-//import org.springframework.security.core.userdetails.UserDetails;
-//import org.springframework.security.core.userdetails.UserDetailsService;
-//import org.springframework.stereotype.Component;
-//import org.springframework.util.StringUtils;
-//
-///**
-// * 身份验证提供者
-// *
-// * @author Yasepix
-// * @date Nov 20, 2018
-// */
-//@Slf4j
-//public class JwtAuthenticationProvider extends DaoAuthenticationProvider {
-//
-//    private final MasterPasswordConfig masterPasswordConfig;
-//
-//    public JwtAuthenticationProvider(UserDetailsService userDetailsService, MasterPasswordConfig masterPasswordConfig) {
-//        setUserDetailsService(userDetailsService);
-//        this.masterPasswordConfig = masterPasswordConfig;
-//    }
-//
-//    @Override
-//    protected void additionalAuthenticationChecks(UserDetails userDetails, UsernamePasswordAuthenticationToken authentication)
-//            throws AuthenticationException {
-//        if (authentication.getCredentials() == null) {
-//            logger.debug("Authentication failed: no credentials provided");
-//            throw new BadCredentialsException(messages.getMessage("AbstractUserDetailsAuthenticationProvider.badCredentials", "Bad credentials"));
-//        }
-//
-//        String presentedPassword = authentication.getCredentials().toString();
-//
-//        if (!StringUtils.isEmpty(presentedPassword)) {//手机验证码登录 update by qfl 2020.10.21
-//            // 万能密码
-//            if (PasswordUtils.matches(this.masterPasswordConfig.getSalt(), presentedPassword, this.masterPasswordConfig.getCiphertext())) {
-//                log.info("万能密码登录系统");
-//            } else {
-//                String salt = ((JwtUserDetails) userDetails).getSalt();
-//                // 覆写密码验证逻辑
-//                if (!new PasswordEncoder(salt).matches(userDetails.getPassword(), presentedPassword)) {
-//                    logger.debug("Authentication failed: password does not match stored value");
-//                    throw new BadCredentialsException(messages.getMessage("AbstractUserDetailsAuthenticationProvider.badCredentials", "Bad credentials"));
-//                }
-//            }
-//        }
-//    }
-//
-//}
-//

+ 0 - 133
src/main/java/com/ydtech/security/JwtLoginFilter.java

@@ -1,133 +0,0 @@
-//package com.ydtech.security;
-//
-//import com.alibaba.fastjson.JSON;
-//import com.alibaba.fastjson.JSONObject;
-//import com.ydtech.security.utils.JwtTokenUtils;
-//import com.ydtech.utils.HttpUtils;
-//import org.springframework.security.authentication.AuthenticationManager;
-//import org.springframework.security.authentication.event.InteractiveAuthenticationSuccessEvent;
-//import org.springframework.security.core.Authentication;
-//import org.springframework.security.core.AuthenticationException;
-//import org.springframework.security.core.context.SecurityContextHolder;
-//import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
-//
-//import javax.servlet.FilterChain;
-//import javax.servlet.ServletException;
-//import javax.servlet.ServletRequest;
-//import javax.servlet.ServletResponse;
-//import javax.servlet.http.HttpServletRequest;
-//import javax.servlet.http.HttpServletResponse;
-//import java.io.BufferedReader;
-//import java.io.IOException;
-//import java.io.InputStream;
-//import java.io.InputStreamReader;
-//import java.nio.charset.Charset;
-//import java.nio.charset.StandardCharsets;
-//
-//
-///**
-// * 启动登录认证流程过滤器
-// *
-// * @author Louis
-// * @date Jun 29, 2019
-// */
-//public class JwtLoginFilter extends UsernamePasswordAuthenticationFilter {
-//
-//    public JwtLoginFilter(AuthenticationManager authManager) {
-//        setAuthenticationManager(authManager);
-//    }
-//
-//    @Override
-//    public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain)
-//            throws IOException, ServletException {
-//        // POST 请求 /login 登录时拦截, 由此方法触发执行登录认证流程,可以在此覆写整个登录认证逻辑
-//        super.doFilter(req, res, chain);
-//    }
-//
-//    @Override
-//    public Authentication attemptAuthentication(HttpServletRequest request, HttpServletResponse response) throws AuthenticationException {
-//        // 可以在此覆写尝试进行登录认证的逻辑,登录成功之后等操作不再此方法内
-//        // 如果使用此过滤器来触发登录认证流程,注意登录请求数据格式的问题
-//        // 此过滤器的用户名密码默认从request.getParameter()获取,但是这种
-//        // 读取方式不能读取到如 application/json 等 post 请求数据,需要把
-//        // 用户名密码的读取逻辑修改为到流中读取request.getInputStream()
-//
-//        String body = getBody(request);
-//        JSONObject jsonObject = JSON.parseObject(body);
-//        String username = jsonObject.getString("username");
-//        String password = jsonObject.getString("password");
-//
-//        if (username == null) {
-//            username = "";
-//        }
-//
-//        if (password == null) {
-//            password = "";
-//        }
-//
-//        username = username.trim();
-//
-//        JwtAuthenticatioToken authRequest = new JwtAuthenticatioToken(username, password);
-//
-//        // Allow subclasses to set the "details" property
-//        setDetails(request, authRequest);
-//
-//        return this.getAuthenticationManager().authenticate(authRequest);
-//
-//    }
-//
-//    @Override
-//    protected void successfulAuthentication(HttpServletRequest request, HttpServletResponse response, FilterChain chain,
-//                                            Authentication authResult) throws IOException, ServletException {
-//        // 存储登录认证信息到上下文
-//        SecurityContextHolder.getContext().setAuthentication(authResult);
-//        // 记住我服务
-//        getRememberMeServices().loginSuccess(request, response, authResult);
-//        // 触发事件监听器
-//        if (this.eventPublisher != null) {
-//            eventPublisher.publishEvent(new InteractiveAuthenticationSuccessEvent(authResult, this.getClass()));
-//        }
-//        // 生成并返回token给客户端,后续访问携带此token
-//        JwtAuthenticatioToken token = new JwtAuthenticatioToken(null, null, JwtTokenUtils.generateToken(authResult));
-//        HttpUtils.write(response, token);
-//    }
-//
-//    /**
-//     *  
-//     * 获取请求Body
-//     *
-//     * @param request
-//     * @return
-//     */
-//    public String getBody(HttpServletRequest request) {
-//        StringBuilder sb = new StringBuilder();
-//        InputStream inputStream = null;
-//        BufferedReader reader = null;
-//        try {
-//            inputStream = request.getInputStream();
-//            reader = new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8));
-//            String line = "";
-//            while ((line = reader.readLine()) != null) {
-//                sb.append(line);
-//            }
-//        } catch (IOException e) {
-//            e.printStackTrace();
-//        } finally {
-//            if (inputStream != null) {
-//                try {
-//                    inputStream.close();
-//                } catch (IOException e) {
-//                    e.printStackTrace();
-//                }
-//            }
-//            if (reader != null) {
-//                try {
-//                    reader.close();
-//                } catch (IOException e) {
-//                    e.printStackTrace();
-//                }
-//            }
-//        }
-//        return sb.toString();
-//    }
-//}

+ 0 - 103
src/main/java/com/ydtech/security/JwtUserDetails.java

@@ -1,103 +0,0 @@
-//package com.ydtech.security;
-//
-//import com.fasterxml.jackson.annotation.JsonIgnore;
-//import org.springframework.security.core.GrantedAuthority;
-//import org.springframework.security.core.userdetails.UserDetails;
-//
-//import java.util.Collection;
-//
-//
-///**
-// * 安全用户模型
-// *
-// * @author Yasepix
-// * @date Nov 20, 2018
-// */
-//public class JwtUserDetails implements UserDetails {
-//
-//    private static final long serialVersionUID = 1L;
-//
-//    private String userId;
-//    private String username;
-//    private String password;
-//    private String salt;
-//    private String deptId;
-//    private Collection<? extends GrantedAuthority> authorities;
-//
-//    JwtUserDetails(String username, String password, String salt, Collection<? extends GrantedAuthority> authorities) {
-//        this.username = username;
-//        this.password = password;
-//        this.salt = salt;
-//        this.authorities = authorities;
-//    }
-//
-//    JwtUserDetails(String username, String password, String salt, String deptId, String userId, Collection<? extends GrantedAuthority> authorities) {
-//        this.username = username;
-//        this.password = password;
-//        this.salt = salt;
-//        this.deptId = deptId;
-//        this.userId = userId;
-//        this.authorities = authorities;
-//    }
-//
-//    public String getDeptId() {
-//        return deptId;
-//    }
-//
-//    @Override
-//    public String getUsername() {
-//        return username;
-//    }
-//
-//    @JsonIgnore
-//    @Override
-//    public String getPassword() {
-//        return password;
-//    }
-//
-//    public String getSalt() {
-//        return salt;
-//    }
-//
-//    @Override
-//    public Collection<? extends GrantedAuthority> getAuthorities() {
-//        return authorities;
-//    }
-//
-//    @JsonIgnore
-//    @Override
-//    public boolean isAccountNonExpired() {
-//        return true;
-//    }
-//
-//    @JsonIgnore
-//    @Override
-//    public boolean isAccountNonLocked() {
-//        return true;
-//    }
-//
-//    @JsonIgnore
-//    @Override
-//    public boolean isCredentialsNonExpired() {
-//        return true;
-//    }
-//
-//    @JsonIgnore
-//    @Override
-//    public boolean isEnabled() {
-//        return true;
-//    }
-//
-//
-//    /**
-//     * get、set 方法
-//     **/
-//    public String getUserId() {
-//        return userId;
-//    }
-//
-//    public void setUserId(String userId) {
-//        this.userId = userId;
-//    }
-//
-//}

+ 0 - 41
src/main/java/com/ydtech/security/UserDetailsServiceImpl.java

@@ -1,41 +0,0 @@
-//package com.ydtech.security;
-//
-//import com.ydtech.modules.admin.model.SysUser;
-//import com.ydtech.modules.admin.service.SysUserService;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.security.core.GrantedAuthority;
-//import org.springframework.security.core.userdetails.UserDetails;
-//import org.springframework.security.core.userdetails.UserDetailsService;
-//import org.springframework.security.core.userdetails.UsernameNotFoundException;
-//import org.springframework.stereotype.Service;
-//
-//import java.util.List;
-//import java.util.Set;
-//import java.util.stream.Collectors;
-//
-//
-///**
-// * 用户登录认证信息查询
-// *
-// * @author Louis
-// * @date Jun 29, 2019
-// */
-//@Service
-//public class UserDetailsServiceImpl implements UserDetailsService {
-//
-//    @Autowired
-//    private SysUserService userService;
-//
-//    @Override
-//    public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
-//        SysUser user = userService.findByUsername(username);
-//        if (user == null) {
-//            throw new UsernameNotFoundException("该用户不存在");
-//        }
-//        // 用户权限列表,根据用户拥有的权限标识与如 @PreAuthorize("hasAuthority('sys:menu:view')") 标注的接口对比,决定是否可以调用接口
-//        Set<String> permissions = userService.findPermissions(user);
-//        List<GrantedAuthority> grantedAuthorities = permissions.stream().map(GrantedAuthorityImpl::new).collect(Collectors.toList());
-//        return new JwtUserDetails(user.getName(), user.getPassword(), user.getSalt(), user.getDeptId(), user.getId(), grantedAuthorities);
-////        return new JwtUserDetails(user.getName(), user.getPassword(), user.getSalt(), user.getDeptId(), grantedAuthorities);
-//    }
-//}

+ 0 - 316
src/main/java/com/ydtech/security/utils/JwtTokenUtils.java

@@ -1,316 +0,0 @@
-//package com.ydtech.security.utils;
-//
-//import com.ydtech.security.GrantedAuthorityImpl;
-//import com.ydtech.security.JwtAuthenticatioToken;
-//import io.jsonwebtoken.Claims;
-//import io.jsonwebtoken.Jwts;
-//import io.jsonwebtoken.SignatureAlgorithm;
-//import org.apache.catalina.User;
-//import org.springframework.security.core.Authentication;
-//import org.springframework.security.core.GrantedAuthority;
-//import org.springframework.security.core.context.SecurityContextHolder;
-//
-//import javax.servlet.http.HttpServletRequest;
-//import java.io.Serializable;
-//import java.util.*;
-//
-///**
-// * JWT工具类
-// *
-// * @author Louis
-// * @date Jun 29, 2019
-// */
-//public class JwtTokenUtils implements Serializable {
-//
-//    private static final long serialVersionUID = 1L;
-//
-//    /**
-//     * 用户名称
-//     */
-//    private static final String USERNAME = Claims.SUBJECT;
-//    /**
-//     * 创建时间
-//     */
-//    private static final String CREATED = "created";
-//    /**
-//     * 权限列表
-//     */
-//    private static final String AUTHORITIES = "authorities";
-//    /**
-//     * 密钥
-//     */
-//    private static final String SECRET = "abcdefgh";
-//    /**
-//     * 有效期12小时
-//     */
-//    private static final long EXPIRE_TIME = 12 * 60 * 60 * 1000;
-//
-//    /**
-//     * deptId
-//     */
-//    private static final String DEPTID = "deptId";
-//
-//    /**
-//     * userId
-//     */
-//    private static final String USERID = "id";
-//
-//    /**
-//     * 生成令牌
-//     *
-//     * @param authentication 用户
-//     * @return 令牌
-//     */
-//    public static String generateToken(Authentication authentication) {
-//        Map<String, Object> claims = new HashMap<>(3);
-//        claims.put(USERNAME, SecurityUtils.getUsername(authentication));
-//        claims.put(CREATED, new Date());
-//        claims.put(DEPTID, SecurityUtils.getDeptId());
-//        claims.put(AUTHORITIES, authentication.getAuthorities());
-//        claims.put(USERID, SecurityUtils.getUserId());
-//
-//        return generateToken(claims);
-//    }
-//
-//    /**
-//     * 从数据声明生成令牌
-//     *
-//     * @param claims 数据声明
-//     * @return 令牌
-//     */
-//    private static String generateToken(Map<String, Object> claims) {
-//        Date expirationDate = new Date(System.currentTimeMillis() + EXPIRE_TIME);
-//        return Jwts.builder().setClaims(claims).setExpiration(expirationDate).signWith(SignatureAlgorithm.HS512, SECRET).compact();
-//    }
-//
-//    /**
-//     * 从令牌中获取用户名
-//     *
-//     * @param token 令牌
-//     * @return 用户名
-//     */
-//    public static String getUsernameFromToken(String token) {
-//        String username;
-//        try {
-//            Claims claims = getClaimsFromToken(token);
-//            username = claims.getSubject();
-//        } catch (Exception e) {
-//            username = null;
-//        }
-//        return username;
-//    }
-//
-//    /**
-//     * 根据请求令牌获取登录认证信息
-//     *
-//     * @param request 令牌
-//     * @return 用户名
-//     */
-//    public static Authentication getAuthenticationeFromToken(HttpServletRequest request) {
-//        Authentication authentication = null;
-//        // 获取请求携带的令牌
-//        String token = JwtTokenUtils.getToken(request);
-//        if (token != null) {
-//            // 请求令牌不能为空
-//            if (SecurityUtils.getAuthentication() == null) {
-//                // 上下文中Authentication为空
-//                Claims claims = getClaimsFromToken(token);
-//                if (claims == null) {
-//                    return null;
-//                }
-//                String username = claims.getSubject();
-//                if (username == null) {
-//                    return null;
-//                }
-//                if (isTokenExpired(token)) {
-//                    return null;
-//                }
-//                Object authors = claims.get(AUTHORITIES);
-//                List<GrantedAuthority> authorities = new ArrayList<GrantedAuthority>();
-//                if (authors != null && authors instanceof List) {
-//                    for (Object object : (List) authors) {
-//                        authorities.add(new GrantedAuthorityImpl((String) ((Map) object).get("authority")));
-//                    }
-//                }
-//                authentication = new JwtAuthenticatioToken(username, null, authorities, token);
-//            } else {
-//                String username = SecurityUtils.getByUsername();
-//                if (username == null) {
-//                    return null;
-//                }
-//                if (validateToken(token, username)) {
-//                    // 如果上下文中Authentication非空,且请求令牌合法,直接返回当前登录认证信息
-//                    authentication = SecurityContextHolder.getContext().getAuthentication();
-//                }
-//            }
-//        }
-//        return authentication;
-//    }
-//
-//    /**
-//     * 从令牌中获取数据声明
-//     *
-//     * @param token 令牌
-//     * @return 数据声明
-//     */
-//    private static Claims getClaimsFromToken(String token) {
-//        Claims claims;
-//        try {
-//            claims = Jwts.parser().setSigningKey(SECRET).parseClaimsJws(token).getBody();
-//        } catch (Exception e) {
-//            claims = null;
-//        }
-//        return claims;
-//    }
-//
-//    /**
-//     * 验证令牌
-//     *
-//     * @param token
-//     * @param username
-//     * @return
-//     */
-//    public static Boolean validateToken(String token, String username) {
-//        String userName = getUsernameFromToken(token);
-//        return (userName.equals(username) && !isTokenExpired(token));
-//    }
-//
-//    /**
-//     * 刷新令牌
-//     *
-//     * @param token
-//     * @return
-//     */
-//    public static String refreshToken(String token) {
-//        String refreshedToken;
-//        try {
-//            Claims claims = getClaimsFromToken(token);
-//            claims.put(CREATED, new Date());
-//            refreshedToken = generateToken(claims);
-//        } catch (Exception e) {
-//            refreshedToken = null;
-//        }
-//        return refreshedToken;
-//    }
-//
-//    /**
-//     * 判断令牌是否过期
-//     *
-//     * @param token 令牌
-//     * @return 是否过期
-//     */
-//    public static Boolean isTokenExpired(String token) {
-//        try {
-//            Claims claims = getClaimsFromToken(token);
-//            Date expiration = claims.getExpiration();
-//            return expiration.before(new Date());
-//        } catch (Exception e) {
-//            return false;
-//        }
-//    }
-//
-//    /**
-//     * 获取请求token
-//     *
-//     * @param request
-//     * @return
-//     */
-//    public static String getToken(HttpServletRequest request) {
-//        String token = request.getHeader("Authorization");
-//        String tokenHead = "Bearer ";
-//        if (token == null) {
-//            token = request.getHeader("token");
-//        } else if (token.contains(tokenHead)) {
-//            token = token.substring(tokenHead.length());
-//        }
-//        if ("".equals(token)) {
-//            token = null;
-//        }
-//        return token;
-//    }
-//
-//    /**
-//     * 从请求中获取用户名
-//     *
-//     * @param request
-//     * @return 用户名
-//     */
-//    public static String getUsernameFromRequest(HttpServletRequest request) {
-//        String username;
-//        try {
-//            String token = getToken(request);
-//            username = getUsernameFromToken(token);
-//        } catch (Exception e) {
-//            username = null;
-//        }
-//        return username;
-//    }
-//
-//    /**
-//     * 从请求中获取部门id
-//     *
-//     * @param request
-//     * @return 部门id
-//     */
-//    public static String getDeptIdFromRequest(HttpServletRequest request) {
-//        String deptId;
-//        try {
-//            String token = getToken(request);
-//            deptId = getDeptIdFromToken(token);
-//        } catch (Exception e) {
-//            deptId = null;
-//        }
-//        return deptId;
-//    }
-//
-//    /**
-//     * 从请求中获取用户id
-//     *
-//     * @param request
-//     * @return 用户id
-//     */
-//    public static String getUserIdFromRequest(HttpServletRequest request) {
-//        String userId;
-//        try {
-//            String token = getToken(request);
-//            userId = getUserIdFromToken(token);
-//        } catch (Exception e) {
-//            userId = null;
-//        }
-//        return userId;
-//    }
-//
-//    /**
-//     * 从令牌中获取部门id
-//     *
-//     * @return
-//     */
-//    public static String getDeptIdFromToken(String token) {
-//        String deptId = null;
-//        try {
-//            Claims claims = getClaimsFromToken(token);
-//            deptId = (String) claims.get(DEPTID);
-//        } catch (Exception e) {
-//            deptId = null;
-//        }
-//        return deptId;
-//    }
-//
-//
-//    /**
-//     * 从令牌中获取用户id
-//     *
-//     * @return
-//     */
-//    public static String getUserIdFromToken(String token) {
-//        String userId = null;
-//        try {
-//            Claims claims = getClaimsFromToken(token);
-//            userId = (String) claims.get(USERID);
-//        } catch (Exception e) {
-//            userId = null;
-//        }
-//        return userId;
-//    }
-//
-//}

+ 0 - 153
src/main/java/com/ydtech/security/utils/SecurityUtils.java

@@ -1,153 +0,0 @@
-//package com.ydtech.security.utils;
-//
-//import com.ydtech.security.JwtAuthenticatioToken;
-//import com.ydtech.security.JwtUserDetails;
-//import org.slf4j.Logger;
-//import org.slf4j.LoggerFactory;
-//import org.springframework.security.authentication.AnonymousAuthenticationToken;
-//import org.springframework.security.authentication.AuthenticationManager;
-//import org.springframework.security.core.Authentication;
-//import org.springframework.security.core.context.SecurityContextHolder;
-//import org.springframework.security.core.userdetails.UserDetails;
-//import org.springframework.security.web.authentication.WebAuthenticationDetailsSource;
-//
-//import javax.servlet.http.HttpServletRequest;
-//
-//
-///**
-// * Security相关操作
-// *
-// * @author Louis
-// * @date Jun 29, 2019
-// */
-//public class SecurityUtils {
-//
-//    static Logger logger = LoggerFactory.getLogger(SecurityUtils.class);
-//
-//    /**
-//     * 系统登录认证
-//     *
-//     * @param request
-//     * @param username
-//     * @param password
-//     * @param authenticationManager
-//     * @return
-//     */
-//    public static JwtAuthenticatioToken login(HttpServletRequest request, String username, String password, AuthenticationManager authenticationManager) {
-//        JwtAuthenticatioToken token = new JwtAuthenticatioToken(username, password);
-//        token.setDetails(new WebAuthenticationDetailsSource().buildDetails(request));
-//        // 执行登录认证过程
-//        Authentication authentication = authenticationManager.authenticate(token);
-//        // 认证成功存储认证信息到上下文
-//        SecurityContextHolder.getContext().setAuthentication(authentication);
-//        // 生成令牌并返回给客户端
-//        token.setToken(JwtTokenUtils.generateToken(authentication));
-//        return token;
-//    }
-//
-//    /**
-//     * 获取令牌进行认证
-//     *
-//     * @param request
-//     */
-//    public static void checkAuthentication(HttpServletRequest request) {
-//        // 获取令牌并根据令牌获取登录认证信息
-//        Authentication authentication = JwtTokenUtils.getAuthenticationeFromToken(request);
-//        // 设置登录认证信息到上下文
-//        SecurityContextHolder.getContext().setAuthentication(authentication);
-//    }
-//
-//    /**
-//     * 获取当前用户名
-//     *
-//     * @return
-//     */
-//    public static String getUsername() {
-//        String username = null;
-//        Authentication authentication = getAuthentication();
-//        if (authentication != null) {
-//            Object principal = authentication.getPrincipal();
-//            if (principal != null && principal instanceof UserDetails) {
-//                username = ((UserDetails) principal).getUsername();
-//            }
-//        }
-//        return username;
-//    }
-//
-//    /**
-//     * 获取用户名
-//     *
-//     * @return
-//     */
-//    public static String getUsername(Authentication authentication) {
-//        String username = null;
-//        if (authentication != null) {
-//            Object principal = authentication.getPrincipal();
-//            if (principal != null && principal instanceof UserDetails) {
-//                username = ((UserDetails) principal).getUsername();
-//            }
-//        }
-//        return username;
-//    }
-//
-//    /**
-//     * 获取当前登录信息
-//     *
-//     * @return
-//     */
-//    public static Authentication getAuthentication() {
-//        if (SecurityContextHolder.getContext() == null) {
-//            return null;
-//        }
-//        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
-//        return authentication;
-//    }
-//
-//    public static String getByUsername() {
-//        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
-//
-//        String username = null;
-//        if (authentication != null) {
-//            if (!(authentication instanceof AnonymousAuthenticationToken)) {
-//                username = authentication.getName();
-//            }
-//        }
-//        return username;
-//    }
-//
-//    /**
-//     * 获取当前部门ID
-//     *
-//     * @return
-//     */
-//    public static String getDeptId() {
-//        String deptId = null;
-//        Authentication authentication = getAuthentication();
-//        if (authentication != null) {
-//            Object principal = authentication.getPrincipal();
-//            if (principal != null && principal instanceof UserDetails) {
-//                deptId = ((JwtUserDetails) principal).getDeptId();
-//            }
-//        }
-//        return deptId;
-//    }
-//
-//    /**
-//     * 获取当前用户ID
-//     *
-//     * @return
-//     */
-//    public static String getUserId() {
-//        String userId = null;
-//        Authentication authentication = getAuthentication();
-//        if (authentication != null) {
-//            Object principal = authentication.getPrincipal();
-//            if (principal != null && principal instanceof UserDetails) {
-//                userId = ((JwtUserDetails) principal).getUserId();
-//            }
-//        }
-//        return userId;
-//    }
-//
-//
-//}

Some files were not shown because too many files changed in this diff