Browse Source

getF10JournalData接口

jwy
review512jwy@163.com 1 week ago
parent
commit
7c1ec2cab9
  1. 25
      data-center-business-controller/src/main/java/com/techsor/datacenter/business/controller/DeviceController.java
  2. 120
      data-center-business-dao/src/main/java/com/techsor/datacenter/business/dao/auto/F10JournalLogMapper.java
  3. 18
      data-center-business-dao/src/main/java/com/techsor/datacenter/business/dao/ex/F10DataMapperExt.java
  4. 1079
      data-center-business-dao/src/main/resources/mappers/auto/F10JournalLogMapper.xml
  5. 66
      data-center-business-dao/src/main/resources/mappers/ex/F10DataMapperExt.xml
  6. 6
      data-center-business-dao/src/main/resources/mybatis-generator/generatorConfig.xml
  7. 24
      data-center-business-model/src/main/java/com/techsor/datacenter/business/dto/data/F10DataParam.java
  8. 1629
      data-center-business-model/src/main/java/com/techsor/datacenter/business/model/F10JournalLog.java
  9. 3383
      data-center-business-model/src/main/java/com/techsor/datacenter/business/model/F10JournalLogExample.java
  10. 120
      data-center-business-model/src/main/java/com/techsor/datacenter/business/vo/data/F10JournalDataVO.java
  11. 4
      data-center-business-service/src/main/java/com/techsor/datacenter/business/service/IDeviceService.java
  12. 20
      data-center-business-service/src/main/java/com/techsor/datacenter/business/service/impl/DeviceServiceImpl.java

25
data-center-business-controller/src/main/java/com/techsor/datacenter/business/controller/DeviceController.java

