Browse Source

fix: 大模型模块名调整

zhongwei
haungxing 3 months ago
parent
commit
02eb81c930
  1. 13
      hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/EmInfoController.java
  2. 2
      hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/mapper/EmInfoMapper.java
  3. 3
      hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/mapper/EmInfoMapper.xml
  4. 2
      hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmInfoService.java
  5. 31
      hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/vo/StationEmInfoVO.java

13
hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/EmInfoController.java

@ -11,14 +11,12 @@ import com.hnac.hzims.common.logs.enums.OperatorType;
import com.hnac.hzims.equipment.dto.DeviceTreeDTO; import com.hnac.hzims.equipment.dto.DeviceTreeDTO;
import com.hnac.hzims.equipment.entity.EmInfoEntity; import com.hnac.hzims.equipment.entity.EmInfoEntity;
import com.hnac.hzims.equipment.service.IEmInfoService; import com.hnac.hzims.equipment.service.IEmInfoService;
import com.hnac.hzims.equipment.vo.EmInfoAddVo; import com.hnac.hzims.equipment.vo.*;
import com.hnac.hzims.equipment.vo.EmInfoContentVO;
import com.hnac.hzims.equipment.vo.EmInfoTreeVO;
import com.hnac.hzims.equipment.vo.EmInfoVO;
import com.hnac.hzims.operational.station.entity.StationEntity; import com.hnac.hzims.operational.station.entity.StationEntity;
import com.hnac.hzims.operational.station.feign.IStationClient; import com.hnac.hzims.operational.station.feign.IStationClient;
import com.hnac.hzims.spare.vo.SparePartVO; import com.hnac.hzims.spare.vo.SparePartVO;
import com.hnac.hzims.util.MemoryPagination; import com.hnac.hzims.util.MemoryPagination;
import com.hnac.hzinfo.api.annotation.ApiInterface;
import com.hnac.hzinfo.inspect.obj.dto.ContentDTO; import com.hnac.hzinfo.inspect.obj.dto.ContentDTO;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;
@ -79,6 +77,13 @@ public class EmInfoController extends BladeController {
return R.data(pages); return R.data(pages);
} }
@GetMapping("/getStationEmList")
@ApiOperationSupport(order = 19)
@ApiInterface
public R<List<StationEmInfoVO>> getStationEmList() {
return R.data(em_infoService.getStationEmList());
}
/** /**
* 设备列表 分页 * 设备列表 分页
*/ */

2
hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/mapper/EmInfoMapper.java

@ -57,4 +57,6 @@ public interface EmInfoMapper extends UserDataScopeBaseMapper<EmInfoEntity> {
List<SparePartVO> getSparePart(@Param("path") String path, @Param("startTime") String startTime, @Param("endTime") String endTime); List<SparePartVO> getSparePart(@Param("path") String path, @Param("startTime") String startTime, @Param("endTime") String endTime);
List<EmInfoTreeVO> getEmInfoTree(@Param("ew") Wrapper ew); List<EmInfoTreeVO> getEmInfoTree(@Param("ew") Wrapper ew);
List<EmInfoEntity> getAllEmInfo();
} }

3
hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/mapper/EmInfoMapper.xml

@ -174,4 +174,7 @@
</where> </where>
order by `create_time` desc order by `create_time` desc
</select> </select>
<select id="getAllEmInfo" resultType="com.hnac.hzims.equipment.entity.EmInfoEntity">
select * from `hzims_em_info` where `is_deleted` = 0
</select>
</mapper> </mapper>

2
hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmInfoService.java

@ -101,4 +101,6 @@ public interface IEmInfoService extends IService<EmInfoEntity> {
List<EmInfoTreeVO> getEmInfoTree(EmInfoEntity req); List<EmInfoTreeVO> getEmInfoTree(EmInfoEntity req);
List<RideDeviceVo> rideDevices(List<Long> deptIds); List<RideDeviceVo> rideDevices(List<Long> deptIds);
List<StationEmInfoVO> getStationEmList();
} }

31
hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/vo/StationEmInfoVO.java

@ -0,0 +1,31 @@
package com.hnac.hzims.equipment.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
/**
* @Author: huangxing
* @Date: 2024/09/11 19:30
*/
@Data
@EqualsAndHashCode
@ApiModel(value = "站点-设备VO对象",description = "站点-设备VO对象")
public class StationEmInfoVO implements Serializable {
@ApiModelProperty("站点编号")
private String stationCode;
@ApiModelProperty("站点名称")
private String stationName;
@ApiModelProperty("设备编号")
private String emCode;
@ApiModelProperty("设备名称")
private String emName;
}
Loading…
Cancel
Save