Skip to content

A
amos-boot-biz
Commit bd0ccfbb authored by maoying's avatar maoying
Browse files
Options

Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

parents b8a25355 af6ac50c
Show whitespace changes
Inline Side-by-side
Showing with 358 additions and 76 deletions
amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/src/main/java/com/yeejoin/amos/supervision/dao/entity/InputItem.java
View file @ bd0ccfbb
package com.yeejoin.amos.supervision.dao.entity; package com.yeejoin.amos.supervision.dao.entity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Lob;
import javax.persistence.NamedQuery;
import javax.persistence.Table;
import org.hibernate.annotations.Where; import org.hibernate.annotations.Where;
import javax.persistence.*;
/** /**
* 检查项 * 检查项
...@@ -183,42 +179,54 @@ public class InputItem extends BasicEntity { ...@@ -183,42 +179,54 @@ public class InputItem extends BasicEntity {
private String testRequirement; private String testRequirement;
/** /**
* 检查类型字典值
*/
@Column(name = "check_type_Val")
private String checkTypeId;
/**
* 检查类型 * 检查类型
*/ */
@Column(name="check_type") @Column(name = "check_type")
private String checkType; private String checkType;
/** /**
* 父类检查项id * 父类检查项id
*/ */
@Column(name="item_parent") @Column(name = "item_parent")
private String itemParent; private String itemParent;
/** /**
* 检查项分类 * 检查项分类
*/ */
@Column(name="item_classify") @Column(name = "item_classify")
private String itemClassify; private String itemClassify;
/** /**
* 适用检查类别 * 适用检查类别
*/ */
@Lob @Lob
@Column(name="item_type_classify") @Column(name = "item_type_classify")
private String itemTypeClassify; private String itemTypeClassify;
/** /**
* 检查项等级 * 检查项等级
*/ */
@Column(name="item_level") @Column(name = "item_level")
private String itemLevel; private String itemLevel;
/** /**
* 检查项启用 * 检查项启用
*/ */
@Column(name="item_start") @Column(name = "item_start")
private Integer itemStart; private Integer itemStart;
/**
* 扩展属性
*/
@Transient
private String ext;
public Integer getItemStart() { public Integer getItemStart() {
return itemStart; return itemStart;
} }
...@@ -498,4 +506,20 @@ public class InputItem extends BasicEntity { ...@@ -498,4 +506,20 @@ public class InputItem extends BasicEntity {
public void setBasisJson(String basisJson) { public void setBasisJson(String basisJson) {
this.basisJson = basisJson; this.basisJson = basisJson;
} }
public String getCheckTypeId() {
return checkTypeId;
}
public void setCheckTypeId(String checkTypeId) {
this.checkTypeId = checkTypeId;
}
public String getExt() {
return ext;
}
public void setExt(String ext) {
this.ext = ext;
}
} }
\ No newline at end of file
amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/src/main/java/com/yeejoin/amos/supervision/dao/entity/RoutePointItem.java
View file @ bd0ccfbb
package com.yeejoin.amos.supervision.dao.entity; package com.yeejoin.amos.supervision.dao.entity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.NamedQuery;
import javax.persistence.Table;
import javax.persistence.Transient;
import com.fasterxml.jackson.annotation.JsonBackReference; import com.fasterxml.jackson.annotation.JsonBackReference;
import javax.persistence.*;
/** /**
* The persistent class for the p_route_point_item database table. * The persistent class for the p_route_point_item database table.
*
*/ */
@Entity @Entity
@Table(name="p_route_point_item") @Table(name = "p_route_point_item")
@NamedQuery(name="RoutePointItem.findAll", query="SELECT r FROM RoutePointItem r") @NamedQuery(name = "RoutePointItem.findAll", query = "SELECT r FROM RoutePointItem r")
public class RoutePointItem extends BasicEntity { public class RoutePointItem extends BasicEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**
* 创建者 * 创建者
*/ */
@Column(name="creator_id") @Column(name = "creator_id")
private String creatorId; private String creatorId;
/** /**
* 排序 * 排序
*/ */
@Column(name="order_no") @Column(name = "order_no")
private int orderNo; private int orderNo;
/** /**
* 巡检点检查项id * 巡检点检查项id
*/ */
@Column(name="point_input_item_id") @Column(name = "point_input_item_id")
private long pointInputItemId; private long pointInputItemId;
/** /**
* 路线点表id * 路线点表id
*/ */
@Column(name="route_point_id") @Column(name = "route_point_id")
private long routePointId; private long routePointId;
/** /**
* 点分类id * 点分类id
*/ */
@Column(name="point_classify_id") @Column(name = "point_classify_id")
private Long pointClassifyId; private Long pointClassifyId;
/** /**
* 前端标记是否绑定 * 前端标记是否绑定
*/ */
...@@ -66,7 +58,21 @@ public class RoutePointItem extends BasicEntity { ...@@ -66,7 +58,21 @@ public class RoutePointItem extends BasicEntity {
*/ */
@Column(name = "basis_json", columnDefinition = "text COMMENT '标准依据'") @Column(name = "basis_json", columnDefinition = "text COMMENT '标准依据'")
private String basisJson; private String basisJson;
/**
* 检查项ID
*/
@Column(name = "input_item_id")
private Long inputItemId;
/**
* 计划ID
*/
@Column(name = "plan_id")
private Long planId;
private long pointId; private long pointId;
public RoutePointItem() { public RoutePointItem() {
} }
...@@ -107,6 +113,7 @@ public class RoutePointItem extends BasicEntity { ...@@ -107,6 +113,7 @@ public class RoutePointItem extends BasicEntity {
public RoutePoint getRoutePoint() { public RoutePoint getRoutePoint() {
return routePoint; return routePoint;
} }
@JsonBackReference @JsonBackReference
public void setRoutePoint(RoutePoint routePoint) { public void setRoutePoint(RoutePoint routePoint) {
this.routePoint = routePoint; this.routePoint = routePoint;
...@@ -129,6 +136,7 @@ public class RoutePointItem extends BasicEntity { ...@@ -129,6 +136,7 @@ public class RoutePointItem extends BasicEntity {
public void setBasisJson(String basisJson) { public void setBasisJson(String basisJson) {
this.basisJson = basisJson; this.basisJson = basisJson;
} }
@Transient @Transient
public long getPointId() { public long getPointId() {
return pointId; return pointId;
...@@ -146,4 +154,20 @@ public class RoutePointItem extends BasicEntity { ...@@ -146,4 +154,20 @@ public class RoutePointItem extends BasicEntity {
public void setIsBound(boolean bound) { public void setIsBound(boolean bound) {
isBound = bound; isBound = bound;
} }
public Long getInputItemId() {
return inputItemId;
}
public void setInputItemId(Long inputItemId) {
this.inputItemId = inputItemId;
}
public Long getPlanId() {
return planId;
}
public void setPlanId(Long planId) {
this.planId = planId;
}
} }
\ No newline at end of file
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/DynamicFormColumnServiceImpl.java
View file @ bd0ccfbb
...@@ -72,7 +72,7 @@ public class DynamicFormColumnServiceImpl extends BaseService<DynamicFormColumnD ...@@ -72,7 +72,7 @@ public class DynamicFormColumnServiceImpl extends BaseService<DynamicFormColumnD
List<DynamicFormInitDto> listForm = new ArrayList<DynamicFormInitDto>(); List<DynamicFormInitDto> listForm = new ArrayList<DynamicFormInitDto>();
String appKey = RequestContext.getAppKey(); String appKey = RequestContext.getAppKey();
// 组装数据 // 组装数据
dynamicFormColumn.parallelStream().forEach(dynamicForm -> { dynamicFormColumn.stream().forEach(dynamicForm -> {
if ( dynamicForm.getFieldType().equals("input") || if ( dynamicForm.getFieldType().equals("input") ||
dynamicForm.getFieldType().equals("string") || dynamicForm.getFieldType().equals("string") ||
dynamicForm.getFieldType().equals("datetime") || dynamicForm.getFieldType().equals("datetime") ||
...@@ -193,7 +193,7 @@ public class DynamicFormColumnServiceImpl extends BaseService<DynamicFormColumnD ...@@ -193,7 +193,7 @@ public class DynamicFormColumnServiceImpl extends BaseService<DynamicFormColumnD
} }
}); });
return listForm.stream().sorted(Comparator.comparing(DynamicFormInitDto::getSort)).collect(Collectors.toList()); return listForm.stream().sorted(Comparator.nullsFirst(Comparator.comparing(DynamicFormInitDto::getSort))).collect(Collectors.toList());
} }
public List<SelectItem> getdata(Collection<DataDictionary> list) { public List<SelectItem> getdata(Collection<DataDictionary> list) {
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/pom.xml
View file @ bd0ccfbb
...@@ -95,6 +95,10 @@ ...@@ -95,6 +95,10 @@
<artifactId>spring-boot-starter-mail</artifactId> <artifactId>spring-boot-starter-mail</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.liquibase</groupId>
<artifactId>liquibase-core</artifactId>
</dependency>
<dependency>
<groupId>cn.jpush.api</groupId> <groupId>cn.jpush.api</groupId>
<artifactId>jpush-client</artifactId> <artifactId>jpush-client</artifactId>
</dependency> </dependency>
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/controller/RoutePointItemController.java 0 → 100644
View file @ bd0ccfbb
package com.yeejoin.amos.supervision.business.controller;
import com.yeejoin.amos.supervision.business.service.intfc.IRoutePointItemService;
import com.yeejoin.amos.supervision.business.util.CommonResponse;
import com.yeejoin.amos.supervision.business.util.CommonResponseUtil;
import com.yeejoin.amos.supervision.dao.entity.Plan;
import com.yeejoin.amos.supervision.dao.entity.RoutePointItem;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import java.util.List;
/**
* @author gaojianqiang
* @date 2021/09/10 11:28
*/
@RestController
@RequestMapping(value = "/api/routePointItem")
@Api(tags = "巡检路线点项api")
public class RoutePointItemController extends AbstractBaseController {
private final Logger log = LoggerFactory.getLogger(RoutePointItemController.class);
@Autowired
private IRoutePointItemService routePointItemService;
/**
* 增加巡检路线点项关系
*
* @param plan 巡检计划
* @param inputItemIds 巡检项IDS
* @return CommonResponse
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "新增巡检路线点项关系", notes = "新增巡检路线点项关系")
@PostMapping(value = "/addRoutePointItem", produces = "application/json;charset=UTF-8")
public CommonResponse addRoute(@ApiParam(value = "巡检计划", required = true) @RequestBody Plan plan,
@ApiParam(value = "检查项IDS", required = true) @RequestParam List<Long> inputItemIds) {
try {
String userId = getUserId();
if (StringUtils.isNotBlank(userId)) {
List<RoutePointItem> list = routePointItemService.addRoutePointItemList(plan, inputItemIds, userId);
if (CollectionUtils.isNotEmpty(list)) {
return CommonResponseUtil.success();
}
return CommonResponseUtil.failure("路线点或检查项为空！");
}
return CommonResponseUtil.failure("创建用户为空！");
} catch (Exception e) {
log.error(e.getMessage(), e);
return CommonResponseUtil.failure("巡检路线点项关系新增失败！");
}
}
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dao/repository/IInputItemDao.java
View file @ bd0ccfbb
...@@ -22,6 +22,9 @@ public interface IInputItemDao extends BaseDao<InputItem, Long> { ...@@ -22,6 +22,9 @@ public interface IInputItemDao extends BaseDao<InputItem, Long> {
@Query(value = "select * from p_input_item where original_id in ?1 and is_delete =0", nativeQuery = true) @Query(value = "select * from p_input_item where original_id in ?1 and is_delete =0", nativeQuery = true)
List<InputItem> listByOriginalIds(List<String> originalIds); List<InputItem> listByOriginalIds(List<String> originalIds);
@Query(value = "select * from p_input_item where id in ?1 and is_delete =0", nativeQuery = true)
List<InputItem> listByIds(List<Long> ids);
@Query(value = "select * from p_input_item where item_no = ?1 and equipment_name = ?2 and is_delete =0", nativeQuery = true) @Query(value = "select * from p_input_item where item_no = ?1 and equipment_name = ?2 and is_delete =0", nativeQuery = true)
List<InputItem> findByItemNoAndEquipmentName(String itemNo,String equipmentName); List<InputItem> findByItemNoAndEquipmentName(String itemNo,String equipmentName);
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dao/repository/IRoutePointItemDao.java
View file @ bd0ccfbb
...@@ -23,4 +23,9 @@ public interface IRoutePointItemDao extends BaseDao<RoutePointItem, Long> { ...@@ -23,4 +23,9 @@ public interface IRoutePointItemDao extends BaseDao<RoutePointItem, Long> {
@Transactional @Transactional
@Query(value = "delete from p_route_point_item WHERE id in (?1)", nativeQuery = true) @Query(value = "delete from p_route_point_item WHERE id in (?1)", nativeQuery = true)
void deleteByRoutePointItemId(List<Long> delRoutePointItemIds); void deleteByRoutePointItemId(List<Long> delRoutePointItemIds);
@Modifying
@Transactional
@Query(value = "delete from p_route_point_item WHERE plan_id = ?1", nativeQuery = true)
void deleteByPlanId(Long planId);
} }
amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/param/InputItemPageParam.java
View file @ bd0ccfbb
...@@ -11,6 +11,7 @@ public class InputItemPageParam extends CommonPageable{ ...@@ -11,6 +11,7 @@ public class InputItemPageParam extends CommonPageable{
private String name; private String name;
private String level; private String level;
private String itemNo; private String itemNo;
private String checkTypeId;
/** /**
* 机构 * 机构
*/ */
...@@ -82,4 +83,12 @@ public class InputItemPageParam extends CommonPageable{ ...@@ -82,4 +83,12 @@ public class InputItemPageParam extends CommonPageable{
public void setCatalogIds(List<Long> catalogIds) { public void setCatalogIds(List<Long> catalogIds) {
this.catalogIds = catalogIds; this.catalogIds = catalogIds;
} }
public String getCheckTypeId() {
return checkTypeId;
}
public void setCheckTypeId(String checkTypeId) {
this.checkTypeId = checkTypeId;
}
} }
amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/PointServiceImpl.java
View file @ bd0ccfbb
...@@ -3,46 +3,25 @@ package com.yeejoin.amos.supervision.business.service.impl; ...@@ -3,46 +3,25 @@ package com.yeejoin.amos.supervision.business.service.impl;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Sequence; import com.baomidou.mybatisplus.core.toolkit.Sequence;
import com.google.common.base.Joiner; import com.google.common.base.Joiner;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel; import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import com.yeejoin.amos.safety.common.cache.PointStatusCache;
import com.yeejoin.amos.supervision.business.constants.XJConstant; import com.yeejoin.amos.supervision.business.constants.XJConstant;
import com.yeejoin.amos.supervision.business.dao.mapper.InputItemMapper; import com.yeejoin.amos.supervision.business.dao.mapper.InputItemMapper;
import com.yeejoin.amos.supervision.business.dao.mapper.PointMapper; import com.yeejoin.amos.supervision.business.dao.mapper.PointMapper;
import com.yeejoin.amos.supervision.business.dao.mapper.RouteMapper; import com.yeejoin.amos.supervision.business.dao.mapper.RouteMapper;
import com.yeejoin.amos.supervision.business.dao.repository.*; import com.yeejoin.amos.supervision.business.dao.repository.*;
import com.yeejoin.amos.supervision.business.dao.repository.ICatalogTreeDao;
import com.yeejoin.amos.supervision.business.dao.repository.IPlanTaskDao;
import com.yeejoin.amos.supervision.business.dao.repository.IPlanTaskDetailDao;
import com.yeejoin.amos.supervision.business.dao.repository.IPointClassifyDao;
import com.yeejoin.amos.supervision.business.dao.repository.IPointDao;
import com.yeejoin.amos.supervision.business.dao.repository.IPointInputItemDao;
import com.yeejoin.amos.supervision.business.dao.repository.IPointPhotoDao;
import com.yeejoin.amos.supervision.business.dao.repository.IRoutePointDao;
import com.yeejoin.amos.supervision.business.dao.repository.IRoutePointItemDao;
import com.yeejoin.amos.supervision.business.dto.FormValue; import com.yeejoin.amos.supervision.business.dto.FormValue;
import com.yeejoin.amos.supervision.business.dto.OrgUsrFormDto; import com.yeejoin.amos.supervision.business.dto.OrgUsrFormDto;
import com.yeejoin.amos.supervision.business.dto.PointDto; import com.yeejoin.amos.supervision.business.dto.PointDto;
import com.yeejoin.amos.supervision.business.entity.mybatis.CheckPtListBo; import com.yeejoin.amos.supervision.business.entity.mybatis.CheckPtListBo;
import com.yeejoin.amos.supervision.business.feign.EquipFeign; import com.yeejoin.amos.supervision.business.feign.EquipFeign;
import com.yeejoin.amos.supervision.business.param.*; import com.yeejoin.amos.supervision.business.param.*;
import com.yeejoin.amos.supervision.business.param.CheckPtListPageParam;
import com.yeejoin.amos.supervision.business.param.MovePointParam;
import com.yeejoin.amos.supervision.business.param.PointImportParam;
import com.yeejoin.amos.supervision.business.param.PointImportQueryParam;
import com.yeejoin.amos.supervision.business.param.PointParam;
import com.yeejoin.amos.supervision.business.service.intfc.IPointService; import com.yeejoin.amos.supervision.business.service.intfc.IPointService;
import com.yeejoin.amos.supervision.business.util.DaoCriteria; import com.yeejoin.amos.supervision.business.util.DaoCriteria;
import com.yeejoin.amos.supervision.business.vo.*; import com.yeejoin.amos.supervision.business.vo.*;
import com.yeejoin.amos.supervision.business.vo.InputItemVo;
import com.yeejoin.amos.supervision.business.vo.LeavelMovePointVo;
import com.yeejoin.amos.supervision.business.vo.MaintenanceResourceData;
import com.yeejoin.amos.supervision.business.vo.PointClassifyVo;
import com.yeejoin.amos.supervision.business.vo.PointInputItemVo;
import com.yeejoin.amos.supervision.business.vo.PointVo;
import com.yeejoin.amos.supervision.common.enums.PointStatusEnum; import com.yeejoin.amos.supervision.common.enums.PointStatusEnum;
import com.yeejoin.amos.supervision.core.common.request.CommonPageable; import com.yeejoin.amos.supervision.core.common.request.CommonPageable;
import com.yeejoin.amos.supervision.core.common.response.PointResponse; import com.yeejoin.amos.supervision.core.common.response.PointResponse;
...@@ -51,19 +30,8 @@ import com.yeejoin.amos.supervision.core.util.query.BaseQuerySpecification; ...@@ -51,19 +30,8 @@ import com.yeejoin.amos.supervision.core.util.query.BaseQuerySpecification;
import com.yeejoin.amos.supervision.dao.entity.*; import com.yeejoin.amos.supervision.dao.entity.*;
import com.yeejoin.amos.supervision.exception.YeeException; import com.yeejoin.amos.supervision.exception.YeeException;
import com.yeejoin.amos.supervision.feign.RemoteSecurityService; import com.yeejoin.amos.supervision.feign.RemoteSecurityService;
import com.yeejoin.amos.safety.common.cache.PointStatusCache;
import com.yeejoin.amos.supervision.dao.entity.CatalogTree;
import com.yeejoin.amos.supervision.dao.entity.InputItem;
import com.yeejoin.amos.supervision.dao.entity.PlanTask;
import com.yeejoin.amos.supervision.dao.entity.PlanTaskDetail;
import com.yeejoin.amos.supervision.dao.entity.Point;
import com.yeejoin.amos.supervision.dao.entity.PointClassify;
import com.yeejoin.amos.supervision.dao.entity.PointInputItem;
import com.yeejoin.amos.supervision.dao.entity.PointPhoto;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.apache.poi.ss.formula.functions.T;
import org.assertj.core.util.Sets; import org.assertj.core.util.Sets;
import org.eclipse.paho.client.mqttv3.MqttException;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
...@@ -141,7 +109,7 @@ public class PointServiceImpl implements IPointService { ...@@ -141,7 +109,7 @@ public class PointServiceImpl implements IPointService {
Point point = pointParam.getPoint(); Point point = pointParam.getPoint();
point.setIsDelete(false); point.setIsDelete(false);
iPointDao.saveAndFlush(point); iPointDao.saveAndFlush(point);
addClassifyAndInputItem(pointParam, point); // addClassifyAndInputItem(pointParam, point);
return point; return point;
} }
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/RoutePointItemServiceImpl.java 0 → 100644
View file @ bd0ccfbb
package com.yeejoin.amos.supervision.business.service.impl;
import com.google.common.collect.Lists;
import com.yeejoin.amos.supervision.business.dao.repository.IInputItemDao;
import com.yeejoin.amos.supervision.business.dao.repository.IRoutePointDao;
import com.yeejoin.amos.supervision.business.dao.repository.IRoutePointItemDao;
import com.yeejoin.amos.supervision.business.service.intfc.IRoutePointItemService;
import com.yeejoin.amos.supervision.dao.entity.InputItem;
import com.yeejoin.amos.supervision.dao.entity.Plan;
import com.yeejoin.amos.supervision.dao.entity.RoutePoint;
import com.yeejoin.amos.supervision.dao.entity.RoutePointItem;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@Service("routePointItemService")
public class RoutePointItemServiceImpl implements IRoutePointItemService {
@Autowired
private IRoutePointItemDao routePointItemDao;
@Autowired
private IInputItemDao inputItemDao;
@Autowired
private IRoutePointDao routePointDao;
@Override
public List<RoutePointItem> addRoutePointItemList(Plan plan, List<Long> inputItemIds, String userId) {
Long planId = plan.getId();
Long routeId = plan.getRouteId();
if (CollectionUtils.isNotEmpty(inputItemIds) && routeId != null && planId != null) {
routePointItemDao.deleteByPlanId(planId);
List<InputItem> inputItemList = inputItemDao.listByIds(inputItemIds);
List<RoutePoint> routePointList = routePointDao.findByRouteId(routeId);
if (CollectionUtils.isNotEmpty(inputItemList) && CollectionUtils.isNotEmpty(routePointList)) {
List<RoutePointItem> list = new ArrayList<>();
routePointList.stream().forEach(route->{
Long routePointId = route.getId();
inputItemList.stream().forEach(item->{
RoutePointItem routePointItem = new RoutePointItem();
routePointItem.setInputItemId(item.getId());
routePointItem.setBasisJson(item.getBasisJson());
routePointItem.setOrderNo(item.getOrderNo());
routePointItem.setRoutePointId(routePointId);
routePointItem.setCreatorId(userId);
routePointItem.setCreateDate(new Date());
list.add(routePointItem);
});
});
return routePointItemDao.saveAll(list);
}
}
return Lists.newArrayList();
}
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/intfc/IRoutePointItemService.java 0 → 100644
View file @ bd0ccfbb
package com.yeejoin.amos.supervision.business.service.intfc;
import com.yeejoin.amos.supervision.dao.entity.Plan;
import com.yeejoin.amos.supervision.dao.entity.RoutePointItem;
import java.util.List;
public interface IRoutePointItemService {
List<RoutePointItem> addRoutePointItemList(Plan plan, List<Long> inputItemIds, String userId);
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/util/InputItemParamUtil.java
View file @ bd0ccfbb
...@@ -58,6 +58,8 @@ public class InputItemParamUtil { ...@@ -58,6 +58,8 @@ public class InputItemParamUtil {
param.setInputClassify(toString(queryRequests.get(i).getValue())); param.setInputClassify(toString(queryRequests.get(i).getValue()));
} else if ("itemClassify".equals(name)) { } else if ("itemClassify".equals(name)) {
param.setItemClassify(toString(queryRequests.get(i).getValue())); param.setItemClassify(toString(queryRequests.get(i).getValue()));
} else if ("checkTypeId".equals(name)) {
param.setCheckTypeId(toString(queryRequests.get(i).getValue()));
} }
} }
} }
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/vo/InputItemVo.java
View file @ bd0ccfbb
...@@ -4,7 +4,7 @@ import java.util.Date; ...@@ -4,7 +4,7 @@ import java.util.Date;
public class InputItemVo { public class InputItemVo {
private long id ; private long id;
/** /**
* 分类ID * 分类ID
*/ */
...@@ -121,12 +121,17 @@ public class InputItemVo { ...@@ -121,12 +121,17 @@ public class InputItemVo {
*/ */
private String inputClassify; private String inputClassify;
private String checkTypeId;
private String checkType; private String checkType;
private String itemParent; private String itemParent;
private String itemClassify; private String itemClassify;
private String itemTypeClassify; private String itemTypeClassify;
private String itemLevel; private String itemLevel;
private String itemStart; private String itemStart;
/**
* 扩展属性
*/
private String ext;
public String getCheckType() { public String getCheckType() {
return checkType; return checkType;
...@@ -381,4 +386,19 @@ public class InputItemVo { ...@@ -381,4 +386,19 @@ public class InputItemVo {
this.riskDesc = riskDesc; this.riskDesc = riskDesc;
} }
public String getCheckTypeId() {
return checkTypeId;
}
public void setCheckTypeId(String checkTypeId) {
this.checkTypeId = checkTypeId;
}
public String getExt() {
return ext;
}
public void setExt(String ext) {
this.ext = ext;
}
} }
amos-boot-system-patrol/src/main/resources/db/changelog/patrol-3.0.1.xml
View file @ bd0ccfbb
...@@ -84,4 +84,41 @@ ...@@ -84,4 +84,41 @@
MODIFY COLUMN `dep_name` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '执行部门名称'; MODIFY COLUMN `dep_name` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '执行部门名称';
</sql> </sql>
</changeSet> </changeSet>
<changeSet author="tb" id="tb-202109101731-1">
<preConditions onFail="MARK_RAN">
<not>
<columnExists tableName="p_latent_danger" columnName="biz_type"/>
</not>
</preConditions>
<comment>p_latent_danger add COLUMN biz_type '业务类型（不同业务创建的隐患以此区分）'</comment>
<sql>
ALTER TABLE p_latent_danger add COLUMN `biz_type` varchar(30) DEFAULT NULL COMMENT '业务类型（不同业务创建的隐患以此区分）' after
`id`;
</sql>
</changeSet>
<changeSet author="tb" id="tb-202109101731-2">
<preConditions onFail="MARK_RAN">
<not>
<columnExists tableName="p_latent_danger" columnName="longitude"/>
</not>
</preConditions>
<comment>p_latent_danger add COLUMN longitude '隐患地址经度'</comment>
<sql>
ALTER TABLE p_latent_danger add COLUMN `longitude` varchar(30) DEFAULT NULL COMMENT '隐患地址经度' after
`danger_position`;
</sql>
</changeSet>
<changeSet author="tb" id="tb-202109101731-3">
<preConditions onFail="MARK_RAN">
<not>
<columnExists tableName="p_latent_danger" columnName="latitude"/>
</not>
</preConditions>
<comment>p_latent_danger add COLUMN latitude '隐患地址纬度'</comment>
<sql>
ALTER TABLE p_latent_danger add COLUMN `latitude` varchar(30) DEFAULT NULL COMMENT '隐患地址纬度' after
`longitude`;
</sql>
</changeSet>
</databaseChangeLog> </databaseChangeLog>
\ No newline at end of file
amos-boot-system-supervision/src/main/resources/db/changelog/mt-1.0.0.xml
View file @ bd0ccfbb
...@@ -216,4 +216,37 @@ ...@@ -216,4 +216,37 @@
ALTER TABLE `p_check_input` ADD COLUMN `major_danger_num` int(11) DEFAULT NULL COMMENT '重大隐患个数' AFTER `safety_danger_num`; ALTER TABLE `p_check_input` ADD COLUMN `major_danger_num` int(11) DEFAULT NULL COMMENT '重大隐患个数' AFTER `safety_danger_num`;
</sql> </sql>
</changeSet> </changeSet>
<changeSet author="gaojianqiang" id="1630567666-1">
<preConditions onFail="MARK_RAN">
<not>
<columnExists tableName="p_input_item" columnName="check_type_id"/>
</not>
</preConditions>
<comment>p_input_item ADD COLUMN check_type_id</comment>
<sql>
ALTER TABLE `p_input_item` ADD COLUMN `check_type_id` varchar(32) DEFAULT NULL COMMENT '检查类别字典值';
</sql>
</changeSet>
<changeSet author="gaojianqiang" id="1630567666-2">
<preConditions onFail="MARK_RAN">
<not>
<columnExists tableName="p_route_point_item" columnName="input_item_id"/>
</not>
</preConditions>
<comment>p_route_point_item ADD COLUMN input_item_id</comment>
<sql>
ALTER TABLE `p_route_point_item` ADD COLUMN `input_item_id` bigint(20) DEFAULT NULL COMMENT '巡检项id';
</sql>
</changeSet>
<changeSet author="gaojianqiang" id="1630567666-3">
<preConditions onFail="MARK_RAN">
<not>
<columnExists tableName="p_route_point_item" columnName="plan_id"/>
</not>
</preConditions>
<comment>p_route_point_item ADD COLUMN plan_id</comment>
<sql>
ALTER TABLE `p_route_point_item` ADD COLUMN `plan_id` bigint(20) DEFAULT NULL COMMENT '计划ID';
</sql>
</changeSet>
</databaseChangeLog> </databaseChangeLog>
\ No newline at end of file
amos-boot-system-supervision/src/main/resources/db/mapper/dbTemplate_input_item.xml
View file @ bd0ccfbb
...@@ -66,12 +66,14 @@ ...@@ -66,12 +66,14 @@
<result property="checkMethod" column="check_method" /> <result property="checkMethod" column="check_method" />
<result property="createDate" column="create_date" /> <result property="createDate" column="create_date" />
<result property="inputClassify" column="input_classify" /> <result property="inputClassify" column="input_classify" />
<result property="checkTypeId" column="check_type_id" />
<result property="checkType" column="check_type" /> <result property="checkType" column="check_type" />
<result property="itemParent" column="item_parent" /> <result property="itemParent" column="item_parent" />
<result property="itemClassify" column="item_classify" /> <result property="itemClassify" column="item_classify" />
<result property="itemTypeClassify" column="item_type_classify" /> <result property="itemTypeClassify" column="item_type_classify" />
<result property="itemLevel" column="item_level" /> <result property="itemLevel" column="item_level" />
<result property="itemStart" column="item_start" /> <result property="itemStart" column="item_start" />
<result property="ext" column="ext" />
</resultMap> </resultMap>
<!--统计 --> <!--统计 -->
<select id="countInputItemInfoData" resultType="long"> <select id="countInputItemInfoData" resultType="long">
...@@ -91,15 +93,15 @@ ...@@ -91,15 +93,15 @@
<select id="getInputItemInfo" resultMap="inputItemMap"> <select id="getInputItemInfo" resultMap="inputItemMap">
SELECT SELECT
a.id, a.id,
a.name, a.NAME,
a.item_no, a.item_no,
a.item_type, a.item_type,
a.is_must, a.is_must,
a.default_value, a.default_value,
a.is_score, a.is_score,
b.name as catalog_name, b.NAME AS catalog_name,
a.remark, a.remark,
a.level, a.LEVEL,
a.risk_desc, a.risk_desc,
a.maintenance_content, a.maintenance_content,
a.test_requirement, a.test_requirement,
...@@ -111,14 +113,20 @@ ...@@ -111,14 +113,20 @@
a.item_classify, a.item_classify,
a.item_type_classify, a.item_type_classify,
a.item_level, a.item_level,
a.item_start a.item_start,
from IF
p_input_item a left join p_catalog_tree b on a.catalog_id = b.id ( i.input_item_id IS NULL, 0, 1 ) AS ext
where a.is_delete = '0' FROM
and a.input_type != '1' p_input_item a
LEFT JOIN p_catalog_tree b ON a.catalog_id = b.id
LEFT JOIN p_route_point_item i ON a.id = i.input_item_id
WHERE
a.is_delete = '0'
AND a.input_type != '1'
<if test="name!=null"> and a.name like concat(concat("%",#{name}),"%")</if> <if test="name!=null"> and a.name like concat(concat("%",#{name}),"%")</if>
<if test="itemNo!=null"> and a.item_no like concat(concat("%",#{itemNo}),"%")</if> <if test="itemNo!=null"> and a.item_no like concat(concat("%",#{itemNo}),"%")</if>
<if test="itemType!=null"> and a.item_Type = #{itemType} </if> <if test="itemType!=null"> and a.item_Type = #{itemType} </if>
<if test="checkTypeId!=null"> and a.check_type_Val = #{checkTypeId} </if>
<!-- <if test="orgCode!=null"> and a.org_Code = #{orgCode}</if>--> <!-- <if test="orgCode!=null"> and a.org_Code = #{orgCode}</if>-->
<if test="itemClassify != null"> and a.item_classify = #{itemClassify}</if> <if test="itemClassify != null"> and a.item_classify = #{itemClassify}</if>
order by a.id desc order by a.id desc
......
amos-boot-utils/amos-boot-utils-video/pom.xml
View file @ bd0ccfbb
...@@ -25,6 +25,13 @@ ...@@ -25,6 +25,13 @@
<artifactId>spring-boot-starter-data-elasticsearch</artifactId> <artifactId>spring-boot-starter-data-elasticsearch</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project> </project>
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