@ -8,6 +8,7 @@ import com.techsor.datacenter.business.common.response.ResponseCode;
import com.techsor.datacenter.business.common.response.SimpleDataResponse;
import com.techsor.datacenter.business.configurator.interceptor.AccessRequired;
import com.techsor.datacenter.business.dto.data.AuroraDataParam;
import com.techsor.datacenter.business.dto.data.F10DataParam;
import com.techsor.datacenter.business.dto.device.*;
import com.techsor.datacenter.business.dto.device.alert.DeviceAlertConfigNextParams;
import com.techsor.datacenter.business.dto.device.alert.DeviceAlertConfigNextUpdateParams;
@ -29,6 +30,7 @@ import com.techsor.datacenter.business.util.FileUtil;
import com.techsor.datacenter.business.vo.company.ApikeyInfo;
import com.techsor.datacenter.business.vo.company.ApikeyOnlyInfo;
import com.techsor.datacenter.business.vo.data.AuroraDataVO;
import com.techsor.datacenter.business.vo.data.F10JournalDataVO;
import com.techsor.datacenter.business.vo.device.DeviceVO;
import com.techsor.datacenter.business.vo.device.LambdaEmailResult;
import com.techsor.datacenter.business.vo.device.MonitoringPointCategoryVO;
@ -579,6 +581,29 @@ public class DeviceController {
return deviceService.getAuroraData(auroraDataParam, UserId, CompanyId, LanguageType);
}
@Operation(summary = "Get F10 Data")
@RequestMapping(value = "/getF10JournalData", method = RequestMethod.GET)
public PageResponse<PageInfo<F10JournalDataVO>> getF10JournalData(
F10DataParam f10DataParam,
@Parameter(name = "LoginName", description = "Login name", required = true, schema = @Schema(defaultValue = "admin")) @RequestHeader(required = true) String LoginName,
@Parameter(name = "AccessToken", description = "Authentication token", required = true) @RequestHeader(required = true) String AccessToken,
@Parameter(name = "UserId", description = "User ID", required = true, schema = @Schema(defaultValue = "1")) @RequestHeader(required = true) Long UserId,
@Parameter(name = "CompanyId", description = "User's company ID", required = false, schema = @Schema(defaultValue = "1")) @RequestHeader(required = false) Long CompanyId,
@Parameter(name = "LanguageType", description = "Language type 0: Chinese 1: English 2: Japanese", required = true, schema = @Schema(defaultValue = "2")) @RequestHeader(required = true) Integer LanguageType,
@Parameter(name = "UTCOffset", description = "Offset between GMT and local time in minutes, e.g., -480 for GMT+8") @RequestHeader(required = true) Integer UTCOffset) {
PageResponse<PageInfo<F10JournalDataVO>> pageResponse = new PageResponse<>();
try {
pageResponse.setData(deviceService.getF10JournalData(f10DataParam, UserId, CompanyId, LanguageType));
pageResponse.setCode(ResponseCode.SUCCESS);
pageResponse.setMsg("success");
} catch (Exception e) {
log.error("Error querying device list", e);
pageResponse.setCode(ResponseCode.SERVER_ERROR);
pageResponse.setMsg("service error");
}
return pageResponse;
}
/**
* Query alarm devices information.
*

120
data-center-business-dao/src/main/java/com/techsor/datacenter/business/dao/auto/F10JournalLogMapper.java

@ -0,0 +1,120 @@
package com.techsor.datacenter.business.dao.auto;
import com.techsor.datacenter.business.model.F10JournalLog;
import com.techsor.datacenter.business.model.F10JournalLogExample;
import java.util.List;
import org.apache.ibatis.annotations.Param;
public interface F10JournalLogMapper {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table f10_journal_log
*
* @mbg.generated
*/
long countByExample(F10JournalLogExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table f10_journal_log
*
* @mbg.generated
*/
int deleteByExample(F10JournalLogExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table f10_journal_log
*
* @mbg.generated
*/
int deleteByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table f10_journal_log
*
* @mbg.generated
*/
int insert(F10JournalLog record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table f10_journal_log
*
* @mbg.generated
*/
int insertSelective(F10JournalLog record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table f10_journal_log
*
* @mbg.generated
*/
List<F10JournalLog> selectByExampleWithBLOBs(F10JournalLogExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table f10_journal_log
*
* @mbg.generated
*/
List<F10JournalLog> selectByExample(F10JournalLogExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table f10_journal_log
*
* @mbg.generated
*/
F10JournalLog selectByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table f10_journal_log
*
* @mbg.generated
*/
int updateByExampleSelective(@Param("record") F10JournalLog record, @Param("example") F10JournalLogExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table f10_journal_log
*
* @mbg.generated
*/
int updateByExampleWithBLOBs(@Param("record") F10JournalLog record, @Param("example") F10JournalLogExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table f10_journal_log
*
* @mbg.generated
*/
int updateByExample(@Param("record") F10JournalLog record, @Param("example") F10JournalLogExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table f10_journal_log
*
* @mbg.generated
*/
int updateByPrimaryKeySelective(F10JournalLog record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table f10_journal_log
*
* @mbg.generated
*/
int updateByPrimaryKeyWithBLOBs(F10JournalLog record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table f10_journal_log
*
* @mbg.generated
*/
int updateByPrimaryKey(F10JournalLog record);
}

18
data-center-business-dao/src/main/java/com/techsor/datacenter/business/dao/ex/F10DataMapperExt.java

@ -0,0 +1,18 @@
package com.techsor.datacenter.business.dao.ex;
import com.techsor.datacenter.business.dao.auto.BasicProjectMapper;
import com.techsor.datacenter.business.dto.data.F10DataParam;
import com.techsor.datacenter.business.dto.project.OptProjectParams;
import com.techsor.datacenter.business.dto.project.ProjectSearchParams;
import com.techsor.datacenter.business.vo.data.F10JournalDataVO;
import com.techsor.datacenter.business.vo.project.ProjectPageVO;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@Mapper
public interface F10DataMapperExt {
List<F10JournalDataVO> getF10JournalData(F10DataParam pageSearchParam);
}

1079
data-center-business-dao/src/main/resources/mappers/auto/F10JournalLogMapper.xml

File diff suppressed because it is too large

66
data-center-business-dao/src/main/resources/mappers/ex/F10DataMapperExt.xml

@ -0,0 +1,66 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.techsor.datacenter.business.dao.ex.F10DataMapperExt">
<select id="getF10JournalData" resultType="com.techsor.datacenter.business.vo.data.F10JournalDataVO">
SELECT
id,
signal_seq,
receive_date,
receive_time,
channel_no,
test_flag,
block_no,
block_name,
signal_type1,
signal_type2,
signal_label,
signal_status,
course_no,
area_code,
course_code,
standby_name,
physical_addr,
customer_name,
phone,
remark,
display_color,
error_reason,
line_type,
area_name,
send_date,
send_time,
customer_no,
display_data1,
display_data2,
instruction_flag,
signal_code,
card_no,
card_type,
mansion_building,
mansion_room,
option_field
FROM
f10_journal_log
<where>
<if test="startTime != null">
AND receive_timestamp <![CDATA[ >= ]]> #{startTime}
</if>
<if test="endTime != null">
AND receive_timestamp <![CDATA[ <= ]]> #{endTime}
</if>
<if test="deviceId != null and deviceId != ''">
AND device_id = #{deviceId}
</if>
</where>
ORDER BY receive_timestamp DESC, id DESC
</select>
</mapper>

6
data-center-business-dao/src/main/resources/mybatis-generator/generatorConfig.xml

@ -312,5 +312,11 @@
<property name="useActualColumnNames" value="false" />
<generatedKey column="ap_gateway_id" sqlStatement="Mysql" identity="true" />
</table>
<table tableName="f10_journal_log" domainObjectName="F10JournalLog" enableCountByExample="true" enableUpdateByExample="true" enableDeleteByExample="true" enableSelectByExample="true" selectByExampleQueryId="true">
<property name="useActualColumnNames" value="false" />
<generatedKey column="id" sqlStatement="Mysql" identity="true" />
</table>
</context>
</generatorConfiguration>

24
data-center-business-model/src/main/java/com/techsor/datacenter/business/dto/data/F10DataParam.java

@ -0,0 +1,24 @@
package com.techsor.datacenter.business.dto.data;
import com.techsor.datacenter.business.dto.BaseSearchParams;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
/**
* @author Mr.Jiang
* @time 2022年7月21日 下午8:50:31
*/
@Data
public class F10DataParam extends BaseSearchParams {
@Schema(description ="Start time", example = "1709870240425")
private Long startTime;
@Schema(description ="End time", example = "1709889240425")
private Long endTime;
@Schema(description ="Device ID", example = "FT0001")
private String deviceId;
}

1629
data-center-business-model/src/main/java/com/techsor/datacenter/business/model/F10JournalLog.java

File diff suppressed because it is too large

3383
data-center-business-model/src/main/java/com/techsor/datacenter/business/model/F10JournalLogExample.java

File diff suppressed because it is too large

120
data-center-business-model/src/main/java/com/techsor/datacenter/business/vo/data/F10JournalDataVO.java

@ -0,0 +1,120 @@
package com.techsor.datacenter.business.vo.data;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
/**
* F10 ジャーナルデータ
* 信号通番オプション領域
*/
@Data
public class F10JournalDataVO {
private Long id;
@Schema(description = "信号通番", example = "0001")
private String signalSeq;
@Schema(description = "受信日付 YYYYMMDD", example = "20260423")
private String receiveDate;
@Schema(description = "受信時刻 HHMMSS", example = "153045")
private String receiveTime;
@Schema(description = "チャンネル番号", example = "01")
private String channelNo;
@Schema(description = "試験設定フラグ", example = "0")
private String testFlag;
@Schema(description = "ブロック番号", example = "001")
private String blockNo;
@Schema(description = "ブロック名称", example = "BLOCK-A")
private String blockName;
@Schema(description = "信号種別1", example = "10")
private String signalType1;
@Schema(description = "信号種別2", example = "20")
private String signalType2;
@Schema(description = "信号ラベル", example = "ALARM")
private String signalLabel;
@Schema(description = "信号状態", example = "1")
private String signalStatus;
@Schema(description = "機動コース番号", example = "100")
private String courseNo;
@Schema(description = "担当地区コード", example = "A01")
private String areaCode;
@Schema(description = "機動コースコード", example = "C001")
private String courseCode;
@Schema(description = "待機所名", example = "Tokyo Station")
private String standbyName;
@Schema(description = "物理アドレス", example = "00010001")
private String physicalAddr;
@Schema(description = "契約先名称", example = "ABC Corporation")
private String customerName;
@Schema(description = "電話番号", example = "09012345678")
private String phone;
@Schema(description = "備考", example = "Test remark")
private String remark;
@Schema(description = "表示色", example = "RED")
private String displayColor;
@Schema(description = "異常要因", example = "01")
private String errorReason;
@Schema(description = "回線種別", example = "LTE")
private String lineType;
@Schema(description = "地区名称", example = "Tokyo Area")
private String areaName;
@Schema(description = "送信日付 YYYYMMDD", example = "20260423")
private String sendDate;
@Schema(description = "送信時刻 HHMMSS", example = "154500")
private String sendTime;
@Schema(description = "契約先番号", example = "CUST001")
private String customerNo;
@Schema(description = "表示データ1", example = "DATA1")
private String displayData1;
@Schema(description = "表示データ2", example = "DATA2")
private String displayData2;
@Schema(description = "指令書作成フラグ", example = "1")
private String instructionFlag;
@Schema(description = "信号コード", example = "SIG001")
private String signalCode;
@Schema(description = "カード番号", example = "CARD001")
private String cardNo;
@Schema(description = "カード種別", example = "TYPE-A")
private String cardType;
@Schema(description = "マンション棟番号", example = "B01")
private String mansionBuilding;
@Schema(description = "マンション部屋番号", example = "1201")
private String mansionRoom;
@Schema(description = "オプション領域", example = "OPTION")
private String optionField;
}

4
data-center-business-service/src/main/java/com/techsor/datacenter/business/service/IDeviceService.java

@ -3,6 +3,7 @@ package com.techsor.datacenter.business.service;
import com.techsor.datacenter.business.common.response.PageInfo;
import com.techsor.datacenter.business.common.response.SimpleDataResponse;
import com.techsor.datacenter.business.dto.data.AuroraDataParam;
import com.techsor.datacenter.business.dto.data.F10DataParam;
import com.techsor.datacenter.business.dto.device.*;
import com.techsor.datacenter.business.dto.device.alert.DeviceAlertConfigNextParams;
import com.techsor.datacenter.business.dto.device.alert.DeviceAlertConfigNextUpdateParams;
@ -21,6 +22,7 @@ import com.techsor.datacenter.business.importexcel.deviceAlertInfo.DeviceAlertIn
import com.techsor.datacenter.business.importexcel.deviceinfo.DeviceInfoExcel;
import com.techsor.datacenter.business.model.MailSentResult;
import com.techsor.datacenter.business.vo.data.AuroraDataVO;
import com.techsor.datacenter.business.vo.data.F10JournalDataVO;
import com.techsor.datacenter.business.vo.device.DeviceVO;
import com.techsor.datacenter.business.vo.device.LambdaEmailResult;
import com.techsor.datacenter.business.vo.device.MonitoringPointCategoryVO;
@ -126,4 +128,6 @@ public interface IDeviceService {
SimpleDataResponse<List<MonitoringPointCategoryVO>> getMonitoringPointCategory(Long companyId, Integer languageType);
PageInfo<DeviceGroupPageVO> getDeviceGroupListPage(DeviceGroupSearchParams pageSearchParam, Long companyId, Long userId, Integer languageType, Integer utcOffset);
PageInfo<F10JournalDataVO> getF10JournalData(F10DataParam f10DataParam, Long userId, Long companyId, Integer languageType);
}

20
data-center-business-service/src/main/java/com/techsor/datacenter/business/service/impl/DeviceServiceImpl.java

@ -23,6 +23,7 @@ import com.techsor.datacenter.business.common.response.SimpleDataResponse;
import com.techsor.datacenter.business.dao.auto.TargetIdCheckMapper;
import com.techsor.datacenter.business.dao.ex.*;
import com.techsor.datacenter.business.dto.data.AuroraDataParam;
import com.techsor.datacenter.business.dto.data.F10DataParam;
import com.techsor.datacenter.business.dto.device.*;
import com.techsor.datacenter.business.dto.device.alert.DeviceAlertConfigNextParams;
import com.techsor.datacenter.business.dto.device.alert.DeviceAlertConfigNextUpdateParams;
@ -58,6 +59,7 @@ import com.techsor.datacenter.business.util.entity.AlertContentExtractParams;
import com.techsor.datacenter.business.util.redis.RedisUtil;
import com.techsor.datacenter.business.vo.company.ApikeyInfo2;
import com.techsor.datacenter.business.vo.data.AuroraDataVO;
import com.techsor.datacenter.business.vo.data.F10JournalDataVO;
import com.techsor.datacenter.business.vo.device.*;
import com.techsor.datacenter.business.vo.device.alert.DeviceAlertConfigVO;
import com.techsor.datacenter.business.vo.device.forward.DeviceForwardConfigVO;
@ -194,6 +196,9 @@ public class DeviceServiceImpl implements IDeviceService {
@Resource
private DeviceGroupRelationMapperExt deviceGroupRelationMapperExt;
@Resource
private F10DataMapperExt f10DataMapperExt;
@Resource
private DeviceForwardConfigMapperExt deviceForwardConfigMapperExt;
@ -2727,6 +2732,17 @@ public class DeviceServiceImpl implements IDeviceService {
}
@Override
public PageInfo<F10JournalDataVO> getF10JournalData(F10DataParam pageSearchParam, Long userId, Long companyId, Integer languageType) {
PageHelper.startPage(pageSearchParam.getPageNum() == null ? 1 : pageSearchParam.getPageNum(),
pageSearchParam.getPageSize() == null ? 20 : pageSearchParam.getPageSize());
List<F10JournalDataVO> list = f10DataMapperExt.getF10JournalData(pageSearchParam);
return new PageInfo<>(list);
}
@Override
public void downloadOldDataFileFromS3(String fileNames, HttpServletResponse response, Long userId, Long companyId,
Integer languageType) {
@ -2818,6 +2834,6 @@ public class DeviceServiceImpl implements IDeviceService {
List<DeviceGroupPageVO> list = deviceGroupMapperExt.getListPage(pageSearchParam);
return new PageInfo<>(list);
}
}

Loading…
Cancel
Save