删除dev

src/main/java/com/ydtech/modules/admin/controller/UpdownLoadController.java

@@ -35,7 +35,7 @@ public class UpdownLoadController {
     @ApiResponses({@ApiResponse(code = 500, message = "出现异常"), @ApiResponse(code = 200, message = "请求成功")})
     @RequestMapping(value = "/uploadFiles", method = RequestMethod.POST)
     public HttpResult upload(@RequestParam("files") MultipartFile[] files, @RequestParam(value = "path", required = false) String path) throws IOException {
-        HttpResult result = null;
+        HttpResult result;
         try {
             result = updownLoadService.upload(files, path);
         } catch (Exception e) {
@@ -51,7 +51,7 @@ public class UpdownLoadController {
     @ApiImplicitParams({@ApiImplicitParam(name = "files", value = "MultipartFile文件"), @ApiImplicitParam(name = "dirid", value = "文件夹id")})
     @ApiResponses({@ApiResponse(code = 500, message = "出现异常"), @ApiResponse(code = 200, message = "请求成功")})
     @RequestMapping(value = "/uploadFilesByDirId", method = RequestMethod.POST)
-    public HttpResult uploadFilesByDirId(@RequestParam("files") MultipartFile[] files, @RequestParam(value = "dirid") String dirid) throws IOException {
+    public HttpResult uploadFilesByDirId(@RequestParam("files") MultipartFile[] files, @RequestParam(value = "dirid") String dirid) {
         HttpResult result = null;
         try {
             result = updownLoadService.uploadFilesByDirId(files, dirid);

src/main/java/com/ydtech/modules/admin/service/impl/SysUserServiceImpl.java

@@ -100,12 +100,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             LambdaQueryWrapper<SysMenu> lqw = new LambdaQueryWrapper<>();
             lqw.isNotNull(SysMenu::getPerms);
             lqw.select(SysMenu::getPerms);
-            lsPerms = sysMenuService.listObjs(lqw, new Function<Object, String>() {
-                @Override
-                public String apply(Object id) {
-                    return id.toString();
-                }
-            });
+            lsPerms = sysMenuService.listObjs(lqw, id -> id.toString());
 
         } else {
 

src/main/java/com/ydtech/modules/largescreen/controller/DataController.java

@@ -199,7 +199,7 @@ public class DataController {
     public HttpResult todayData(@RequestBody DataQuery dataQuery){
         dataQuery.setOrderStatus("3");
         List<OrderStatusData> orderStatusData = dataService.getOrderStatusData(dataQuery);
-        if(orderStatusData.size() == 0)
+        if(orderStatusData.isEmpty())
         {
             return HttpResult.error("当天无已承包数据");
         }

src/main/resources/application-dev.yml

@@ -1,385 +0,0 @@
-spring:
-  datasource:
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    druid:
-      # 通过connectProperties属性来打开mergeSql功能；慢SQL记录
-      connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
-      # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters: stat,wall,log4j
-      # 初始化大小，最小，最大
-      initial-size: 5
-      maxActive: 20
-      maxPoolPreparedStatementPerConnectionSize: 20
-      # 配置获取连接等待超时的时间
-      maxWait: 60000
-      # 配置一个连接在池中最小生存的时间，单位是毫秒
-      minEvictableIdleTimeMillis: 300000
-      minIdle: 5
-      # 打开PSCache，并且指定每个连接上PSCache的大小
-      poolPreparedStatements: true
-      testOnBorrow: true
-      testOnReturn: true
-      testWhileIdle: true
-      # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-      timeBetweenEvictionRunsMillis: 60000
-      validationQuery: SELECT 1 FROM DUAL
-#    # 本地
-#    url: jdbc:p6spy:mysql://127.0.0.1:3306/zgdd?serverTimezone=Asia/Shanghai&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
-#    username: root
-#    password: root
-    # 测试库
-      url: jdbc:mysql://127.0.0.1:3306/zgdd?serverTimezone=Asia/Shanghai&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true
-      username: root
-      password: 1234
-    # 生产库
-      #password: 'Iy$@$koH@oURxyvw'
-      #url: jdbc:mysql://121.89.62.56:3306/agent?serverTimezone=Asia/Shanghai&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true
-      #username: sxzgkj
-  # redis 配置
-  redis:
-    database: 5
-    #host: 127.0.0.1
-    host: 127.0.0.1
-    lettuce:
-      pool:
-        # 连接池最大连接数
-        max-active: 8
-        # 连接池中的最大空闲连接
-        max-idle: 8
-        # 连接池最大阻塞等待时间（使用负值表示没有限制）
-        max-wait: 100
-        # 连接池中的最小空闲连接
-        min-idle: 0
-    #password: aaaaaa
-    password: 1234
-    port: 6379
-    timeOut: 3000
-  servlet:
-    multipart:
-      # 最大支持文件大小
-      max-file-size: 2000MB
-      # 最大支持请求大小
-      max-request-size: 2000MB
-
-
-
-CallbackUrl: http://47.92.254.66:8080/zm/Underwriting
-RGCallbackUrl: http://47.92.254.66:8080/zm/ArtificialUnderwriting
-Specialaccount: 99999999999999
-TAInsureUrl: https://testow.95505.cn/cpf/tianan_cpf/access/car/insureConfirmation.mvc
-TAModelUrl: https://testow.95505.cn/cpf/tianan_cpf/access/car/queryCarModel.mvc
-TAPayUrl: https://testow.95505.cn/cpf/tianan_cpf/common/pay/applyPay.do
-TAQuoteUrl: https://testow.95505.cn/cpf/tianan_cpf/access/car/premiumAccurate.mvc
-#天安API测试参数
-TASign: gIpr5j5haL7T8WJY7ZS54JdlYL/7PToQOy505Mr/iH3qN4SMpJJVdvxFE1/KsWH0EjDxR9qVwRC/t6kLCJo+Y1AB+FD1qNjkbLyEQ+9aeQEF2Af/4bJqUDArewHHT879o5IqzHg/lcg=
-TAUploadUrl: https://testow.95505.cn/cpf/tianan_cpf/access/car/thirdUploadAttach.mvc
-ZMIMGUrl: https://test.echinacoal.com/singlePlatform/others/
-ZMSMSUrl: https://test.echinacoal.com/singlePlatform/prpall/
-ZMToken: THIRDSCOuloft2020052818346904zmYBSX
-#中煤接口测试地址
-ZMUrl: https://test.echinacoal.com/singlePlatform/
-aly:
-  cbit:
-    #================ 阿里云部署对接保信服务器==============#
-    url_pre: http://223.70.186.115:8080/CBIT/API/insCBIT
-  pay:
-    html_path: C:\soft\apache-tomcat-8.5.75\webapps\html\
-    url_pre: http://test.baoxianzhanggui.com:8080
-apk:
-  path: /usr/local/apache-tomcat-8.5.73/webapps/app/android/
-# 安盛天平
-as:
-  audit:
-    url: /as/jiaofei
-    # 安盛天平爬虫接口
-  domain: http://47.92.254.66:8088
-  image:
-    url: /as/yxsc
-  quote:
-    url: /as/bfjs
-
-
-#================ 中保信接口对接--开始==============#
-## 接口地址
-cbit:
-  ### 合作伙伴-加解密秘钥对  私钥+公钥
-  HZHB_PRIVATE_KEY: MIICeAIBADANBgkqhkiG9w0BAQEFAASCAmIwggJeAgEAAoGBAJnWpyVLFBli1kakBXUjk/SmH+X1X0kGGik0ub1MXnNUOk9NBqRQjO6G9A6wdiGzo9j9w26u5u9R6R6De843YMhgW6iIoDodexvZzInxTE+YY52iUBDCcksHYAM7uHZBtdXKovm+bEzL0nwa89Xw6zyuCm8x7enoDiVzs/75WoqrAgMBAAECgYAnEcC5U+vy1oscvaM1MKfuxhHr0Pk2DnquZFmXncGPAKEeaq15JYvlOBjbci1OOdUu0qPDhF/Z/694tGPI53+If0MkS3VpxaOYc+i/G/KQiYZIu1hjUb2F8j8xQrF60WkIsqwzjJYF9T5MCjLEZvDg9cPzFY+QpS8yl5Cbl0aOYQJBAMd+0VtQYV9q3nsZgEk4ux6Vz19SakRbk9zkz1yBUKRfWcLa1T9DleaBqGdkdZbO8v6PCtyz6Fdymq+USYWeV3UCQQDFaU5O8GeNr07J6quTgHgsbN8IV28Wp4wKmDAXCWlehkGGoTm11FOL2zxItjgmmHGyXBA08osPCojBPptOazWfAkEAmG3K04WwUPLcOZy7i7cAKpd3ErNrJP4AFcjytBDOqDl+4UbJp4QhljW9kfqNaoSH4H81YntIbQDRNpUMND9PPQJBAKWfnBuOhtLQagHt6NVvy2M6VETjVkhjeZLJ7E7njofHi+IwEgMDiLSl0wYOGz4GWB2UL+S8OP79j47Rv+si93ECQQCNqD8nMcVXIHKze7aM9c8v1yfgEdk8IpVhAbiXbRs3ANTT4Jx2M6GNBEeEAorHqO4eOTxdObNuz/RADoRnpzHk
-  HZHB_PUBLIC_KEY: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCZ1qclSxQZYtZGpAV1I5P0ph/l9V9JBhopNLm9TF5zVDpPTQakUIzuhvQOsHYhs6PY/cNurubvUekeg3vON2DIYFuoiKA6HXsb2cyJ8UxPmGOdolAQwnJLB2ADO7h2QbXVyqL5vmxMy9J8GvPV8Os8rgpvMe3p6A4lc7P++VqKqwIDAQAB
-  ### 中介平台-加解密秘钥对 私钥+公钥
-  ZJPT_PUBLIC_KEY: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDKbJHlAPiXza9A7Mfs2cLvysKa5GjdMtG1QQv8oADkAgcdujRq0aHVjNFXoVm7b1DdlhEAdhKXJ7XyY/2zoEbpoU4YxzIftloHZ0vd/k4vgAg5beH972jpWZj6N3ER+EgR73+Ui0p0pdXIRjDF4o8mWSLw8W8Z93eILtLg0DcOIwIDAQAB
-  aly:
-    ##================ 保信回调阿里云接服务器==============#
-    url_pre: http://47.92.254.66:8080/API/insCBIT
-  api10: /pjms/insurance/open/unify/order/cancelUnderwriting
-  api11: /pjms/insurance/open/unify/order/getVerificationCode
-  api12: /pjms/insurance/open/unify/order/commitVerificationCode
-  api14: /pjms/insurance/open/unify/order/sendEleApplicationSign
-  api17: /pjms/insurance/open/unify/order/viewToPay
-  api2: /pjms/insurance/open/unify/order/getInitParams
-  api3: /pjms/insurance/open/unify/order/generateOrderNo
-  api4: /pjms/insurance/open/unify/vehicle/getTMBVerificationCode
-  api5: /pjms/insurance/open/unify/vehicle/queryVehicleModel
-  api6: /pjms/insurance/open/unify/vehicle/confirmVehicle
-  api7: /pjms/insurance/open/unify/order/quote
-  api8: /pjms/insurance/open/unify/order/postUnderwriting
-  api9: /pjms/insurance/open/unify/order/applyPay
-  carDealerCode_pingan: 224189117001
-  franchiserChannelCode_pingan: QIAOYRXX-00001
-  franchiserChannelId_pingan: CBIT01240000
-  franchiserChannelId_taiping: CBIT01240000
-  franchiserChannelId_taipingyang: CBIT01240000
-  ### 中介机构id
-  franchiserId: taiyuantianqin-001
-  groupCode_taiping: S132001
-  insurerBranchCode_pingan: 140000
-  insurerBranchCode_taiping: 140000
-  insurerBranchCode_taipingyang: 140000
-  ### ip地址
-  ip: 10.23.69.89
-  url_pre: http://88.88.1.51:5017
-#================ 中保信接口对接--结束==============#
-
-#文件上传路径测试
-filePath: C:/soft/apache-tomcat-8.5.75/webapps/upload/
-
-# 恒邦
-hb:
-  audit:
-    url: http://47.92.254.66:8088/hb/hb_hebao
-  getPolicyPrint:
-    url: http://47.92.254.66:8088/hb/hb_bdsearch
-  image:
-    url: http://47.92.254.66:8088/hb/hb_phoup
-  quote:
-    url: http://47.92.254.66:8088/hb/hb_bfjs
-
-#华农
-hn:
-  vin:
-    search:
-      #华农vin码查询
-      url: http://47.92.254.66:8088/hn/vinsearch
-master:
-  password:
-    ciphertext: 9d3b721959d63c10173d378e82aaecf2
-    salt: 7cb112e917a8446f8616
-mybatis:
-  configuration:
-    map-underscore-to-camel-case: true
-  #mybatis xml文件扫描路径
-  mapper-locations: classpath:mapper/**/*.xml
-  type-aliases-package: com.ydtech.modules.*.model
-mybatis-plus:
-  configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-##测试地址
-netUrl: http://47.92.254.66:8080/
-open:
-  method:
-    log: true
-##平安
-pa:
-  vin:
-    search:
-      #平安vin码查询
-      url: http://47.92.254.66:8888/pingan/vinSearch
-
-#================ mybatis pagehelper ==============#
-pagehelper:
-  helper-dialect: mysql
-  params: count=countSql
-  reasonable: true
-  support-methods-arguments: true
-pyramid:
-  dept:
-    id: 99D05
-
-# 人保
-rb:
-  audit:
-    url: http://47.92.254.66:8088/rb/jiaofei
-  brand:
-    search:
-      url: http://47.92.254.66:8088/rb/brandsearch
-  car:
-    search:
-      url: http://47.92.254.66:8088/rb/carsearch
-  domain: http://47.92.254.66:8088/rb
-  quote:
-    url: http://47.92.254.66:8088/rb/bfjs
-
-resp_json: '{"code":200,"msg":null,"data":{"busUniqueId":"P_YBX_TESTT0NukiEN02OGDABB","total":3518.79,"insureId":null,"businessPolicy":{"specialTermItems":null,"coverages":null,"applicationNo":"53201093900246326035"},"trafficPolicy":{"specialTermItems":null,"coverages":null,"applicationNo":"53201093900246326036"},"propertyPolicies":null,"casualtyPolicies":null}}'
-server:
-  servlet:
-    encoding:
-      charset: UTF-8
-      force: true
-
-upload:
-  # 路径带上前后斜杆
-  basepath: ${filePath}
-  file:
-    # 上传目录
-    path: D:/upload/
-    # 映射路劲
-    url: /upload/
-  host: ''
-  password: ''
-  url: ${netUrl}
-  username: ''
-wechat:
-  open:
-    componentAppId: wx612ca90988c46947
-    componentSecret: 75b7d4cda453b2075dec23f849278bc0
-
-#================ 永安 ==============#
-ya:
-  callbackUrl: http://test.baoxianzhanggui.com:8080/order/yongAn/updatePolicy
-  #  comCode: 214040020000
-  #  consumerAccessKey: 123456test
-  #  consumerID: 102120
-  #  matchCode: 10212014040001
-  url: https://tapi.yaic.com.cn/auto/issue
-  sign: https://tapi.yaic.com.cn/auto/debug/generate-access-key
-#  userCode: 10061765
-
-##永诚
-yc:
-  api:
-#    agent:
-#      # 机构代码(dptCde)
-#      dptCde: 14A4
-#      # 渠道编码(agentCode)
-#      agentCode: 250000P00004
-#      # 协议编码(conferCode)
-#      conferCode: 250000P0000401
-#      # 渠道分类(agentType)
-#      agentType: 191010
-#      # 代理人名称(agentNme)
-#      agentNme: 永鑫保险销售服务有限公司山西分公司
-#      # 代理人资格证号(qlftNo)
-#      qlftNo: 2752454675645
-#      # 录入人(operatorCode)
-#      operatorCode: 100030057
-#      # 业务员代码(salesmanNo)
-#      salesmanNo: 100030057
-#      # 新业务来源(CChaType)
-#      CChaType: 191010
-#      # 客户性质(custNature)
-#      custNature: 192099
-#      # 操作人员代码(cOprcde)
-#      cOprcde: 100030057
-#      # 业务来源(cBsnsTyp)
-#      cBsnsTyp: 19002
-#    password: yc@20230202!
-    pay:
-      callBack: http://127.0.0.1:8080/api/yongCheng/callBack
-#    url: http://140.206.189.151:17000/
-    # 生产
-    url: http://www.yongcheng.com:17002/
-#    userName: yctest1
-  audit:
-    url: /yc/jiaofei
-  domain: http://47.92.254.66:8088
-  getPolicyPrint:
-    url: /yc/bdxz
-  image:
-    url: /yc/yxsc
-  quote:
-    url: /yc/bfjs
-
-#中煤
-zm:
-  ascription:
-    url: ${zm.domain}/ascription
-  audit:
-    url: ${zm.domain}/audit
-  #domain: http://47.92.254.66:8888/zm
-  domain: http://sxzgkj.baoxianzhanggui.com/zm/zm
-  getPolicyPrint:
-    url: ${zm.domain}/getPolicyPrint
-  image:
-    url: ${zm.domain}/yxsc
-  manualUnderwriting:
-    url: ${zm.domain}/manualUnderwriting
-  modelQuery:
-    url: ${zm.domain}/modelQuery
-  quote:
-    url: ${zm.domain}/quotedPrice
-  verifyPayment:
-    url: ${zm.domain}/verifyPayment
-  vinSearch:
-    url: ${zm.domain}/vinSearch
-  # 测试
-  api:
-    source: 326
-    token: THIRDSCOuloft2020052818346904zmYBSXXHTQ
-    url: https://test.echinacoal.com/singlePlatform/
-    imageUrl: https://test.echinacoal.com/singlePlatform/others/
-    smsUrl: https://test.echinacoal.com/singlePlatform/prpall/
-    pageUrl: http://www.baidu.com
-    callbackDomain: http://39.98.239.48/web-api
-    callbackUrl: /order/zhongMeiApi/underwritingCallback
-    passMsgUrl: /order/zhongMeiApi/auditCallback
-    sessionKey: 1237891234567589
-
-
-image:
-  # 验证码识别
-  identificationUrl: http://sxzgkj.baoxianzhanggui.com/zm/images/recognition
-
-logging:
-  file:
-    path: logs
-
-agreement:
-  shutdown: true
-
-
-# 国任
-guoRen:
-  baseUrl: https://devyun.guorenpcic.com/api/grchannel-interface/httpCurrency/httpJsonCommonEntrance
-  uploadUrl: https://devyun.guorenpcic.com/api/grecar/photo/upload
-  redirectUrl: http://127.0.0.1:8080/api/guoRen/callBack
-
-
-# 华泰
-huaTai:
-  baseUrl: https://gears.pc.ehuatai.com:9040/interFaces/common/AutoInsuranceQuotation.do
-  selfPublicKey: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDBOtXf1T/no13LOuy5ti+/d+SADHns8hAv3+LjhDFsQRbHk3tHhnUNX7I8b25576AVmgraefS7jnpyB299f58PK8WkWZN+UB6pcyEpktrtqOnKcaQSTbkQzaseCW4sCRdoea0alzSXUuXC2FN0pHAE3JkT07e5doX3IHas2GJAkwIDAQAB
-  selfPrivateKey: MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAME61d/VP+ejXcs67Lm2L7935IAMeezyEC/f4uOEMWxBFseTe0eGdQ1fsjxvbnnvoBWaCtp59LuOenIHb31/nw8rxaRZk35QHqlzISmS2u2o6cpxpBJNuRDNqx4JbiwJF2h5rRqXNJdS5cLYU3SkcATcmRPTt7l2hfcgdqzYYkCTAgMBAAECgYAwAAWRDNBLInHyQjj8CR3jWk0Q4giHq7oJqnwaOIRud9zIxwIgym3ZXKRSDvxKnhQOSa3Yh+MblFEmcmJnsoQ4OedLq7FVOw1eur/nw6jMcROT6ZiP512ZGgKZI1OdkQDpjCqM9Vg1brrFuGdV2RwI9ak2bjKbi7vs6slvd4r3AQJBAOqU+5xkyuaupg9cO/7TIxMgnTQH8W7IC1uDcx3f28QdkP+udJYfU/n1dYyGuhkW66KVANSqz4dsrEiAmfhvydECQQDS304+LEvPi4j8YmNlOXrs1o8H0tPB69svC9ER2YbrTjZf49XvY9fuor11XAprXZhBp8yvJu07FuRWilrQ8FkjAkEAop1qmqzIdweE+ErxECJfQygtsd77v9cPAH5sM752Q0pXtNbD3TmUZkeBGExg/3mDGW5/Z+2M9Y0hFRWJJs6fsQJAO11mV5Z82Tb9H6BLPyoJczeMGLW/q65MjFgVSaMlmoTwRdqMVdKT7bifAbUhscwtmv40X3LkAmiVa8+TdZLUZQJACu2NgPZkw6gjKCZf5xOfvKaC3PqKlhPghq+ypyutzTih9y81+EBJ25emLWNcd5BtIZ/AXmr3UUiGg0zX4s5njA==
-  huaTaiPublicKey: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCYyF2SBNzLOP5N5fFW2T2eQ5+iaI5wVpsedu+UY290TVuG152tkdtSuTXsx+8BKnd79/PF966/2aSP4EUm7vD9kvQUnX2EDUiMooorGvDTRxoHNXFGqOtxdMiUOuqx19HwNb4gOXZ1WdjWJwSmqC6ZP6OgxKIotCHJwe826Q/w8wIDAQAB
-
-# api url
-api:
-  url: http://39.98.239.48/web-api
-#大家财险api
-dajia:
-  api:
-    url: https://ics-test.djbx.com/sip-agent/simpleRequest/
-    encryptKey: "qwertyuiopasdfgh"
-qrcode:
-  genAddress: http://39.98.239.48/order/qrCode/index
-
-
-xxl:
-  job:
-    admin:
-      # 调度中心部署跟地址 [选填]：如调度中心集群部署存在多个地址则用逗号分隔。
-      addresses: http://192.168.0.253:8083/xxl-job-admin
-      # 执行器通讯TOKEN [选填]：非空时启用 系统默认 default_token
-      accessToken: default_token
-    executor:
-      # 执行器的应用名称
-      appname: xxl-job-executor-sample
-      # 执行器注册 [选填]：优先使用该配置作为注册地址
-      address: ""
-      # 执行器IP [选填]：默认为空表示自动获取IP
-      ip:
-      # 执行器端口号 [选填]：小于等于0则自动获取；默认端口为9999
-      port: 0
-      # 执行器运行日志文件存储磁盘路径 [选填] ：需要对该路径拥有读写权限；为空则使用默认路径；
-      logpath:
-      #logpath: /data/logs/mls/job
-      # 执行器日志文件保存天数 [选填] ： 过期日志自动清理, 限制值大于等于3时生效; 否则, 如-1, 关闭自动清理功能；
-      logretentiondays: 7