补充logbacktest配置，application-test配置

yangys

2025-04-10 220141036107ef2103833fcd878de43307ca0905

补充logbacktest配置，application-test配置

 smart-man-boot/src/main/java/com/qianwen/smartman/common/interceptor/LicenseCheckInterceptor.java

@@ -18,6 +18,8 @@

    @Override
    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
        //return true;
		
        LicenseVerify licenseVerify = new LicenseVerify();
        //校验证书是否有效
        boolean verifyResult = licenseVerify.verify();

 smart-man-boot/src/main/java/com/qianwen/smartman/modules/smis/service/WorkstationDatapointsService.java

@@ -25,6 +25,8 @@
import com.qianwen.smartman.modules.smis.vo.WorkstationDatapointsSubmitVO;
import com.qianwen.smartman.modules.smis.vo.WorkstationDatapointsVO;

import cn.hutool.core.util.ObjectUtil;

@Service
public class WorkstationDatapointsService extends BaseServiceImpl<WorkstationDatapointsMapper, WorkstationDatapoints> {
    private Logger log = LoggerFactory.getLogger(this.getClass());
@@ -47,7 +49,9 @@
    @Transactional
    public void submit(WorkstationDatapointsSubmitVO dpVO) {
      
		
        if(ObjectUtil.isEmpty(dpVO.getAppId())) {
            throw new ServiceException("应用ID不能为空");
        }
        Workstation usingWorkstation = appIdUsingWorkstation(dpVO.getAppId(),dpVO.getWorkstationId());
        if(usingWorkstation != null) {
            //appId被使用
@@ -147,4 +151,12 @@
        return dpVO;
    }

    /**
     * åˆ é™¤å·¥ä½çš„采集数据点位配置
     * @param workstationId
     */
    public void removeByWorkstation(List<Long> workstationIds) {
        log.info("删除工位数据点配置，workstationIds",workstationIds);
        baseMapper.delete(Wrappers.<WorkstationDatapoints>lambdaQuery().in(WorkstationDatapoints::getWorkstationId, workstationIds));
    }
}

 smart-man-boot/src/main/java/com/qianwen/smartman/modules/smis/service/impl/WorkstationServiceImpl.java

@@ -152,6 +152,8 @@
    private WorkstationDatapointsService wsDpService;
    @Autowired
    private LicenseWrapper licenseWrapper;
    @Autowired
    private WorkstationDatapointsService dataPointService;
    
