Skip to content

A
amos-boot-biz
Commit d0e7527e authored by Tkunkun's avatar Tkunkun
Browse files
Options

修改了故障记录

parent 67924c9d
Show whitespace changes
Inline Side-by-side
Showing with 44 additions and 24 deletions
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/EquipmentParams.java
View file @ d0e7527e
......@@ -6,8 +6,9 @@
package com.yeejoin.equipmanage.common.entity;
import cn.afterturn.easypoi.excel.annotation.Excel;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.yeejoin.equipmanage.common.entity.publics.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
......@@ -15,31 +16,41 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.util.Date;
/**
* 故障类型
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("wl_equipment_params")
@ApiModel(value = "EquipmentDetail对象", description = "")
public class EquipmentParams extends BaseEntity {
public class EquipmentParams implements Serializable {
@TableId(type = IdType.ID_WORKER)
@JsonSerialize(using = ToStringSerializer.class)
private String id;
private static final long serialVersionUID = 1L;
/**
* 新增和更新执行
*/
@TableField(value = "create_date", fill = FieldFill.INSERT)
private Date createDate;
@TableField("status")
@ApiModelProperty(value="状态")
@Excel(name = "状态",orderNum = "11")
private int status;
private String status;
@TableField("detail_id")
@ApiModelProperty(value="装备id")
private Long detailId;
private String detailId;
@TableField("fault_knowledge_id")
@ApiModelProperty(value="知识库id")
private Long faultKnowledgeId;
private String faultKnowledgeId;
@TableField(exist = false)
@ApiModelProperty(value = "故障类型")
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentDetailController.java
View file @ d0e7527e
......@@ -185,17 +185,18 @@ public class EquipmentDetailController extends AbstractBaseController {
@RequestParam(required = false) Long stockDetailId) {
EquipmentDate equipmentDate = new EquipmentDate();
EquipmentSpecific equipmentSpecific = equipmentSpecificSerivce.getById(id);
String iotCode=equipmentSpecific.getIotCode();
equipmentSpecific.setFullqrCode("01#" + equipmentSpecific.getQrCode());
EquipmentDetail equipmentDetail = iEquipmentDetailService.getOneById(equipmentSpecific.getEquipmentDetailId());
//查找装备故障的最后一条状态
QueryWrapper<EquipmentParams> wrapper = new QueryWrapper<>();
wrapper.eq("detail_id",equipmentDetail.getId());
wrapper.eq("detail_id",iotCode);//故障记录表中的detail_id 是装备的iotCode
wrapper.orderByDesc("create_date");
List<EquipmentParams> equipmentParams = equipmentParamsMapper.selectList(wrapper);
if(!equipmentParams.isEmpty()){
EquipmentParams equipmentParam = equipmentParams.get(0);
equipmentDetail.setStatus(Integer.toString(equipmentParam.getStatus()));
equipmentDetail.setStatus(equipmentParam.getStatus());
}
equipmentDetail.setStatus("正常");
......@@ -586,7 +587,7 @@ public class EquipmentDetailController extends AbstractBaseController {
}
@RequestMapping(value = "/getPref", method = RequestMethod.GET)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
public String getPref(@RequestParam(value = "id") String id) {
String temp = iEquipmentDetailService.getPref(id);
......@@ -607,7 +608,7 @@ public class EquipmentDetailController extends AbstractBaseController {
@ApiOperation(value = "导出装备清单", notes = "导出装备清单")
@PostMapping(value = "/export")
@TycloudOperation(ApiLevel = UserType.AGENCY)
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
public void exportDangerList(@RequestBody List<DetailssAmountVO> detailssAmountVO,@RequestParam Integer prop, HttpServletResponse response) {
String fileName = "装备清单" + new Date().getTime();
if(prop==1){//全部导出
......@@ -635,9 +636,11 @@ public class EquipmentDetailController extends AbstractBaseController {
List<EquipmentParams> equipmentParams =iEquipmentParamsService.list(wrapper);
if(!equipmentParams.isEmpty()){
EquipmentParams equipmentParam = equipmentParams.get(0);
model.setStatus(equipmentParam.getStatus()==0?"正常":"故障");
Long faultKnowledgeId = equipmentParam.getFaultKnowledgeId();
EquipmentFaultKnowledge equipmentFaultKnowledge = equipmentFaultKnowledgeService.getById(faultKnowledgeId);
model.setStatus(equipmentParam.getStatus());
String faultKnowledgeId = equipmentParam.getFaultKnowledgeId();//这里的knowledgeId 是只是库里面的type字段
QueryWrapper<EquipmentFaultKnowledge> wrapperKnowledge = new QueryWrapper<>();
wrapperKnowledge.eq("type",faultKnowledgeId);
EquipmentFaultKnowledge equipmentFaultKnowledge = equipmentFaultKnowledgeService.list(wrapperKnowledge).get(0);
model.setReason(equipmentFaultKnowledge.getType());
model.setMeasure(equipmentFaultKnowledge.getMeasure());
}else{
......@@ -653,7 +656,7 @@ public class EquipmentDetailController extends AbstractBaseController {
* @return
*/
@GetMapping(value = "/eqParamsList")
@TycloudOperation(ApiLevel = UserType.AGENCY)
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@ApiOperation(httpMethod = "GET", value = "按照id故障记录查询", notes = "按照id故障记录查询")
public IPage<EquipmentParams> list(@RequestParam(name = "cur")String pageNum, @RequestParam(name = "pageSize")String pageSize, @RequestParam(name = "specificId") Long specificId) {
Page<EquipmentParams> pageBean;
......@@ -664,15 +667,17 @@ public class EquipmentDetailController extends AbstractBaseController {
pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
}
EquipmentSpecific equmentSpecific = equipmentSpecificSerivce.getById(specificId);
Long detailId = equmentSpecific.getEquipmentDetailId();
String iotCode = equmentSpecific.getIotCode();
QueryWrapper<EquipmentParams> wrapper = new QueryWrapper<>();
wrapper.eq("detail_id",detailId);
wrapper.eq("detail_id",iotCode);
wrapper.orderByDesc("create_date");
page = iEquipmentParamsService.page(pageBean, wrapper);
List<EquipmentParams> records = page.getRecords();
for(EquipmentParams ep :records){
Long faultKnowledgeId = ep.getFaultKnowledgeId();
EquipmentFaultKnowledge model = equipmentFaultKnowledgeService.getById(faultKnowledgeId);
String faultKnowledgeId = ep.getFaultKnowledgeId();
QueryWrapper<EquipmentFaultKnowledge> wrapperKnowledge = new QueryWrapper<>();
wrapperKnowledge.eq("type",faultKnowledgeId);
EquipmentFaultKnowledge model = equipmentFaultKnowledgeService.list(wrapperKnowledge).get(0);
ep.setType(model.getType());
ep.setMeasure(model.getMeasure());
}
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/FireFightingSystemController.java
View file @ d0e7527e
......@@ -293,7 +293,7 @@ public class FireFightingSystemController extends AbstractBaseController {
@PostMapping(value = "/getEquipTypeAmount")
@TycloudOperation(ApiLevel = UserType.AGENCY)
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@ApiOperation(httpMethod = "POST", value = "九大类下装备，通过code截取", notes = "九大类下装备信息列表")
public IPage<DetailssAmountVO> getEquipType(@RequestBody DetailssDTO detailssDTO) {
String[] result = hierarchy.split(",");
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/FireFightingSystemServiceImpl.java
View file @ d0e7527e
......@@ -722,14 +722,14 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
List<DetailssAmountVO> records = list.getRecords();
for(DetailssAmountVO da: records){
Long id = da.getId();
Long EquipmentDetailId = equipmentSpecificService.getById(id).getEquipmentDetailId();
String iotCode = equipmentSpecificService.getById(id).getIotCode();
QueryWrapper<EquipmentParams> wrapper = new QueryWrapper<>();
wrapper.eq("detail_id",EquipmentDetailId);
wrapper.eq("detail_id",iotCode);
wrapper.orderByDesc("create_date");//根据创建时间进行倒叙
List<EquipmentParams> equipmentParams = equipmentParamsMapper.selectList(wrapper);
if(!equipmentParams.isEmpty()){
EquipmentParams params = equipmentParams.get(0);
da.setStatus(params.getStatus()==0?"正常":"故障");
da.setStatus(params.getStatus());
}else {
da.setStatus("正常");
}
......
amos-boot-system-equip/src/main/resources/application-dev.properties
View file @ d0e7527e
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.url = jdbc:mysql://192.168.1.114:3306/business_v3.0.0.2?useUnicode=true&allowMultiQueries=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
#spring.datasource.url = jdbc:mysql://127.0.0.1:3306/business_v3.0.0.2?useUnicode=true&allowMultiQueries=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
spring.datasource.username=root
spring.datasource.password=Yeejoin@2020
spring.datasource.type=com.zaxxer.hikari.HikariDataSource
......
amos-boot-system-equip/src/main/resources/application.properties
View file @ d0e7527e
......@@ -114,3 +114,6 @@ dcs.token-key=dcs_token_key
dcs.client.secret=fire_system
dcs.x.hw.id=NR_REST_APP
dcs.x.hw.appKey=s+YkvQhwilx91TRJHhNDmw==
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment