Skip to content

A
amos-boot-biz
Commit 44c5aac6 authored by suhuiguang's avatar suhuiguang
Browse files
Options

Merge branch 'developer' into develop_ccs

# Conflicts: # amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java
parents b8d144d1 574d9037
Hide whitespace changes
Inline Side-by-side
Showing with 596 additions and 523 deletions
amos-boot-module/amos-boot-module-api/amos-boot-module-command-api/src/main/java/com/yeejoin/amos/boot/module/command/api/dao/SeismometeorologyDtoDao.java
View file @ 44c5aac6
......@@ -14,6 +14,7 @@ import org.springframework.stereotype.Component;
import com.yeejoin.amos.boot.module.command.api.dto.SeismometeorologyDto;
import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.stereotype.Service;
/**
* @description:
* @author: tw
......@@ -28,65 +29,61 @@ public class SeismometeorologyDtoDao {
/**
* 保存对象SeismometeorologyDto
* @param
*
* @param
*/
public void saveObj(SeismometeorologyDto book) {
mongoTemplate.save(book);
}
/**
*
* 24小時预警
*
* **/
public List<SeismometeorologyDto> findCarStateByWatchSn(){
System.out.println(new Date().getTime());
Query query = new Query(Criteria.where("releaseTime").gte(getStartTime())
.lte(getEndTime()));
Sort sort= Sort.by(Sort.Direction.DESC, "releaseTime");
query.with(sort);
List<SeismometeorologyDto> gpsList = mongoTemplate.find(query, SeismometeorologyDto.class);
return gpsList;
**/
public List<SeismometeorologyDto> findCarStateByWatchSn() {
System.out.println(new Date().getTime());
Query query = new Query(Criteria.where("releaseTime").gte(getStartTime())
.lte(getEndTime()));
Sort sort = Sort.by(Sort.Direction.DESC, "releaseTime");
query.with(sort);
List<SeismometeorologyDto> gpsList = mongoTemplate.find(query, SeismometeorologyDto.class);
return gpsList;
}
/**
*
*当天气象预警
*
* **/
public List<SeismometeorologyDto> findDutyCarStateBy(){
* 当天气象预警
**/
public List<SeismometeorologyDto> findDutyCarStateBy() {
System.out.println(new Date().getTime());
Query query = new Query(Criteria.where("releaseTime").gte(getStartTime())
.lte(getEndTime()));
Sort sort= Sort.by(Sort.Direction.DESC, "releaseTime");
.lte(getEndTime()));
Sort sort = Sort.by(Sort.Direction.DESC, "releaseTime");
query.with(sort);
List<SeismometeorologyDto> gpsList = mongoTemplate.find(query, SeismometeorologyDto.class);
return gpsList;
}
private static Date getStartTime() {
Calendar todayStart = Calendar.getInstance();
todayStart.set(Calendar.HOUR_OF_DAY,0);
todayStart.set(Calendar.MINUTE,0);
todayStart.set(Calendar.SECOND,0);
todayStart.set(Calendar.MILLISECOND,0);
return todayStart.getTime();
Calendar todayStart = Calendar.getInstance();
todayStart.set(Calendar.HOUR_OF_DAY, 0);
todayStart.set(Calendar.MINUTE, 0);
todayStart.set(Calendar.SECOND, 0);
todayStart.set(Calendar.MILLISECOND, 0);
return todayStart.getTime();
}
private static Date getEndTime() {
Calendar todayEnd = Calendar.getInstance();
todayEnd.set(Calendar.HOUR_OF_DAY,23);
todayEnd.set(Calendar.MINUTE,59);
todayEnd.set(Calendar.SECOND,59);
todayEnd.set(Calendar.MILLISECOND,999);
return todayEnd.getTime();
Calendar todayEnd = Calendar.getInstance();
todayEnd.set(Calendar.HOUR_OF_DAY, 23);
todayEnd.set(Calendar.MINUTE, 59);
todayEnd.set(Calendar.SECOND, 59);
todayEnd.set(Calendar.MILLISECOND, 999);
return todayEnd.getTime();
}
}
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/FailureDetailsMapper.xml
View file @ 44c5aac6
......@@ -60,13 +60,13 @@
and submission_time between #{startTime} and #{endTime}
</if>
<if test="submissionName != null ">
and submission_name = like concat (%, #{submissionName},%)
and submission_name like concat ('%', #{submissionName},'%')
</if>
<if test="submissionBranchId!= null ">
and submission_branch_id= #{submissionBranchId}
</if>
<if test="sequenceNbr!= null ">
and sequence_nbr = like concat (%,#{ sequenceNbr},%)
and sequence_nbr like concat ('%',#{ sequenceNbr},'%')
</if>
</where>
order by submission_time DESC limit #{current},#{size}
......
amos-boot-module/amos-boot-module-api/amos-boot-module-latentdanger-api/src/main/java/com/yeejoin/amos/latentdanger/dao/entity/LatentDanger.java
View file @ 44c5aac6
......@@ -90,7 +90,7 @@ public class LatentDanger extends BasicEntity {
/**
* 限制时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date reformLimitDate;
private Integer overtimeState;
......
amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/pom.xml
View file @ 44c5aac6
......@@ -21,7 +21,7 @@
<dependency>
<groupId>cn.afterturn</groupId>
<artifactId>easypoi-base</artifactId>
<version>3.0.3</version>
<version>4.0.0</version>
<exclusions>
<exclusion>
<artifactId>poi-ooxml</artifactId>
......@@ -32,12 +32,12 @@
<dependency>
<groupId>cn.afterturn</groupId>
<artifactId>easypoi-web</artifactId>
<version>3.0.3</version>
<version>4.0.0</version>
</dependency>
<dependency>
<groupId>cn.afterturn</groupId>
<artifactId>easypoi-annotation</artifactId>
<version>3.0.3</version>
<version>4.0.0</version>
</dependency>
<dependency>
<groupId>org.jsoup</groupId>
......
amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/src/main/java/com/yeejoin/amos/supervision/dao/entity/CheckInput.java
View file @ 44c5aac6
......@@ -8,300 +8,327 @@ import java.util.List;
/**
* The persistent class for the p_check_input database table.
*
*/
@Entity
@Table(name="p_check_input")
@NamedQuery(name="CheckInput.findAll", query="SELECT c FROM CheckInput c")
@Table(name = "p_check_input")
@NamedQuery(name = "CheckInput.findAll", query = "SELECT c FROM CheckInput c")
public class CheckInput extends BasicEntity {
private static final long serialVersionUID = 1L;
/**
* 巡检记录id
*/
@Column(name="check_id")
private Long checkId;
/**
* 检查项id
*/
@Column(name="input_id")
private Long inputId;
/**
* 检查项名称
*/
@Column(name="input_name")
private String inputName;
/**
* 巡检点检查项
*/
@Column(name="route_point_item_id")
private Long routePointItemId;
/**
* 输入值
*/
@Column(name="input_value")
private String inputValue;
/**
* 是否合格
*/
@Column(name="is_ok")
private String isOk;
/**
* 序号
*/
@Column(name="order_no")
private int orderNo;
/**
* 权限系统org code
*/
@Column(name="org_code")
private String orgCode;
/**
* 检查点分类id
*/
@Column(name="point_classify_id")
private Long pointClassifyId;
/**
* 检查点分类名称
*/
@Column(name="point_classify_name")
private String pointClassifyName;
/**
* 评分
*/
private int score;
/**
* 备注
*/
private String remark;
/**
* 执行人ids
*/
@Column(name="user_id")
private String userId;
/**
* 执行人名称
*/
@Column(name="user_name")
private String userName;
/**
* 执行部门ids
*/
@Column(name="dep_id")
private String depId;
/**
* 执行部门名称
*/
@Column(name="dep_name")
private String depName;
/**
* 安全隐患个数
*/
@Column(name="safety_danger_num")
private int safetyDangerNum;
/**
* 重大隐患个数
*/
@Column(name="major_danger_num")
private int majorDangerNum;
private List<DangerDto> dangerDtoList;
@Transient
public List<CheckShot> getCheckShotList() {
return checkShotList;
}
public void setCheckShotList(List<CheckShot> checkShotList) {
this.checkShotList = checkShotList;
}
private List<CheckShot> checkShotList;
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
public CheckInput() {
}
private Check check;
public Long getCheckId() {
return this.checkId;
}
public void setCheckId(Long checkId) {
this.checkId = checkId;
}
public Long getInputId() {
return this.inputId;
}
public void setInputId(Long inputId) {
this.inputId = inputId;
}
public String getInputValue() {
return this.inputValue;
}
public void setInputValue(String inputValue) {
this.inputValue = inputValue;
}
public String getIsOk() {
return this.isOk;
}
public void setIsOk(String isOk) {
this.isOk = isOk;
}
public int getOrderNo() {
return this.orderNo;
}
public void setOrderNo(int orderNo) {
this.orderNo = orderNo;
}
public String getOrgCode() {
return this.orgCode;
}
public void setOrgCode(String orgCode) {
this.orgCode = orgCode;
}
public int getScore() {
return this.score;
}
public void setScore(int score) {
this.score = score;
}
@ManyToOne
@JoinColumn(name = "checkId", referencedColumnName = "id", updatable = false, insertable = false)
public Check getCheck() {
return check;
}
public void setCheck(Check check) {
this.check = check;
}
public String getInputName() {
return inputName;
}
public void setInputName(String inputName) {
this.inputName = inputName;
}
public Long getRoutePointItemId() {
return routePointItemId;
}
public void setRoutePointItemId(Long routePointItemId) {
this.routePointItemId = routePointItemId;
}
public Long getPointClassifyId() {
return pointClassifyId;
}
public void setPointClassifyId(Long pointClassifyId) {
this.pointClassifyId = pointClassifyId;
}
public String getPointClassifyName() {
return pointClassifyName;
}
public void setPointClassifyName(String pointClassifyName) {
this.pointClassifyName = pointClassifyName;
}
public String getUserId() {
return userId;
}
public void setUserId(String userId) {
this.userId = userId;
}
public String getUserName() {
return userName;
}
public void setUserName(String userName) {
this.userName = userName;
}
public String getDepId() {
return depId;
}
public void setDepId(String depId) {
this.depId = depId;
}
public String getDepName() {
return depName;
}
public void setDepName(String depName) {
this.depName = depName;
}
public int getMajorDangerNum() {
return majorDangerNum;
}
public void setMajorDangerNum(int majorDangerNum) {
this.majorDangerNum = majorDangerNum;
}
public int getSafetyDangerNum() {
return safetyDangerNum;
}
public void setSafetyDangerNum(int safetyDangerNum) {
this.safetyDangerNum = safetyDangerNum;
}
@Transient
public List<DangerDto> getDangerDtoList() {
return dangerDtoList;
}
public void setDangerDtoList(List<DangerDto> dangerDtoList) {
this.dangerDtoList = dangerDtoList;
}
private static final long serialVersionUID = 1L;
/**
* 巡检记录id
*/
@Column(name = "check_id")
private Long checkId;
/**
* 检查项id
*/
@Column(name = "input_id")
private Long inputId;
/**
* 检查项名称
*/
@Column(name = "input_name")
private String inputName;
/**
* 巡检点检查项
*/
@Column(name = "route_point_item_id")
private Long routePointItemId;
/**
* 输入值
*/
@Column(name = "input_value")
private String inputValue;
/**
* 是否合格
*/
@Column(name = "is_ok")
private String isOk;
/**
* 序号
*/
@Column(name = "order_no")
private int orderNo;
/**
* 权限系统org code
*/
@Column(name = "org_code")
private String orgCode;
/**
* 检查点分类id
*/
@Column(name = "point_classify_id")
private Long pointClassifyId;
/**
* 检查点分类名称
*/
@Column(name = "point_classify_name")
private String pointClassifyName;
/**
* 评分
*/
private int score;
/**
* 备注
*/
private String remark;
/**
* 执行人ids
*/
@Column(name = "user_id")
private String userId;
/**
* 执行人名称
*/
@Column(name = "user_name")
private String userName;
/**
* 陪同检查人ids
*/
@Column(name = "accompany_user_id")
private String accompanyUserId;
/**
* 陪同检查人名称
*/
@Column(name = "accompany_user_name")
private String accompanyUserName;
/**
* 执行部门ids
*/
@Column(name = "dep_id")
private String depId;
/**
* 执行部门名称
*/
@Column(name = "dep_name")
private String depName;
/**
* 安全隐患个数
*/
@Column(name = "safety_danger_num")
private int safetyDangerNum;
/**
* 重大隐患个数
*/
@Column(name = "major_danger_num")
private int majorDangerNum;
private List<DangerDto> dangerDtoList;
@Transient
public List<CheckShot> getCheckShotList() {
return checkShotList;
}
public void setCheckShotList(List<CheckShot> checkShotList) {
this.checkShotList = checkShotList;
}
private List<CheckShot> checkShotList;
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
public CheckInput() {
}
private Check check;
public Long getCheckId() {
return this.checkId;
}
public void setCheckId(Long checkId) {
this.checkId = checkId;
}
public Long getInputId() {
return this.inputId;
}
public void setInputId(Long inputId) {
this.inputId = inputId;
}
public String getInputValue() {
return this.inputValue;
}
public void setInputValue(String inputValue) {
this.inputValue = inputValue;
}
public String getIsOk() {
return this.isOk;
}
public void setIsOk(String isOk) {
this.isOk = isOk;
}
public int getOrderNo() {
return this.orderNo;
}
public void setOrderNo(int orderNo) {
this.orderNo = orderNo;
}
public String getOrgCode() {
return this.orgCode;
}
public void setOrgCode(String orgCode) {
this.orgCode = orgCode;
}
public int getScore() {
return this.score;
}
public void setScore(int score) {
this.score = score;
}
@ManyToOne
@JoinColumn(name = "checkId", referencedColumnName = "id", updatable = false, insertable = false)
public Check getCheck() {
return check;
}
public void setCheck(Check check) {
this.check = check;
}
public String getInputName() {
return inputName;
}
public void setInputName(String inputName) {
this.inputName = inputName;
}
public Long getRoutePointItemId() {
return routePointItemId;
}
public void setRoutePointItemId(Long routePointItemId) {
this.routePointItemId = routePointItemId;
}
public Long getPointClassifyId() {
return pointClassifyId;
}
public void setPointClassifyId(Long pointClassifyId) {
this.pointClassifyId = pointClassifyId;
}
public String getPointClassifyName() {
return pointClassifyName;
}
public void setPointClassifyName(String pointClassifyName) {
this.pointClassifyName = pointClassifyName;
}
public String getUserId() {
return userId;
}
public void setUserId(String userId) {
this.userId = userId;
}
public String getUserName() {
return userName;
}
public void setUserName(String userName) {
this.userName = userName;
}
public String getDepId() {
return depId;
}
public void setDepId(String depId) {
this.depId = depId;
}
public String getDepName() {
return depName;
}
public void setDepName(String depName) {
this.depName = depName;
}
public int getMajorDangerNum() {
return majorDangerNum;
}
public void setMajorDangerNum(int majorDangerNum) {
this.majorDangerNum = majorDangerNum;
}
public int getSafetyDangerNum() {
return safetyDangerNum;
}
public void setSafetyDangerNum(int safetyDangerNum) {
this.safetyDangerNum = safetyDangerNum;
}
@Transient
public List<DangerDto> getDangerDtoList() {
return dangerDtoList;
}
public void setDangerDtoList(List<DangerDto> dangerDtoList) {
this.dangerDtoList = dangerDtoList;
}
public String getAccompanyUserId() {
return accompanyUserId;
}
public void setAccompanyUserId(String accompanyUserId) {
this.accompanyUserId = accompanyUserId;
}
public String getAccompanyUserName() {
return accompanyUserName;
}
public void setAccompanyUserName(String accompanyUserName) {
this.accompanyUserName = accompanyUserName;
}
}
\ No newline at end of file
amos-boot-module/amos-boot-module-biz/amos-boot-module-command-biz/src/main/java/com/yeejoin/amos/boot/module/command/biz/controller/CommandController.java
View file @ 44c5aac6
......@@ -39,7 +39,9 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.client.RestTemplate;
import org.typroject.tyboot.core.foundation.context.RequestContext;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.foundation.exception.BaseException;
......@@ -146,6 +148,8 @@ public class CommandController extends BaseController {
@Autowired
IUserCarService userCarService;
@Autowired
RestTemplate restTemplate;
/**
* 警情列表
......@@ -1531,4 +1535,13 @@ public class CommandController extends BaseController {
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@RequestMapping(value = "getAMapWeather", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "获取百度地图天气", notes = "获取百度地图天气")
public ResponseModel<Object> getAMapWeather() {
ResponseEntity<HashMap> weather = restTemplate.getForEntity(
"https://restapi.amap.com/v3/weather/weatherInfo?key=4bee67717254d93067fdbc09cd61c7d9&city=610100&extensions=all",
HashMap.class);
return ResponseHelper.buildResponse(weather);
}
}
\ 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/OrgUsrServiceImpl.java
View file @ 44c5aac6
package com.yeejoin.amos.boot.module.common.biz.service.impl;
import java.io.Serializable;
import java.lang.reflect.Method;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
import javax.annotation.Resource;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
import org.typroject.tyboot.component.emq.EmqKeeper;
import org.typroject.tyboot.core.foundation.utils.Bean;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
......@@ -9,12 +38,28 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.google.common.base.Joiner;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import com.yeejoin.amos.boot.biz.common.interceptors.PermissionInterceptorContext;
import com.yeejoin.amos.boot.biz.common.utils.TreeParser;
import com.yeejoin.amos.boot.module.common.api.dto.*;
import com.yeejoin.amos.boot.module.common.api.dto.CheckObjectDto;
import com.yeejoin.amos.boot.module.common.api.dto.CompanyDto;
import com.yeejoin.amos.boot.module.common.api.dto.CompanyPerson;
import com.yeejoin.amos.boot.module.common.api.dto.DynamicFormInstanceDto;
import com.yeejoin.amos.boot.module.common.api.dto.ESOrgUsrDto;
import com.yeejoin.amos.boot.module.common.api.dto.FormValue;
import com.yeejoin.amos.boot.module.common.api.dto.OrgDepartmentDto;
import com.yeejoin.amos.boot.module.common.api.dto.OrgDepartmentFormDto;
import com.yeejoin.amos.boot.module.common.api.dto.OrgMenuDto;
import com.yeejoin.amos.boot.module.common.api.dto.OrgPersonDto;
import com.yeejoin.amos.boot.module.common.api.dto.OrgPersonExcelDto;
import com.yeejoin.amos.boot.module.common.api.dto.OrgPersonFormDto;
import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrDto;
import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrExcelDto;
import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrFormDto;
import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrzhDto;
import com.yeejoin.amos.boot.module.common.api.dto.RequestData;
import com.yeejoin.amos.boot.module.common.api.dto.UserDto;
import com.yeejoin.amos.boot.module.common.api.dto.UserUnitDto;
import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormColumn;
import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormInstance;
import com.yeejoin.amos.boot.module.common.api.entity.MaintenanceCompany;
......@@ -31,27 +76,6 @@ import com.yeejoin.amos.component.feign.model.FeignClientResult;
import com.yeejoin.amos.feign.privilege.Privilege;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import com.yeejoin.amos.feign.privilege.model.RoleModel;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
import org.typroject.tyboot.component.emq.EmqKeeper;
import org.typroject.tyboot.core.foundation.utils.Bean;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import javax.annotation.Resource;
import java.io.Serializable;
import java.lang.reflect.Method;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
/**
* 机构/部门/人员表 服务实现类
......@@ -94,26 +118,27 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
@Autowired
DynamicFormInstanceMapper dynamicFormInstanceMapper;
@Autowired
AmosTrainingFeignClient amosTrainingFeignClient;
@Value("${auth-key-org-user:org_user_info}")
private String authKey;
public static List<OrgMenuDto> buildTreeParallel(List<OrgUsr> list) {
List<OrgMenuDto> menuList = list.stream().map(o ->
new OrgMenuDto(o.getSequenceNbr(), o.getBizOrgName(),
ObjectUtils.isEmpty(o.getParentId()) ? 0L : Long.parseLong(o.getParentId()), o.getBizOrgType(), false,
o.getBizOrgCode()).setTotal(o.getTotal())).collect(Collectors.toList());
List<OrgMenuDto> menuList = list.stream().map(o -> {
OrgMenuDto menu = new OrgMenuDto(o.getSequenceNbr(), o.getBizOrgName(),
ObjectUtils.isEmpty(o.getParentId()) ? 0L : Long.valueOf(o.getParentId()), o.getBizOrgType(), false,
o.getBizOrgCode());
return menu;
}).collect(Collectors.toList());
List<OrgMenuDto> result = new ArrayList<>();
Map<Long, OrgMenuDto> map = new HashMap<>(menuList.size());
menuList.forEach(e -> map.put(e.getKey(), e));
Set<? extends Map.Entry<Long, ? extends OrgMenuDto>> entries = map.entrySet();
// 此处多线程，会value 出现null 的情况
// entries.parallelStream().forEach(entry -> {
entries.forEach(entry -> {
entries.stream().forEach(entry -> {
OrgMenuDto value = entry.getValue();
if (value != null) {
OrgMenuDto treeDto = map.get(value.getParentId());
......@@ -665,6 +690,8 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
orgUsr.setBizOrgCode(getOrgCodeStr());
}
OrgUsrDto orgUsrDto = saveOrgUsrDynamicFormInstance(orgUsr, OrgUsrVo.getDynamicFormValue());
orgUsr.setSequenceNbr(orgUsrDto.getSequenceNbr());
/**
* 同步保存ES
......@@ -754,11 +781,12 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
@Override
public OrgPersonDto updateByIdOrgPerson(OrgPersonDto OrgPersonVo, Long id) throws Exception {
try {
updatePersonNumber(id, OrgPersonVo);
} catch (Exception e) {
logger.info("同步修改培训计划中的人员编号：---------------" + id);
}
try {
updatePersonNumber(id,OrgPersonVo);
} catch (Exception e) {
logger.info("同步修改培训计划中的人员编号：---------------"+id);
}
// 修改人员信息
OrgUsr orgUsr = new OrgUsr();
OrgUsr oriOrgUsr = getById(id);
......@@ -792,22 +820,21 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
}
return OrgPersonVo;
}
void updatePersonNumber(Long id, OrgPersonDto OrgPersonVo) {
String oldNumber = null;
String newNumber = null;
List<DynamicFormInstanceDto> list = alertFormValueServiceImpl.listByCalledId(id);
for (DynamicFormInstanceDto dynamicFormInstanceDto : list) {
if (dynamicFormInstanceDto.getFieldCode().equals("personNumber")) {
oldNumber = dynamicFormInstanceDto.getFieldValue();
}
}
for (DynamicFormInstance dynamicForm : OrgPersonVo.getDynamicFormValue()) {
if (dynamicForm.getFieldCode().equals("personNumber")) {
newNumber = dynamicForm.getFieldValue();
}
}
amosTrainingFeignClient.updOperationNumber(newNumber, oldNumber);
void updatePersonNumber(Long id,OrgPersonDto OrgPersonVo){
String oldNumber = null;
String newNumber =null;
List<DynamicFormInstanceDto> list = alertFormValueServiceImpl.listByCalledId(id);
for (DynamicFormInstanceDto dynamicFormInstanceDto : list) {
if(dynamicFormInstanceDto.getFieldCode().equals("personNumber")) {
oldNumber =dynamicFormInstanceDto.getFieldValue();
}
}
for (DynamicFormInstance dynamicForm : OrgPersonVo.getDynamicFormValue()) {
if(dynamicForm.getFieldCode().equals("personNumber")) {
newNumber =dynamicForm.getFieldValue();
}
}
amosTrainingFeignClient.updOperationNumber(newNumber, oldNumber);
}
@Override
......@@ -1201,10 +1228,10 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
}
public String getParentId(String amosOrgId) {
LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(BaseEntity::getIsDelete, false);
wrapper.eq(OrgUsr::getAmosOrgId, amosOrgId);
List<OrgUsr> orgUsrs = orgUsrMapper.selectList(wrapper);
LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(BaseEntity::getIsDelete,false);
wrapper.eq(OrgUsr::getAmosOrgId,amosOrgId);
List<OrgUsr> orgUsrs = orgUsrMapper.selectList(wrapper);
String parentId = null;
if (orgUsrs.size() >= 1) {
......@@ -1270,8 +1297,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
// 业主单位人员
List<UserUnitDto> list = orgUsrMapper.getUserUnit(userId, typeArr[0], null);
// 维保单位人员
// maintenanceCompanyService.findPerssonByAmosOrgId(typeArr[0], userId);
List<MaintenanceCompany> maintenancePersons = null;
List<MaintenanceCompany> maintenancePersons = maintenanceCompanyService.findPersonByAmosOrgId(typeArr[0], userId);
if (!CollectionUtils.isEmpty(list) && !CollectionUtils.isEmpty(maintenancePersons)) {
throw new RuntimeException("人员绑定单位重复！");
}
......@@ -1358,14 +1384,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
return gettTreeByUser(user, companyDepartmentMsgList);
}
@Override
public List<OrgMenuDto> companyTreeByUserAndType(ReginParams reginParams, String type) {
Map<String, Object> param = new HashMap<>();
param.put("bizOrgCode", reginParams.getPersonIdentity().getBizOrgCode());
param.put("type", type);
List<OrgUsr> list = orgUsrMapper.companyTreeByUserAndType(param);
return buildTreeParallel(list);
}
;
@Override
public List<CheckObjectDto> companyListByUser(AgencyUserModel user) {
......@@ -2039,28 +2058,6 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
return jsonObject;
}
@Override
public UserDto getUserParentInfo(String userId) {
UserDto userDto = new UserDto();
if (StringUtils.isNotEmpty(userId)) {
OrgUsr orgUsr = orgUsrMapper.queryByUserId(Long.parseLong(userId));
if (!ObjectUtils.isEmpty(orgUsr)) {
String parentId = orgUsr.getParentId();
userDto.setPersonSeq(String.valueOf(orgUsr.getSequenceNbr()));
userDto.setPersonName(orgUsr.getBizOrgName());
OrgUsr bizOrg = orgUsrMapper.queryBySequenceNbr(parentId);
if (!ObjectUtils.isEmpty(bizOrg)) {
userDto.setBizOrgType(bizOrg.getBizOrgType());
userDto.setBizOrgCode(bizOrg.getBizOrgCode());
userDto.setCompanyId(String.valueOf(bizOrg.getSequenceNbr()));
userDto.setCompanyName(bizOrg.getBizOrgName());
}
}
}
return userDto;
}
public Object getOrgUserByAmosUserId(String amosUserId) throws Exception {
LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<OrgUsr>();
wrapper.eq(OrgUsr::getIsDelete, false);
......@@ -2068,30 +2065,4 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
wrapper.like(StringUtils.isNotBlank(amosUserId), OrgUsr::getAmosOrgId, amosUserId);
return this.baseMapper.selectList(wrapper);
}
@Override
public List<OrgUsr> getListByBizOrgTypeCode(String orgTypes, String orgCode) {
LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(OrgUsr::getIsDelete, false);
if (!StringUtils.isEmpty(orgTypes)) {
List<String> orgUserIdList = Lists.newArrayList(orgTypes.split(","));
wrapper.in(OrgUsr::getBizOrgType, orgUserIdList);
}
if (!StringUtils.isEmpty(orgCode)) {
wrapper.likeRight(OrgUsr::getBizOrgCode, orgCode);
}
wrapper.orderByAsc(BaseEntity::getRecDate);
return this.baseMapper.selectList(wrapper);
}
@Override
public List<OrgMenuDto> companyTreeByUserNumber(ReginParams reginParams) {
Map<String, Object> param = new HashMap<>();
// 权限处理
PermissionInterceptorContext.setDataAuthRule(authKey);
param.put("bizOrgCode", reginParams.getPersonIdentity().getBizOrgCode());
List<OrgUsr> list = orgUsrMapper.companyDeptListWithPersonCount(param);
return buildTreeParallel(list);
}
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AlertCalledServiceImpl.java
View file @ 44c5aac6
......@@ -1071,7 +1071,7 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
String condition2 = "";
for (FormValue i : list) {
if (i.getKey().equals(AlertStageEnums.aircraftRescueSub.getCode())) {
condition2 = condition1 + i.getValue();
condition2 = i.getValue();
}
}
result= getIdsList1(alertCalled.getAlertTypeCode(),AlertStageEnums.救援预案警情类型.getValue() + "," + condition1,
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AlertSubmittedServiceImpl.java
View file @ 44c5aac6
......@@ -445,10 +445,10 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
}
AlertSubmitted alertSubmittedNew = null;
Optional<AlertBusinessTypeEnum> alertBusinessTypeEnum =
EnumsUtils.getEnumObject(AlertBusinessTypeEnum.class,
e -> e.getCode().equals(calledRo.getAlertTypeCode()));
smsCode = alertBusinessTypeEnum.get().getSms_code();
// Optional<AlertBusinessTypeEnum> alertBusinessTypeEnum =
// EnumsUtils.getEnumObject(AlertBusinessTypeEnum.class,
// e -> e.getCode().equals(calledRo.getAlertTypeCode()));
// smsCode = alertBusinessTypeEnum.get().getSms_code();
if (!alertWay.equals(AlertBusinessTypeEnum.警情初报.getCode())) {
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/service/impl/LatentDangerServiceImpl.java
View file @ 44c5aac6
......@@ -1919,6 +1919,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
pageParam.put("reformLeaderId", jcsUserId);
// 登录人单位
pageParam.put("bizOrgCode", person.get("bizOrgCode").toString().substring(0, 6));
// 登录人为治理人
pageParam.put("governUserId", jcsUserId);
}
}
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/LatentDangerServiceImpl.java
View file @ 44c5aac6
......@@ -575,7 +575,10 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
Date endDate = new Date();
logger.info("-------------------------工作流列表时间" + (endDate.getTime() - startDate.getTime()));
JSONArray taskJsonList = respBody.getJSONArray("data");
List<JSONObject> taskList = JSONObject.parseArray(taskJsonList.toJSONString(), JSONObject.class);
List<JSONObject> taskList = Lists.newArrayList();
if (!ValidationUtil.isEmpty(taskJsonList)) {
taskList = JSONObject.parseArray(taskJsonList.toJSONString(), JSONObject.class);
}
List<String> bussinessKeys = new ArrayList<>();
for (JSONObject json : taskList) {
bussinessKeys.add(json.getString("businessKey"));
......@@ -610,7 +613,12 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
List<AgencyUserModel> users = remoteSecurityService.listUserByUserIds(toke, product, appKey, userIdsStr);
Map<String, AgencyUserModel> userMap = Maps.uniqueIndex(users, AgencyUserModel::getUserId);
for (LatentDangerBo bo : dangerList) {
JSONObject task = taskList.stream().filter(t -> t.getString("businessKey").equals(bo.getBusinessKey())).collect(Collectors.toList()).get(0);
List<JSONObject> filterTaskList =
taskList.stream().filter(t -> t.getString("businessKey").equals(bo.getBusinessKey())).collect(Collectors.toList());
if (ValidationUtil.isEmpty(filterTaskList)) {
continue;
}
JSONObject task = filterTaskList.get(0);
LatentDangerListVo vo = new LatentDangerListVo();
vo.setTaskId(task.getString("id"));
vo.setDangerId(bo.getId());
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/controller/CheckController.java
View file @ 44c5aac6
......@@ -4,10 +4,7 @@ import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.supervision.business.constants.XJConstant;
import com.yeejoin.amos.supervision.business.dto.CheckDto;
import com.yeejoin.amos.supervision.business.dto.CheckInputItemDto;
import com.yeejoin.amos.supervision.business.param.CheckInfoPageParam;
import com.yeejoin.amos.supervision.business.param.CheckPageParam;
import com.yeejoin.amos.supervision.business.param.CheckRecordParam;
import com.yeejoin.amos.supervision.business.param.CheckStatisticalParam;
import com.yeejoin.amos.supervision.business.param.*;
import com.yeejoin.amos.supervision.business.service.intfc.ICheckService;
import com.yeejoin.amos.supervision.business.service.intfc.IPlanTaskService;
import com.yeejoin.amos.supervision.business.service.intfc.ISafety3DDataSendService;
......@@ -50,6 +47,7 @@ import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.function.Consumer;
@RestController
@RequestMapping(value = "/api/check")
......@@ -546,8 +544,15 @@ public class CheckController extends AbstractBaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "保存检查记录", notes = "保存检查记录")
@RequestMapping(value = "/saveRecord", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
public ResponseModel saveSupervisionCheckRecord(@ApiParam(value = "检查信息", required = false) @RequestBody(required = true) CheckRecordParam requestParam) {
public ResponseModel saveSupervisionCheckRecord(
@ApiParam(value = "检查信息", required = false)
@RequestBody CheckRecordParam requestParam) {
try {
//存放检查人信息
requestParam.getCheckItems().forEach(checkInputParam -> {
checkInputParam.setUserId(getUserId());
checkInputParam.setUserName(getUserInfo().getRealName());
});
ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getOrgCode(reginParams);
requestParam.setOrgCode(orgCode);
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/param/CheckInputParam.java
View file @ 44c5aac6
......@@ -12,21 +12,23 @@ import java.util.List;
*/
@Data
public class CheckInputParam {
private Long id;
private long inputItemId;
private String inputValue;
private String selectName;
private boolean isCheck;
private String remark;
private Long routePointItemId;
private String userId;
private String userName;
private String depId;
private String depName;
private List<CheckShot> checkInputShot = new ArrayList<>();
private Long id;
private long inputItemId;
private String inputValue;
private String selectName;
private boolean isCheck;
private String remark;
private Long routePointItemId;
private String userId;//检查人ID
private String userName;//检查人姓名
private String accompanyUserId;//陪同检查人姓名
private String accompanyUserName;//陪同检查人姓名
private String depId;
private String depName;
private List<CheckShot> checkInputShot = new ArrayList<>();
/**
* 隐患列表
*/
private List<DangerDto> dangerList = new ArrayList<>();
/**
* 隐患列表
*/
private List<DangerDto> dangerList = new ArrayList<>();
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/CheckServiceImpl.java
View file @ 44c5aac6
......@@ -1455,6 +1455,8 @@ public class CheckServiceImpl implements ICheckService {
checkInput.setRemark(item.getRemark());
checkInput.setUserId(item.getUserId());
checkInput.setUserName(item.getUserName());
checkInput.setAccompanyUserId(item.getAccompanyUserId());
checkInput.setAccompanyUserName(item.getAccompanyUserName());
checkInput.setDepId(item.getDepId());
checkInput.setDepName(item.getDepName());
//1.校验结果
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/HiddenDangerServiceImpl.java
View file @ 44c5aac6
......@@ -315,6 +315,10 @@ public class HiddenDangerServiceImpl implements IHiddenDangerService {
List<CheckShot> shotList = iCheckShotDao.findAllByCheckIdAndCheckInputId(checkInput.getCheckId(), checkInput.getId());
result.put("checkUserId", checkInput.getUserId());
result.put("checkUserName", checkInput.getUserName());
result.put("accompanyUserId", checkInput.getAccompanyUserId());
result.put("accompanyUserName", checkInput.getAccompanyUserName());
result.put("accompanyingUserId", checkInput.getAccompanyUserId());
result.put("accompanyingUserName",checkInput.getAccompanyUserName());
result.put("planExecuteTime", checkInput.getCreateDate());
result.put("checkPhotoUrl", shotList.stream().map(CheckShot::getPhotoData).collect(Collectors.joining(",")));
}
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/util/FileHelper.java
View file @ 44c5aac6
......@@ -5,7 +5,6 @@ import cn.afterturn.easypoi.excel.ExcelImportUtil;
import cn.afterturn.easypoi.excel.entity.ExportParams;
import cn.afterturn.easypoi.excel.entity.ImportParams;
import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
import com.alibaba.excel.metadata.Sheet;
import com.google.zxing.BarcodeFormat;
import com.google.zxing.MultiFormatWriter;
import com.google.zxing.client.j2se.MatrixToImageWriter;
......@@ -13,7 +12,6 @@ import com.google.zxing.common.BitMatrix;
import com.yeejoin.amos.supervision.business.vo.PointVo;
import com.yeejoin.amos.supervision.exception.YeeException;
import org.apache.commons.io.FileUtils;
import org.apache.poi.hslf.usermodel.HSLFSlideShow;
import org.apache.poi.hssf.usermodel.*;
import org.apache.poi.hwpf.HWPFDocument;
import org.apache.poi.ss.usermodel.*;
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/vo/CheckVo.java
View file @ 44c5aac6
......@@ -44,7 +44,10 @@ public class CheckVo {
* 检查人
*/
private String userName;
/**
* 陪同检查人
*/
private String accompanyUserName;
/**
* 责任单位ID
*/
......
amos-boot-system-latentdanger/src/main/resources/db/mapper/LatentDangerMapper.xml
View file @ 44c5aac6
......@@ -1017,12 +1017,6 @@
<if test="key == 'endDeadline' and value != null and value != ''">
and a.reform_limit_date <![CDATA[ <= ]]> #{value}
</if>
<if test="key == 'leadPeopleId' and value != null and value != ''">
and ( 1=1 or a.biz_info->'$.leadPeopleId' = #{value})
</if>
<if test="key == 'reformLeaderId' and value != null and value != ''">
and ( 1=1 or a.reform_json->'$.reformLeaderId' = #{value})
</if>
</foreach>
</where>
<if test="paramMap.order != null and paramMap.order == 1">
......
amos-boot-system-patrol/src/main/resources/db/mapper/LatentDangerMapper.xml
View file @ 44c5aac6
......@@ -871,11 +871,13 @@
*
FROM
p_latent_danger pld
WHERE
pld.business_key IN
<foreach collection = "businessKeys" item = "businessKey" index="index" open = "(" close = ")" separator = "," >
#{businessKey}
</foreach>
WHERE 1=1
<if test="businessKeys != null and businessKeys.size > 0">
and pld.business_key IN
<foreach collection = "businessKeys" item = "businessKey" index="index" open = "(" close = ")" separator = "," >
#{businessKey}
</foreach>
</if>
<if test="latentDangerListParam.dangerLevel != null and latentDangerListParam.dangerLevel != -1">
and pld.danger_level=#{latentDangerListParam.dangerLevel}
</if>
......@@ -902,11 +904,13 @@
count(*)
FROM
p_latent_danger pld
WHERE
pld.business_key IN
<foreach collection = "businessKeys" item = "businessKey" index="index" open = "(" close = ")" separator = "," >
#{businessKey}
</foreach>
WHERE 1=1
<if test="businessKeys != null and businessKeys.size > 0">
and pld.business_key IN
<foreach collection = "businessKeys" item = "businessKey" index="index" open = "(" close = ")" separator = "," >
#{businessKey}
</foreach>
</if>
<if test="latentDangerListParam.dangerLevel != null and latentDangerListParam.dangerLevel != -1">
and pld.danger_level=#{latentDangerListParam.dangerLevel}
</if>
......
amos-boot-system-supervision/pom.xml
View file @ 44c5aac6
......@@ -16,10 +16,6 @@
<version>${amos-biz-boot.version}</version>
<exclusions>
<exclusion>
<artifactId>easypoi-base</artifactId>
<groupId>cn.afterturn</groupId>
</exclusion>
<exclusion>
<artifactId>poi-ooxml</artifactId>
<groupId>org.apache.poi</groupId>
</exclusion>
......
amos-boot-system-supervision/src/main/resources/db/changelog/mt-1.0.0.xml
View file @ 44c5aac6
......@@ -5,7 +5,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd">
<changeSet author="suhuiguang" id="1587367889717-2">
<changeSet author="suhuiguang" id="1587367889717-2">
<preConditions onFail="MARK_RAN">
<not>
<columnExists tableName="p_point" columnName="last_check_id"/>
......@@ -13,7 +13,8 @@
</preConditions>
<comment>p_point ADD COLUMN last_check_id</comment>
<sql>
ALTER TABLE p_point ADD COLUMN `last_check_id` varchar(32) DEFAULT NULL COMMENT '最近检查记录（漏检不算）' AFTER `original_id`;
ALTER TABLE p_point ADD COLUMN `last_check_id` varchar(32) DEFAULT NULL COMMENT '最近检查记录（漏检不算）' AFTER
`original_id`;
</sql>
</changeSet>
......@@ -25,7 +26,8 @@
</preConditions>
<comment>p_input_item ADD COLUMN check_type</comment>
<sql>
ALTER TABLE p_input_item ADD COLUMN `check_type` varchar(32) DEFAULT NULL COMMENT '检查类别' AFTER `test_requirement`;
ALTER TABLE p_input_item ADD COLUMN `check_type` varchar(32) DEFAULT NULL COMMENT '检查类别' AFTER
`test_requirement`;
</sql>
</changeSet>
......@@ -37,7 +39,8 @@
</preConditions>
<comment>p_input_item ADD COLUMN item_parent</comment>
<sql>
ALTER TABLE p_input_item ADD COLUMN `item_parent` varchar(50) DEFAULT NULL COMMENT '父类检查项id' AFTER `check_type`;
ALTER TABLE p_input_item ADD COLUMN `item_parent` varchar(50) DEFAULT NULL COMMENT '父类检查项id' AFTER
`check_type`;
</sql>
</changeSet>
......@@ -49,7 +52,8 @@
</preConditions>
<comment>p_input_item ADD COLUMN item_classify</comment>
<sql>
ALTER TABLE p_input_item ADD COLUMN `item_classify` varchar(50) DEFAULT NULL COMMENT '检查项分类' AFTER `item_parent`;
ALTER TABLE p_input_item ADD COLUMN `item_classify` varchar(50) DEFAULT NULL COMMENT '检查项分类' AFTER
`item_parent`;
</sql>
</changeSet>
......@@ -61,7 +65,8 @@
</preConditions>
<comment>p_input_item ADD COLUMN item_type_classify</comment>
<sql>
ALTER TABLE p_input_item ADD COLUMN `item_type_classify` varchar(50) DEFAULT NULL COMMENT '适用检查类别' AFTER `item_classify`;
ALTER TABLE p_input_item ADD COLUMN `item_type_classify` varchar(50) DEFAULT NULL COMMENT '适用检查类别' AFTER
`item_classify`;
</sql>
</changeSet>
......@@ -73,7 +78,8 @@
</preConditions>
<comment>p_input_item ADD COLUMN item_level</comment>
<sql>
ALTER TABLE p_input_item ADD COLUMN `item_level` varchar(50) DEFAULT NULL COMMENT '检查项等级' AFTER `item_type_classify`;修改列
ALTER TABLE p_input_item ADD COLUMN `item_level` varchar(50) DEFAULT NULL COMMENT '检查项等级' AFTER
`item_type_classify`;修改列
</sql>
</changeSet>
......@@ -107,7 +113,8 @@
</preConditions>
<comment>p_plan_task_detail ADD COLUMN executor_name</comment>
<sql>
ALTER TABLE `p_plan_task_detail` ADD COLUMN `executor_name` text DEFAULT null COMMENT '执行人名称' AFTER `executor_id`;
ALTER TABLE `p_plan_task_detail` ADD COLUMN `executor_name` text DEFAULT null COMMENT '执行人名称' AFTER
`executor_id`;
</sql>
</changeSet>
......@@ -119,7 +126,8 @@
</preConditions>
<comment>p_plan_task_detail ADD COLUMN item_num</comment>
<sql>
ALTER TABLE `p_plan_task_detail` ADD COLUMN `item_num` int(11) DEFAULT 0 COMMENT '检查项个数' AFTER `executor_name`;
ALTER TABLE `p_plan_task_detail` ADD COLUMN `item_num` int(11) DEFAULT 0 COMMENT '检查项个数' AFTER
`executor_name`;
</sql>
</changeSet>
......@@ -131,7 +139,8 @@
</preConditions>
<comment>p_plan_task_detail ADD COLUMN executed_num</comment>
<sql>
ALTER TABLE `p_plan_task_detail` ADD COLUMN `executed_num` int(11) DEFAULT 0 COMMENT '已执行个数' AFTER `item_num`;
ALTER TABLE `p_plan_task_detail` ADD COLUMN `executed_num` int(11) DEFAULT 0 COMMENT '已执行个数' AFTER
`item_num`;
</sql>
</changeSet>
......@@ -143,7 +152,8 @@
</preConditions>
<comment>p_plan_task_detail ADD COLUMN safety_danger_num</comment>
<sql>
ALTER TABLE `p_plan_task_detail` ADD COLUMN `safety_danger_num` int(11) DEFAULT 0 COMMENT '安全隐患个数' AFTER `executed_num`;
ALTER TABLE `p_plan_task_detail` ADD COLUMN `safety_danger_num` int(11) DEFAULT 0 COMMENT '安全隐患个数' AFTER
`executed_num`;
</sql>
</changeSet>
......@@ -155,7 +165,8 @@
</preConditions>
<comment>p_plan_task_detail ADD COLUMN major_danger_num</comment>
<sql>
ALTER TABLE `p_plan_task_detail` ADD COLUMN `major_danger_num` int(11) DEFAULT 0 COMMENT '重大隐患个数' AFTER `safety_danger_num`;
ALTER TABLE `p_plan_task_detail` ADD COLUMN `major_danger_num` int(11) DEFAULT 0 COMMENT '重大隐患个数' AFTER
`safety_danger_num`;
</sql>
</changeSet>
......@@ -165,7 +176,8 @@
</preConditions>
<comment>p_plan_task_detail modify column is_finish</comment>
<sql>
alter table `p_plan_task_detail` modify column `is_finish` int(11) COMMENT '0-未开始，1-执行中，2-已完成，3-超时漏检(有一个检查项漏检则为漏检)' after `create_date`;
alter table `p_plan_task_detail` modify column `is_finish` int(11) COMMENT
'0-未开始，1-执行中，2-已完成，3-超时漏检(有一个检查项漏检则为漏检)' after `create_date`;
</sql>
</changeSet>
......@@ -189,7 +201,8 @@
</preConditions>
<comment>p_check ADD COLUMN company_name</comment>
<sql>
ALTER TABLE `p_check` ADD COLUMN `company_name` varchar(255) DEFAULT NULL COMMENT '责任单位名称' AFTER `company_id`;
ALTER TABLE `p_check` ADD COLUMN `company_name` varchar(255) DEFAULT NULL COMMENT '责任单位名称' AFTER
`company_id`;
</sql>
</changeSet>
......@@ -201,7 +214,8 @@
</preConditions>
<comment>p_check_input ADD COLUMN safety_danger_num</comment>
<sql>
ALTER TABLE `p_check_input` ADD COLUMN `safety_danger_num` int(11) DEFAULT NULL COMMENT '安全隐患个数' AFTER `danger_handle_state`;
ALTER TABLE `p_check_input` ADD COLUMN `safety_danger_num` int(11) DEFAULT NULL COMMENT '安全隐患个数' AFTER
`danger_handle_state`;
</sql>
</changeSet>
......@@ -213,7 +227,8 @@
</preConditions>
<comment>p_check_input ADD COLUMN major_danger_num</comment>
<sql>
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>
</changeSet>
<changeSet author="gaojianqiang" id="1630567666-1">
......@@ -224,7 +239,7 @@
</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 '检查类别字典值';
ALTER TABLE `p_input_item` ADD COLUMN `check_type_id` varchar(32) DEFAULT NULL COMMENT '检查类别字典值';
</sql>
</changeSet>
<changeSet author="gaojianqiang" id="1630567666-2">
......@@ -257,7 +272,7 @@
</preConditions>
<comment>p_input_item ADD COLUMN item_type_classify_ids</comment>
<sql>
ALTER TABLE `p_input_item` ADD COLUMN `item_type_classify_ids` varchar(64) DEFAULT NULL COMMENT '检查类别IDS';
ALTER TABLE `p_input_item` ADD COLUMN `item_type_classify_ids` varchar(64) DEFAULT NULL COMMENT '检查类别IDS';
</sql>
</changeSet>
......@@ -269,10 +284,11 @@
</preConditions>
<comment>add p_check_report table</comment>
<sql>
CREATE TABLE `p_check_report` (
CREATE TABLE `p_check_report` (
`id` bigint(30) NOT NULL COMMENT '主键',
`name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '报告名称',
`plan_type` varchar(30) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '计划类型（0单位级/1公司级）',
`plan_type` varchar(30) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT
'计划类型（0单位级/1公司级）',
`plan_task_id` bigint(30) NULL DEFAULT NULL COMMENT '关联计划任务id',
`check_user` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '执行人',
`start_check_date` datetime NULL DEFAULT NULL COMMENT '检查实际开始时间',
......@@ -312,4 +328,29 @@
ALTER TABLE `p_plan` MODIFY COLUMN `create_date` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间';
</sql>
</changeSet>
<changeSet author="helinlin" id="2022-1-5-1">
<preConditions onFail="MARK_RAN">
<not>
<columnExists tableName="p_check_input" columnName="accompany_user_id"/>
</not>
</preConditions>
<comment>p_check_input add column</comment>
<sql>
alter table `p_check_input` add column `accompany_user_id` text DEFAULT NULL COMMENT '陪同检查人ids';
</sql>
</changeSet>
<changeSet author="helinlin" id="2022-1-5-2">
<preConditions onFail="MARK_RAN">
<not>
<columnExists tableName="p_check_input" columnName="accompany_user_name"/>
</not>
</preConditions>
<comment>p_check_input add column</comment>
<sql>
alter table `p_check_input` add column `accompany_user_name` text DEFAULT NULL COMMENT '陪同检查人名称';
</sql>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
amos-boot-system-supervision/src/main/resources/db/mapper/dbTemplate_check.xml
View file @ 44c5aac6
......@@ -2012,6 +2012,7 @@
ci.major_danger_num,
ci.create_date checkTime,
ci.user_name,
ci.accompany_user_name,
pp.original_id,
pp.name companyName,
......
amos-boot-system-supervision/src/main/resources/db/mapper/pointMapper.xml
View file @ 44c5aac6
......@@ -1152,6 +1152,8 @@
pii.picture_json picJson,
pci.user_id userId,
pci.user_name userName,
pci.accompany_user_id accompanyUserId,
pci.accompany_user_name accompanyUserName,
pii.id itemId,
group_concat(pcs.photo_data) photoData,
COALESCE (pci.input_value, '') selectValue,
......
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