if (config == null) { | if (config == null) { | ||||
return response.failure("配置信息不存在"); | return response.failure("配置信息不存在"); | ||||
} | } | ||||
config.setMark(Byte.valueOf("0")); | |||||
config.setMark(0); | |||||
configMapper.updateById(config); | configMapper.updateById(config); | ||||
return response.success("操作成功"); | return response.success("操作成功"); | ||||
} | } |
import com.taauav.admin.mapper.SysDictMapper; | import com.taauav.admin.mapper.SysDictMapper; | ||||
import com.taauav.admin.service.ISysAdminService; | import com.taauav.admin.service.ISysAdminService; | ||||
import com.taauav.admin.service.ISysDictService; | import com.taauav.admin.service.ISysDictService; | ||||
import com.taauav.common.util.DateUtil; | |||||
import com.taauav.common.util.FunctionUtils; | import com.taauav.common.util.FunctionUtils; | ||||
import com.taauav.common.util.ShiroUtils; | import com.taauav.common.util.ShiroUtils; | ||||
import org.apache.shiro.authz.annotation.RequiresPermissions; | import org.apache.shiro.authz.annotation.RequiresPermissions; | ||||
if (dict == null) { | if (dict == null) { | ||||
return response.failure("对应数据不存在"); | return response.failure("对应数据不存在"); | ||||
} | } | ||||
dict.setMark(Byte.valueOf("0")); | |||||
dict.setUpdateTime(FunctionUtils.now()); | |||||
dict.setMark(Integer.valueOf("0")); | |||||
dict.setUpdateTime(DateUtil.now()); | |||||
dict.setUpdateUser(ShiroUtils.getAdminId()); | dict.setUpdateUser(ShiroUtils.getAdminId()); | ||||
dictMapper.updateById(dict); | dictMapper.updateById(dict); | ||||
return response.success("操作成功"); | return response.success("操作成功"); |
import com.taauav.admin.entity.SysDictType; | import com.taauav.admin.entity.SysDictType; | ||||
import com.taauav.admin.mapper.SysDictTypeMapper; | import com.taauav.admin.mapper.SysDictTypeMapper; | ||||
import com.taauav.admin.service.ISysDictTypeService; | import com.taauav.admin.service.ISysDictTypeService; | ||||
import com.taauav.common.util.DateUtil; | |||||
import com.taauav.common.util.FunctionUtils; | import com.taauav.common.util.FunctionUtils; | ||||
import com.taauav.common.util.ShiroUtils; | import com.taauav.common.util.ShiroUtils; | ||||
import org.apache.shiro.authz.annotation.RequiresPermissions; | import org.apache.shiro.authz.annotation.RequiresPermissions; | ||||
if (dictType == null) { | if (dictType == null) { | ||||
return response.failure("字典分类信息不存在"); | return response.failure("字典分类信息不存在"); | ||||
} | } | ||||
dictType.setMark(Byte.valueOf("0")); | |||||
dictType.setUpdateTime(FunctionUtils.now()); | |||||
dictType.setMark(Integer.valueOf("0")); | |||||
dictType.setUpdateTime(DateUtil.now()); | |||||
dictType.setUpdateUser(ShiroUtils.getAdminId()); | dictType.setUpdateUser(ShiroUtils.getAdminId()); | ||||
dictTypeMapper.updateById(dictType); | dictTypeMapper.updateById(dictType); | ||||
return response.success("操作成功"); | return response.success("操作成功"); |
import com.baomidou.mybatisplus.annotation.TableField; | import com.baomidou.mybatisplus.annotation.TableField; | ||||
import com.baomidou.mybatisplus.annotation.TableId; | import com.baomidou.mybatisplus.annotation.TableId; | ||||
import com.baomidou.mybatisplus.annotation.TableName; | import com.baomidou.mybatisplus.annotation.TableName; | ||||
import com.taauav.common.domain.Entity; | |||||
import lombok.Data; | import lombok.Data; | ||||
import lombok.EqualsAndHashCode; | import lombok.EqualsAndHashCode; | ||||
import lombok.experimental.Accessors; | import lombok.experimental.Accessors; | ||||
import javax.validation.constraints.NotEmpty; | import javax.validation.constraints.NotEmpty; | ||||
import javax.validation.constraints.NotNull; | import javax.validation.constraints.NotNull; | ||||
import javax.validation.constraints.Pattern; | import javax.validation.constraints.Pattern; | ||||
import java.io.Serializable; | |||||
import java.lang.reflect.Array; | |||||
import java.util.List; | import java.util.List; | ||||
import java.util.Map; | import java.util.Map; | ||||
*/ | */ | ||||
@Data | @Data | ||||
@EqualsAndHashCode(callSuper = false) | @EqualsAndHashCode(callSuper = false) | ||||
@Accessors(chain = true) | |||||
@TableName("sys_admin") | @TableName("sys_admin") | ||||
public class SysAdmin implements Serializable { | |||||
public class SysAdmin extends Entity { | |||||
private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
*/ | */ | ||||
@TableId(value = "id", type = IdType.AUTO) | @TableId(value = "id", type = IdType.AUTO) | ||||
private Integer id; | private Integer id; | ||||
/** | /** | ||||
* 姓名 | * 姓名 | ||||
*/ | */ | ||||
@Override | @Override | ||||
public String toString() { | public String toString() { | ||||
return "SysAdmin{" + | return "SysAdmin{" + | ||||
"id=" + id + | |||||
", realname='" + realname + '\'' + | ", realname='" + realname + '\'' + | ||||
", username='" + username + '\'' + | ", username='" + username + '\'' + | ||||
", password='" + password + '\'' + | ", password='" + password + '\'' + | ||||
", loginFailure=" + loginFailure + | ", loginFailure=" + loginFailure + | ||||
", lastIp=" + lastIp + | ", lastIp=" + lastIp + | ||||
", lastTime=" + lastTime + | ", lastTime=" + lastTime + | ||||
", status=" + status + | |||||
", sort=" + sort + | ", sort=" + sort + | ||||
", createUser=" + createUser + | |||||
", updateUser=" + updateUser + | |||||
", createTime=" + createTime + | |||||
", updateTime=" + updateTime + | |||||
", mark=" + mark + | |||||
'}'; | '}'; | ||||
} | } | ||||
private Integer lastTime; | private Integer lastTime; | ||||
/** | |||||
* 状态:1正常 2关闭 3未审核 | |||||
*/ | |||||
private Byte status; | |||||
/** | /** | ||||
* 排序 | * 排序 | ||||
*/ | */ | ||||
private Integer sort; | private Integer sort; | ||||
/** | |||||
* 创建人 | |||||
*/ | |||||
@TableField("create_user") | |||||
private Integer createUser; | |||||
/** | |||||
* 更新人 | |||||
*/ | |||||
@TableField("update_user") | |||||
private Integer updateUser; | |||||
/** | |||||
* 创建时间 | |||||
*/ | |||||
@TableField("create_time") | |||||
private Integer createTime; | |||||
/** | |||||
* 更新时间 | |||||
*/ | |||||
@TableField("update_time") | |||||
private Integer updateTime; | |||||
/** | |||||
* 有效标记 | |||||
*/ | |||||
private Byte mark; | |||||
/** | /** | ||||
* 角色描述 | * 角色描述 |
package com.taauav.admin.entity; | package com.taauav.admin.entity; | ||||
import com.baomidou.mybatisplus.annotation.IdType; | |||||
import com.baomidou.mybatisplus.annotation.TableId; | |||||
import com.baomidou.mybatisplus.annotation.TableName; | import com.baomidou.mybatisplus.annotation.TableName; | ||||
import com.taauav.common.domain.Entity; | |||||
import lombok.Data; | import lombok.Data; | ||||
import lombok.EqualsAndHashCode; | import lombok.EqualsAndHashCode; | ||||
import lombok.experimental.Accessors; | import lombok.experimental.Accessors; | ||||
import org.hibernate.validator.constraints.Length; | import org.hibernate.validator.constraints.Length; | ||||
import javax.validation.constraints.NotEmpty; | import javax.validation.constraints.NotEmpty; | ||||
import java.io.Serializable; | |||||
/** | /** | ||||
* <p> | * <p> | ||||
@EqualsAndHashCode(callSuper = false) | @EqualsAndHashCode(callSuper = false) | ||||
@Accessors(chain = true) | @Accessors(chain = true) | ||||
@TableName("sys_auth_group") | @TableName("sys_auth_group") | ||||
public class SysAuthGroup implements Serializable { | |||||
public class SysAuthGroup extends Entity { | |||||
private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
/** | |||||
* 编号 | |||||
*/ | |||||
@TableId(value = "id", type = IdType.AUTO) | |||||
private Integer id; | |||||
/** | /** | ||||
* 父级ID | * 父级ID | ||||
/** | /** | ||||
* 有无子级:1有 2无 | * 有无子级:1有 2无 | ||||
*/ | */ | ||||
private Byte hasChild; | |||||
private Integer hasChild; | |||||
/** | /** | ||||
* 角色层级 | * 角色层级 | ||||
*/ | */ | ||||
private Byte level; | |||||
private Integer level; | |||||
/** | /** | ||||
* 用户组拥有的规则id,多个规则","隔开 | * 用户组拥有的规则id,多个规则","隔开 | ||||
@Length(max = 200, message = "备注不能超过200字") | @Length(max = 200, message = "备注不能超过200字") | ||||
private String remark; | private String remark; | ||||
/** | |||||
* 状态:1正常 2禁用 | |||||
*/ | |||||
private Byte status; | |||||
/** | /** | ||||
* 排序 | * 排序 | ||||
*/ | */ | ||||
private Integer sort; | private Integer sort; | ||||
/** | |||||
* 创建人 | |||||
*/ | |||||
private Integer createUser; | |||||
/** | |||||
* 更新人 | |||||
*/ | |||||
private Integer updateUser; | |||||
/** | |||||
* 创建时间 | |||||
*/ | |||||
private Integer createTime; | |||||
/** | |||||
* 更新时间 | |||||
*/ | |||||
private Integer updateTime; | |||||
/** | |||||
* 有效标记 | |||||
*/ | |||||
private Byte mark; | |||||
@Override | @Override | ||||
public String toString() { | public String toString() { | ||||
return "SysAuthGroup{" + | return "SysAuthGroup{" + | ||||
"id=" + id + | |||||
", pid=" + pid + | ", pid=" + pid + | ||||
", name='" + name + '\'' + | ", name='" + name + '\'' + | ||||
", hasChild=" + hasChild + | ", hasChild=" + hasChild + | ||||
", level=" + level + | ", level=" + level + | ||||
", rules='" + rules + '\'' + | ", rules='" + rules + '\'' + | ||||
", remark='" + remark + '\'' + | ", remark='" + remark + '\'' + | ||||
", status=" + status + | |||||
", sort=" + sort + | ", sort=" + sort + | ||||
", createUser=" + createUser + | |||||
", updateUser=" + updateUser + | |||||
", createTime=" + createTime + | |||||
", updateTime=" + updateTime + | |||||
", mark=" + mark + | |||||
'}'; | '}'; | ||||
} | } | ||||
} | } |
import java.io.Serializable; | import java.io.Serializable; | ||||
import com.baomidou.mybatisplus.annotation.TableName; | import com.baomidou.mybatisplus.annotation.TableName; | ||||
import com.taauav.common.domain.BaseEntity; | |||||
import com.taauav.common.domain.Entity; | |||||
import lombok.Data; | import lombok.Data; | ||||
import lombok.EqualsAndHashCode; | import lombok.EqualsAndHashCode; | ||||
import lombok.experimental.Accessors; | import lombok.experimental.Accessors; | ||||
@EqualsAndHashCode(callSuper = false) | @EqualsAndHashCode(callSuper = false) | ||||
@Accessors(chain = true) | @Accessors(chain = true) | ||||
@TableName("sys_auth_group_access") | @TableName("sys_auth_group_access") | ||||
public class SysAuthGroupAccess implements Serializable { | |||||
public class SysAuthGroupAccess extends BaseEntity { | |||||
private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
import com.baomidou.mybatisplus.annotation.TableField; | import com.baomidou.mybatisplus.annotation.TableField; | ||||
import com.baomidou.mybatisplus.annotation.TableId; | import com.baomidou.mybatisplus.annotation.TableId; | ||||
import com.baomidou.mybatisplus.annotation.TableName; | import com.baomidou.mybatisplus.annotation.TableName; | ||||
import com.taauav.common.domain.Entity; | |||||
import lombok.Data; | import lombok.Data; | ||||
import lombok.EqualsAndHashCode; | import lombok.EqualsAndHashCode; | ||||
import lombok.experimental.Accessors; | import lombok.experimental.Accessors; | ||||
@EqualsAndHashCode(callSuper = false) | @EqualsAndHashCode(callSuper = false) | ||||
@Accessors(chain = true) | @Accessors(chain = true) | ||||
@TableName("sys_auth_rule_new") | @TableName("sys_auth_rule_new") | ||||
public class SysAuthRule implements Serializable { | |||||
public class SysAuthRule extends Entity { | |||||
private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
@TableId(value = "id",type = IdType.AUTO) | |||||
private Integer id; | |||||
/** | /** | ||||
* 规则唯一英文标识,全小写 | * 规则唯一英文标识,全小写 | ||||
*/ | */ | ||||
* 菜单层级 | * 菜单层级 | ||||
*/ | */ | ||||
@TableField("`level`") | @TableField("`level`") | ||||
private Byte level; | |||||
private Integer level; | |||||
/** | /** | ||||
* 有无子级:1有 2无 | * 有无子级:1有 2无 | ||||
*/ | */ | ||||
private Byte hasChild; | |||||
private Integer hasChild; | |||||
/** | /** | ||||
* 分类:1操作 2菜单 | * 分类:1操作 2菜单 | ||||
*/ | */ | ||||
@TableField("`type`") | @TableField("`type`") | ||||
private Byte type; | |||||
private Integer type; | |||||
/** | /** | ||||
* 图标 | * 图标 | ||||
@Length(max = 200, message = "备注不能超过200字") | @Length(max = 200, message = "备注不能超过200字") | ||||
private String remark; | private String remark; | ||||
/** | |||||
* 状态:1显示 2隐藏 | |||||
*/ | |||||
@TableField("`status`") | |||||
private Byte status; | |||||
/** | /** | ||||
* 排序 | * 排序 | ||||
*/ | */ | ||||
private Integer sort; | private Integer sort; | ||||
/** | |||||
* 创建人 | |||||
*/ | |||||
private Integer createUser; | |||||
/** | |||||
* 更新人 | |||||
*/ | |||||
private Integer updateUser; | |||||
/** | |||||
* 创建时间 | |||||
*/ | |||||
private Integer createTime; | |||||
/** | |||||
* 更新时间 | |||||
*/ | |||||
private Integer updateTime; | |||||
/** | |||||
* 有效标记 | |||||
*/ | |||||
private Byte mark; | |||||
public Map<Integer,String> getStatusList() { | public Map<Integer,String> getStatusList() { |
import com.baomidou.mybatisplus.annotation.IdType; | import com.baomidou.mybatisplus.annotation.IdType; | ||||
import com.baomidou.mybatisplus.annotation.TableId; | import com.baomidou.mybatisplus.annotation.TableId; | ||||
import com.baomidou.mybatisplus.annotation.TableName; | import com.baomidou.mybatisplus.annotation.TableName; | ||||
import com.taauav.common.domain.Entity; | |||||
import lombok.Data; | import lombok.Data; | ||||
import lombok.EqualsAndHashCode; | import lombok.EqualsAndHashCode; | ||||
import lombok.experimental.Accessors; | import lombok.experimental.Accessors; | ||||
@EqualsAndHashCode(callSuper = false) | @EqualsAndHashCode(callSuper = false) | ||||
@Accessors(chain = true) | @Accessors(chain = true) | ||||
@TableName("sys_city") | @TableName("sys_city") | ||||
public class SysCity implements Serializable { | |||||
public class SysCity extends Entity { | |||||
private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
@TableId(value = "id",type = IdType.AUTO) | |||||
private Integer id; | |||||
/** | /** | ||||
* 父级ID | * 父级ID | ||||
*/ | */ | ||||
*/ | */ | ||||
private Integer sort; | private Integer sort; | ||||
/** | |||||
* 创建人 | |||||
*/ | |||||
private Integer createUser; | |||||
/** | |||||
* 更新人 | |||||
*/ | |||||
private Integer updateUser; | |||||
/** | |||||
* 创建时间 | |||||
*/ | |||||
private Integer createTime; | |||||
/** | |||||
* 更新时间 | |||||
*/ | |||||
private Integer updateTime; | |||||
/** | |||||
* 有效标记 | |||||
*/ | |||||
private Boolean mark; | |||||
} | } |
import com.baomidou.mybatisplus.annotation.IdType; | import com.baomidou.mybatisplus.annotation.IdType; | ||||
import com.baomidou.mybatisplus.annotation.TableField; | import com.baomidou.mybatisplus.annotation.TableField; | ||||
import com.baomidou.mybatisplus.annotation.TableId; | import com.baomidou.mybatisplus.annotation.TableId; | ||||
import com.taauav.common.domain.Entity; | |||||
import lombok.Data; | import lombok.Data; | ||||
import lombok.EqualsAndHashCode; | import lombok.EqualsAndHashCode; | ||||
import lombok.experimental.Accessors; | import lombok.experimental.Accessors; | ||||
@Data | @Data | ||||
@EqualsAndHashCode(callSuper = false) | @EqualsAndHashCode(callSuper = false) | ||||
@Accessors(chain = true) | @Accessors(chain = true) | ||||
public class SysConfig implements Serializable { | |||||
public class SysConfig extends Entity { | |||||
private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
/** | |||||
* id | |||||
*/ | |||||
@TableId(value = "id",type = IdType.AUTO) | |||||
private Integer id; | |||||
/** | /** | ||||
* 变量名 | * 变量名 | ||||
*/ | */ | ||||
@Length(max = 200, message = "备注不能超过200字") | @Length(max = 200, message = "备注不能超过200字") | ||||
private String remark; | private String remark; | ||||
/** | |||||
* 状态:1正常 2禁用 | |||||
*/ | |||||
@TableField("`status`") | |||||
@NotNull(message = "请选择状态") | |||||
private Byte status; | |||||
/** | /** | ||||
* 排序 | * 排序 | ||||
*/ | */ | ||||
@NotNull(message = "请填写排序") | @NotNull(message = "请填写排序") | ||||
private Integer sort; | private Integer sort; | ||||
/** | |||||
* 创建人 | |||||
*/ | |||||
private Integer createUser; | |||||
/** | |||||
* 更新人 | |||||
*/ | |||||
private Integer updateUser; | |||||
/** | |||||
* 创建时间 | |||||
*/ | |||||
private Integer createTime; | |||||
/** | |||||
* 更新时间 | |||||
*/ | |||||
private Integer updateTime; | |||||
/** | |||||
* 有效标记 | |||||
*/ | |||||
private Byte mark; | |||||
/** | /** | ||||
* 获取字段类型配置 | * 获取字段类型配置 |
import com.baomidou.mybatisplus.annotation.IdType; | import com.baomidou.mybatisplus.annotation.IdType; | ||||
import com.baomidou.mybatisplus.annotation.TableField; | import com.baomidou.mybatisplus.annotation.TableField; | ||||
import com.baomidou.mybatisplus.annotation.TableId; | import com.baomidou.mybatisplus.annotation.TableId; | ||||
import com.taauav.common.domain.Entity; | |||||
import lombok.Data; | import lombok.Data; | ||||
import lombok.EqualsAndHashCode; | import lombok.EqualsAndHashCode; | ||||
import lombok.experimental.Accessors; | import lombok.experimental.Accessors; | ||||
@Data | @Data | ||||
@EqualsAndHashCode(callSuper = false) | @EqualsAndHashCode(callSuper = false) | ||||
@Accessors(chain = true) | @Accessors(chain = true) | ||||
public class SysDep implements Serializable { | |||||
public class SysDep extends Entity { | |||||
private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
/** | |||||
* 编号 | |||||
*/ | |||||
@TableId(value = "id", type = IdType.AUTO) | |||||
private Integer id; | |||||
/** | /** | ||||
* 部门名称 | * 部门名称 | ||||
/** | /** | ||||
* 部门层级 | * 部门层级 | ||||
*/ | */ | ||||
private Byte level; | |||||
private Integer level; | |||||
/** | /** | ||||
* 有无子节点:1有 2无 | * 有无子节点:1有 2无 | ||||
*/ | */ | ||||
@TableField("has_child") | @TableField("has_child") | ||||
private Byte hasChild; | |||||
private Integer hasChild; | |||||
/** | /** | ||||
* 部门主管 | * 部门主管 | ||||
*/ | */ | ||||
private Integer sort; | private Integer sort; | ||||
/** | |||||
* 创建人 | |||||
*/ | |||||
@TableField("create_user") | |||||
private Integer createUser; | |||||
/** | |||||
* 更新人 | |||||
*/ | |||||
@TableField("update_user") | |||||
private Integer updateUser; | |||||
/** | |||||
* 创建时间 | |||||
*/ | |||||
@TableField("create_time") | |||||
private Integer createTime; | |||||
/** | |||||
* 更新时间 | |||||
*/ | |||||
@TableField("update_time") | |||||
private Integer updateTime; | |||||
/** | |||||
* 有效标记 | |||||
*/ | |||||
private Byte mark; | |||||
} | } |
package com.taauav.admin.entity; | package com.taauav.admin.entity; | ||||
import com.baomidou.mybatisplus.annotation.IdType; | |||||
import com.baomidou.mybatisplus.annotation.TableField; | import com.baomidou.mybatisplus.annotation.TableField; | ||||
import com.baomidou.mybatisplus.annotation.TableId; | |||||
import java.io.Serializable; | |||||
import com.taauav.common.domain.Entity; | |||||
import lombok.Data; | import lombok.Data; | ||||
import lombok.EqualsAndHashCode; | import lombok.EqualsAndHashCode; | ||||
import lombok.experimental.Accessors; | import lombok.experimental.Accessors; | ||||
@Data | @Data | ||||
@EqualsAndHashCode(callSuper = false) | @EqualsAndHashCode(callSuper = false) | ||||
@Accessors(chain = true) | @Accessors(chain = true) | ||||
public class SysDict implements Serializable { | |||||
public class SysDict extends Entity { | |||||
private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
/** | |||||
* ID | |||||
*/ | |||||
@TableId(value = "id", type = IdType.AUTO) | |||||
private Integer id; | |||||
/** | /** | ||||
* 名称 | * 名称 | ||||
/** | /** | ||||
* 层级 | * 层级 | ||||
*/ | */ | ||||
private Byte level; | |||||
private Integer level; | |||||
/** | /** | ||||
* 有无子级:1有 2无 | * 有无子级:1有 2无 | ||||
*/ | */ | ||||
@NotNull(message = "请选择有无子类") | @NotNull(message = "请选择有无子类") | ||||
@TableField("`has_child`") | @TableField("`has_child`") | ||||
private Byte hasChild; | |||||
private Integer hasChild; | |||||
/** | /** | ||||
* 分类ID | * 分类ID | ||||
@Length(max = 200, message = "备注长度不能超过200字") | @Length(max = 200, message = "备注长度不能超过200字") | ||||
private String remark; | private String remark; | ||||
/** | |||||
* 状态:1正常 2禁用 | |||||
*/ | |||||
@NotNull(message = "请选择状态") | |||||
@TableField("`status`") | |||||
private Byte status; | |||||
/** | /** | ||||
* 排序 | * 排序 | ||||
*/ | */ | ||||
@TableField("`sort`") | @TableField("`sort`") | ||||
private Integer sort; | private Integer sort; | ||||
/** | |||||
* 创建人 | |||||
*/ | |||||
private Integer createUser; | |||||
/** | |||||
* 更新人 | |||||
*/ | |||||
private Integer updateUser; | |||||
/** | |||||
* 创建时间 | |||||
*/ | |||||
private Integer createTime; | |||||
/** | |||||
* 更新时间 | |||||
*/ | |||||
private Integer updateTime; | |||||
/** | |||||
* 有效标记 | |||||
*/ | |||||
private Byte mark; | |||||
} | } |
import com.baomidou.mybatisplus.annotation.TableField; | import com.baomidou.mybatisplus.annotation.TableField; | ||||
import com.baomidou.mybatisplus.annotation.TableId; | import com.baomidou.mybatisplus.annotation.TableId; | ||||
import java.io.Serializable; | import java.io.Serializable; | ||||
import com.taauav.common.domain.Entity; | |||||
import lombok.Data; | import lombok.Data; | ||||
import lombok.EqualsAndHashCode; | import lombok.EqualsAndHashCode; | ||||
import lombok.experimental.Accessors; | import lombok.experimental.Accessors; | ||||
@Data | @Data | ||||
@EqualsAndHashCode(callSuper = false) | @EqualsAndHashCode(callSuper = false) | ||||
@Accessors(chain = true) | @Accessors(chain = true) | ||||
public class SysDictType implements Serializable { | |||||
public class SysDictType extends Entity { | |||||
private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
/** | |||||
* ID | |||||
*/ | |||||
@TableId(value = "id", type = IdType.AUTO) | |||||
private Integer id; | |||||
/** | /** | ||||
* 名称 | * 名称 | ||||
*/ | */ | ||||
@NotNull(message = "排序值不能为空") | @NotNull(message = "排序值不能为空") | ||||
private Integer sort; | private Integer sort; | ||||
/** | |||||
* 创建人 | |||||
*/ | |||||
private Integer createUser; | |||||
/** | |||||
* 更新人 | |||||
*/ | |||||
private Integer updateUser; | |||||
/** | |||||
* 创建时间 | |||||
*/ | |||||
private Integer createTime; | |||||
/** | |||||
* 更新时间 | |||||
*/ | |||||
private Integer updateTime; | |||||
/** | |||||
* 有效标记 | |||||
*/ | |||||
private Byte mark; | |||||
} | } |
import com.baomidou.mybatisplus.annotation.IdType; | import com.baomidou.mybatisplus.annotation.IdType; | ||||
import com.baomidou.mybatisplus.annotation.TableId; | import com.baomidou.mybatisplus.annotation.TableId; | ||||
import com.taauav.common.domain.Entity; | |||||
import lombok.Data; | import lombok.Data; | ||||
import lombok.EqualsAndHashCode; | import lombok.EqualsAndHashCode; | ||||
import lombok.experimental.Accessors; | import lombok.experimental.Accessors; | ||||
@Data | @Data | ||||
@EqualsAndHashCode(callSuper = false) | @EqualsAndHashCode(callSuper = false) | ||||
@Accessors(chain = true) | @Accessors(chain = true) | ||||
public class SysLevel implements Serializable { | |||||
public class SysLevel extends Entity { | |||||
private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
/** | |||||
* 编号 | |||||
*/ | |||||
@TableId(value = "id", type = IdType.AUTO) | |||||
private Integer id; | |||||
/** | /** | ||||
* 职级名称 | * 职级名称 | ||||
@Length(max = 200, message = "备注不能超过200字") | @Length(max = 200, message = "备注不能超过200字") | ||||
private String remark; | private String remark; | ||||
/** | |||||
* 状态:1正常 2禁用 | |||||
*/ | |||||
@NotNull(message = "状态不能为空") | |||||
private Byte status; | |||||
/** | /** | ||||
* 排序 | * 排序 | ||||
*/ | */ | ||||
@NotNull(message = "排序不能为空") | @NotNull(message = "排序不能为空") | ||||
private Integer sort; | private Integer sort; | ||||
/** | |||||
* 创建人 | |||||
*/ | |||||
private Integer createUser; | |||||
/** | |||||
* 更新人 | |||||
*/ | |||||
private Integer updateUser; | |||||
/** | |||||
* 创建时间 | |||||
*/ | |||||
private Integer createTime; | |||||
/** | |||||
* 更新时间 | |||||
*/ | |||||
private Integer updateTime; | |||||
/** | |||||
* 有效标记 | |||||
*/ | |||||
private Byte mark; | |||||
} | } |
import com.baomidou.mybatisplus.annotation.IdType; | import com.baomidou.mybatisplus.annotation.IdType; | ||||
import com.baomidou.mybatisplus.annotation.TableId; | import com.baomidou.mybatisplus.annotation.TableId; | ||||
import com.taauav.common.domain.Entity; | |||||
import lombok.Data; | import lombok.Data; | ||||
import lombok.EqualsAndHashCode; | import lombok.EqualsAndHashCode; | ||||
import lombok.experimental.Accessors; | import lombok.experimental.Accessors; | ||||
@Data | @Data | ||||
@EqualsAndHashCode(callSuper = false) | @EqualsAndHashCode(callSuper = false) | ||||
@Accessors(chain = true) | @Accessors(chain = true) | ||||
public class SysPosition implements Serializable { | |||||
public class SysPosition extends Entity { | |||||
private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
/** | |||||
* 编号 | |||||
*/ | |||||
@TableId(value = "id", type = IdType.AUTO) | |||||
private Integer id; | |||||
/** | /** | ||||
* 名称 | * 名称 | ||||
*/ | */ | ||||
@Length(max = 200, message = "备注不能超过200字") | @Length(max = 200, message = "备注不能超过200字") | ||||
private String remark; | private String remark; | ||||
/** | |||||
* 状态:1正常 2禁用 | |||||
*/ | |||||
@NotNull(message = "状态不能为空") | |||||
private Byte status; | |||||
/** | /** | ||||
* 排序 | * 排序 | ||||
*/ | */ | ||||
private Integer sort; | private Integer sort; | ||||
/** | |||||
* 创建人 | |||||
*/ | |||||
private Integer createUser; | |||||
/** | |||||
* 更新人 | |||||
*/ | |||||
private Integer updateUser; | |||||
/** | |||||
* 创建时间 | |||||
*/ | |||||
private Integer createTime; | |||||
/** | |||||
* 更新时间 | |||||
*/ | |||||
private Integer updateTime; | |||||
/** | |||||
* 有效标记 | |||||
*/ | |||||
private Byte mark; | |||||
} | } |
/** | /** | ||||
* 是否省/国考河道:1是 2否 | * 是否省/国考河道:1是 2否 | ||||
*/ | */ | ||||
private Byte isExam; | |||||
private Integer isExam; | |||||
/** | /** | ||||
* 起点 | * 起点 |
import com.baomidou.mybatisplus.annotation.IdType; | import com.baomidou.mybatisplus.annotation.IdType; | ||||
import com.baomidou.mybatisplus.annotation.TableId; | import com.baomidou.mybatisplus.annotation.TableId; | ||||
import com.taauav.common.domain.Entity; | |||||
import lombok.Data; | import lombok.Data; | ||||
import lombok.EqualsAndHashCode; | import lombok.EqualsAndHashCode; | ||||
import lombok.experimental.Accessors; | import lombok.experimental.Accessors; | ||||
@Data | @Data | ||||
@EqualsAndHashCode(callSuper = false) | @EqualsAndHashCode(callSuper = false) | ||||
@Accessors(chain = true) | @Accessors(chain = true) | ||||
public class TauvEquipment implements Serializable { | |||||
public class TauvEquipment extends Entity { | |||||
private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
@TableId(value = "id",type = IdType.AUTO) | |||||
private Integer id; | |||||
/** | /** | ||||
* 产品序号 | * 产品序号 | ||||
*/ | */ | ||||
/** | /** | ||||
* 类型:1多旋翼 2固定翼 | * 类型:1多旋翼 2固定翼 | ||||
*/ | */ | ||||
private Byte type; | |||||
private Integer type; | |||||
/** | /** | ||||
* 注册时间 | * 注册时间 | ||||
*/ | */ | ||||
private Integer registerTime; | private Integer registerTime; | ||||
/** | |||||
* 状态:1正常 2停用 | |||||
*/ | |||||
private Byte status; | |||||
/** | |||||
* 创建人 | |||||
*/ | |||||
private Integer createUser; | |||||
/** | |||||
* 更新人 | |||||
*/ | |||||
private Integer updateUser; | |||||
/** | |||||
* 创建时间 | |||||
*/ | |||||
private Integer createTime; | |||||
/** | |||||
* 更新时间 | |||||
*/ | |||||
private Integer updateTime; | |||||
/** | |||||
* 有效标记 | |||||
*/ | |||||
private Byte mark; | |||||
public Map<Integer,String> getStatusList() { | public Map<Integer,String> getStatusList() { | ||||
Map<Integer,String> map = new HashMap<>(); | Map<Integer,String> map = new HashMap<>(); |
import java.util.List; | import java.util.List; | ||||
import java.util.Map; | import java.util.Map; | ||||
import com.taauav.common.domain.Entity; | |||||
import lombok.Data; | import lombok.Data; | ||||
import lombok.EqualsAndHashCode; | import lombok.EqualsAndHashCode; | ||||
import lombok.experimental.Accessors; | import lombok.experimental.Accessors; | ||||
@Data | @Data | ||||
@EqualsAndHashCode(callSuper = false) | @EqualsAndHashCode(callSuper = false) | ||||
@Accessors(chain = true) | @Accessors(chain = true) | ||||
public class TauvInspect implements Serializable { | |||||
public class TauvInspect extends Entity { | |||||
private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
/** | |||||
* ID | |||||
*/ | |||||
@TableId(value = "id", type = IdType.AUTO) | |||||
private Integer id; | |||||
/** | /** | ||||
* 巡检任务单号 | * 巡检任务单号 | ||||
*/ | */ | ||||
* 类型:1日常任务 2周期性任务 | * 类型:1日常任务 2周期性任务 | ||||
*/ | */ | ||||
@NotNull(message = "巡检类型不能为空") | @NotNull(message = "巡检类型不能为空") | ||||
private Byte type; | |||||
private Integer type; | |||||
/** | /** | ||||
* 巡检目的 | * 巡检目的 | ||||
*/ | */ | ||||
private String inspectResult; | private String inspectResult; | ||||
/** | |||||
* 创建人 | |||||
*/ | |||||
private Integer createUser; | |||||
/** | |||||
* 创建时间 | |||||
*/ | |||||
private Integer createTime; | |||||
/** | |||||
* 更新人 | |||||
*/ | |||||
private Integer updateUser; | |||||
/** | |||||
* 更新时间 | |||||
*/ | |||||
private Integer updateTime; | |||||
/** | |||||
* 有效标记 | |||||
*/ | |||||
private Byte mark; | |||||
/** | /** | ||||
* 河道任务 | * 河道任务 | ||||
*/ | */ |
import java.util.HashMap; | import java.util.HashMap; | ||||
import java.util.Map; | import java.util.Map; | ||||
import com.taauav.common.domain.Entity; | |||||
import lombok.Data; | import lombok.Data; | ||||
import lombok.EqualsAndHashCode; | import lombok.EqualsAndHashCode; | ||||
import lombok.experimental.Accessors; | import lombok.experimental.Accessors; | ||||
@Data | @Data | ||||
@EqualsAndHashCode(callSuper = false) | @EqualsAndHashCode(callSuper = false) | ||||
@Accessors(chain = true) | @Accessors(chain = true) | ||||
public class TauvInspectDriver implements Serializable { | |||||
public class TauvInspectDriver extends Entity { | |||||
private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
/** | |||||
* ID | |||||
*/ | |||||
@TableId(value = "id", type = IdType.AUTO) | |||||
private Integer id; | |||||
/** | /** | ||||
* 巡检任务ID | * 巡检任务ID | ||||
/** | /** | ||||
* 是否省/国考河道:1是 2否 | * 是否省/国考河道:1是 2否 | ||||
*/ | */ | ||||
private Byte driverExam; | |||||
private Integer driverExam; | |||||
/** | /** | ||||
* 飞行小组 | * 飞行小组 | ||||
*/ | */ | ||||
private String remark; | private String remark; | ||||
/** | |||||
* 状态:1待分配 2待执行 3执行中 4已完成 5复核中 6复核完成 | |||||
*/ | |||||
private Byte status; | |||||
/** | /** | ||||
* 复核人 | * 复核人 | ||||
*/ | */ | ||||
* 复核时间 | * 复核时间 | ||||
*/ | */ | ||||
private Integer reviewTime; | private Integer reviewTime; | ||||
/** | |||||
* 创建人 | |||||
*/ | |||||
private Integer createUser; | |||||
/** | |||||
* 创建时间 | |||||
*/ | |||||
private Integer createTime; | |||||
/** | |||||
* 更新人 | |||||
*/ | |||||
private Integer updateUser; | |||||
/** | |||||
* 更新时间 | |||||
*/ | |||||
private Integer updateTime; | |||||
/** | |||||
* 有效标记 | |||||
*/ | |||||
private Byte mark; | |||||
} | } |
import java.util.HashMap; | import java.util.HashMap; | ||||
import java.util.Map; | import java.util.Map; | ||||
import com.taauav.common.domain.Entity; | |||||
import lombok.Data; | import lombok.Data; | ||||
import lombok.EqualsAndHashCode; | import lombok.EqualsAndHashCode; | ||||
import lombok.experimental.Accessors; | import lombok.experimental.Accessors; | ||||
@Data | @Data | ||||
@EqualsAndHashCode(callSuper = false) | @EqualsAndHashCode(callSuper = false) | ||||
@Accessors(chain = true) | @Accessors(chain = true) | ||||
public class TauvInspectFile implements Serializable { | |||||
public class TauvInspectFile extends Entity { | |||||
private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
/** | |||||
* ID | |||||
*/ | |||||
@TableId(value = "id", type = IdType.AUTO) | |||||
private Integer id; | |||||
/** | /** | ||||
* 巡检任务ID | * 巡检任务ID | ||||
/** | /** | ||||
* 附件类型:1图片 2视频 | * 附件类型:1图片 2视频 | ||||
*/ | */ | ||||
private Byte fileType; | |||||
private Integer fileType; | |||||
/** | /** | ||||
* 文件类型:文件夹/文件 | * 文件类型:文件夹/文件 | ||||
/** | /** | ||||
* 是否已复核 1是 2否 | * 是否已复核 1是 2否 | ||||
*/ | */ | ||||
private Byte isReview; | |||||
private Integer isReview; | |||||
/** | /** | ||||
* 是否有效:1是 2否 | * 是否有效:1是 2否 | ||||
*/ | */ | ||||
private Byte isEffective; | |||||
/** | |||||
* 是否已标记:1是 2否 | |||||
*/ | |||||
@TableField("`status`") | |||||
private Byte status; | |||||
private Integer isEffective; | |||||
/** | /** | ||||
* 坐标检查:1处理成功 2待处理 3处理失败 | * 坐标检查:1处理成功 2待处理 3处理失败 | ||||
*/ | */ | ||||
private Byte checkStatus; | |||||
private Integer checkStatus; | |||||
/** | |||||
* 创建人 | |||||
*/ | |||||
private Integer createUser; | |||||
/** | |||||
* 创建时间 | |||||
*/ | |||||
private Integer createTime; | |||||
/** | |||||
* 更新人 | |||||
*/ | |||||
private Integer updateUser; | |||||
/** | |||||
* 更新时间 | |||||
*/ | |||||
private Integer updateTime; | |||||
/** | |||||
* 有效标记 | |||||
*/ | |||||
private Byte mark; | |||||
public Map<String,String> getFileDocumentList() { | public Map<String,String> getFileDocumentList() { | ||||
Map<String,String> map = new HashMap<>(4); | Map<String,String> map = new HashMap<>(4); |
import com.baomidou.mybatisplus.annotation.IdType; | import com.baomidou.mybatisplus.annotation.IdType; | ||||
import com.baomidou.mybatisplus.annotation.TableId; | import com.baomidou.mybatisplus.annotation.TableId; | ||||
import java.io.Serializable; | import java.io.Serializable; | ||||
import com.taauav.common.domain.Entity; | |||||
import lombok.Data; | import lombok.Data; | ||||
import lombok.EqualsAndHashCode; | import lombok.EqualsAndHashCode; | ||||
import lombok.experimental.Accessors; | import lombok.experimental.Accessors; | ||||
@Data | @Data | ||||
@EqualsAndHashCode(callSuper = false) | @EqualsAndHashCode(callSuper = false) | ||||
@Accessors(chain = true) | @Accessors(chain = true) | ||||
public class TauvInspectFileBak implements Serializable { | |||||
public class TauvInspectFileBak extends Entity { | |||||
private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
/** | |||||
* ID | |||||
*/ | |||||
@TableId(value = "id", type = IdType.AUTO) | |||||
private Integer id; | |||||
/** | /** | ||||
* 巡检任务ID | * 巡检任务ID | ||||
/** | /** | ||||
* 附件类型:1图片 2视频 | * 附件类型:1图片 2视频 | ||||
*/ | */ | ||||
private Byte fileType; | |||||
private Integer fileType; | |||||
/** | /** | ||||
* 文件类型:文件夹/文件 | * 文件类型:文件夹/文件 | ||||
/** | /** | ||||
* 是否已复核:1是 2否 | * 是否已复核:1是 2否 | ||||
*/ | */ | ||||
private Byte isReview; | |||||
private Integer isReview; | |||||
/** | /** | ||||
* 是否有效:1是 2否 | * 是否有效:1是 2否 | ||||
*/ | */ | ||||
private Byte isEffective; | |||||
/** | |||||
* 是否已标记:1是 2否 | |||||
*/ | |||||
private Byte status; | |||||
private Integer isEffective; | |||||
/** | /** | ||||
* 坐标检查:1处理成功 2待处理 3处理失败 | * 坐标检查:1处理成功 2待处理 3处理失败 | ||||
*/ | */ | ||||
private Byte checkStatus; | |||||
/** | |||||
* 创建人 | |||||
*/ | |||||
private Integer createUser; | |||||
/** | |||||
* 创建时间 | |||||
*/ | |||||
private Integer createTime; | |||||
/** | |||||
* 更新人 | |||||
*/ | |||||
private Integer updateUser; | |||||
/** | |||||
* 更新时间 | |||||
*/ | |||||
private Integer updateTime; | |||||
/** | |||||
* 有效标记 | |||||
*/ | |||||
private Byte mark; | |||||
private Integer checkStatus; | |||||
} | } |
import com.baomidou.mybatisplus.annotation.IdType; | import com.baomidou.mybatisplus.annotation.IdType; | ||||
import com.baomidou.mybatisplus.annotation.TableId; | import com.baomidou.mybatisplus.annotation.TableId; | ||||
import com.taauav.common.domain.Entity; | |||||
import lombok.Data; | import lombok.Data; | ||||
import lombok.EqualsAndHashCode; | import lombok.EqualsAndHashCode; | ||||
import lombok.experimental.Accessors; | import lombok.experimental.Accessors; | ||||
@Data | @Data | ||||
@EqualsAndHashCode(callSuper = false) | @EqualsAndHashCode(callSuper = false) | ||||
@Accessors(chain = true) | @Accessors(chain = true) | ||||
public class TauvQuestionOptions implements Serializable { | |||||
public class TauvQuestionOptions extends Entity { | |||||
private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
@TableId(value = "id", type = IdType.AUTO) | |||||
private Integer id; | |||||
/** | /** | ||||
* 分类:1水面 2岸线 3排口 4水质 | * 分类:1水面 2岸线 3排口 4水质 | ||||
*/ | */ | ||||
@NotNull(message = "请选项分类") | @NotNull(message = "请选项分类") | ||||
private Byte category; | |||||
private Integer category; | |||||
/** | /** | ||||
* 类型:1日常监测 2重点核查 | * 类型:1日常监测 2重点核查 | ||||
*/ | */ | ||||
@NotNull(message = "请选择类型") | @NotNull(message = "请选择类型") | ||||
private Byte type; | |||||
private Integer type; | |||||
/** | /** | ||||
* 问题选项 | * 问题选项 | ||||
*/ | */ | ||||
private Integer sort; | private Integer sort; | ||||
/** | |||||
* 状态1:启用、2:禁用 | |||||
*/ | |||||
private Integer status; | |||||
/** | |||||
* 创建人 | |||||
*/ | |||||
private Integer createUser; | |||||
/** | |||||
* 更新人 | |||||
*/ | |||||
private Integer updateUser; | |||||
/** | |||||
* 创建时间 | |||||
*/ | |||||
private Integer createTime; | |||||
/** | |||||
* 更新时间 | |||||
*/ | |||||
private Integer updateTime; | |||||
/** | |||||
* 有效标记 | |||||
*/ | |||||
private Byte mark; | |||||
public Map<Integer,String> getStatusList() { | public Map<Integer,String> getStatusList() { | ||||
Map<Integer,String> map = new HashMap<>(2); | Map<Integer,String> map = new HashMap<>(2); | ||||
map.put(1,"正常"); | map.put(1,"正常"); |
import java.util.HashMap; | import java.util.HashMap; | ||||
import java.util.Map; | import java.util.Map; | ||||
import com.taauav.common.domain.Entity; | |||||
import lombok.Data; | import lombok.Data; | ||||
import lombok.EqualsAndHashCode; | import lombok.EqualsAndHashCode; | ||||
import lombok.experimental.Accessors; | import lombok.experimental.Accessors; | ||||
@Data | @Data | ||||
@EqualsAndHashCode(callSuper = false) | @EqualsAndHashCode(callSuper = false) | ||||
@Accessors(chain = true) | @Accessors(chain = true) | ||||
public class TauvReport implements Serializable { | |||||
public class TauvReport extends Entity { | |||||
private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
/** | |||||
* ID | |||||
*/ | |||||
@TableId(value = "id", type = IdType.AUTO) | |||||
private Integer id; | |||||
/** | /** | ||||
* 报告编号 | * 报告编号 | ||||
/** | /** | ||||
* 是否省/国考河道:1是 2否 | * 是否省/国考河道:1是 2否 | ||||
*/ | */ | ||||
private Byte driverExam; | |||||
private Integer driverExam; | |||||
/** | /** | ||||
* 巡检总长 | * 巡检总长 | ||||
*/ | */ | ||||
private Integer totalCheckScore; | private Integer totalCheckScore; | ||||
/** | |||||
* 巡检任务状态:1待生成 2审核中 3审核通过 4审核驳回 | |||||
*/ | |||||
@TableField(value = "`status`") | |||||
private Byte status; | |||||
/** | /** | ||||
* 报告描述 | * 报告描述 | ||||
*/ | */ | ||||
@TableField(value = "`desc`") | @TableField(value = "`desc`") | ||||
private String desc; | private String desc; | ||||
/** | |||||
* 创建人 | |||||
*/ | |||||
private Integer createUser; | |||||
/** | |||||
* 创建时间 | |||||
*/ | |||||
private Integer createTime; | |||||
/** | |||||
* 更新人 | |||||
*/ | |||||
private Integer updateUser; | |||||
/** | |||||
* 更新时间 | |||||
*/ | |||||
private Integer updateTime; | |||||
/** | /** | ||||
* 创建人 | * 创建人 | ||||
*/ | */ | ||||
private Integer inputTime; | private Integer inputTime; | ||||
/** | |||||
* 有效标记 | |||||
*/ | |||||
private Byte mark; | |||||
/** | /** | ||||
* 是否省/国考 | * 是否省/国考 |
import com.baomidou.mybatisplus.annotation.TableField; | import com.baomidou.mybatisplus.annotation.TableField; | ||||
import com.baomidou.mybatisplus.annotation.TableId; | import com.baomidou.mybatisplus.annotation.TableId; | ||||
import java.io.Serializable; | import java.io.Serializable; | ||||
import com.taauav.common.domain.Entity; | |||||
import lombok.Data; | import lombok.Data; | ||||
import lombok.EqualsAndHashCode; | import lombok.EqualsAndHashCode; | ||||
import lombok.experimental.Accessors; | import lombok.experimental.Accessors; | ||||
@Data | @Data | ||||
@EqualsAndHashCode(callSuper = false) | @EqualsAndHashCode(callSuper = false) | ||||
@Accessors(chain = true) | @Accessors(chain = true) | ||||
public class TauvReportCheck implements Serializable { | |||||
public class TauvReportCheck extends Entity { | |||||
private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
@TableId(value = "id", type = IdType.AUTO) | |||||
private Integer id; | |||||
/** | /** | ||||
* 报告编号 | * 报告编号 | ||||
*/ | */ | ||||
private String remark; | private String remark; | ||||
/** | |||||
* 3.通过 4.驳回 | |||||
*/ | |||||
private Byte status; | |||||
/** | /** | ||||
* 审核人编号 | * 审核人编号 | ||||
*/ | */ | ||||
private Integer checkUser; | private Integer checkUser; | ||||
@TableField(exist = false) | @TableField(exist = false) | ||||
private String formatCheckUser; | private String formatCheckUser; | ||||
private Integer createTime; | |||||
@TableField(exist = false) | @TableField(exist = false) | ||||
private String formatCreateTime; | private String formatCreateTime; | ||||
private Integer updateTime; | |||||
private Byte mark; | |||||
} | } |
import java.util.HashMap; | import java.util.HashMap; | ||||
import java.util.Map; | import java.util.Map; | ||||
import com.taauav.common.domain.Entity; | |||||
import lombok.Data; | import lombok.Data; | ||||
import lombok.EqualsAndHashCode; | import lombok.EqualsAndHashCode; | ||||
import lombok.experimental.Accessors; | import lombok.experimental.Accessors; | ||||
@Data | @Data | ||||
@EqualsAndHashCode(callSuper = false) | @EqualsAndHashCode(callSuper = false) | ||||
@Accessors(chain = true) | @Accessors(chain = true) | ||||
public class TauvReportEvaluation implements Serializable { | |||||
public class TauvReportEvaluation extends Entity { | |||||
private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
/** | |||||
* ID | |||||
*/ | |||||
@TableId(value = "id", type = IdType.AUTO) | |||||
private Integer id; | |||||
/** | /** | ||||
* 评价内容 | * 评价内容 | ||||
*/ | */ | ||||
*/ | */ | ||||
private Integer sort; | private Integer sort; | ||||
/** | |||||
* 状态1:启用、2:禁用 | |||||
*/ | |||||
private Integer status; | |||||
/** | |||||
* 创建人 | |||||
*/ | |||||
private Integer createUser; | |||||
/** | |||||
* 更新人 | |||||
*/ | |||||
private Integer updateUser; | |||||
/** | |||||
* 创建时间 | |||||
*/ | |||||
private Integer createTime; | |||||
/** | |||||
* 更新时间 | |||||
*/ | |||||
private Integer updateTime; | |||||
/** | |||||
* 有效标记 | |||||
*/ | |||||
private Byte mark; | |||||
public Map<Integer,String> getStatusList() { | public Map<Integer,String> getStatusList() { | ||||
Map<Integer,String> map = new HashMap<>(2); | Map<Integer,String> map = new HashMap<>(2); |
import com.baomidou.mybatisplus.annotation.IdType; | import com.baomidou.mybatisplus.annotation.IdType; | ||||
import com.baomidou.mybatisplus.annotation.TableId; | import com.baomidou.mybatisplus.annotation.TableId; | ||||
import java.io.Serializable; | import java.io.Serializable; | ||||
import com.taauav.common.domain.Entity; | |||||
import lombok.Data; | import lombok.Data; | ||||
import lombok.EqualsAndHashCode; | import lombok.EqualsAndHashCode; | ||||
import lombok.experimental.Accessors; | import lombok.experimental.Accessors; | ||||
@Data | @Data | ||||
@EqualsAndHashCode(callSuper = false) | @EqualsAndHashCode(callSuper = false) | ||||
@Accessors(chain = true) | @Accessors(chain = true) | ||||
public class TauvReportRemark implements Serializable { | |||||
public class TauvReportRemark extends Entity { | |||||
private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
@TableId(value = "id", type = IdType.AUTO) | |||||
private Integer id; | |||||
/** | /** | ||||
* 报告表编号 | * 报告表编号 | ||||
* 备注 | * 备注 | ||||
*/ | */ | ||||
private String remark; | private String remark; | ||||
private Integer createTime; | |||||
private Integer updateTime; | |||||
private Boolean mark; | |||||
} | } |
import com.baomidou.mybatisplus.extension.service.IService; | import com.baomidou.mybatisplus.extension.service.IService; | ||||
import com.taauav.common.bean.Response; | import com.taauav.common.bean.Response; | ||||
import com.taauav.admin.entity.SysAdmin; | import com.taauav.admin.entity.SysAdmin; | ||||
import com.taauav.common.service.IBaseService; | |||||
import java.util.List; | import java.util.List; | ||||
import java.util.Map; | import java.util.Map; | ||||
* @author dyg | * @author dyg | ||||
* @since 2019-11-04 | * @since 2019-11-04 | ||||
*/ | */ | ||||
public interface ISysAdminService extends IService<SysAdmin> { | |||||
public interface ISysAdminService extends IBaseService<SysAdmin> { | |||||
/** | /** | ||||
* 根据用户获取数据 | * 根据用户获取数据 | ||||
* @param username | * @param username |
package com.taauav.admin.service; | package com.taauav.admin.service; | ||||
import com.taauav.admin.entity.SysAuthGroupAccess; | import com.taauav.admin.entity.SysAuthGroupAccess; | ||||
import com.baomidou.mybatisplus.extension.service.IService; | |||||
import com.taauav.common.service.IBaseService; | |||||
import java.util.List; | import java.util.List; | ||||
import java.util.Map; | import java.util.Map; | ||||
* @author dyg | * @author dyg | ||||
* @since 2019-11-04 | * @since 2019-11-04 | ||||
*/ | */ | ||||
public interface ISysAuthGroupAccessService extends IService<SysAuthGroupAccess> { | |||||
public interface ISysAuthGroupAccessService extends IBaseService<SysAuthGroupAccess> { | |||||
/** | /** | ||||
* 根据角色编号获取用户列表 | * 根据角色编号获取用户列表 | ||||
* @param groupId | * @param groupId |
import com.taauav.common.bean.Response; | import com.taauav.common.bean.Response; | ||||
import com.taauav.admin.entity.SysAdmin; | import com.taauav.admin.entity.SysAdmin; | ||||
import com.taauav.admin.entity.SysAuthGroup; | import com.taauav.admin.entity.SysAuthGroup; | ||||
import com.baomidou.mybatisplus.extension.service.IService; | |||||
import com.taauav.common.service.IBaseService; | |||||
import java.util.List; | import java.util.List; | ||||
import java.util.Map; | import java.util.Map; | ||||
* @author dyg | * @author dyg | ||||
* @since 2019-11-04 | * @since 2019-11-04 | ||||
*/ | */ | ||||
public interface ISysAuthGroupService extends IService<SysAuthGroup> { | |||||
public interface ISysAuthGroupService extends IBaseService<SysAuthGroup> { | |||||
/** | /** | ||||
* 根据用户编号获取权限 | * 根据用户编号获取权限 |
import com.taauav.common.bean.Response; | import com.taauav.common.bean.Response; | ||||
import com.taauav.admin.entity.SysAdmin; | import com.taauav.admin.entity.SysAdmin; | ||||
import com.taauav.admin.entity.SysAuthRule; | import com.taauav.admin.entity.SysAuthRule; | ||||
import com.baomidou.mybatisplus.extension.service.IService; | |||||
import com.taauav.common.service.IBaseService; | |||||
import java.util.List; | import java.util.List; | ||||
import java.util.Map; | import java.util.Map; | ||||
* @author dyg | * @author dyg | ||||
* @since 2019-11-04 | * @since 2019-11-04 | ||||
*/ | */ | ||||
public interface ISysAuthRuleService extends IService<SysAuthRule> { | |||||
public interface ISysAuthRuleService extends IBaseService<SysAuthRule> { | |||||
/** | /** | ||||
* 获取用户拥有的菜单权限 | * 获取用户拥有的菜单权限 | ||||
* @return | * @return |
import com.taauav.common.bean.Response; | import com.taauav.common.bean.Response; | ||||
import com.taauav.admin.entity.SysCity; | import com.taauav.admin.entity.SysCity; | ||||
import com.baomidou.mybatisplus.extension.service.IService; | |||||
import com.taauav.common.service.IBaseService; | |||||
import java.util.List; | import java.util.List; | ||||
import java.util.Map; | import java.util.Map; | ||||
* @author dyg | * @author dyg | ||||
* @since 2019-11-13 | * @since 2019-11-13 | ||||
*/ | */ | ||||
public interface ISysCityService extends IService<SysCity> { | |||||
public interface ISysCityService extends IBaseService<SysCity> { | |||||
/** | /** | ||||
* 根据父级编号获取数据 | * 根据父级编号获取数据 | ||||
* @param pid 320100 南京编号 | * @param pid 320100 南京编号 |
import com.taauav.common.bean.Response; | import com.taauav.common.bean.Response; | ||||
import com.taauav.admin.entity.SysConfig; | import com.taauav.admin.entity.SysConfig; | ||||
import com.baomidou.mybatisplus.extension.service.IService; | |||||
import com.taauav.common.service.IBaseService; | |||||
import java.util.Map; | import java.util.Map; | ||||
* @author dyg | * @author dyg | ||||
* @since 2019-11-12 | * @since 2019-11-12 | ||||
*/ | */ | ||||
public interface ISysConfigService extends IService<SysConfig> { | |||||
public interface ISysConfigService extends IBaseService<SysConfig> { | |||||
/** | /** | ||||
* 获取列表分页数据 | * 获取列表分页数据 | ||||
* @param map | * @param map |
import com.taauav.common.bean.Response; | import com.taauav.common.bean.Response; | ||||
import com.taauav.admin.entity.SysDep; | import com.taauav.admin.entity.SysDep; | ||||
import com.baomidou.mybatisplus.extension.service.IService; | |||||
import com.taauav.common.service.IBaseService; | |||||
import java.util.Map; | import java.util.Map; | ||||
* @author dyg | * @author dyg | ||||
* @since 2019-11-07 | * @since 2019-11-07 | ||||
*/ | */ | ||||
public interface ISysDepService extends IService<SysDep> { | |||||
public interface ISysDepService extends IBaseService<SysDep> { | |||||
/** | /** | ||||
* 列表 | * 列表 |
import com.taauav.common.bean.Response; | import com.taauav.common.bean.Response; | ||||
import com.taauav.admin.entity.SysDict; | import com.taauav.admin.entity.SysDict; | ||||
import com.baomidou.mybatisplus.extension.service.IService; | |||||
import com.taauav.common.service.IBaseService; | |||||
import java.util.List; | import java.util.List; | ||||
import java.util.Map; | import java.util.Map; | ||||
* @author dyg | * @author dyg | ||||
* @since 2019-11-14 | * @since 2019-11-14 | ||||
*/ | */ | ||||
public interface ISysDictService extends IService<SysDict> { | |||||
public interface ISysDictService extends IBaseService<SysDict> { | |||||
/** | /** | ||||
* 获取列表分页数据 | * 获取列表分页数据 | ||||
* @param map | * @param map |
import com.taauav.common.bean.Response; | import com.taauav.common.bean.Response; | ||||
import com.taauav.admin.entity.SysDictType; | import com.taauav.admin.entity.SysDictType; | ||||
import com.baomidou.mybatisplus.extension.service.IService; | |||||
import com.taauav.common.service.IBaseService; | |||||
import java.util.Map; | import java.util.Map; | ||||
* @author dyg | * @author dyg | ||||
* @since 2019-11-14 | * @since 2019-11-14 | ||||
*/ | */ | ||||
public interface ISysDictTypeService extends IService<SysDictType> { | |||||
public interface ISysDictTypeService extends IBaseService<SysDictType> { | |||||
/** | /** | ||||
* 获取列表分页数据 | * 获取列表分页数据 | ||||
* @param map | * @param map |
import com.taauav.common.bean.Response; | import com.taauav.common.bean.Response; | ||||
import com.taauav.admin.entity.SysLevel; | import com.taauav.admin.entity.SysLevel; | ||||
import com.baomidou.mybatisplus.extension.service.IService; | |||||
import com.taauav.common.service.IBaseService; | |||||
import java.util.Map; | import java.util.Map; | ||||
* @author dyg | * @author dyg | ||||
* @since 2019-11-11 | * @since 2019-11-11 | ||||
*/ | */ | ||||
public interface ISysLevelService extends IService<SysLevel> { | |||||
public interface ISysLevelService extends IBaseService<SysLevel> { | |||||
/** | /** | ||||
* 获取职级分页列表 | * 获取职级分页列表 | ||||
* @param map | * @param map | ||||
* @param status | * @param status | ||||
* @return | * @return | ||||
*/ | */ | ||||
Response changeStatus(Integer id, Byte status); | |||||
Response changeStatus(Integer id, Integer status); | |||||
} | } |
import com.taauav.common.bean.Response; | import com.taauav.common.bean.Response; | ||||
import com.taauav.admin.entity.SysPosition; | import com.taauav.admin.entity.SysPosition; | ||||
import com.baomidou.mybatisplus.extension.service.IService; | |||||
import com.taauav.common.service.IBaseService; | |||||
import java.util.Map; | import java.util.Map; | ||||
* @author dyg | * @author dyg | ||||
* @since 2019-11-12 | * @since 2019-11-12 | ||||
*/ | */ | ||||
public interface ISysPositionService extends IService<SysPosition> { | |||||
public interface ISysPositionService extends IBaseService<SysPosition> { | |||||
/** | /** | ||||
* 岗位列表 | * 岗位列表 | ||||
* @param map | * @param map | ||||
* @param status | * @param status | ||||
* @return | * @return | ||||
*/ | */ | ||||
Response changeStatus(Integer id, Byte status); | |||||
Response changeStatus(Integer id, Integer status); | |||||
} | } |
import com.taauav.common.bean.Response; | import com.taauav.common.bean.Response; | ||||
import com.taauav.admin.entity.TauvEquipment; | import com.taauav.admin.entity.TauvEquipment; | ||||
import com.baomidou.mybatisplus.extension.service.IService; | |||||
import com.taauav.common.service.IBaseService; | |||||
import java.util.Map; | import java.util.Map; | ||||
* @author dyg | * @author dyg | ||||
* @since 2019-11-13 | * @since 2019-11-13 | ||||
*/ | */ | ||||
public interface ITauvEquipmentService extends IService<TauvEquipment> { | |||||
public interface ITauvEquipmentService extends IBaseService<TauvEquipment> { | |||||
/** | /** | ||||
* 获取设备分页数据 | * 获取设备分页数据 | ||||
* @param map | * @param map |
import com.taauav.common.bean.Response; | import com.taauav.common.bean.Response; | ||||
import com.taauav.admin.entity.TauvInspect; | import com.taauav.admin.entity.TauvInspect; | ||||
import com.taauav.admin.entity.TauvInspectDriver; | import com.taauav.admin.entity.TauvInspectDriver; | ||||
import com.baomidou.mybatisplus.extension.service.IService; | |||||
import com.taauav.admin.validate.ExecuteTask; | import com.taauav.admin.validate.ExecuteTask; | ||||
import com.taauav.common.service.IBaseService; | |||||
import java.util.Map; | import java.util.Map; | ||||
* @author dyg | * @author dyg | ||||
* @since 2019-11-14 | * @since 2019-11-14 | ||||
*/ | */ | ||||
public interface ITauvInspectDriverService extends IService<TauvInspectDriver> { | |||||
public interface ITauvInspectDriverService extends IBaseService<TauvInspectDriver> { | |||||
/** | /** | ||||
* 添加任务对应数据 | * 添加任务对应数据 |
package com.taauav.admin.service; | package com.taauav.admin.service; | ||||
import com.taauav.admin.entity.TauvInspectFileBak; | import com.taauav.admin.entity.TauvInspectFileBak; | ||||
import com.baomidou.mybatisplus.extension.service.IService; | |||||
import com.taauav.common.service.IBaseService; | |||||
/** | /** | ||||
* <p> | * <p> | ||||
* @author dyg | * @author dyg | ||||
* @since 2019-11-29 | * @since 2019-11-29 | ||||
*/ | */ | ||||
public interface ITauvInspectFileBakService extends IService<TauvInspectFileBak> { | |||||
public interface ITauvInspectFileBakService extends IBaseService<TauvInspectFileBak> { | |||||
} | } |
import com.taauav.common.bean.Response; | import com.taauav.common.bean.Response; | ||||
import com.taauav.admin.entity.TauvInspectFile; | import com.taauav.admin.entity.TauvInspectFile; | ||||
import com.baomidou.mybatisplus.extension.service.IService; | |||||
import com.taauav.common.service.IBaseService; | |||||
import java.io.File; | import java.io.File; | ||||
import java.io.IOException; | import java.io.IOException; | ||||
* @author dyg | * @author dyg | ||||
* @since 2019-11-14 | * @since 2019-11-14 | ||||
*/ | */ | ||||
public interface ITauvInspectFileService extends IService<TauvInspectFile> { | |||||
public interface ITauvInspectFileService extends IBaseService<TauvInspectFile> { | |||||
/** | /** | ||||
* 根据条件获取分页数据 | * 根据条件获取分页数据 | ||||
* @return | * @return |
import com.taauav.common.bean.Response; | import com.taauav.common.bean.Response; | ||||
import com.taauav.admin.entity.TauvInspect; | import com.taauav.admin.entity.TauvInspect; | ||||
import com.baomidou.mybatisplus.extension.service.IService; | |||||
import com.taauav.common.service.IBaseService; | |||||
/** | /** | ||||
* <p> | * <p> | ||||
* @author dyg | * @author dyg | ||||
* @since 2019-11-14 | * @since 2019-11-14 | ||||
*/ | */ | ||||
public interface ITauvInspectService extends IService<TauvInspect> { | |||||
public interface ITauvInspectService extends IBaseService<TauvInspect> { | |||||
/** | /** | ||||
* 添加任务 | * 添加任务 | ||||
* @param inspect | * @param inspect |
import com.taauav.common.bean.Response; | import com.taauav.common.bean.Response; | ||||
import com.taauav.admin.entity.TauvQuestionOptions; | import com.taauav.admin.entity.TauvQuestionOptions; | ||||
import com.baomidou.mybatisplus.extension.service.IService; | |||||
import com.taauav.common.service.IBaseService; | |||||
import java.util.List; | import java.util.List; | ||||
import java.util.Map; | import java.util.Map; | ||||
* @author dyg | * @author dyg | ||||
* @since 2019-11-13 | * @since 2019-11-13 | ||||
*/ | */ | ||||
public interface ITauvQuestionOptionsService extends IService<TauvQuestionOptions> { | |||||
public interface ITauvQuestionOptionsService extends IBaseService<TauvQuestionOptions> { | |||||
/** | /** | ||||
* 分页数据列表 | * 分页数据列表 | ||||
* @param map | * @param map |
package com.taauav.admin.service; | package com.taauav.admin.service; | ||||
import com.taauav.admin.entity.TauvReportCheck; | import com.taauav.admin.entity.TauvReportCheck; | ||||
import com.baomidou.mybatisplus.extension.service.IService; | |||||
import com.taauav.common.service.IBaseService; | |||||
import java.util.List; | import java.util.List; | ||||
* @author dyg | * @author dyg | ||||
* @since 2019-11-29 | * @since 2019-11-29 | ||||
*/ | */ | ||||
public interface ITauvReportCheckService extends IService<TauvReportCheck> { | |||||
public interface ITauvReportCheckService extends IBaseService<TauvReportCheck> { | |||||
/** | /** | ||||
* 根据报告编号获取审核数据 | * 根据报告编号获取审核数据 | ||||
* @param reportId | * @param reportId |
import com.taauav.common.bean.Response; | import com.taauav.common.bean.Response; | ||||
import com.taauav.admin.entity.TauvReportEvaluation; | import com.taauav.admin.entity.TauvReportEvaluation; | ||||
import com.baomidou.mybatisplus.extension.service.IService; | |||||
import com.taauav.common.service.IBaseService; | |||||
import java.util.List; | import java.util.List; | ||||
import java.util.Map; | import java.util.Map; | ||||
* @author dyg | * @author dyg | ||||
* @since 2019-11-14 | * @since 2019-11-14 | ||||
*/ | */ | ||||
public interface ITauvReportEvaluationService extends IService<TauvReportEvaluation> { | |||||
public interface ITauvReportEvaluationService extends IBaseService<TauvReportEvaluation> { | |||||
Response getPageList(Map<String,String> map); | Response getPageList(Map<String,String> map); | ||||
package com.taauav.admin.service; | package com.taauav.admin.service; | ||||
import com.taauav.admin.entity.TauvReportRemark; | import com.taauav.admin.entity.TauvReportRemark; | ||||
import com.baomidou.mybatisplus.extension.service.IService; | |||||
import com.taauav.common.service.IBaseService; | |||||
/** | /** | ||||
* <p> | * <p> | ||||
* @author dyg | * @author dyg | ||||
* @since 2019-11-29 | * @since 2019-11-29 | ||||
*/ | */ | ||||
public interface ITauvReportRemarkService extends IService<TauvReportRemark> { | |||||
public interface ITauvReportRemarkService extends IBaseService<TauvReportRemark> { | |||||
/** | /** | ||||
* 根据报告编号和问题编号获取数据 | * 根据报告编号和问题编号获取数据 | ||||
* @param reportId | * @param reportId |
import com.baomidou.mybatisplus.core.metadata.IPage; | import com.baomidou.mybatisplus.core.metadata.IPage; | ||||
import com.taauav.common.bean.Response; | import com.taauav.common.bean.Response; | ||||
import com.taauav.admin.entity.TauvReport; | import com.taauav.admin.entity.TauvReport; | ||||
import com.baomidou.mybatisplus.extension.service.IService; | |||||
import com.taauav.common.service.IBaseService; | |||||
import java.util.List; | import java.util.List; | ||||
import java.util.Map; | import java.util.Map; | ||||
* @author dyg | * @author dyg | ||||
* @since 2019-11-22 | * @since 2019-11-22 | ||||
*/ | */ | ||||
public interface ITauvReportService extends IService<TauvReport> { | |||||
public interface ITauvReportService extends IBaseService<TauvReport> { | |||||
/** | /** | ||||
* 添加报告 | * 添加报告 | ||||
* @param report | * @param report |
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; | import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; | ||||
import com.baomidou.mybatisplus.core.metadata.IPage; | import com.baomidou.mybatisplus.core.metadata.IPage; | ||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; | import com.baomidou.mybatisplus.extension.plugins.pagination.Page; | ||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; | |||||
import com.taauav.common.bean.CacheUser; | import com.taauav.common.bean.CacheUser; | ||||
import com.taauav.common.bean.Response; | import com.taauav.common.bean.Response; | ||||
import com.taauav.common.constant.SysAdminConstant; | import com.taauav.common.constant.SysAdminConstant; | ||||
import com.taauav.admin.service.ISysAuthGroupAccessService; | import com.taauav.admin.service.ISysAuthGroupAccessService; | ||||
import com.taauav.admin.service.ISysAuthRuleService; | import com.taauav.admin.service.ISysAuthRuleService; | ||||
import com.taauav.admin.service.ISysCityService; | import com.taauav.admin.service.ISysCityService; | ||||
import com.taauav.common.service.impl.BaseServiceImpl; | |||||
import com.taauav.common.util.DateUtil; | |||||
import com.taauav.common.util.FunctionUtils; | import com.taauav.common.util.FunctionUtils; | ||||
import com.taauav.common.util.ShiroUtils; | import com.taauav.common.util.ShiroUtils; | ||||
import org.apache.shiro.SecurityUtils; | import org.apache.shiro.SecurityUtils; | ||||
* @since 2019-11-04 | * @since 2019-11-04 | ||||
*/ | */ | ||||
@Service | @Service | ||||
public class SysAdminServiceImpl extends ServiceImpl<SysAdminMapper, SysAdmin> implements ISysAdminService { | |||||
public class SysAdminServiceImpl extends BaseServiceImpl<SysAdminMapper, SysAdmin> implements ISysAdminService { | |||||
@Resource | @Resource | ||||
private Response response; | private Response response; | ||||
@Value("${spring.pageSize}") | @Value("${spring.pageSize}") | ||||
} | } | ||||
if (id != null && id > 0) { | if (id != null && id > 0) { | ||||
admin.setUpdateUser(ShiroUtils.getAdminId()); | admin.setUpdateUser(ShiroUtils.getAdminId()); | ||||
admin.setUpdateTime(FunctionUtils.now()); | |||||
admin.setUpdateTime(DateUtil.now()); | |||||
Integer res = sysAdminMapper.updateById(admin); | Integer res = sysAdminMapper.updateById(admin); | ||||
} else { | } else { | ||||
admin.setCreateUser(ShiroUtils.getAdminId()); | admin.setCreateUser(ShiroUtils.getAdminId()); | ||||
admin.setCreateTime(FunctionUtils.now()); | |||||
admin.setCreateTime(DateUtil.now()); | |||||
Integer res = sysAdminMapper.insert(admin); | Integer res = sysAdminMapper.insert(admin); | ||||
id = admin.getId(); | id = admin.getId(); | ||||
} | } | ||||
String savePermit = "savePermit"; | String savePermit = "savePermit"; | ||||
if (drop.equals(act)) { | if (drop.equals(act)) { | ||||
//逻辑删除 | //逻辑删除 | ||||
admin.setMark(Byte.valueOf("0")); | |||||
admin.setMark(Integer.valueOf("0")); | |||||
} else if (reset.equals(act)) { | } else if (reset.equals(act)) { | ||||
//重置密码 | //重置密码 | ||||
admin.setPassword(FunctionUtils.password("123456")); | admin.setPassword(FunctionUtils.password("123456")); | ||||
return response.failure("管理员状态不能为空"); | return response.failure("管理员状态不能为空"); | ||||
} | } | ||||
if (Integer.valueOf(status) == 1) { | if (Integer.valueOf(status) == 1) { | ||||
admin.setStatus(Byte.valueOf("2")); | |||||
admin.setStatus(Integer.valueOf("2")); | |||||
} else { | } else { | ||||
admin.setStatus(Byte.valueOf("1")); | |||||
admin.setStatus(Integer.valueOf("1")); | |||||
} | } | ||||
} else if (savePermit.equals(act)){ | } else if (savePermit.equals(act)){ | ||||
//保存权限数据 | //保存权限数据 | ||||
return response.failure("操作方法不存在"); | return response.failure("操作方法不存在"); | ||||
} | } | ||||
admin.setUpdateUser(ShiroUtils.getAdminId()); | admin.setUpdateUser(ShiroUtils.getAdminId()); | ||||
admin.setUpdateTime(FunctionUtils.now()); | |||||
admin.setUpdateTime(DateUtil.now()); | |||||
Boolean res = updateById(admin); | Boolean res = updateById(admin); | ||||
return response.success("操作成功"); | return response.success("操作成功"); | ||||
} | } |
import com.taauav.admin.entity.SysAuthGroupAccess; | import com.taauav.admin.entity.SysAuthGroupAccess; | ||||
import com.taauav.admin.mapper.SysAuthGroupAccessMapper; | import com.taauav.admin.mapper.SysAuthGroupAccessMapper; | ||||
import com.taauav.admin.service.ISysAuthGroupAccessService; | import com.taauav.admin.service.ISysAuthGroupAccessService; | ||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; | |||||
import com.taauav.common.service.impl.BaseServiceImpl; | |||||
import org.springframework.beans.factory.annotation.Autowired; | import org.springframework.beans.factory.annotation.Autowired; | ||||
import org.springframework.stereotype.Service; | import org.springframework.stereotype.Service; | ||||
import org.springframework.util.StringUtils; | import org.springframework.util.StringUtils; | ||||
* @since 2019-11-04 | * @since 2019-11-04 | ||||
*/ | */ | ||||
@Service | @Service | ||||
public class SysAuthGroupAccessServiceImpl extends ServiceImpl<SysAuthGroupAccessMapper, SysAuthGroupAccess> implements ISysAuthGroupAccessService { | |||||
public class SysAuthGroupAccessServiceImpl extends BaseServiceImpl<SysAuthGroupAccessMapper, SysAuthGroupAccess> implements ISysAuthGroupAccessService { | |||||
@Autowired | @Autowired | ||||
private Response response; | private Response response; | ||||
@Autowired | @Autowired |
import com.taauav.admin.service.ISysAuthGroupService; | import com.taauav.admin.service.ISysAuthGroupService; | ||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; | import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; | ||||
import com.taauav.admin.service.ISysConfigService; | import com.taauav.admin.service.ISysConfigService; | ||||
import com.taauav.common.service.impl.BaseServiceImpl; | |||||
import com.taauav.common.util.DateUtil; | |||||
import com.taauav.common.util.FunctionUtils; | import com.taauav.common.util.FunctionUtils; | ||||
import com.taauav.common.util.ShiroUtils; | import com.taauav.common.util.ShiroUtils; | ||||
import org.springframework.beans.factory.annotation.Autowired; | import org.springframework.beans.factory.annotation.Autowired; | ||||
* @since 2019-11-04 | * @since 2019-11-04 | ||||
*/ | */ | ||||
@Service | @Service | ||||
public class SysAuthGroupServiceImpl extends ServiceImpl<SysAuthGroupMapper, SysAuthGroup> implements ISysAuthGroupService { | |||||
public class SysAuthGroupServiceImpl extends BaseServiceImpl<SysAuthGroupMapper, SysAuthGroup> implements ISysAuthGroupService { | |||||
@Resource | @Resource | ||||
private SysAuthGroupMapper authGroupMapper; | private SysAuthGroupMapper authGroupMapper; | ||||
@Resource | @Resource | ||||
*/ | */ | ||||
@Override | @Override | ||||
public Response add(SysAuthGroup authGroup) { | public Response add(SysAuthGroup authGroup) { | ||||
Integer t = FunctionUtils.getCurrentTime(); | |||||
Integer adminId = ShiroUtils.getAdminId(); | Integer adminId = ShiroUtils.getAdminId(); | ||||
authGroup.setCreateTime(t); | |||||
authGroup.setCreateTime(DateUtil.now()); | |||||
authGroup.setCreateUser(adminId); | authGroup.setCreateUser(adminId); | ||||
SysAuthGroup exit = getInfoByName(authGroup.getName()); | SysAuthGroup exit = getInfoByName(authGroup.getName()); | ||||
if (!StringUtils.isEmpty(exit)) { | if (!StringUtils.isEmpty(exit)) { | ||||
} | } | ||||
SysAuthGroup delSet = new SysAuthGroup(); | SysAuthGroup delSet = new SysAuthGroup(); | ||||
delSet.setId(authGroup.getId()); | delSet.setId(authGroup.getId()); | ||||
delSet.setMark(Byte.valueOf("0")); | |||||
delSet.setMark(0); | |||||
Integer res = authGroupMapper.updateById(delSet); | Integer res = authGroupMapper.updateById(delSet); | ||||
return response.success("操作成功", res); | return response.success("操作成功", res); | ||||
} | } | ||||
if ("2".equals(status) || "1".equals(status)) { | if ("2".equals(status) || "1".equals(status)) { | ||||
SysAuthGroup sysAuthGroup= new SysAuthGroup(); | SysAuthGroup sysAuthGroup= new SysAuthGroup(); | ||||
sysAuthGroup.setId(Integer.valueOf(idStr)); | sysAuthGroup.setId(Integer.valueOf(idStr)); | ||||
sysAuthGroup.setStatus(Byte.valueOf(status)); | |||||
sysAuthGroup.setStatus(Integer.valueOf(status)); | |||||
authGroupMapper.updateById(sysAuthGroup); | authGroupMapper.updateById(sysAuthGroup); | ||||
return response.success("操作成功"); | return response.success("操作成功"); | ||||
} else { | } else { | ||||
private Map<String,Object> formatInfo(Map<String,Object> map) { | private Map<String,Object> formatInfo(Map<String,Object> map) { | ||||
String createTime = map.get("create_time").toString(); | String createTime = map.get("create_time").toString(); | ||||
String status = map.get("status").toString(); | String status = map.get("status").toString(); | ||||
map.put("format_create_time",FunctionUtils.formatTime(Integer.valueOf(createTime),"yyyy-MM-dd HH:mm:ss")); | |||||
map.put("format_create_time",createTime); | |||||
String statusText = "1".equals(status) ? "正常" : "禁用"; | String statusText = "1".equals(status) ? "正常" : "禁用"; | ||||
map.put("status_text",statusText); | map.put("status_text",statusText); | ||||
map.put("format_create_user",""); | map.put("format_create_user",""); |
import com.taauav.admin.service.ISysAdminService; | import com.taauav.admin.service.ISysAdminService; | ||||
import com.taauav.admin.service.ISysAuthGroupService; | import com.taauav.admin.service.ISysAuthGroupService; | ||||
import com.taauav.admin.service.ISysAuthRuleService; | import com.taauav.admin.service.ISysAuthRuleService; | ||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; | |||||
import com.taauav.common.service.impl.BaseServiceImpl; | |||||
import com.taauav.common.util.DateUtil; | |||||
import com.taauav.common.util.FunctionUtils; | import com.taauav.common.util.FunctionUtils; | ||||
import com.taauav.common.util.MenuTree; | import com.taauav.common.util.MenuTree; | ||||
import com.taauav.common.util.ShiroUtils; | import com.taauav.common.util.ShiroUtils; | ||||
@Service | @Service | ||||
@Slf4j | @Slf4j | ||||
@Data | @Data | ||||
public class SysAuthRuleServiceImpl extends ServiceImpl<SysAuthRuleMapper, SysAuthRule> implements ISysAuthRuleService { | |||||
public class SysAuthRuleServiceImpl extends BaseServiceImpl<SysAuthRuleMapper, SysAuthRule> implements ISysAuthRuleService { | |||||
@Value("${spring.pageSize}") | @Value("${spring.pageSize}") | ||||
private Integer pageSize; | private Integer pageSize; | ||||
return response.failure("名称已经存在"); | return response.failure("名称已经存在"); | ||||
} | } | ||||
} | } | ||||
Integer addTime = FunctionUtils.getCurrentTime(); | |||||
Date addTime = DateUtil.now(); | |||||
authRule.setUpdateTime(addTime); | authRule.setUpdateTime(addTime); | ||||
authRule.setUpdateUser(ShiroUtils.getAdminId()); | authRule.setUpdateUser(ShiroUtils.getAdminId()); | ||||
authRuleMapper.updateById(authRule); | authRuleMapper.updateById(authRule); | ||||
if ( !StringUtils.isEmpty(pid)) { | if ( !StringUtils.isEmpty(pid)) { | ||||
SysAuthRule authRuleInfo = authRuleMapper.selectById(pid); | SysAuthRule authRuleInfo = authRuleMapper.selectById(pid); | ||||
if (!StringUtils.isEmpty(authRuleInfo)) { | if (!StringUtils.isEmpty(authRuleInfo)) { | ||||
Byte level = authRuleInfo.getLevel(); | |||||
authRule.setLevel(Byte.valueOf((Integer.valueOf(level) +1)+"")); | |||||
Integer level = authRuleInfo.getLevel(); | |||||
authRule.setLevel(level+1); | |||||
} | } | ||||
} | } | ||||
Integer addTime = FunctionUtils.getCurrentTime(); | Integer addTime = FunctionUtils.getCurrentTime(); | ||||
authRule.setCreateTime(addTime); | |||||
authRule.setCreateTime(DateUtil.now()); | |||||
authRule.setCreateUser(ShiroUtils.getAdminId()); | authRule.setCreateUser(ShiroUtils.getAdminId()); | ||||
authRule.setMark(Byte.valueOf("1")); | |||||
authRule.setMark(1); | |||||
authRuleMapper.insert(authRule); | authRuleMapper.insert(authRule); | ||||
return response.success("添加成功"); | return response.success("添加成功"); | ||||
} | } | ||||
return response.failure("数据不存在"); | return response.failure("数据不存在"); | ||||
} | } | ||||
SysAuthRule delSet = new SysAuthRule(); | SysAuthRule delSet = new SysAuthRule(); | ||||
delSet.setMark(Byte.valueOf("0")); | |||||
delSet.setMark(0); | |||||
delSet.setId(authRule.getId()); | delSet.setId(authRule.getId()); | ||||
authRuleMapper.updateById(delSet); | authRuleMapper.updateById(delSet); | ||||
return response.success("删除成功"); | return response.success("删除成功"); | ||||
if ("2".equals(status) || "1".equals(status)) { | if ("2".equals(status) || "1".equals(status)) { | ||||
SysAuthRule sysAuthRule = new SysAuthRule(); | SysAuthRule sysAuthRule = new SysAuthRule(); | ||||
sysAuthRule.setId(Integer.valueOf(idStr)); | sysAuthRule.setId(Integer.valueOf(idStr)); | ||||
sysAuthRule.setStatus(Byte.valueOf(status)); | |||||
sysAuthRule.setStatus(Integer.valueOf(status)); | |||||
authRuleMapper.updateById(sysAuthRule); | authRuleMapper.updateById(sysAuthRule); | ||||
return response.success("操作成功"); | return response.success("操作成功"); | ||||
} else { | } else { |
import com.taauav.admin.mapper.SysCityMapper; | import com.taauav.admin.mapper.SysCityMapper; | ||||
import com.taauav.admin.mapper.TauvDriverMapper; | import com.taauav.admin.mapper.TauvDriverMapper; | ||||
import com.taauav.admin.service.ISysCityService; | import com.taauav.admin.service.ISysCityService; | ||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; | |||||
import com.taauav.common.service.impl.BaseServiceImpl; | |||||
import com.taauav.common.util.ShiroUtils; | import com.taauav.common.util.ShiroUtils; | ||||
import com.taauav.common.util.StringUtils; | |||||
import org.springframework.beans.factory.annotation.Autowired; | import org.springframework.beans.factory.annotation.Autowired; | ||||
import org.springframework.stereotype.Service; | import org.springframework.stereotype.Service; | ||||
* @since 2019-11-13 | * @since 2019-11-13 | ||||
*/ | */ | ||||
@Service | @Service | ||||
public class SysCityServiceImpl extends ServiceImpl<SysCityMapper, SysCity> implements ISysCityService { | |||||
public class SysCityServiceImpl extends BaseServiceImpl<SysCityMapper, SysCity> implements ISysCityService { | |||||
@Autowired | @Autowired | ||||
private SysCityMapper sysCityMapper; | private SysCityMapper sysCityMapper; | ||||
@Autowired | @Autowired | ||||
SysAdmin admin = adminMapper.selectById(adminId); | SysAdmin admin = adminMapper.selectById(adminId); | ||||
if (!"".equals(admin.getCityIds())) { | if (!"".equals(admin.getCityIds())) { | ||||
QueryWrapper<SysCity> wrapper = new QueryWrapper<>(); | QueryWrapper<SysCity> wrapper = new QueryWrapper<>(); | ||||
String[] ids = admin.getCityIds().split(","); | |||||
if (!StringUtils.isEmpty(admin.getCityIds())) { | |||||
String[] ids = admin.getCityIds().split(","); | |||||
wrapper.in("id", ids); | |||||
} | |||||
wrapper.eq("pid", pid); | wrapper.eq("pid", pid); | ||||
wrapper.eq("mark", 1); | wrapper.eq("mark", 1); | ||||
wrapper.in("id", ids); | |||||
wrapper.select("id,pid,name,longitude,latitude"); | wrapper.select("id,pid,name,longitude,latitude"); | ||||
List<Map<String,Object>> list = sysCityMapper.selectMaps(wrapper); | List<Map<String,Object>> list = sysCityMapper.selectMaps(wrapper); | ||||
return list; | return list; |
import com.taauav.admin.entity.SysConfig; | import com.taauav.admin.entity.SysConfig; | ||||
import com.taauav.admin.mapper.SysConfigMapper; | import com.taauav.admin.mapper.SysConfigMapper; | ||||
import com.taauav.admin.service.ISysConfigService; | import com.taauav.admin.service.ISysConfigService; | ||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; | |||||
import com.taauav.common.service.impl.BaseServiceImpl; | |||||
import com.taauav.common.util.DateUtil; | |||||
import com.taauav.common.util.FunctionUtils; | import com.taauav.common.util.FunctionUtils; | ||||
import com.taauav.common.util.ShiroUtils; | import com.taauav.common.util.ShiroUtils; | ||||
import org.springframework.beans.factory.annotation.Autowired; | import org.springframework.beans.factory.annotation.Autowired; | ||||
* @since 2019-11-12 | * @since 2019-11-12 | ||||
*/ | */ | ||||
@Service | @Service | ||||
public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig> implements ISysConfigService { | |||||
public class SysConfigServiceImpl extends BaseServiceImpl<SysConfigMapper, SysConfig> implements ISysConfigService { | |||||
@Autowired | @Autowired | ||||
private Response response; | private Response response; | ||||
@Value("${spring.pageSize}") | @Value("${spring.pageSize}") | ||||
} | } | ||||
} | } | ||||
if (map.getId() != null && map.getId() > 0) { | if (map.getId() != null && map.getId() > 0) { | ||||
map.setUpdateTime(FunctionUtils.now()); | |||||
map.setUpdateTime(DateUtil.now()); | |||||
map.setUpdateUser(ShiroUtils.getAdminId()); | map.setUpdateUser(ShiroUtils.getAdminId()); | ||||
updateById(map); | updateById(map); | ||||
} else { | } else { | ||||
map.setCreateTime(FunctionUtils.now()); | |||||
map.setCreateTime(DateUtil.now()); | |||||
map.setCreateUser(ShiroUtils.getAdminId()); | map.setCreateUser(ShiroUtils.getAdminId()); | ||||
save(map); | save(map); | ||||
} | } | ||||
return response.failure("对应配置数据不存在"); | return response.failure("对应配置数据不存在"); | ||||
} | } | ||||
if (status == 1) { | if (status == 1) { | ||||
config.setStatus(Byte.valueOf("2")); | |||||
config.setStatus(Integer.valueOf("2")); | |||||
} else { | } else { | ||||
config.setStatus(Byte.valueOf("1")); | |||||
config.setStatus(Integer.valueOf("1")); | |||||
} | } | ||||
updateById(config); | updateById(config); | ||||
return response.success("操作成功"); | return response.success("操作成功"); |
import com.taauav.admin.mapper.SysDepMapper; | import com.taauav.admin.mapper.SysDepMapper; | ||||
import com.taauav.admin.service.ISysAdminService; | import com.taauav.admin.service.ISysAdminService; | ||||
import com.taauav.admin.service.ISysDepService; | import com.taauav.admin.service.ISysDepService; | ||||
import com.taauav.common.util.FunctionUtils; | |||||
import com.taauav.common.service.impl.BaseServiceImpl; | |||||
import com.taauav.common.util.DateUtil; | |||||
import com.taauav.common.util.ShiroUtils; | import com.taauav.common.util.ShiroUtils; | ||||
import org.springframework.beans.factory.annotation.Autowired; | import org.springframework.beans.factory.annotation.Autowired; | ||||
import org.springframework.stereotype.Service; | import org.springframework.stereotype.Service; | ||||
* @since 2019-11-07 | * @since 2019-11-07 | ||||
*/ | */ | ||||
@Service | @Service | ||||
public class SysDepServiceImpl extends ServiceImpl<SysDepMapper, SysDep> implements ISysDepService { | |||||
public class SysDepServiceImpl extends BaseServiceImpl<SysDepMapper, SysDep> implements ISysDepService { | |||||
@Resource | @Resource | ||||
private Response response; | private Response response; | ||||
@Autowired | @Autowired | ||||
} | } | ||||
map.put("createUserName", pCreateUser); | map.put("createUserName", pCreateUser); | ||||
String pCreateTime = ""; | String pCreateTime = ""; | ||||
if (sysDep.getCreateTime() > 0) { | |||||
pCreateTime = FunctionUtils.formatTime(sysDep.getCreateTime(), "yyyy-MM-dd HH:mm:ss"); | |||||
if (sysDep.getCreateTime() != null) { | |||||
pCreateTime = DateUtil.format(sysDep.getCreateTime(),"yyyy-MM-dd HH:mm:ss"); | |||||
} | } | ||||
map.put("formatCreateTime", pCreateTime); | map.put("formatCreateTime", pCreateTime); | ||||
Byte hasChild = sysDep.getHasChild(); | |||||
Integer hasChild = sysDep.getHasChild(); | |||||
if (Integer.valueOf(hasChild) == 1) { | if (Integer.valueOf(hasChild) == 1) { | ||||
QueryWrapper wrp = new QueryWrapper(); | QueryWrapper wrp = new QueryWrapper(); | ||||
wrp.eq("mark", 1); | wrp.eq("mark", 1); | ||||
} | } | ||||
vl.put("createUserName", fCreateUser); | vl.put("createUserName", fCreateUser); | ||||
String fCreateTime = ""; | String fCreateTime = ""; | ||||
if (child.getCreateTime() > 0) { | |||||
fCreateTime = FunctionUtils.formatTime(child.getCreateTime(), "yyyy-MM-dd HH:mm:ss"); | |||||
if (child.getCreateTime() != null) { | |||||
fCreateTime = DateUtil.format(child.getCreateTime(),"yyyy-MM-dd HH:mm:ss"); | |||||
} | } | ||||
vl.put("formatCreateTime", fCreateTime); | vl.put("formatCreateTime", fCreateTime); | ||||
if (Integer.valueOf(child.getHasChild()) == 1) { | if (Integer.valueOf(child.getHasChild()) == 1) { | ||||
} | } | ||||
cld.put("createUserName", createUserName); | cld.put("createUserName", createUserName); | ||||
String formatCreateTime = ""; | String formatCreateTime = ""; | ||||
if (cl.getCreateTime() > 0) { | |||||
formatCreateTime = FunctionUtils.formatTime(cl.getCreateTime(), "yyyy-MM-dd HH:mm:ss"); | |||||
if (cl.getCreateTime() != null) { | |||||
formatCreateTime = DateUtil.format(cl.getCreateTime(),"yyyy-MM-dd HH:mm:ss"); | |||||
} | } | ||||
cld.put("formatCreateTime", formatCreateTime); | cld.put("formatCreateTime", formatCreateTime); | ||||
thirdChild.add(cld); | thirdChild.add(cld); | ||||
Integer id = map.getId(); | Integer id = map.getId(); | ||||
if (id == null) { | if (id == null) { | ||||
dep.setCreateUser(ShiroUtils.getAdminId()); | dep.setCreateUser(ShiroUtils.getAdminId()); | ||||
dep.setCreateTime(FunctionUtils.now()); | |||||
dep.setCreateTime(DateUtil.now()); | |||||
} else { | } else { | ||||
dep.setId(id); | dep.setId(id); | ||||
dep.setUpdateUser(ShiroUtils.getAdminId()); | dep.setUpdateUser(ShiroUtils.getAdminId()); | ||||
dep.setUpdateTime(FunctionUtils.now()); | |||||
dep.setUpdateTime(DateUtil.now()); | |||||
} | } | ||||
dep.setName(map.getName()); | dep.setName(map.getName()); | ||||
dep.setPid(map.getPid()); | dep.setPid(map.getPid()); | ||||
level = pInfo.getLevel() + 1; | level = pInfo.getLevel() + 1; | ||||
} | } | ||||
} | } | ||||
dep.setLevel(Byte.valueOf(String.valueOf(level))); | |||||
dep.setLevel(level); | |||||
dep.setManager(map.getManager()); | dep.setManager(map.getManager()); | ||||
dep.setHasChild(map.getHasChild()); | dep.setHasChild(map.getHasChild()); | ||||
dep.setSort(map.getSort()); | dep.setSort(map.getSort()); | ||||
} | } | ||||
SysDep dep = new SysDep(); | SysDep dep = new SysDep(); | ||||
dep.setId(Integer.valueOf(id)); | dep.setId(Integer.valueOf(id)); | ||||
dep.setMark(Byte.valueOf("0")); | |||||
dep.setMark(Integer.valueOf("0")); | |||||
dep.setUpdateUser(ShiroUtils.getAdminId()); | dep.setUpdateUser(ShiroUtils.getAdminId()); | ||||
dep.setUpdateTime(FunctionUtils.now()); | |||||
dep.setUpdateTime(DateUtil.now()); | |||||
Boolean res = updateById(dep); | Boolean res = updateById(dep); | ||||
if (res.equals(false)) { | if (res.equals(false)) { | ||||
return response.failure("操作失败"); | return response.failure("操作失败"); |
import com.taauav.admin.mapper.SysDictMapper; | import com.taauav.admin.mapper.SysDictMapper; | ||||
import com.taauav.admin.service.ISysAdminService; | import com.taauav.admin.service.ISysAdminService; | ||||
import com.taauav.admin.service.ISysDictService; | import com.taauav.admin.service.ISysDictService; | ||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; | |||||
import com.taauav.common.service.impl.BaseServiceImpl; | |||||
import com.taauav.common.util.DateUtil; | |||||
import com.taauav.common.util.FunctionUtils; | import com.taauav.common.util.FunctionUtils; | ||||
import com.taauav.common.util.ShiroUtils; | import com.taauav.common.util.ShiroUtils; | ||||
import org.springframework.beans.factory.annotation.Autowired; | import org.springframework.beans.factory.annotation.Autowired; | ||||
* @since 2019-11-14 | * @since 2019-11-14 | ||||
*/ | */ | ||||
@Service | @Service | ||||
public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> implements ISysDictService { | |||||
public class SysDictServiceImpl extends BaseServiceImpl<SysDictMapper, SysDict> implements ISysDictService { | |||||
@Value("${spring.pageSize}") | @Value("${spring.pageSize}") | ||||
private Integer pageSize; | private Integer pageSize; | ||||
@Autowired | @Autowired | ||||
//添加时间筛选 | //添加时间筛选 | ||||
String startTime = "startTime"; | String startTime = "startTime"; | ||||
String endTime = "endTime"; | String endTime = "endTime"; | ||||
if (map.containsKey(startTime) && map.containsKey(endTime) && FunctionUtils.isNumeric(map.get(startTime)) && FunctionUtils.isNumeric(map.get(endTime))) { | |||||
wrapper.between("`create_time`", Integer.valueOf(map.get(startTime)), Integer.valueOf(map.get(endTime))); | |||||
if (map.containsKey(startTime) && map.containsKey(endTime) ) { | |||||
wrapper.between("`create_time`", map.get(startTime), map.get(endTime)); | |||||
} | } | ||||
pageNo = map.containsKey("page") && Integer.valueOf(map.get("page")) > 0 ? Integer.valueOf(map.get("page")) : 1; | pageNo = map.containsKey("page") && Integer.valueOf(map.get("page")) > 0 ? Integer.valueOf(map.get("page")) : 1; | ||||
//每页条数 | //每页条数 | ||||
for (Map<String, Object> mp : data.getRecords()) { | for (Map<String, Object> mp : data.getRecords()) { | ||||
Integer createUser = new Long(mp.get("create_user").toString()).intValue(); | Integer createUser = new Long(mp.get("create_user").toString()).intValue(); | ||||
mp.put("createUserName", adminService.getRealNameById(createUser)); | mp.put("createUserName", adminService.getRealNameById(createUser)); | ||||
Integer createTime = new Long(mp.get("create_time").toString()).intValue(); | |||||
mp.put("formatCreateTime", FunctionUtils.formatTime(createTime, "yyyy-MM-dd HH:mm:ss")); | |||||
mp.put("formatCreateTime", mp.get("create_time").toString()); | |||||
if ((Integer) mp.get("has_child") == 1) { | if ((Integer) mp.get("has_child") == 1) { | ||||
QueryWrapper query = new QueryWrapper(); | QueryWrapper query = new QueryWrapper(); | ||||
query.eq("mark", 1); | query.eq("mark", 1); | ||||
for (Map<String, Object> val : fChild) { | for (Map<String, Object> val : fChild) { | ||||
createUser = new Long(val.get("create_user").toString()).intValue(); | createUser = new Long(val.get("create_user").toString()).intValue(); | ||||
val.put("createUserName", adminService.getRealNameById(createUser)); | val.put("createUserName", adminService.getRealNameById(createUser)); | ||||
createTime = new Long(val.get("create_time").toString()).intValue(); | |||||
val.put("formatCreateTime", FunctionUtils.formatTime(createTime, "yyyy-MM-dd HH:mm:ss")); | |||||
val.put("formatCreateTime", val.get("create_time").toString()); | |||||
if ((Integer) val.get("has_child") == 1) { | if ((Integer) val.get("has_child") == 1) { | ||||
QueryWrapper cond = new QueryWrapper(); | QueryWrapper cond = new QueryWrapper(); | ||||
cond.eq("pid", val.get("id")); | cond.eq("pid", val.get("id")); | ||||
for (Map<String, Object> item : sChild) { | for (Map<String, Object> item : sChild) { | ||||
createUser = new Long(item.get("create_user").toString()).intValue(); | createUser = new Long(item.get("create_user").toString()).intValue(); | ||||
item.put("createUserName", adminService.getRealNameById(createUser)); | item.put("createUserName", adminService.getRealNameById(createUser)); | ||||
createTime = new Long(item.get("create_time").toString()).intValue(); | |||||
item.put("formatCreateTime", FunctionUtils.formatTime(createTime, "yyyy-MM-dd HH:mm:ss")); | |||||
item.put("formatCreateTime", item.get("create_time").toString()); | |||||
} | } | ||||
val.put("children", sChild); | val.put("children", sChild); | ||||
} | } | ||||
} | } | ||||
} | } | ||||
if (map.getId() != null && map.getId() > 0) { | if (map.getId() != null && map.getId() > 0) { | ||||
map.setUpdateTime(FunctionUtils.now()); | |||||
map.setUpdateTime(DateUtil.now()); | |||||
map.setUpdateUser(ShiroUtils.getAdminId()); | map.setUpdateUser(ShiroUtils.getAdminId()); | ||||
updateById(map); | updateById(map); | ||||
} else { | } else { | ||||
map.setCreateTime(FunctionUtils.now()); | |||||
map.setCreateTime(DateUtil.now()); | |||||
map.setCreateUser(ShiroUtils.getAdminId()); | map.setCreateUser(ShiroUtils.getAdminId()); | ||||
save(map); | save(map); | ||||
} | } |
import com.taauav.admin.mapper.SysDictTypeMapper; | import com.taauav.admin.mapper.SysDictTypeMapper; | ||||
import com.taauav.admin.service.ISysAdminService; | import com.taauav.admin.service.ISysAdminService; | ||||
import com.taauav.admin.service.ISysDictTypeService; | import com.taauav.admin.service.ISysDictTypeService; | ||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; | |||||
import com.taauav.common.service.impl.BaseServiceImpl; | |||||
import com.taauav.common.util.DateUtil; | |||||
import com.taauav.common.util.FunctionUtils; | import com.taauav.common.util.FunctionUtils; | ||||
import com.taauav.common.util.ShiroUtils; | import com.taauav.common.util.ShiroUtils; | ||||
import org.springframework.beans.factory.annotation.Autowired; | import org.springframework.beans.factory.annotation.Autowired; | ||||
* @since 2019-11-14 | * @since 2019-11-14 | ||||
*/ | */ | ||||
@Service | @Service | ||||
public class SysDictTypeServiceImpl extends ServiceImpl<SysDictTypeMapper, SysDictType> implements ISysDictTypeService { | |||||
public class SysDictTypeServiceImpl extends BaseServiceImpl<SysDictTypeMapper, SysDictType> implements ISysDictTypeService { | |||||
@Value("${spring.pageSize}") | @Value("${spring.pageSize}") | ||||
private Integer pageSize; | private Integer pageSize; | ||||
@Autowired | @Autowired | ||||
for (Map<String, Object> mp : data.getRecords()) { | for (Map<String, Object> mp : data.getRecords()) { | ||||
Integer createUser = new Long(mp.get("create_user").toString()).intValue(); | Integer createUser = new Long(mp.get("create_user").toString()).intValue(); | ||||
mp.put("createUserName", adminService.getRealNameById(createUser)); | mp.put("createUserName", adminService.getRealNameById(createUser)); | ||||
Integer createTime = new Long(mp.get("create_time").toString()).intValue(); | |||||
mp.put("formatCreateTime", FunctionUtils.formatTime(createTime, "yyyy-MM-dd HH:mm:ss")); | |||||
mp.put("formatCreateTime", mp.get("create_time").toString()); | |||||
} | } | ||||
} | } | ||||
return response.success("操作成功", data); | return response.success("操作成功", data); | ||||
} | } | ||||
} | } | ||||
if (map.getId() != null && map.getId() > 0) { | if (map.getId() != null && map.getId() > 0) { | ||||
map.setUpdateTime(FunctionUtils.now()); | |||||
map.setUpdateTime(DateUtil.now()); | |||||
map.setUpdateUser(ShiroUtils.getAdminId()); | map.setUpdateUser(ShiroUtils.getAdminId()); | ||||
updateById(map); | updateById(map); | ||||
} else { | } else { | ||||
map.setCreateTime(FunctionUtils.now()); | |||||
map.setCreateTime(DateUtil.now()); | |||||
map.setCreateUser(ShiroUtils.getAdminId()); | map.setCreateUser(ShiroUtils.getAdminId()); | ||||
save(map); | save(map); | ||||
} | } |
import com.taauav.admin.mapper.SysLevelMapper; | import com.taauav.admin.mapper.SysLevelMapper; | ||||
import com.taauav.admin.service.ISysLevelService; | import com.taauav.admin.service.ISysLevelService; | ||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; | import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; | ||||
import com.taauav.common.service.impl.BaseServiceImpl; | |||||
import com.taauav.common.util.DateUtil; | |||||
import com.taauav.common.util.FunctionUtils; | import com.taauav.common.util.FunctionUtils; | ||||
import com.taauav.common.util.ShiroUtils; | import com.taauav.common.util.ShiroUtils; | ||||
import org.springframework.beans.factory.annotation.Autowired; | import org.springframework.beans.factory.annotation.Autowired; | ||||
* @since 2019-11-11 | * @since 2019-11-11 | ||||
*/ | */ | ||||
@Service | @Service | ||||
public class SysLevelServiceImpl extends ServiceImpl<SysLevelMapper, SysLevel> implements ISysLevelService { | |||||
public class SysLevelServiceImpl extends BaseServiceImpl<SysLevelMapper, SysLevel> implements ISysLevelService { | |||||
@Autowired | @Autowired | ||||
private SysLevelMapper levelMapper; | private SysLevelMapper levelMapper; | ||||
@Autowired | @Autowired | ||||
mp.put("createUsername", ""); | mp.put("createUsername", ""); | ||||
} | } | ||||
mp.put("createTime", val.getCreateTime()); | mp.put("createTime", val.getCreateTime()); | ||||
mp.put("formatCreateTime", FunctionUtils.formatTime(val.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); | |||||
mp.put("formatCreateTime", DateUtil.format(val.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); | |||||
records.add(mp); | records.add(mp); | ||||
}); | }); | ||||
list.put("records", records); | list.put("records", records); | ||||
Boolean res = true; | Boolean res = true; | ||||
if (id != null && id > 0) { | if (id != null && id > 0) { | ||||
level.setId(id); | level.setId(id); | ||||
level.setUpdateTime(FunctionUtils.now()); | |||||
level.setUpdateTime(DateUtil.now()); | |||||
level.setUpdateUser(ShiroUtils.getAdminId()); | level.setUpdateUser(ShiroUtils.getAdminId()); | ||||
res = updateById(level); | res = updateById(level); | ||||
} else { | } else { | ||||
level.setCreateTime(FunctionUtils.now()); | |||||
level.setCreateTime(DateUtil.now()); | |||||
level.setCreateUser(ShiroUtils.getAdminId()); | level.setCreateUser(ShiroUtils.getAdminId()); | ||||
res = save(level); | res = save(level); | ||||
} | } | ||||
info.put("createUserName", createUserName); | info.put("createUserName", createUserName); | ||||
info.put("createTime", levelInfo.getCreateTime()); | info.put("createTime", levelInfo.getCreateTime()); | ||||
String formatCreateTime = ""; | String formatCreateTime = ""; | ||||
if (levelInfo.getCreateTime() > 0) { | |||||
formatCreateTime = FunctionUtils.formatTime(levelInfo.getCreateTime(), "yyyy-MM-dd HH:mm:ss"); | |||||
if (levelInfo.getCreateTime() != null) { | |||||
formatCreateTime = DateUtil.format(levelInfo.getCreateTime(), "yyyy-MM-dd HH:mm:ss"); | |||||
} | } | ||||
info.put("formatCreateTime", formatCreateTime); | info.put("formatCreateTime", formatCreateTime); | ||||
info.put("updateUser", levelInfo.getUpdateUser()); | info.put("updateUser", levelInfo.getUpdateUser()); | ||||
info.put("updateUserName", updateUserName); | info.put("updateUserName", updateUserName); | ||||
info.put("updateTime", levelInfo.getUpdateTime()); | info.put("updateTime", levelInfo.getUpdateTime()); | ||||
String formatUpdateTime = ""; | String formatUpdateTime = ""; | ||||
if (levelInfo.getUpdateTime() > 0) { | |||||
formatUpdateTime = FunctionUtils.formatTime(levelInfo.getUpdateTime(), "yyyy-MM-dd HH:mm:ss"); | |||||
if (levelInfo.getUpdateTime() != null) { | |||||
formatUpdateTime = DateUtil.format(levelInfo.getUpdateTime(), "yyyy-MM-dd HH:mm:ss"); | |||||
} | } | ||||
info.put("formatUpdateTime", formatUpdateTime); | info.put("formatUpdateTime", formatUpdateTime); | ||||
return response.success("操作成功", info); | return response.success("操作成功", info); | ||||
return response.failure("职级数据不存在"); | return response.failure("职级数据不存在"); | ||||
} | } | ||||
level.setUpdateUser(ShiroUtils.getAdminId()); | level.setUpdateUser(ShiroUtils.getAdminId()); | ||||
level.setUpdateTime(FunctionUtils.now()); | |||||
level.setMark(Byte.valueOf("0")); | |||||
level.setUpdateTime(DateUtil.now()); | |||||
level.setMark(Integer.valueOf("0")); | |||||
Boolean res = updateById(level); | Boolean res = updateById(level); | ||||
if (res.equals(false)) { | if (res.equals(false)) { | ||||
return response.failure("操作失败"); | return response.failure("操作失败"); | ||||
* @return | * @return | ||||
*/ | */ | ||||
@Override | @Override | ||||
public Response changeStatus(Integer id, Byte status) { | |||||
public Response changeStatus(Integer id, Integer status) { | |||||
if (id < 1) { | if (id < 1) { | ||||
return response.failure("职级id必须大于0"); | return response.failure("职级id必须大于0"); | ||||
} | } | ||||
if (info == null) { | if (info == null) { | ||||
return response.failure("职级数据不存在"); | return response.failure("职级数据不存在"); | ||||
} | } | ||||
Byte st = 0; | |||||
Integer st = 0; | |||||
if (status == 1) { | if (status == 1) { | ||||
st = 2; | st = 2; | ||||
} else { | } else { | ||||
} | } | ||||
info.setStatus(st); | info.setStatus(st); | ||||
info.setUpdateUser(ShiroUtils.getAdminId()); | info.setUpdateUser(ShiroUtils.getAdminId()); | ||||
info.setUpdateTime(FunctionUtils.now()); | |||||
info.setUpdateTime(DateUtil.now()); | |||||
Boolean res = updateById(info); | Boolean res = updateById(info); | ||||
if (res.equals(false)) { | if (res.equals(false)) { | ||||
return response.failure("操作失败"); | return response.failure("操作失败"); |
import com.taauav.admin.mapper.SysAdminMapper; | import com.taauav.admin.mapper.SysAdminMapper; | ||||
import com.taauav.admin.mapper.SysPositionMapper; | import com.taauav.admin.mapper.SysPositionMapper; | ||||
import com.taauav.admin.service.ISysPositionService; | import com.taauav.admin.service.ISysPositionService; | ||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; | |||||
import com.taauav.common.service.impl.BaseServiceImpl; | |||||
import com.taauav.common.util.DateUtil; | |||||
import com.taauav.common.util.FunctionUtils; | import com.taauav.common.util.FunctionUtils; | ||||
import com.taauav.common.util.ShiroUtils; | import com.taauav.common.util.ShiroUtils; | ||||
import org.springframework.beans.factory.annotation.Autowired; | import org.springframework.beans.factory.annotation.Autowired; | ||||
* @since 2019-11-12 | * @since 2019-11-12 | ||||
*/ | */ | ||||
@Service | @Service | ||||
public class SysPositionServiceImpl extends ServiceImpl<SysPositionMapper, SysPosition> implements ISysPositionService { | |||||
public class SysPositionServiceImpl extends BaseServiceImpl<SysPositionMapper, SysPosition> implements ISysPositionService { | |||||
@Autowired | @Autowired | ||||
private SysPositionMapper positionMapper; | private SysPositionMapper positionMapper; | ||||
@Autowired | @Autowired | ||||
mp.put("createUsername", ""); | mp.put("createUsername", ""); | ||||
} | } | ||||
mp.put("createTime", val.getCreateTime()); | mp.put("createTime", val.getCreateTime()); | ||||
mp.put("formatCreateTime", FunctionUtils.formatTime(val.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); | |||||
mp.put("formatCreateTime", DateUtil.format(val.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); | |||||
records.add(mp); | records.add(mp); | ||||
}); | }); | ||||
list.put("records", records); | list.put("records", records); | ||||
Integer id = map.getId(); | Integer id = map.getId(); | ||||
Boolean res; | Boolean res; | ||||
if (id != null && id > 0) { | if (id != null && id > 0) { | ||||
position.setUpdateTime(FunctionUtils.now()); | |||||
position.setUpdateTime(DateUtil.now()); | |||||
position.setUpdateUser(ShiroUtils.getAdminId()); | position.setUpdateUser(ShiroUtils.getAdminId()); | ||||
position.setId(id); | position.setId(id); | ||||
res = updateById(position); | res = updateById(position); | ||||
} else { | } else { | ||||
position.setCreateTime(FunctionUtils.now()); | |||||
position.setCreateTime(DateUtil.now()); | |||||
position.setCreateUser(ShiroUtils.getAdminId()); | position.setCreateUser(ShiroUtils.getAdminId()); | ||||
res = save(position); | res = save(position); | ||||
} | } | ||||
info.put("createUserName", createUserName); | info.put("createUserName", createUserName); | ||||
info.put("createTime", position.getCreateTime()); | info.put("createTime", position.getCreateTime()); | ||||
String formatCreateTime = ""; | String formatCreateTime = ""; | ||||
if (position.getCreateTime() > 0) { | |||||
formatCreateTime = FunctionUtils.formatTime(position.getCreateTime(), "yyyy-MM-dd HH:mm:ss"); | |||||
if (position.getCreateTime() != null) { | |||||
formatCreateTime = DateUtil.format(position.getCreateTime(), "yyyy-MM-dd HH:mm:ss"); | |||||
} | } | ||||
info.put("formatCreateTime", formatCreateTime); | info.put("formatCreateTime", formatCreateTime); | ||||
info.put("updateUser", position.getUpdateUser()); | info.put("updateUser", position.getUpdateUser()); | ||||
info.put("updateUserName", updateUserName); | info.put("updateUserName", updateUserName); | ||||
info.put("updateTime", position.getUpdateTime()); | info.put("updateTime", position.getUpdateTime()); | ||||
String formatUpdateTime = ""; | String formatUpdateTime = ""; | ||||
if (position.getUpdateTime() > 0) { | |||||
formatUpdateTime = FunctionUtils.formatTime(position.getUpdateTime(), "yyyy-MM-dd HH:mm:ss"); | |||||
if (position.getUpdateTime() != null) { | |||||
formatUpdateTime = DateUtil.format(position.getUpdateTime(), "yyyy-MM-dd HH:mm:ss"); | |||||
} | } | ||||
info.put("formatUpdateTime", formatUpdateTime); | info.put("formatUpdateTime", formatUpdateTime); | ||||
return response.success("操作成功", info); | return response.success("操作成功", info); | ||||
if (position == null) { | if (position == null) { | ||||
return response.failure("岗位数据不存在"); | return response.failure("岗位数据不存在"); | ||||
} | } | ||||
position.setMark(Byte.valueOf("0")); | |||||
position.setMark(Integer.valueOf("0")); | |||||
position.setUpdateUser(ShiroUtils.getAdminId()); | position.setUpdateUser(ShiroUtils.getAdminId()); | ||||
position.setUpdateTime(FunctionUtils.now()); | |||||
position.setUpdateTime(DateUtil.now()); | |||||
Boolean res = updateById(position); | Boolean res = updateById(position); | ||||
if (res.equals(false)) { | if (res.equals(false)) { | ||||
return response.failure("操作失败"); | return response.failure("操作失败"); | ||||
* @return | * @return | ||||
*/ | */ | ||||
@Override | @Override | ||||
public Response changeStatus(Integer id, Byte status) { | |||||
public Response changeStatus(Integer id, Integer status) { | |||||
if (id < 1) { | if (id < 1) { | ||||
return response.failure("岗位id必须大于0"); | return response.failure("岗位id必须大于0"); | ||||
} | } | ||||
if (info == null) { | if (info == null) { | ||||
return response.failure("岗位数据不存在"); | return response.failure("岗位数据不存在"); | ||||
} | } | ||||
Byte st = 0; | |||||
Integer st = 0; | |||||
if (status == 1) { | if (status == 1) { | ||||
st = 2; | st = 2; | ||||
} else { | } else { | ||||
} | } | ||||
info.setStatus(st); | info.setStatus(st); | ||||
info.setUpdateUser(ShiroUtils.getAdminId()); | info.setUpdateUser(ShiroUtils.getAdminId()); | ||||
info.setUpdateTime(FunctionUtils.now()); | |||||
info.setUpdateTime(DateUtil.now()); | |||||
Boolean res = updateById(info); | Boolean res = updateById(info); | ||||
if (res.equals(false)) { | if (res.equals(false)) { | ||||
return response.failure("操作失败"); | return response.failure("操作失败"); |
import com.taauav.admin.service.ISysAdminService; | import com.taauav.admin.service.ISysAdminService; | ||||
import com.taauav.admin.service.ISysCityService; | import com.taauav.admin.service.ISysCityService; | ||||
import com.taauav.admin.service.ITauvDriverService; | import com.taauav.admin.service.ITauvDriverService; | ||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; | |||||
import com.taauav.common.service.impl.BaseServiceImpl; | import com.taauav.common.service.impl.BaseServiceImpl; | ||||
import com.taauav.common.util.DateUtil; | import com.taauav.common.util.DateUtil; | ||||
import com.taauav.common.util.FunctionUtils; | |||||
import com.taauav.common.util.ShiroUtils; | |||||
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; | ||||
import org.springframework.stereotype.Service; | import org.springframework.stereotype.Service; | ||||
import org.springframework.util.StringUtils; | import org.springframework.util.StringUtils; | ||||
import javax.validation.Valid; | |||||
import java.util.HashMap; | import java.util.HashMap; | ||||
import java.util.List; | import java.util.List; | ||||
import java.util.Map; | import java.util.Map; |
import com.taauav.admin.entity.TauvEquipment; | import com.taauav.admin.entity.TauvEquipment; | ||||
import com.taauav.admin.mapper.TauvEquipmentMapper; | import com.taauav.admin.mapper.TauvEquipmentMapper; | ||||
import com.taauav.admin.service.ITauvEquipmentService; | import com.taauav.admin.service.ITauvEquipmentService; | ||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; | |||||
import com.taauav.common.service.impl.BaseServiceImpl; | |||||
import com.taauav.common.util.DateUtil; | |||||
import com.taauav.common.util.FunctionUtils; | import com.taauav.common.util.FunctionUtils; | ||||
import com.taauav.common.util.ShiroUtils; | import com.taauav.common.util.ShiroUtils; | ||||
import org.springframework.beans.factory.annotation.Autowired; | import org.springframework.beans.factory.annotation.Autowired; | ||||
* @since 2019-11-13 | * @since 2019-11-13 | ||||
*/ | */ | ||||
@Service | @Service | ||||
public class TauvEquipmentServiceImpl extends ServiceImpl<TauvEquipmentMapper, TauvEquipment> implements ITauvEquipmentService { | |||||
public class TauvEquipmentServiceImpl extends BaseServiceImpl<TauvEquipmentMapper, TauvEquipment> implements ITauvEquipmentService { | |||||
@Value("${spring.pageSize}") | @Value("${spring.pageSize}") | ||||
private Integer pageSize; | private Integer pageSize; | ||||
@Autowired | @Autowired | ||||
*/ | */ | ||||
@Override | @Override | ||||
public Response edit(TauvEquipment equipment) { | public Response edit(TauvEquipment equipment) { | ||||
equipment.setUpdateTime(FunctionUtils.getCurrentTime()); | |||||
equipment.setUpdateTime(DateUtil.now()); | |||||
equipment.setUpdateUser(ShiroUtils.getAdminId()); | equipment.setUpdateUser(ShiroUtils.getAdminId()); | ||||
equipmentMapper.updateById(equipment); | equipmentMapper.updateById(equipment); | ||||
return response.success("操作成功"); | return response.success("操作成功"); | ||||
*/ | */ | ||||
@Override | @Override | ||||
public Response add(TauvEquipment equipment) { | public Response add(TauvEquipment equipment) { | ||||
equipment.setCreateTime(FunctionUtils.getCurrentTime()); | |||||
equipment.setCreateTime(DateUtil.now()); | |||||
equipment.setCreateUser(ShiroUtils.getAdminId()); | equipment.setCreateUser(ShiroUtils.getAdminId()); | ||||
equipmentMapper.insert(equipment); | equipmentMapper.insert(equipment); | ||||
return response.success("操作成功"); | return response.success("操作成功"); | ||||
return response.failure("状态值不合法"); | return response.failure("状态值不合法"); | ||||
} | } | ||||
TauvEquipment tauvEquipment = new TauvEquipment(); | TauvEquipment tauvEquipment = new TauvEquipment(); | ||||
tauvEquipment.setStatus(Byte.valueOf(statusStr)); | |||||
tauvEquipment.setStatus(Integer.valueOf(statusStr)); | |||||
tauvEquipment.setId(Integer.valueOf(idStr)); | tauvEquipment.setId(Integer.valueOf(idStr)); | ||||
equipmentMapper.updateById(tauvEquipment); | equipmentMapper.updateById(tauvEquipment); | ||||
return response.success("操作成功"); | return response.success("操作成功"); |
import com.taauav.admin.mapper.TauvInspectMapper; | import com.taauav.admin.mapper.TauvInspectMapper; | ||||
import com.taauav.admin.service.*; | import com.taauav.admin.service.*; | ||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; | import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; | ||||
import com.taauav.common.service.impl.BaseServiceImpl; | |||||
import com.taauav.common.util.DateUtil; | |||||
import com.taauav.common.util.FileUtil; | import com.taauav.common.util.FileUtil; | ||||
import com.taauav.common.util.FunctionUtils; | import com.taauav.common.util.FunctionUtils; | ||||
import com.taauav.common.util.ShiroUtils; | import com.taauav.common.util.ShiroUtils; | ||||
*/ | */ | ||||
@Service | @Service | ||||
@Slf4j | @Slf4j | ||||
public class TauvInspectDriverServiceImpl extends ServiceImpl<TauvInspectDriverMapper, TauvInspectDriver> implements ITauvInspectDriverService { | |||||
public class TauvInspectDriverServiceImpl extends BaseServiceImpl<TauvInspectDriverMapper, TauvInspectDriver> implements ITauvInspectDriverService { | |||||
@Value("${spring.pageSize}") | @Value("${spring.pageSize}") | ||||
private Integer pageSize; | private Integer pageSize; | ||||
@Value("${server.UPLOAD_URL}") | @Value("${server.UPLOAD_URL}") | ||||
} | } | ||||
driver.setInspectId(inspectId); | driver.setInspectId(inspectId); | ||||
driver.setInspectNo(inspect.getInspectNo()); | driver.setInspectNo(inspect.getInspectNo()); | ||||
driver.setCreateTime(FunctionUtils.getCurrentTime()); | |||||
driver.setCreateTime(DateUtil.now()); | |||||
driver.setCreateUser(ShiroUtils.getAdminId()); | driver.setCreateUser(ShiroUtils.getAdminId()); | ||||
driver.setNum(i*10); | driver.setNum(i*10); | ||||
i++; | i++; | ||||
TauvInspectDriver inspectDriver = new TauvInspectDriver(); | TauvInspectDriver inspectDriver = new TauvInspectDriver(); | ||||
inspectDriver.setId(id); | inspectDriver.setId(id); | ||||
inspectDriver.setFlightGroup(flightGroupId); | inspectDriver.setFlightGroup(flightGroupId); | ||||
inspectDriver.setStatus(Byte.valueOf("2")); | |||||
inspectDriver.setStatus(Integer.valueOf("2")); | |||||
Integer res = inspectDriverMapper.updateById(inspectDriver); | Integer res = inspectDriverMapper.updateById(inspectDriver); | ||||
if (res > 0) { | if (res > 0) { | ||||
return true; | return true; | ||||
} | } | ||||
TauvInspectDriver inspectDriver = new TauvInspectDriver(); | TauvInspectDriver inspectDriver = new TauvInspectDriver(); | ||||
inspectDriver.setId(id); | inspectDriver.setId(id); | ||||
inspectDriver.setStatus(Byte.valueOf("1")); | |||||
inspectDriver.setStatus(Integer.valueOf("1")); | |||||
inspectDriverMapper.updateById(inspectDriver); | inspectDriverMapper.updateById(inspectDriver); | ||||
return response.success("操作成功"); | return response.success("操作成功"); | ||||
} | } | ||||
inspectDriver.setFlightSpeed(new BigDecimal(task.getFlightSpeed())); | inspectDriver.setFlightSpeed(new BigDecimal(task.getFlightSpeed())); | ||||
inspectDriver.setFlightTime(new BigDecimal(task.getFlightTime())); | inspectDriver.setFlightTime(new BigDecimal(task.getFlightTime())); | ||||
inspectDriver.setRemark(task.getRemark()); | inspectDriver.setRemark(task.getRemark()); | ||||
inspectDriver.setStatus(Byte.valueOf("3")); | |||||
inspectDriver.setStatus(Integer.valueOf("3")); | |||||
inspectDriver.setFlightGroup(adminId); | inspectDriver.setFlightGroup(adminId); | ||||
inspectDriver.setExecutionStartTime(Integer.valueOf(executionStartTime)); | inspectDriver.setExecutionStartTime(Integer.valueOf(executionStartTime)); | ||||
inspectDriver.setExecutionEndTime(Integer.valueOf(executionEndTime)); | inspectDriver.setExecutionEndTime(Integer.valueOf(executionEndTime)); | ||||
if (reportInfo != null) { | if (reportInfo != null) { | ||||
return response.failure("该任务已经生成报告,请先删除报告后再处理。"); | return response.failure("该任务已经生成报告,请先删除报告后再处理。"); | ||||
} | } | ||||
info.setMark(Byte.valueOf("0")); | |||||
info.setMark(Integer.valueOf("0")); | |||||
inspectDriverMapper.updateById(info); | inspectDriverMapper.updateById(info); | ||||
return response.success("操作成功"); | return response.success("操作成功"); | ||||
} else { | } else { | ||||
if (info == null) { | if (info == null) { | ||||
return response.failure("任务数据不存在"); | return response.failure("任务数据不存在"); | ||||
} | } | ||||
info.setStatus(Byte.valueOf("3")); | |||||
info.setStatus(Integer.valueOf("3")); | |||||
inspectDriverMapper.updateById(info); | inspectDriverMapper.updateById(info); | ||||
return response.success("操作成功"); | return response.success("操作成功"); | ||||
} else { | } else { |
import com.taauav.admin.entity.TauvInspectFileBak; | import com.taauav.admin.entity.TauvInspectFileBak; | ||||
import com.taauav.admin.mapper.TauvInspectFileBakMapper; | import com.taauav.admin.mapper.TauvInspectFileBakMapper; | ||||
import com.taauav.admin.service.ITauvInspectFileBakService; | import com.taauav.admin.service.ITauvInspectFileBakService; | ||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; | |||||
import com.taauav.common.service.impl.BaseServiceImpl; | |||||
import org.springframework.stereotype.Service; | import org.springframework.stereotype.Service; | ||||
/** | /** | ||||
* @since 2019-11-29 | * @since 2019-11-29 | ||||
*/ | */ | ||||
@Service | @Service | ||||
public class TauvInspectFileBakServiceImpl extends ServiceImpl<TauvInspectFileBakMapper, TauvInspectFileBak> implements ITauvInspectFileBakService { | |||||
public class TauvInspectFileBakServiceImpl extends BaseServiceImpl<TauvInspectFileBakMapper, TauvInspectFileBak> implements ITauvInspectFileBakService { | |||||
} | } |
import com.taauav.admin.mapper.TauvReportMapper; | import com.taauav.admin.mapper.TauvReportMapper; | ||||
import com.taauav.admin.service.*; | import com.taauav.admin.service.*; | ||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; | import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; | ||||
import com.taauav.common.service.impl.BaseServiceImpl; | |||||
import com.taauav.common.util.FileUtil; | import com.taauav.common.util.FileUtil; | ||||
import com.taauav.common.util.FunctionUtils; | import com.taauav.common.util.FunctionUtils; | ||||
import com.taauav.common.util.ImageUtil; | import com.taauav.common.util.ImageUtil; | ||||
* @since 2019-11-14 | * @since 2019-11-14 | ||||
*/ | */ | ||||
@Service | @Service | ||||
public class TauvInspectFileServiceImpl extends ServiceImpl<TauvInspectFileMapper, TauvInspectFile> implements ITauvInspectFileService { | |||||
public class TauvInspectFileServiceImpl extends BaseServiceImpl<TauvInspectFileMapper, TauvInspectFile> implements ITauvInspectFileService { | |||||
@Value("${spring.pageSize}") | @Value("${spring.pageSize}") | ||||
private Integer pageSize; | private Integer pageSize; | ||||
@Value("${file.uploadFolder}") | @Value("${file.uploadFolder}") | ||||
inspectFile.setFileDocument(fileDocument); | inspectFile.setFileDocument(fileDocument); | ||||
inspectFile.setExtension(extension); | inspectFile.setExtension(extension); | ||||
inspectFile.setName(originName); | inspectFile.setName(originName); | ||||
inspectFile.setFileType(Byte.valueOf("1")); | |||||
inspectFile.setFileType(Integer.valueOf("1")); | |||||
inspectFile.setSize(size.intValue()); | inspectFile.setSize(size.intValue()); | ||||
inspectFile.setFileName(originName); | inspectFile.setFileName(originName); | ||||
inspectFile.setType(extension); | inspectFile.setType(extension); | ||||
inspectFile.setSrc(filePath); | inspectFile.setSrc(filePath); | ||||
inspectFile.setOriginalImg(filePath); | inspectFile.setOriginalImg(filePath); | ||||
inspectFile.setCreateUser(ShiroUtils.getAdminId()); | inspectFile.setCreateUser(ShiroUtils.getAdminId()); | ||||
inspectFile.setCreateTime(FunctionUtils.getCurrentTime()); | |||||
inspectFile.setCreateTime(com.taauav.common.util.DateUtil.now()); | |||||
inspectFile.setThumbImg(thumbImg); | inspectFile.setThumbImg(thumbImg); | ||||
inspectFileMapper.insert(inspectFile); | inspectFileMapper.insert(inspectFile); | ||||
mapReturn.put("msg","success"); | mapReturn.put("msg","success"); | ||||
TauvInspectFile inspectFile = new TauvInspectFile(); | TauvInspectFile inspectFile = new TauvInspectFile(); | ||||
inspectFile.setId(id); | inspectFile.setId(id); | ||||
inspectFile.setSrc(newFilePath); | inspectFile.setSrc(newFilePath); | ||||
inspectFile.setStatus(Byte.valueOf("1")); | |||||
inspectFile.setUpdateTime(FunctionUtils.getCurrentTime()); | |||||
inspectFile.setStatus(Integer.valueOf("1")); | |||||
inspectFile.setUpdateTime(com.taauav.common.util.DateUtil.now()); | |||||
inspectFile.setUpdateUser(ShiroUtils.getAdminId()); | inspectFile.setUpdateUser(ShiroUtils.getAdminId()); | ||||
if (!StringUtils.isEmpty(questionId)) { | if (!StringUtils.isEmpty(questionId)) { | ||||
inspectFile.setQuestionId(Integer.valueOf(questionId)); | inspectFile.setQuestionId(Integer.valueOf(questionId)); | ||||
} | } | ||||
TauvInspectFile inspectFile = new TauvInspectFile(); | TauvInspectFile inspectFile = new TauvInspectFile(); | ||||
inspectFile.setId(id); | inspectFile.setId(id); | ||||
inspectFile.setStatus(Byte.valueOf("2")); | |||||
inspectFile.setStatus(Integer.valueOf("2")); | |||||
inspectFile.setSrc(""); | inspectFile.setSrc(""); | ||||
inspectFile.setUpdateTime(FunctionUtils.getCurrentTime()); | |||||
inspectFile.setUpdateTime(com.taauav.common.util.DateUtil.now()); | |||||
inspectFile.setUpdateUser(ShiroUtils.getAdminId()); | inspectFile.setUpdateUser(ShiroUtils.getAdminId()); | ||||
inspectFileMapper.updateById(inspectFile); | inspectFileMapper.updateById(inspectFile); | ||||
return response.success("操作成功"); | return response.success("操作成功"); | ||||
if (StringUtils.isEmpty(info)) { | if (StringUtils.isEmpty(info)) { | ||||
return response.failure("数据不存在"); | return response.failure("数据不存在"); | ||||
} | } | ||||
byte mark = Byte.valueOf("0"); | |||||
Integer mark = 0; | |||||
// TauvInspectDriver inspectDriver = new TauvInspectDriver(); | // TauvInspectDriver inspectDriver = new TauvInspectDriver(); | ||||
// inspectDriver.setMark(mark); | // inspectDriver.setMark(mark); | ||||
// inspectDriver.setId(id); | // inspectDriver.setId(id); | ||||
} | } | ||||
TauvInspectFile inspectFile = new TauvInspectFile(); | TauvInspectFile inspectFile = new TauvInspectFile(); | ||||
inspectFile.setId(id); | inspectFile.setId(id); | ||||
inspectFile.setMark(Byte.valueOf("0")); | |||||
inspectFile.setUpdateTime(FunctionUtils.getCurrentTime()); | |||||
inspectFile.setMark(Integer.valueOf("0")); | |||||
inspectFile.setUpdateTime(com.taauav.common.util.DateUtil.now()); | |||||
inspectFile.setUpdateUser(ShiroUtils.getAdminId()); | inspectFile.setUpdateUser(ShiroUtils.getAdminId()); | ||||
inspectFileMapper.updateById(inspectFile); | inspectFileMapper.updateById(inspectFile); | ||||
return response.success("操作成功"); | return response.success("操作成功"); | ||||
return response.failure("您还有【" + fileList.size() + "】张图片未标记"); | return response.failure("您还有【" + fileList.size() + "】张图片未标记"); | ||||
} | } | ||||
TauvInspectDriver inspectDriver = new TauvInspectDriver(); | TauvInspectDriver inspectDriver = new TauvInspectDriver(); | ||||
inspectDriver.setStatus(Byte.valueOf("5")); | |||||
inspectDriver.setStatus(Integer.valueOf("5")); | |||||
inspectDriver.setId(id); | inspectDriver.setId(id); | ||||
inspectDriver.setUpdateTime(FunctionUtils.getCurrentTime()); | |||||
inspectDriver.setUpdateTime(com.taauav.common.util.DateUtil.now()); | |||||
inspectDriver.setUpdateUser(ShiroUtils.getAdminId()); | inspectDriver.setUpdateUser(ShiroUtils.getAdminId()); | ||||
inspectDriverMapper.updateById(inspectDriver); | inspectDriverMapper.updateById(inspectDriver); | ||||
return response.success("操作成功"); | return response.success("操作成功"); | ||||
inspectDriverId = info.getInspectDriverId(); | inspectDriverId = info.getInspectDriverId(); | ||||
if (Integer.valueOf(effective) > 0) { | if (Integer.valueOf(effective) > 0) { | ||||
TauvInspectFile inspectFile = new TauvInspectFile(); | TauvInspectFile inspectFile = new TauvInspectFile(); | ||||
inspectFile.setIsReview(Byte.valueOf("1")); | |||||
inspectFile.setIsEffective(Byte.valueOf(effective)); | |||||
inspectFile.setIsReview(Integer.valueOf("1")); | |||||
inspectFile.setIsEffective(Integer.valueOf(effective)); | |||||
inspectFile.setId(id); | inspectFile.setId(id); | ||||
inspectFileMapper.updateById(inspectFile); | inspectFileMapper.updateById(inspectFile); | ||||
} | } | ||||
//巡检任务状态变更为"复核中" | //巡检任务状态变更为"复核中" | ||||
TauvInspectDriver driver = inspectDriverMapper.selectById(inspectDriverId); | TauvInspectDriver driver = inspectDriverMapper.selectById(inspectDriverId); | ||||
driver.setId(inspectDriverId); | driver.setId(inspectDriverId); | ||||
driver.setStatus(Byte.valueOf("5")); | |||||
driver.setStatus(Integer.valueOf("5")); | |||||
driver.setReviewUser(ShiroUtils.getAdminId()); | driver.setReviewUser(ShiroUtils.getAdminId()); | ||||
driver.setReviewTime(FunctionUtils.getCurrentTime()); | driver.setReviewTime(FunctionUtils.getCurrentTime()); | ||||
inspectDriverMapper.updateById(driver); | inspectDriverMapper.updateById(driver); | ||||
if (StringUtils.isEmpty(info)) { | if (StringUtils.isEmpty(info)) { | ||||
return response.failure("数据不存在"); | return response.failure("数据不存在"); | ||||
} | } | ||||
info.setStatus(Byte.valueOf("6")); | |||||
info.setStatus(Integer.valueOf("6")); | |||||
info.setReviewTime(FunctionUtils.getCurrentTime()); | info.setReviewTime(FunctionUtils.getCurrentTime()); | ||||
info.setReviewUser(ShiroUtils.getAdminId()); | info.setReviewUser(ShiroUtils.getAdminId()); | ||||
inspectDriverMapper.updateById(info); | inspectDriverMapper.updateById(info); | ||||
report.setInspectEndTime(inspectDriver.getExecutionEndTime()); | report.setInspectEndTime(inspectDriver.getExecutionEndTime()); | ||||
report.setFlightGroup(inspectDriver.getFlightGroup()); | report.setFlightGroup(inspectDriver.getFlightGroup()); | ||||
report.setDriverExam(inspectDriver.getDriverExam()); | report.setDriverExam(inspectDriver.getDriverExam()); | ||||
report.setCreateTime(FunctionUtils.getCurrentTime()); | |||||
report.setCreateTime(com.taauav.common.util.DateUtil.now()); | |||||
report.setCreateUser(ShiroUtils.getAdminId()); | report.setCreateUser(ShiroUtils.getAdminId()); | ||||
reportMapper.insert(report); | reportMapper.insert(report); | ||||
return response.success("操作成功"); | return response.success("操作成功"); | ||||
@Override | @Override | ||||
public List<Map<String,Object>> getNumByFileDocument(String driverArea, Integer inspectDriverId, String driverExam, Integer inspectStartTime, Integer inspectEndTime) { | public List<Map<String,Object>> getNumByFileDocument(String driverArea, Integer inspectDriverId, String driverExam, Integer inspectStartTime, Integer inspectEndTime) { | ||||
Byte bDriverExam = Byte.valueOf(driverExam); | Byte bDriverExam = Byte.valueOf(driverExam); | ||||
String[] driverAreaList = driverArea.split(","); | |||||
String[] driverAreaList = StringUtils.isEmpty(driverArea) ? null : driverArea.split(","); | |||||
if (inspectStartTime == 0 || inspectEndTime == 0 && inspectEndTime < inspectStartTime) { | if (inspectStartTime == 0 || inspectEndTime == 0 && inspectEndTime < inspectStartTime) { | ||||
inspectStartTime = 0; | inspectStartTime = 0; | ||||
inspectEndTime = 0; | inspectEndTime = 0; | ||||
if (StringUtils.isEmpty(inspectFile)) { | if (StringUtils.isEmpty(inspectFile)) { | ||||
return ""; | return ""; | ||||
} | } | ||||
Integer lastUploadTime = inspectFile.getCreateTime(); | |||||
return FunctionUtils.formatTime(lastUploadTime, "yyyy-MM-dd HH:mm:ss"); | |||||
return com.taauav.common.util.DateUtil.format(inspectFile.getCreateTime(), "yyyy-MM-dd HH:mm:ss"); | |||||
} | } | ||||
/** | /** |
import com.taauav.admin.mapper.TauvInspectMapper; | import com.taauav.admin.mapper.TauvInspectMapper; | ||||
import com.taauav.admin.service.ITauvInspectDriverService; | import com.taauav.admin.service.ITauvInspectDriverService; | ||||
import com.taauav.admin.service.ITauvInspectService; | import com.taauav.admin.service.ITauvInspectService; | ||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; | |||||
import com.taauav.common.service.impl.BaseServiceImpl; | |||||
import com.taauav.common.util.DateUtil; | |||||
import com.taauav.common.util.FunctionUtils; | import com.taauav.common.util.FunctionUtils; | ||||
import com.taauav.common.util.ShiroUtils; | import com.taauav.common.util.ShiroUtils; | ||||
import org.springframework.beans.factory.annotation.Autowired; | import org.springframework.beans.factory.annotation.Autowired; | ||||
* @since 2019-11-14 | * @since 2019-11-14 | ||||
*/ | */ | ||||
@Service | @Service | ||||
public class TauvInspectServiceImpl extends ServiceImpl<TauvInspectMapper, TauvInspect> implements ITauvInspectService { | |||||
public class TauvInspectServiceImpl extends BaseServiceImpl<TauvInspectMapper, TauvInspect> implements ITauvInspectService { | |||||
@Autowired | @Autowired | ||||
private Response response; | private Response response; | ||||
@Autowired | @Autowired | ||||
if (type.equals(2) && StringUtils.isEmpty(inspect.getExecutionCycle())) { | if (type.equals(2) && StringUtils.isEmpty(inspect.getExecutionCycle())) { | ||||
return response.failure("巡检周期不能为空"); | return response.failure("巡检周期不能为空"); | ||||
} | } | ||||
inspect.setCreateTime(FunctionUtils.getCurrentTime()); | |||||
inspect.setCreateTime(DateUtil.now()); | |||||
inspect.setCreateUser(ShiroUtils.getAdminId()); | inspect.setCreateUser(ShiroUtils.getAdminId()); | ||||
inspectMapper.insert(inspect); | inspectMapper.insert(inspect); | ||||
//生成巡检任务单号 | //生成巡检任务单号 |
import com.taauav.admin.service.ISysAdminService; | import com.taauav.admin.service.ISysAdminService; | ||||
import com.taauav.admin.service.ITauvQuestionOptionsService; | import com.taauav.admin.service.ITauvQuestionOptionsService; | ||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; | import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; | ||||
import com.taauav.common.service.impl.BaseServiceImpl; | |||||
import com.taauav.common.util.DateUtil; | |||||
import com.taauav.common.util.FunctionUtils; | import com.taauav.common.util.FunctionUtils; | ||||
import com.taauav.common.util.ShiroUtils; | import com.taauav.common.util.ShiroUtils; | ||||
import org.springframework.beans.factory.annotation.Autowired; | import org.springframework.beans.factory.annotation.Autowired; | ||||
* @since 2019-11-13 | * @since 2019-11-13 | ||||
*/ | */ | ||||
@Service | @Service | ||||
public class TauvQuestionOptionsServiceImpl extends ServiceImpl<TauvQuestionOptionsMapper, TauvQuestionOptions> implements ITauvQuestionOptionsService { | |||||
public class TauvQuestionOptionsServiceImpl extends BaseServiceImpl<TauvQuestionOptionsMapper, TauvQuestionOptions> implements ITauvQuestionOptionsService { | |||||
@Value("${spring.pageSize}") | @Value("${spring.pageSize}") | ||||
private Integer pageSize; | private Integer pageSize; | ||||
@Autowired | @Autowired | ||||
*/ | */ | ||||
@Override | @Override | ||||
public Response edit(TauvQuestionOptions questionOptions) { | public Response edit(TauvQuestionOptions questionOptions) { | ||||
questionOptions.setUpdateTime(FunctionUtils.getCurrentTime()); | |||||
questionOptions.setUpdateTime(DateUtil.now()); | |||||
questionOptions.setUpdateUser(ShiroUtils.getAdminId()); | questionOptions.setUpdateUser(ShiroUtils.getAdminId()); | ||||
questionOptionsMapper.updateById(questionOptions); | questionOptionsMapper.updateById(questionOptions); | ||||
return response.success("添加成功"); | return response.success("添加成功"); | ||||
*/ | */ | ||||
@Override | @Override | ||||
public Response add(TauvQuestionOptions questionOptions) { | public Response add(TauvQuestionOptions questionOptions) { | ||||
questionOptions.setCreateTime(FunctionUtils.getCurrentTime()); | |||||
questionOptions.setCreateTime(DateUtil.now()); | |||||
questionOptions.setCreateUser(ShiroUtils.getAdminId()); | questionOptions.setCreateUser(ShiroUtils.getAdminId()); | ||||
questionOptionsMapper.insert(questionOptions); | questionOptionsMapper.insert(questionOptions); | ||||
return response.success("添加成功"); | return response.success("添加成功"); |
import com.taauav.admin.entity.TauvReportCheck; | import com.taauav.admin.entity.TauvReportCheck; | ||||
import com.taauav.admin.mapper.TauvReportCheckMapper; | import com.taauav.admin.mapper.TauvReportCheckMapper; | ||||
import com.taauav.admin.service.ITauvReportCheckService; | import com.taauav.admin.service.ITauvReportCheckService; | ||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; | |||||
import com.taauav.common.util.FunctionUtils; | |||||
import com.taauav.common.service.impl.BaseServiceImpl; | |||||
import com.taauav.common.util.DateUtil; | |||||
import com.taauav.common.util.ShiroUtils; | import com.taauav.common.util.ShiroUtils; | ||||
import org.springframework.beans.factory.annotation.Autowired; | import org.springframework.beans.factory.annotation.Autowired; | ||||
import org.springframework.stereotype.Service; | import org.springframework.stereotype.Service; | ||||
* @since 2019-11-29 | * @since 2019-11-29 | ||||
*/ | */ | ||||
@Service | @Service | ||||
public class TauvReportCheckServiceImpl extends ServiceImpl<TauvReportCheckMapper, TauvReportCheck> implements ITauvReportCheckService { | |||||
public class TauvReportCheckServiceImpl extends BaseServiceImpl<TauvReportCheckMapper, TauvReportCheck> implements ITauvReportCheckService { | |||||
@Autowired | @Autowired | ||||
private TauvReportCheckMapper reportCheckMapper; | private TauvReportCheckMapper reportCheckMapper; | ||||
/** | /** | ||||
@Override | @Override | ||||
public void addData(TauvReportCheck reportCheck) { | public void addData(TauvReportCheck reportCheck) { | ||||
reportCheck.setCheckUser(ShiroUtils.getAdminId()); | reportCheck.setCheckUser(ShiroUtils.getAdminId()); | ||||
reportCheck.setCreateTime(FunctionUtils.getCurrentTime()); | |||||
reportCheck.setCreateTime(DateUtil.now()); | |||||
saveOrUpdate(reportCheck); | saveOrUpdate(reportCheck); | ||||
} | } | ||||
} | } |
import com.taauav.admin.mapper.TauvReportEvaluationMapper; | import com.taauav.admin.mapper.TauvReportEvaluationMapper; | ||||
import com.taauav.admin.service.ISysAdminService; | import com.taauav.admin.service.ISysAdminService; | ||||
import com.taauav.admin.service.ITauvReportEvaluationService; | import com.taauav.admin.service.ITauvReportEvaluationService; | ||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; | |||||
import com.taauav.common.service.impl.BaseServiceImpl; | |||||
import com.taauav.common.util.FunctionUtils; | import com.taauav.common.util.FunctionUtils; | ||||
import com.taauav.common.util.ShiroUtils; | |||||
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; | ||||
import org.springframework.stereotype.Service; | import org.springframework.stereotype.Service; | ||||
* @since 2019-11-14 | * @since 2019-11-14 | ||||
*/ | */ | ||||
@Service | @Service | ||||
public class TauvReportEvaluationServiceImpl extends ServiceImpl<TauvReportEvaluationMapper, TauvReportEvaluation> implements ITauvReportEvaluationService { | |||||
public class TauvReportEvaluationServiceImpl extends BaseServiceImpl<TauvReportEvaluationMapper, TauvReportEvaluation> implements ITauvReportEvaluationService { | |||||
@Value("${spring.pageSize}") | @Value("${spring.pageSize}") | ||||
private Integer pageSize; | private Integer pageSize; | ||||
@Autowired | @Autowired | ||||
*/ | */ | ||||
@Override | @Override | ||||
public Response add(TauvReportEvaluation reportEvaluation) { | public Response add(TauvReportEvaluation reportEvaluation) { | ||||
reportEvaluation.setUpdateTime(FunctionUtils.getCurrentTime()); | |||||
reportEvaluation.setUpdateUser(ShiroUtils.getAdminId()); | |||||
reportEvaluationMapper.insert(reportEvaluation); | |||||
addData(reportEvaluation); | |||||
return response.success("添加成功"); | return response.success("添加成功"); | ||||
} | } | ||||
*/ | */ | ||||
@Override | @Override | ||||
public Response edit(TauvReportEvaluation reportEvaluation) { | public Response edit(TauvReportEvaluation reportEvaluation) { | ||||
reportEvaluation.setCreateTime(FunctionUtils.getCurrentTime()); | |||||
reportEvaluation.setCreateUser(ShiroUtils.getAdminId()); | |||||
reportEvaluationMapper.updateById(reportEvaluation); | |||||
editData(reportEvaluation); | |||||
return response.success("编辑成功"); | return response.success("编辑成功"); | ||||
} | } | ||||
TauvReportEvaluation reportEvaluation = new TauvReportEvaluation(); | TauvReportEvaluation reportEvaluation = new TauvReportEvaluation(); | ||||
reportEvaluation.setId(Integer.valueOf(idStr)); | reportEvaluation.setId(Integer.valueOf(idStr)); | ||||
reportEvaluation.setStatus(Integer.valueOf(statusStr)); | reportEvaluation.setStatus(Integer.valueOf(statusStr)); | ||||
reportEvaluationMapper.updateById(reportEvaluation); | |||||
editData(reportEvaluation); | |||||
return response.success("操作成功"); | return response.success("操作成功"); | ||||
} | } | ||||
import com.taauav.admin.entity.TauvReportRemark; | import com.taauav.admin.entity.TauvReportRemark; | ||||
import com.taauav.admin.mapper.TauvReportRemarkMapper; | import com.taauav.admin.mapper.TauvReportRemarkMapper; | ||||
import com.taauav.admin.service.ITauvReportRemarkService; | import com.taauav.admin.service.ITauvReportRemarkService; | ||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; | |||||
import com.taauav.common.util.FunctionUtils; | |||||
import com.taauav.common.service.impl.BaseServiceImpl; | |||||
import com.taauav.common.util.DateUtil; | |||||
import org.springframework.beans.factory.annotation.Autowired; | import org.springframework.beans.factory.annotation.Autowired; | ||||
import org.springframework.stereotype.Service; | import org.springframework.stereotype.Service; | ||||
* @since 2019-11-29 | * @since 2019-11-29 | ||||
*/ | */ | ||||
@Service | @Service | ||||
public class TauvReportRemarkServiceImpl extends ServiceImpl<TauvReportRemarkMapper, TauvReportRemark> implements ITauvReportRemarkService { | |||||
public class TauvReportRemarkServiceImpl extends BaseServiceImpl<TauvReportRemarkMapper, TauvReportRemark> implements ITauvReportRemarkService { | |||||
@Autowired | @Autowired | ||||
private TauvReportRemarkMapper tauvReportRemarkMapper; | private TauvReportRemarkMapper tauvReportRemarkMapper; | ||||
@Override | @Override | ||||
public void addData(TauvReportRemark reportRemark) { | public void addData(TauvReportRemark reportRemark) { | ||||
reportRemark.setCreateTime(FunctionUtils.getCurrentTime()); | |||||
reportRemark.setCreateTime(DateUtil.now()); | |||||
tauvReportRemarkMapper.insert(reportRemark); | tauvReportRemarkMapper.insert(reportRemark); | ||||
} | } | ||||
} | } |
import com.taauav.admin.mapper.TauvReportMapper; | import com.taauav.admin.mapper.TauvReportMapper; | ||||
import com.taauav.admin.service.*; | import com.taauav.admin.service.*; | ||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; | import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; | ||||
import com.taauav.common.service.impl.BaseServiceImpl; | |||||
import com.taauav.common.util.DateUtil; | |||||
import com.taauav.common.util.FunctionUtils; | import com.taauav.common.util.FunctionUtils; | ||||
import com.taauav.common.util.ShiroUtils; | import com.taauav.common.util.ShiroUtils; | ||||
import org.apache.commons.beanutils.ConvertUtils; | import org.apache.commons.beanutils.ConvertUtils; | ||||
* @since 2019-11-22 | * @since 2019-11-22 | ||||
*/ | */ | ||||
@Service | @Service | ||||
public class TauvReportServiceImpl extends ServiceImpl<TauvReportMapper, TauvReport> implements ITauvReportService { | |||||
public class TauvReportServiceImpl extends BaseServiceImpl<TauvReportMapper, TauvReport> implements ITauvReportService { | |||||
@Autowired | @Autowired | ||||
private TauvReportMapper reportMapper; | private TauvReportMapper reportMapper; | ||||
@Autowired | @Autowired | ||||
/*获取复核有效的图片数量*/ | /*获取复核有效的图片数量*/ | ||||
Integer questionNum = iTauvInspectFileService.getReviewNumByInspectDriverId(questionOptions.getId(), reportInfo.getInspectDriverId()); | Integer questionNum = iTauvInspectFileService.getReviewNumByInspectDriverId(questionOptions.getId(), reportInfo.getInspectDriverId()); | ||||
TauvReportRemark remarkInfo = iTauvReportRemarkService.getInfoByReportIdAndQuestionId(reportInfo.getId(), questionOptions.getId()); | TauvReportRemark remarkInfo = iTauvReportRemarkService.getInfoByReportIdAndQuestionId(reportInfo.getId(), questionOptions.getId()); | ||||
Byte category = questionOptions.getCategory(); | |||||
Byte type = questionOptions.getType(); | |||||
Integer category = questionOptions.getCategory(); | |||||
Integer type = questionOptions.getType(); | |||||
questionMap.put("category", category); | questionMap.put("category", category); | ||||
questionMap.put("categoryText", categoryList.get(category.intValue())); | questionMap.put("categoryText", categoryList.get(category.intValue())); | ||||
questionMap.put("type", type); | questionMap.put("type", type); | ||||
if (null != reportChecksList) { | if (null != reportChecksList) { | ||||
for (TauvReportCheck reportCheck : reportChecksList) { | for (TauvReportCheck reportCheck : reportChecksList) { | ||||
Integer checkUser = reportCheck.getCheckUser(); | Integer checkUser = reportCheck.getCheckUser(); | ||||
Integer createTime = reportCheck.getCreateTime(); | |||||
reportCheck.setFormatCreateTime(FunctionUtils.formatTime(createTime,"yyyy-MM-dd HH:mm:ss")); | |||||
Date createTime = DateUtil.now(); | |||||
reportCheck.setFormatCreateTime(DateUtil.format(createTime,"yyyy-MM-dd HH:mm:ss")); | |||||
SysAdmin adminInfo = iSysAdminService.getAdminInfo(checkUser); | SysAdmin adminInfo = iSysAdminService.getAdminInfo(checkUser); | ||||
reportCheck.setFormatCheckUser(adminInfo.getRealname()); | reportCheck.setFormatCheckUser(adminInfo.getRealname()); | ||||
} | } | ||||
tauvReport.setTotalExamineScore(StringUtils.isEmpty(totalExamineScore) ? 0 : Integer.valueOf(totalExamineScore)); | tauvReport.setTotalExamineScore(StringUtils.isEmpty(totalExamineScore) ? 0 : Integer.valueOf(totalExamineScore)); | ||||
tauvReport.setTotalCheckScore(StringUtils.isEmpty(totalCheckScore) ? 0 : Integer.valueOf(totalCheckScore)); | tauvReport.setTotalCheckScore(StringUtils.isEmpty(totalCheckScore) ? 0 : Integer.valueOf(totalCheckScore)); | ||||
tauvReport.setId(id); | tauvReport.setId(id); | ||||
Byte status = 0; | |||||
Integer status = 0; | |||||
/*审核操作*/ | /*审核操作*/ | ||||
if (map.containsKey("status")) { | if (map.containsKey("status")) { | ||||
String statusStr = map.getOrDefault("status", "").toString(); | String statusStr = map.getOrDefault("status", "").toString(); | ||||
if (!statusStr.equals("3") && !statusStr.equals("4")) { | if (!statusStr.equals("3") && !statusStr.equals("4")) { | ||||
return response.failure("状态不合法"); | return response.failure("状态不合法"); | ||||
} | } | ||||
status = Byte.valueOf(statusStr); | |||||
status = Integer.valueOf(statusStr); | |||||
tauvReport.setStatus(status); | tauvReport.setStatus(status); | ||||
} | } | ||||
//生成报告-修改状态为“审核中” | //生成报告-修改状态为“审核中” | ||||
if ("generate".equals(act)) { | if ("generate".equals(act)) { | ||||
tauvReport.setStatus(Byte.valueOf("2")); | |||||
tauvReport.setStatus(Integer.valueOf("2")); | |||||
tauvReport.setInputTime(FunctionUtils.getCurrentTime()); | tauvReport.setInputTime(FunctionUtils.getCurrentTime()); | ||||
tauvReport.setInputUser(ShiroUtils.getAdminId()); | tauvReport.setInputUser(ShiroUtils.getAdminId()); | ||||
} | } | ||||
tauvReport.setVideoUrl(videoUrl); | tauvReport.setVideoUrl(videoUrl); | ||||
tauvReport.setImageUrl(imgUrl); | tauvReport.setImageUrl(imgUrl); | ||||
tauvReport.setReportUrl(reportUrl); | tauvReport.setReportUrl(reportUrl); | ||||
tauvReport.setUpdateTime(FunctionUtils.getCurrentTime()); | |||||
tauvReport.setUpdateTime(DateUtil.now()); | |||||
tauvReport.setUpdateUser(ShiroUtils.getAdminId()); | tauvReport.setUpdateUser(ShiroUtils.getAdminId()); | ||||
tauvReport.setId(id); | tauvReport.setId(id); | ||||
reportMapper.updateById(tauvReport); | reportMapper.updateById(tauvReport); | ||||
* @param remark | * @param remark | ||||
* @return | * @return | ||||
*/ | */ | ||||
private void checkSub(Integer reportId, Integer inspectDriverId, String remark,Byte status) { | |||||
private void checkSub(Integer reportId, Integer inspectDriverId, String remark,Integer status) { | |||||
TauvInspectDriver inspectDriver = new TauvInspectDriver(); | TauvInspectDriver inspectDriver = new TauvInspectDriver(); | ||||
inspectDriver.setId(inspectDriverId); | inspectDriver.setId(inspectDriverId); | ||||
inspectDriver.setStatus(Byte.valueOf("4")); | |||||
inspectDriver.setStatus(Integer.valueOf("4")); | |||||
inspectDriverMapper.updateById(inspectDriver); | inspectDriverMapper.updateById(inspectDriver); | ||||
QueryWrapper wrapper = new QueryWrapper(); | QueryWrapper wrapper = new QueryWrapper(); | ||||
wrapper.eq("mark", 1); | wrapper.eq("mark", 1); | ||||
return response.failure("报告数据不存在"); | return response.failure("报告数据不存在"); | ||||
} | } | ||||
if ("drop".equals(act)) { | if ("drop".equals(act)) { | ||||
reportInfo.setMark(Byte.valueOf("0")); | |||||
reportInfo.setMark(Integer.valueOf("0")); | |||||
} else { | } else { | ||||
reportInfo.setStatus(Byte.valueOf("2")); | |||||
reportInfo.setStatus(Integer.valueOf("2")); | |||||
} | } | ||||
reportMapper.updateById(reportInfo); | reportMapper.updateById(reportInfo); | ||||
return response.success("操作成功"); | return response.success("操作成功"); |
TauvInspectFile inspectFile = new TauvInspectFile(); | TauvInspectFile inspectFile = new TauvInspectFile(); | ||||
inspectFile.setId(info.getId()); | inspectFile.setId(info.getId()); | ||||
if (StringUtils.isEmpty(latitude) || StringUtils.isEmpty(longitude)) { | if (StringUtils.isEmpty(latitude) || StringUtils.isEmpty(longitude)) { | ||||
inspectFile.setCheckStatus(Byte.valueOf("3")); | |||||
inspectFile.setCheckStatus(Integer.valueOf("3")); | |||||
} else { | } else { | ||||
inspectFile.setLatitude(latitude); | inspectFile.setLatitude(latitude); | ||||
inspectFile.setLongitude(longitude); | inspectFile.setLongitude(longitude); | ||||
inspectFile.setGaodeLongitude(gaodeLon); | inspectFile.setGaodeLongitude(gaodeLon); | ||||
inspectFile.setGaodeAddress(gaodeAddress); | inspectFile.setGaodeAddress(gaodeAddress); | ||||
inspectFile.setCheckStatus(Byte.valueOf("1")); | |||||
inspectFile.setCheckStatus(Integer.valueOf("1")); | |||||
} | } | ||||
}else { | }else { | ||||
TauvInspectFile inspectFile = new TauvInspectFile(); | TauvInspectFile inspectFile = new TauvInspectFile(); | ||||
inspectFile.setId(info.getId()); | inspectFile.setId(info.getId()); | ||||
inspectFile.setCheckStatus(Byte.valueOf("3")); | |||||
inspectFile.setCheckStatus(Integer.valueOf("3")); | |||||
iTauvInspectFileService.updateById(inspectFile); | iTauvInspectFileService.updateById(inspectFile); | ||||
} | } | ||||
String key = "HK_InspectFile_info_"+info.getId(); | String key = "HK_InspectFile_info_"+info.getId(); |
if (!StringUtils.isEmpty(map.get("driverArea"))) { | if (!StringUtils.isEmpty(map.get("driverArea"))) { | ||||
areaIds = map.get("driverArea").toString().split(","); | areaIds = map.get("driverArea").toString().split(","); | ||||
} else { | } else { | ||||
areaIds = admin.getCityIds().split(","); | |||||
areaIds = com.taauav.common.util.StringUtils.isEmpty(admin.getCityIds()) ? null : admin.getCityIds().split(","); | |||||
} | } | ||||
if (areaIds.length > 0) { | |||||
if (null != areaIds && areaIds.length > 0) { | |||||
map.put("driverArea", areaIds); | map.put("driverArea", areaIds); | ||||
} else { | } else { | ||||
map.remove("driverArea"); | map.remove("driverArea"); |
} | } | ||||
@GetMapping("init") | @GetMapping("init") | ||||
public void initDriver(@RequestParam("f") String f) { | public void initDriver(@RequestParam("f") String f) { | ||||
/* try { | |||||
/*try { | |||||
readFileByBytes(f); | readFileByBytes(f); | ||||
} catch (IOException e) { | } catch (IOException e) { | ||||
e.printStackTrace(); | e.printStackTrace(); |