    private final String NAME = "默认工作台";
    private final Integer SORT = 1;
@@ -237,9 +239,12 @@
        }
        return workstationVO;
    }
    
    /**
     * éªŒè¯è®¸å¯ä¸­é…ç½®çš„设备数量
     */
    void checkLicenseCount() {
        
    
        Wrapper<Workstation> wrapper = Wrappers.lambdaQuery(Workstation.class).eq(Workstation::getIsDeleted, 0);
        Long count = workstationMapper.selectCount(wrapper);
        
@@ -376,6 +381,9 @@
            this.workstationWcsService.deleteByWorkstationIdList(workstationIds);
            this.workstationOfMachineService.remove(Wrappers.<WorkstationOfMachine>lambdaQuery().in(WorkstationOfMachine::getWorkstationId, workstationIds));
            this.commonGroupOfItemService.remove(Wrappers.<CommonGroupOfItem>lambdaQuery().in(CommonGroupOfItem::getItemId, workstationIds));
            
            //20250324新增，删除工位对应的数据点位配置。
            dataPointService.removeByWorkstation(workstationIds);
            /*
            this.workstationOfMachineService.remove((Wrapper) Wrappers.lambdaQuery().in((v0) -> {
                return v0.getWorkstationId();
@@ -407,7 +415,7 @@
                return String.valueOf(item.getId());
            }).collect(Collectors.toList()));
        }
        List<WorkstationVO> workstationVOS = this.workstationMapper.listPage(workStationGroupIdList, workstationVOIPage, keyWord, groupId, CommonGroupConstant.ALL_WORKSTATION_ID, status == null ? CommonConstant.ENABLE : status, type, Integer.valueOf(LocalDate.now().getYear()));
        List<WorkstationVO> workstationVOS = this.workstationMapper.listPage(workStationGroupIdList, workstationVOIPage, keyWord, groupId, CommonGroupConstant.ALL_WORKSTATION_ID, status == null ? CommonConstant.ENABLE : status, type, LocalDate.now().getYear());
        workstationVOS.forEach(workstationVO -> {
            String calendarName = workstationVO.getCalendarName();
            if (Func.isBlank(calendarName)) {

 smart-man-boot/src/main/resources/application-test.yml

@@ -1,6 +1,6 @@
# redis
redis:
  host: localhost
  host: 120.46.212.231
  port: 6379
  password: root
  database: 11
@@ -8,11 +8,11 @@
# database config
datasource:
  type: mysql
  url: localhost
  url: 120.46.212.231
  port: 3306
  #数据库内如果没有表，会引发进入初始化界面
  database: smart_man
  username: root
  database: smartman
  username: qwmdc
  password: Kknd_1234
  driver-class-name: com.mysql.cj.jdbc.Driver
#datasource:
@@ -29,17 +29,6 @@
  enabled: true
  domain: http://127.0.0.1:1888

# rocketmq
rocketmq-name-server: localhost:9876

# tdengine
tdengine:
  driver: com.taosdata.jdbc.rs.RestfulDriver
  #url: jdbc:TAOS-RS://192.168.1.41:6041/iot_data?charset=UTF-8&locale=en_US.UTF-8&timezone=UTC-8
  url: jdbc:TAOS-RS://localhost:6041/iot_data?charset=UTF-8&locale=en_US.UTF-8&timezone=UTC-8
  username: root
  password: taosdata

iotdb:
  driver: org.apache.iotdb.jdbc.IoTDBDriver
  host: localhost
@@ -48,17 +37,31 @@
  username: root
  password: root

mqtt:
  host: tcp://82.156.1.83:1884
  #username=admin #MQTT-服务端用户名
  #password=public #MQTT-服务端密码
  cleansession: false #MQTT-是否清理session
  #MQTT-当前客户端的唯一标识
  clientid: mqtt_publish
  default_topic: TEST #当前客户端的默认主题(大多数时候没什么用)
  #发送超时时间
  timeout: 3000
  #心跳时间
  keepalive: 10
  connectionTimeout: 3000 #连接超时时间
  isRecevieMsg: false
xxl:
  job:
    admin:
      ### xxl-job admin address list, such as "http://address" or "http://address01,http://address02"
      addresses: http://192.168.1.40:31137/xxl-job-admin
      addresses: http://localhost:8080/xxl-job-admin
    ### xxl-job executor address
    executor:
      appname: phoenix
      appname: smartman
      ip:
      # éƒ¨ç½²39，临时调整 7017 -> 7117
      port: 7079
      port: 7089
      ### xxl-job log path
      logpath: /data/applogs/xxl-job/jobhandler
      ### xxl-job log retention days

 smart-man-boot/src/main/resources/application.yml

@@ -359,9 +359,9 @@
license:
  subject: user #主体 - æ³¨æ„ä¸»ä½“要与生成证书的主体一致一致，不然验证通过不了
  publicAlias: publiccert #公钥别称
  storePass: a1b2c3 #访问公钥库的密码
  licensePath: D:\lictest\ctest.lic #license位置
  publicKeysStorePath: D:\lictest\publicCerts.store #公钥位置
  storePass: a1b2c3z4 #访问公钥库的密码
  licensePath: D:\certs\hwserver\mdc.lic #license位置
  publicKeysStorePath: D:\certs\hwserver\publicCerts.store #公钥位置
forest:
  bean-id: config0 # åœ¨spring上下文中bean的id, é»˜è®¤å€¼ä¸ºforestConfiguration
  backend: okhttp3 # åŽç«¯HTTP API： okhttp3 ã€æ”¯æŒ`okhttp3`/`httpclient`】

 smart-man-boot/src/main/resources/dp/dpend-´ø¼ÆËã¹æÔò.json

ÎļþÒÑɾ³ý

 smart-man-boot/src/main/resources/dp/dpend-ÎÞ¼ÆËã¹æÔò.json

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1 @@
[{"prop":"dpUnit","label":"单位"},{"prop":"access","isRequired":true,"sendCode":1,"label":"权限","describe":"读写权限\\n RO(只读)：只允许读取点位数据、\\nRW(读/写)：既能读取数据也能写入数据。","default":"RO","type":"option","options":["RO","RW"]},{"prop":"pollingInterval","isRequired":true,"label":"轮询间隔（ms）","describe":"轮询间隔（ms）","default":1000},{"prop":"keepOriginalValue","isRequired":true,"sendCode":1,"label":"保留原始值","describe":"保留原始值","default":true,"type":"boolean"},{"prop":"isSave","isRequired":true,"sendCode":1,"label":"是否存储","describe":"是否存储","default":true,"type":"boolean"}]

 smart-man-boot/src/main/resources/dp/dpend.json

@@ -1 +1 @@
[{"prop":"dpUnit","label":"单位"},{"prop":"access","isRequired":true,"sendCode":1,"label":"权限","describe":"读写权限\\n RO(只读)：只允许读取点位数据、\\nRW(读/写)：既能读取数据也能写入数据。","default":"RO","type":"option","options":["RO","RW"]},{"prop":"pollingInterval","isRequired":true,"label":"轮询间隔（ms）","describe":"轮询间隔（ms）","default":1000},{"prop":"keepOriginalValue","isRequired":true,"sendCode":1,"label":"保留原始值","describe":"保留原始值","default":true,"type":"boolean"},{"prop":"isSave","isRequired":true,"sendCode":1,"label":"是否存储","describe":"是否存储","default":true,"type":"boolean"}]
[{"prop":"dpUnit","label":"单位"},{"prop":"ruleContent","label":"计算规则","describe":"计算规则来源于[规则管理-计算规则]，通过lua脚本编写计算规则，对数据点的原始数据进行计算，生成新的数据点及数据点值。","sendCode":1,"isReqOptions":true,"type":"option","options":["默认"]},{"prop":"ruleArgs","label":"计算参数","describe":"根据计算规则，填写计算参数，多个计算参数用英文“，”隔开；注意:dpValue为采集到的值不需要填写。","sendCode":1},{"prop":"access","isRequired":true,"sendCode":1,"label":"权限","describe":"读写权限\\n RO(只读)：只允许读取点位数据、\\nRW(读/写)：既能读取数据也能写入数据。","default":"RO","type":"option","options":["RO","RW"]},{"prop":"pollingInterval","isRequired":true,"label":"轮询间隔（ms）","describe":"轮询间隔（ms）","default":1000},{"prop":"keepOriginalValue","isRequired":true,"sendCode":1,"label":"保留原始值","describe":"保留原始值","default":true,"type":"boolean"},{"prop":"isSave","isRequired":true,"sendCode":1,"label":"是否存储","describe":"是否存储","default":true,"type":"boolean"}]

 smart-man-boot/src/main/resources/log/logback-test.xml

@@ -27,7 +27,7 @@
    <appender name="INFO" class="ch.qos.logback.core.rolling.RollingFileAppender">
        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
            <!-- æ—¥å¿—文件输出的文件名 -->
            <FileNamePattern>target/blade/log/info-%d{yyyy-MM-dd}.%i.log</FileNamePattern>
            <FileNamePattern>/var/smartman/logs/info-%d{yyyy-MM-dd}.%i.log</FileNamePattern>
            <maxHistory>30</maxHistory>
            <totalSizeCap>3GB</totalSizeCap>
            <!--按大小分割同一天的-->