iailab-module-data/iailab-module-data-biz/db/mysql/tenant.sql

@@ -129,7 +129,7 @@
) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='KIO测点表';

CREATE TABLE t_da_point(
                         `id` VARCHAR(255) NOT NULL  COMMENT 'ID' ,
                         `id` VARCHAR(36) NOT NULL  COMMENT 'ID' ,
                         `point_no` VARCHAR(36)   COMMENT '测点编码' ,
                         `point_name` VARCHAR(36)   COMMENT '测点名称' ,
                         `point_type` VARCHAR(10)   COMMENT '测点类型' ,
@@ -169,7 +169,7 @@
CREATE TABLE t_da_math_point(
                              `id` VARCHAR(36) NOT NULL  COMMENT 'ID' ,
                              `point_id` VARCHAR(36)   COMMENT '测点ID' ,
                              `expression` VARCHAR(500)   COMMENT '计算公式' ,
                              `expression` VARCHAR(2000)   COMMENT '计算公式' ,
                              PRIMARY KEY (id) USING BTREE,
                              UNIQUE KEY `uk_point_id` (`point_id`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT = '计算点表';

 iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/controller/admin/DaPointController.java

@@ -138,16 +138,15 @@
    @ApiAccessLog(operateType = EXPORT)
    public void exportPointList(@Validated DaPointPageReqVO exportReqVO,
                                HttpServletResponse response) throws IOException {
        exportReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
        List<DaPointExcelVO> dataList = new ArrayList<>();
        List<DaPointDTO> measurePointList = daPointService.getMeasurePoint(exportReqVO);
        List<DaPointExcelVO> dataList = ConvertUtils.sourceToTarget(daPointService.getList(exportReqVO), DaPointExcelVO.class);
        /*List<DaPointDTO> measurePointList = daPointService.getMeasurePoint(exportReqVO);
        dataList.addAll(ConvertUtils.sourceToTarget(measurePointList, DaPointExcelVO.class));
        List<DaPointDTO> mathPointList = daPointService.getMathPoint(exportReqVO);
        dataList.addAll(ConvertUtils.sourceToTarget(mathPointList, DaPointExcelVO.class));
        List<DaPointDTO> constantPointList = daPointService.getConstantPoint(exportReqVO);
        dataList.addAll(ConvertUtils.sourceToTarget(constantPointList, DaPointExcelVO.class));
        List<DaPointDTO> cumulatePointList = daPointService.getCumulatePoint(exportReqVO);
        dataList.addAll(ConvertUtils.sourceToTarget(cumulatePointList, DaPointExcelVO.class));
        dataList.addAll(ConvertUtils.sourceToTarget(cumulatePointList, DaPointExcelVO.class));*/
        ExcelUtils.write(response, "测点列表.xls", "测点列表", DaPointExcelVO.class, dataList);
    }


 iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/service/DaPointCollectStatusService.java

@@ -15,6 +15,8 @@
 */
public interface DaPointCollectStatusService extends BaseService<DaPointCollectStatusEntity> {

    void add(String pointNo);

    @Async
    void recordStatus(String pointNo, String collectValue, Date collectTime);


 iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/service/impl/DaPointCollectStatusServiceImpl.java

@@ -26,6 +26,15 @@
public class DaPointCollectStatusServiceImpl extends BaseServiceImpl<DaPointCollectStatusDao, DaPointCollectStatusEntity>
        implements DaPointCollectStatusService {

    @Override
    public void add(String pointNo) {
        DaPointCollectStatusEntity entity = new DaPointCollectStatusEntity();
        entity.setId(UUID.randomUUID().toString());
        entity.setPointNo(pointNo);
        baseDao.insert(entity);
    }

    @Override
    public void recordStatus(String pointNo, String collectValue, Date collectTime) {
        QueryWrapper<DaPointCollectStatusEntity> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("point_no", pointNo);
@@ -47,6 +56,7 @@

    }

    @Override
    public void recordStatusList(List<InfluxPointValuePOJO> pointValues, Date collectTime) {
        List<String> listGood = new ArrayList<>();
        List<String> listBad = new ArrayList<>();

 iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/service/impl/DaPointServiceImpl.java

@@ -64,6 +64,9 @@
    @Resource
    private ChannelSourceService channelSourceService;

    @Resource
    private DaPointCollectStatusService daPointCollectStatusService;

    private static Map<String, DaPointDTO> pointIdMap = new ConcurrentHashMap<>();

    private static Map<String, DaPointDTO> pointNoMap = new ConcurrentHashMap<>();
@@ -182,6 +185,7 @@
        daPointEntity.setCreateTime(new Date());
        daPointDao.insert(daPointEntity);

        daPointCollectStatusService.add(daPointEntity.getPointNo());
        // 清空缓存
        clearCache();
    }
@@ -417,6 +421,7 @@
                }

                daPointDao.insert(daPointEntity);
                daPointCollectStatusService.add(daPointEntity.getPointNo());
                respVO.getCreatePointnames().add(importPoint.getPointName());
                return;
            }

 iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/vo/DaPointExcelVO.java

@@ -96,4 +96,8 @@
    @Schema(description = "除数")
    @ExcelProperty("除数")
    private Integer divisor;

    @Schema(description = "采集质量")
    @ExcelProperty("采集质量")
    private String collectQuality;
}

 iailab-module-data/iailab-module-data-biz/src/main/resources/mapper/point/DaPointDao.xml

@@ -98,9 +98,13 @@
        t3.source_name,
        t2.tag_no,
        t2.dimension,
        t2.value_type
        t2.value_type,
        t6.collect_value,
        t6.collect_quality,
        t6.collect_time
        from t_da_point t1
        left join t_da_measure_point t2 on t2.point_id = t1.id
        left join t_da_point_collect_status t6 on t6.point_no = t1.point_no
        left join (
        select id source_id,server_name source_name
        from t_channel_opcua_device
@@ -136,6 +140,9 @@
            <if test="isEnable != null ">
                and t1.is_enable = #{isEnable}
            </if>
            <if test="collectQuality != null and collectQuality != ''">
                and t6.collect_quality = #{collectQuality}
            </if>
        </where>
        order by t1.create_time desc, t1.point_no desc
    </select>

 iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmModelArithSettingsServiceImpl.java

@@ -56,6 +56,6 @@

    @Override
    public void updatePyFile(String pyModule, String fileName) {
        baseMapper.updatePyFile(pyModule + "." + fileName.substring(0,fileName.lastIndexOf("_")),pyModule + "." + fileName);
        baseMapper.updatePyFile(pyModule + "." + fileName.substring(0,fileName.lastIndexOf("_")+1),pyModule + "." + fileName);
    }
}

 iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/service/impl/StScheduleModelSettingServiceImpl.java

@@ -56,6 +56,6 @@

    @Override
    public void updatePyFile(String pyModule, String fileName) {
        baseDao.updatePyFile(pyModule + "." + fileName.substring(0,fileName.lastIndexOf("_")),pyModule + "." + fileName);
        baseDao.updatePyFile(pyModule + "." + fileName.substring(0,fileName.lastIndexOf("_")+1),pyModule + "." + fileName);
    }
}

 iailab-module-system/iailab-module-system-api/src/main/java/com/iailab/module/system/api/user/AdminUserApi.java

@@ -1,6 +1,7 @@
package com.iailab.module.system.api.user;

import cn.hutool.core.convert.Convert;
import com.fhs.core.trans.anno.AutoTrans;
import com.iailab.framework.common.pojo.CommonResult;
import com.iailab.framework.common.util.collection.CollectionUtils;
import com.iailab.module.system.api.user.dto.AdminUserRespDTO;
@@ -14,12 +15,13 @@
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import static com.iailab.module.system.api.user.AdminUserApi.PREFIX;

import java.util.*;

@FeignClient(name = ApiConstants.NAME)
@Tag(name = "RPC 服务 - 管理员用户")
//@AutoTrans(namespace = PREFIX, fields = {"nickname"}) // TODO @iailab：需要 easy-trans 做个 bugfix
@AutoTrans(namespace = PREFIX, fields = {"nickname"}) // TODO @iailab：需要 easy-trans 做个 bugfix
public interface AdminUserApi extends AutoTransable<AdminUserRespDTO> {

    String PREFIX = ApiConstants.PREFIX + "/user";

 iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/controller/admin/auth/AuthController.java

@@ -136,7 +136,7 @@
        Set<Long> menuIds = permissionService.getRoleMenuListByRoleId(convertSet(roles, RoleDO::getId));
        List<MenuDO> menuList = menuService.getMenuList(menuIds);
        menuList = menuService.filterDisableMenus(menuList);
        menuList = menuService.filterMenus(menuList, "system");
//        menuList = menuService.filterMenus(menuList, "system");

        // 2. 拼接结果返回
        return success(AuthConvert.INSTANCE.convert(user, roles, menuList));

 iailab-module-system/iailab-module-system-biz/src/test/java/com/iailab/module/system/framework/sms/core/client/impl/AliyunSmsClientTest.java

文件已删除

 iailab-module-system/iailab-module-system-biz/src/test/java/com/iailab/module/system/framework/sms/core/client/impl/TencentSmsClientTest.java

文件已删除

 iailab-module-system/iailab-module-system-biz/src/test/java/com/iailab/module/system/service/auth/AdminAuthServiceImplTest.java

文件已删除

 iailab-module-system/iailab-module-system-biz/src/test/java/com/iailab/module/system/service/dept/DeptServiceImplTest.java

文件已删除

 iailab-module-system/iailab-module-system-biz/src/test/java/com/iailab/module/system/service/dept/PostServiceImplTest.java

文件已删除

 iailab-module-system/iailab-module-system-biz/src/test/java/com/iailab/module/system/service/dict/DictDataServiceImplTest.java

文件已删除

 iailab-module-system/iailab-module-system-biz/src/test/java/com/iailab/module/system/service/dict/DictTypeServiceImplTest.java

文件已删除

 iailab-module-system/iailab-module-system-biz/src/test/java/com/iailab/module/system/service/logger/LoginLogServiceImplTest.java

文件已删除

 iailab-module-system/iailab-module-system-biz/src/test/java/com/iailab/module/system/service/logger/OperateLogServiceImplTest.java

文件已删除

 iailab-module-system/iailab-module-system-biz/src/test/java/com/iailab/module/system/service/mail/MailAccountServiceImplTest.java

文件已删除

 iailab-module-system/iailab-module-system-biz/src/test/java/com/iailab/module/system/service/mail/MailLogServiceImplTest.java

文件已删除

 iailab-module-system/iailab-module-system-biz/src/test/java/com/iailab/module/system/service/mail/MailSendServiceImplTest.java

文件已删除

 iailab-module-system/iailab-module-system-biz/src/test/java/com/iailab/module/system/service/mail/MailTemplateServiceImplTest.java

文件已删除

 iailab-module-system/iailab-module-system-biz/src/test/java/com/iailab/module/system/service/notice/NoticeServiceImplTest.java

文件已删除

 iailab-module-system/iailab-module-system-biz/src/test/java/com/iailab/module/system/service/notify/NotifyMessageServiceImplTest.java

文件已删除

 iailab-module-system/iailab-module-system-biz/src/test/java/com/iailab/module/system/service/notify/NotifySendServiceImplTest.java

文件已删除

 iailab-module-system/iailab-module-system-biz/src/test/java/com/iailab/module/system/service/notify/NotifyTemplateServiceImplTest.java

文件已删除

 iailab-module-system/iailab-module-system-biz/src/test/java/com/iailab/module/system/service/oauth2/OAuth2ApproveServiceImplTest.java

文件已删除

 iailab-module-system/iailab-module-system-biz/src/test/java/com/iailab/module/system/service/oauth2/OAuth2ClientServiceImplTest.java

文件已删除

 iailab-module-system/iailab-module-system-biz/src/test/java/com/iailab/module/system/service/oauth2/OAuth2CodeServiceImplTest.java

文件已删除

 iailab-module-system/iailab-module-system-biz/src/test/java/com/iailab/module/system/service/oauth2/OAuth2GrantServiceImplTest.java

文件已删除

 iailab-module-system/iailab-module-system-biz/src/test/java/com/iailab/module/system/service/oauth2/OAuth2TokenServiceImplTest.java

文件已删除

 iailab-module-system/iailab-module-system-biz/src/test/java/com/iailab/module/system/service/permission/MenuServiceImplTest.java

文件已删除

 iailab-module-system/iailab-module-system-biz/src/test/java/com/iailab/module/system/service/permission/PermissionServiceTest.java

文件已删除

 iailab-module-system/iailab-module-system-biz/src/test/java/com/iailab/module/system/service/permission/RoleServiceImplTest.java

文件已删除

 iailab-module-system/iailab-module-system-biz/src/test/java/com/iailab/module/system/service/sms/SmsChannelServiceTest.java

文件已删除

 iailab-module-system/iailab-module-system-biz/src/test/java/com/iailab/module/system/service/sms/SmsCodeServiceImplTest.java

文件已删除

 iailab-module-system/iailab-module-system-biz/src/test/java/com/iailab/module/system/service/sms/SmsLogServiceImplTest.java

文件已删除

 iailab-module-system/iailab-module-system-biz/src/test/java/com/iailab/module/system/service/sms/SmsSendServiceImplTest.java

文件已删除

 iailab-module-system/iailab-module-system-biz/src/test/java/com/iailab/module/system/service/sms/SmsTemplateServiceImplTest.java

文件已删除

 iailab-module-system/iailab-module-system-biz/src/test/java/com/iailab/module/system/service/social/SocialClientServiceImplTest.java

文件已删除

 iailab-module-system/iailab-module-system-biz/src/test/java/com/iailab/module/system/service/social/SocialUserServiceImplTest.java

文件已删除

 iailab-module-system/iailab-module-system-biz/src/test/java/com/iailab/module/system/service/tenant/TenantPackageServiceImplTest.java

文件已删除

 iailab-module-system/iailab-module-system-biz/src/test/java/com/iailab/module/system/service/tenant/TenantServiceImplTest.java

文件已删除

 iailab-module-system/iailab-module-system-biz/src/test/java/com/iailab/module/system/service/user/AdminUserServiceImplTest.java

文件已删除