Merge remote-tracking branch 'origin/radio_frequency' into radio_frequency

chenrui

2025-04-03 deb25b1c56eafc4a8a9fc293b7807baad99e216c

Merge remote-tracking branch 'origin/radio_frequency' into radio_frequency

 cnas-device/src/main/java/com/ruoyi/device/task/DeviceRecordSchedule.java

@@ -31,7 +31,7 @@
     * æé†’填写设备使用记录
     */
//    @Scheduled(cron = "0/5 * * * * *")
    @Scheduled(cron = "0 0 9 * * 6") // æ¯å‘¨å…­æ‰§è¡Œä¸€æ¬¡
//    @Scheduled(cron = "0 0 9 * * 6") // æ¯å‘¨å…­æ‰§è¡Œä¸€æ¬¡
    public void task1() {
        // æŸ¥è¯¢æœªå¡«å†™çš„设备使用记录
        List<DeviceRecordDto> deviceRecords = deviceRecordMapper.selectNotFilled();

 cnas-manage/src/main/java/com/ruoyi/manage/schedule/ManageRecordTotalSchedule.java

@@ -20,7 +20,7 @@
    @Resource
    private ManageRecordIntervalsTotalService manageRecordIntervalsTotalService;

    @Scheduled(cron = "0 0 2 1 1 ?") //每年1月1号2点
//    @Scheduled(cron = "0 0 2 1 1 ?") //每年1月1号2点
    public void manageRecordTotal() {
        ManageRecordTotal manageRecordTotal = new ManageRecordTotal();
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy");

 cnas-personnel/src/main/java/com/ruoyi/personnel/task/PersonTrainingSchedule.java

@@ -31,7 +31,7 @@
     * æé†’填写设备使用记录
     */
//    @Scheduled(cron = "0/5 * * * * *")
    @Scheduled(cron = "0 0 9 1 * *") // æ¯æœˆä¸€å·æ‰§è¡Œ
//    @Scheduled(cron = "0 0 9 1 * *") // æ¯æœˆä¸€å·æ‰§è¡Œ
    public void task1() {
        // æŸ¥è¯¢å½“月培训计划
        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy.M");

 cnas-process/src/main/java/com/ruoyi/process/schedule/ProcessTotaldealSchedule.java

@@ -21,7 +21,7 @@
    @Resource
    private ProcessTotalSampleService processTotalSampleService;

    @Scheduled(cron = "0 0 2 1 * ?") //每月1号2点
//    @Scheduled(cron = "0 0 2 1 * ?") //每月1号2点
    public void processTotaldeal() {
        ProcessTotaldeal processTotaldeal = new ProcessTotaldeal();
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");

 cnas-process/src/main/java/com/ruoyi/process/task/QualitySuperviseSchedule.java

@@ -32,7 +32,7 @@
     * æé†’填写设备使用记录
     */
//    @Scheduled(cron = "0/5 * * * * *")
    @Scheduled(cron = "0 0 9 1 * *") // æ¯æœˆ1号执行
//    @Scheduled(cron = "0 0 9 1 * *") // æ¯æœˆ1号执行
    public void task1() {
        // æŸ¥è¯¢å½“月监督计划
        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy.M");

 cnas-require/src/main/java/com/ruoyi/require/task/FeTempHumDateSchedule.java

@@ -69,7 +69,7 @@
     * èŽ·å–温度湿度
     */
//    @Scheduled(cron = "0/5 * * * * *")
    @Scheduled(cron = "0 0 9 * * 1-6") // æ¯å¤©9点执行一次 é™¤äº†æ˜ŸæœŸå¤©
//    @Scheduled(cron = "0 0 9 * * 1-6") // æ¯å¤©9点执行一次 é™¤äº†æ˜ŸæœŸå¤©
    public void task1() {
        checkLaboratoriesSchedule();
        // æ ¹æ®æ—¶é—´é™åºï¼ŒèŽ·å–到最新的一条数据
@@ -138,7 +138,7 @@
     * èŽ·å–温度湿度
     */
//    @Scheduled(cron = "0/5 * * * * *")
    @Scheduled(cron = "0 0 14 * * 1-5") // æ¯å¤©14点执行一次 é™¤äº†æ˜ŸæœŸå…­å’Œæ˜ŸæœŸå¤©
//    @Scheduled(cron = "0 0 14 * * 1-5") // æ¯å¤©14点执行一次 é™¤äº†æ˜ŸæœŸå…­å’Œæ˜ŸæœŸå¤©
    public void task2() {

        // æ£€æŸ¥å®žéªŒå®¤æ˜¯å¦æœ‰ä»»åŠ¡ å¦‚果没有新增任务

 inspect-server/src/main/java/com/ruoyi/inspect/task/RawMaterIalSchedule.java

@@ -19,7 +19,7 @@
    /**
     * å®šæ—¶ä»»åŠ¡èŽ·å–采购订单
     */
    @Scheduled(fixedDelay = 1200000)
//    @Scheduled(fixedDelay = 1200000)
    public void getIfsOrderTiming() {
        insOrderService.getIfsOrder();
    }

 ruoyi-admin/src/main/resources/application-druid.yml

@@ -1,4 +1,4 @@
# è£…备正式库
# æœ¬åœ°

# æ•°æ®æºé…ç½®
spring:
@@ -8,9 +8,13 @@
    druid:
      # ä¸»åº“数据源
      master:
        url: jdbc:mysql://10.16.173.59:3306/lims-ruoyi?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
#        url: jdbc:mysql://127.0.0.1:3306/lims-ruoyi?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
#        username: root
#        password: zttZTT123!
        # å·¥æ—¶æ•°æ®åº“
        url: jdbc:mysql://114.132.189.42:9004/zt_radio_requency?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
        username: root
        password: zttZTT123!
        password: 123456
      # ä»Žåº“数据源
      slave:
        # ä»Žæ•°æ®æºå¼€å…³/默认关闭

 ruoyi-admin/src/main/resources/application-prod.yml

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/application-test.yml

@@ -1,4 +1,4 @@
# è£…备测试库配置
# å°„频测试库

# æ•°æ®æºé…ç½®
spring:
@@ -8,9 +8,9 @@
    druid:
      # ä¸»åº“数据源
      master:
        url: jdbc:mysql://127.0.0.1:3306/center-lims-dz?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
        url: jdbc:mysql://192.168.18.50:3306/center-lims?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
        username: root
        password: zttZTT123!
        password: zttZTT123$%^

      # ä»Žåº“数据源
      slave:
@@ -66,13 +66,13 @@
  # redis é…ç½®
  redis:
    # åœ°å€
    host: localhost
    host: 192.168.18.50
    # ç«¯å£ï¼Œé»˜è®¤ä¸º6379
    port: 6379
    # æ•°æ®åº“索引
    database: 0
    #    # å¯†ç 
    password: zttZTT123!
    password: Ztl123$%^
    # è¿žæŽ¥è¶…时时间
    timeout: 10s
    lettuce:
@@ -101,7 +101,7 @@

# æ—¥å¿—配置
logging:
  file-location: /center-lims/Java
  file-location: /center-lims/after
  level:
    com.ruoyi: info
    org.springframework: warn
@@ -109,54 +109,58 @@
# Swagger配置
swagger:
  # æ˜¯å¦å¼€å¯swagger
  enabled: true
  enabled: false

# minio容器管理
minio:
  endpoint: http://114.132.189.42/
  port: 7019
  endpoint: http://114.132.189.42:7019
  secure: false
  accessKey: admin
  secretKey: 12345678
  preview-expiry: 24 # é¢„览地址默认24小时
  bucketName: radio-frequency
  publicUrl:

# ç…§ç‰‡å­˜å‚¨è·¯å¾„+++++++++++++++++++++++++++运维需要配置+++++++++++++++++++++++++++
file:
  path: /center-lims/Work/img
  path: /center-lims/after/file/img
  # ä¸Šä¼ æ–‡ä»¶å…è®¸çš„扩展名
  allowed: png,jpg,jpeg,gif
# æŠ¥å‘Šåœ°å€
wordUrl: /center-lims/Work/word
wordUrl: /center-lims/after/file/word

#oa:
#    oaHost: http://192.168.0.49:8000/oa_workflowrequest.asmx?wsdl
#    prodIp: http://192.168.21.53:8081
#    unqualifiedProcessId: 41974
# oa流程
oa:
  oaHost:
  prodIp:
  unqualifiedProcessId:

# ä¼ä¸šå¾®ä¿¡æŽ¨é€
wechat:
  # è´¨é‡æŠ¥æ£€é€šçŸ¥
  examiningUrl:

# äººäº‹ç³»ç»Ÿ
personnel:
  # æ­£å¼åœ°å€
  code: https://ztt-sso.ztt.cn/oauth2/token
  code:
  # è£…备人事正式库
  appId: 6f5f6a0c-2a01-4ef6-9e75-c8a6f0c2f044
  appSecret: 9b9c4735b1e5ee9d6a8544b9b38bb03
  companies: https://ztt-connector.ztt.cn/api/org/v1/companies
  simple: https://ztt-connector.ztt.cn/api/org/v1/employees/simple?companyId=
  appId:
  appSecret:
  companies:
  simple:
  # äººå‘˜å¯†ç èŽ·å–
  password: https://ztt-connector.ztt.cn/api/org/v1/employees/original_pwd/
  department: https://ztt-connector.ztt.cn/api/org/v1/companies/companyId/departments
  person: https://ztt-connector.ztt.cn/api/org/v1/employees/simple/

wechat:
  # è´¨é‡æŠ¥æ£€é€šçŸ¥
  examiningUrl: https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=21993616-9966-4fe4-81b0-68e99a40c964
  password:
  department:
  person:

ifs:
  contract: ZTZB
  contract-key-get: 4ttDeLKNsZuhstjtROMcRE1USNFXKdFYE7lQ2p1m5Bo=
  contract-key-post: 4ttDeLKNsZuhstjtROMcRE1USNFXKdFYE7lQ2p1m5Bo=
  custorder: http://192.168.20.47/PurchService.ashx?
  custorder-port: http://192.168.20.47:8008/PurchService.ashx?
  erp-services: http://192.168.20.47:8081
  contract:
  contract-key-get:
  contract-key-post:
  custorder:
  custorder-port:
  erp-services:

# å¤‡æ³¨ 18083密码：zttZTT123!@
mqtt:

 ruoyi-admin/src/main/resources/application-ztzb.yml

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/resources/application.yml

@@ -16,7 +16,7 @@
# å¼€å‘环境配置
server:
  # æœåŠ¡å™¨çš„HTTP端口
  port: 8001
  port: 7002
  servlet:
    # åº”用的访问路径
    context-path:
@@ -46,7 +46,7 @@
    # å›½é™…化资源文件路径
    basename: i18n/messages
  profiles:
    active: druid
    active: test
  # å…¨å±€æ—¶é—´å¤„理 LocalDateTime时间序列号
  jackson:
    date-format: yyyy-MM-dd HH:mm:ss
@@ -91,8 +91,8 @@
#集团统一登录
sso:
  url: https://ztt-sso.asuncloud.net
  clientId: 47ded514-f447-43b4-afdf-181c10e2222d
  clientSecret: appSecret:ea93d26a68863da5d71a6e3355ec22df
  callbackUrl: https://ztzb-lims.ztt.cn/thirdpartylogin
  clientId:
  clientSecret:
  callbackUrl:



 ruoyi-common/src/main/java/com/ruoyi/common/utils/WxCpUtils.java

@@ -22,9 +22,9 @@
 */
public class WxCpUtils {

    public static final String CORP_ID = "wwa423654b975441ac";
    public static final String CORP_SECRET = "snXq8qwA5tGu0YN1PlSDQqr6u9x3A0c_jQDmt8CN8Vs";
    public static final Integer AGENT_ID = 1000515;
    public static final String CORP_ID = "";
    public static final String CORP_SECRET = "";
    public static final Integer AGENT_ID = null;

    /**
     * @param user      ä¾‹ï¼šZT-033268|ZT-028629，多个中间用|隔开