Commit 2511fbdd authored by liqin's avatar liqin 💬

Merge branch 'master' of http://111.203.232.171:8888/lee/chnmuseum-party into master

 Conflicts:
	src/main/java/cn/wisenergy/chnmuseum/party/model/Audit.java
	src/main/resources/mapper/AuditMapper.xml
parents 4436daae 44558264
...@@ -55,7 +55,7 @@ public class Audit implements Serializable { ...@@ -55,7 +55,7 @@ public class Audit implements Serializable {
@NotBlank(message = "提交人员不能为空", groups = {Add.class}) @NotBlank(message = "提交人员不能为空", groups = {Add.class})
private String userId; private String userId;
@ApiModelProperty(value = "审核内容", allowableValues = "视频内容 ASSET, 展板内容 EXHIBITION_BOARD, 学习内容 LEARNING_CONTENT, 账户 ACCOUNT") @ApiModelProperty(value = "审核内容", allowableValues = "ASSET,EXHIBITION_BOARD,LEARNING_CONTENT,ACCOUNT")
@TableField("type") @TableField("type")
@NotBlank(message = "0,看板;1 视频;2 学习内容;3 账号禁用不能为空", groups = {Add.class}) @NotBlank(message = "0,看板;1 视频;2 学习内容;3 账号禁用不能为空", groups = {Add.class})
private String type; private String type;
...@@ -64,20 +64,21 @@ public class Audit implements Serializable { ...@@ -64,20 +64,21 @@ public class Audit implements Serializable {
@TableField("operation") @TableField("operation")
private String operation; private String operation;
@ApiModelProperty(value = "审核状态", allowableValues = "待初审 TBC, 驳回 REFUSED,待复审 TBCA, 通过APPROVED_FINAL") @ApiModelProperty(value = "审核状态", allowableValues = "TBC,REFUSED,TBCA,APPROVED_FINAL")
@TableField("status") @TableField("status")
private String status; private String status;
@ApiModelProperty("创建日期") @ApiModelProperty("创建日期")
@TableField(value = "create_time", fill = FieldFill.INSERT) @TableField(value = "create_time", fill = FieldFill.INSERT)
@NotNull(message = "创建日期不能为空", groups = {Add.class})
private LocalDateTime createTime; private LocalDateTime createTime;
@ApiModelProperty("初审时间") @ApiModelProperty("初审日期")
@TableField("first_time") @TableField(value = "first_time", fill = FieldFill.INSERT_UPDATE)
private LocalDateTime firstTime; private LocalDateTime firstTime;
@ApiModelProperty("复审时间") @ApiModelProperty("复审日期")
@TableField("second_time") @TableField(value = "second_time", fill = FieldFill.INSERT_UPDATE)
private LocalDateTime secondTime; private LocalDateTime secondTime;
@ApiModelProperty("0:未删除,1:已删除") @ApiModelProperty("0:未删除,1:已删除")
...@@ -92,7 +93,7 @@ public class Audit implements Serializable { ...@@ -92,7 +93,7 @@ public class Audit implements Serializable {
@TableField("second_remarks") @TableField("second_remarks")
private String secondRemarks; private String secondRemarks;
@ApiModelProperty(value = "审核层级", allowableValues = "初审 TBC,复审 TBCA") @ApiModelProperty(value = "审核层级", allowableValues = "TBC,TBCA")
@TableField("level") @TableField("level")
private String level; private String level;
......
...@@ -48,14 +48,14 @@ public class Menu extends Model<Menu> { ...@@ -48,14 +48,14 @@ public class Menu extends Model<Menu> {
* 菜单地址 * 菜单地址
*/ */
@ApiModelProperty(value = "菜单地址") @ApiModelProperty(value = "菜单地址")
@TableField("menu_url") @TableField("url")
private String menuUrl; private String url;
/** /**
* 菜单名称 * 菜单名称
*/ */
@ApiModelProperty(value = "菜单名称") @ApiModelProperty(value = "菜单名称")
@TableField("menu_name") @TableField("name")
private String menuName; private String name;
/** /**
* 上级菜单ID * 上级菜单ID
*/ */
...@@ -81,6 +81,27 @@ public class Menu extends Model<Menu> { ...@@ -81,6 +81,27 @@ public class Menu extends Model<Menu> {
@ApiModelProperty(value = "级别") @ApiModelProperty(value = "级别")
private Integer level; private Integer level;
/**
* 图标
*/
@TableField("icon")
@ApiModelProperty(value = "图标")
private String icon;
/**
* 页面风格
*/
@TableField("color")
@ApiModelProperty(value = "页面风格")
private String color;
/**
* 头像
*/
@TableField("avatar")
@ApiModelProperty(value = "头像")
private String avatar;
/** /**
* 下级 * 下级
*/ */
...@@ -121,20 +142,20 @@ public class Menu extends Model<Menu> { ...@@ -121,20 +142,20 @@ public class Menu extends Model<Menu> {
this.isDeleted = isDeleted; this.isDeleted = isDeleted;
} }
public String getMenuUrl() { public String getUrl() {
return menuUrl; return url;
} }
public void setMenuUrl(String menuUrl) { public void setUrl(String url) {
this.menuUrl = menuUrl; this.url = url;
} }
public String getMenuName() { public String getName() {
return menuName; return name;
} }
public void setMenuName(String menuName) { public void setName(String name) {
this.menuName = menuName; this.name = name;
} }
public String getParentId() { public String getParentId() {
...@@ -177,22 +198,54 @@ public class Menu extends Model<Menu> { ...@@ -177,22 +198,54 @@ public class Menu extends Model<Menu> {
this.children = children; this.children = children;
} }
@Override public String getIcon() {
protected Serializable pkVal() { return icon;
return this.id; }
public void setIcon(String icon) {
this.icon = icon;
}
public String getColor() {
return color;
}
public void setColor(String color) {
this.color = color;
}
public String getAvatar() {
return avatar;
}
public void setAvatar(String avatar) {
this.avatar = avatar;
} }
@Override @Override
public String toString() { public String toString() {
return "Menu{" + return "Menu{" +
", id=" + id + "id='" + id + '\'' +
", createTime=" + createTime + ", createTime=" + createTime +
", updateTime=" + updateTime + ", updateTime=" + updateTime +
", isDeleted=" + isDeleted + ", isDeleted=" + isDeleted +
", menuUrl=" + menuUrl + ", url='" + url + '\'' +
", menuName=" + menuName + ", name='" + name + '\'' +
", parentId=" + parentId + ", parentId='" + parentId + '\'' +
", is button=" + isButton + ", isButton=" + isButton +
"}"; ", sort=" + sort +
", level=" + level +
", icon='" + icon + '\'' +
", color='" + color + '\'' +
", avatar='" + avatar + '\'' +
", children=" + children +
'}';
} }
@Override
protected Serializable pkVal() {
return this.id;
}
} }
...@@ -24,6 +24,7 @@ import org.springframework.validation.annotation.Validated; ...@@ -24,6 +24,7 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -56,13 +57,12 @@ public class AuditController extends BaseController { ...@@ -56,13 +57,12 @@ public class AuditController extends BaseController {
@ApiImplicitParam(name = "_size", value = "返回条数", paramType = "query", dataType = "Integer"), @ApiImplicitParam(name = "_size", value = "返回条数", paramType = "query", dataType = "Integer"),
@ApiImplicitParam(name = "name", value = "账号名称或提交人", paramType = "query", dataType = "String"), @ApiImplicitParam(name = "name", value = "账号名称或提交人", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "name", value = "账号名称或提交人", paramType = "query", dataType = "String"), @ApiImplicitParam(name = "name", value = "账号名称或提交人", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "status", value = "待初审 TBC, 驳回 REFUSED,待复审 TBCA, 通过APPROVED_FINAL", paramType = "query", dataType = "String"), @ApiImplicitParam(name = "status", value = "TBC,REFUSED,TBCA,APPROVED_FINAL", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "level", value = "初审 TBC,复审 TBCA", paramType = "query", dataType = "String") @ApiImplicitParam(name = "level", value = "TBC,TBCA", paramType = "query", dataType = "String")
}) })
public Map<String, Object> getUserList(String name, String status, String level) { public Map<String, Object> getUserList(String name, String status, String level) {
Page<Audit> auditList; Page<Audit> auditList;
try { try {
TUser user1 = getcurUser();
TUser user = new TUser(); TUser user = new TUser();
if (StringUtils.isNotBlank(name)) { if (StringUtils.isNotBlank(name)) {
user.setUserName(name); user.setUserName(name);
...@@ -73,7 +73,6 @@ public class AuditController extends BaseController { ...@@ -73,7 +73,6 @@ public class AuditController extends BaseController {
if (StringUtils.isNotBlank(level)) { if (StringUtils.isNotBlank(level)) {
user.setAuditStatus(level); user.setAuditStatus(level);
} }
user.setOrgCode(user1.getOrgCode());
auditList = auditService.getUserList(getPage(), user); auditList = auditService.getUserList(getPage(), user);
return getResult(auditList); return getResult(auditList);
} catch (Exception e) { } catch (Exception e) {
...@@ -87,11 +86,20 @@ public class AuditController extends BaseController { ...@@ -87,11 +86,20 @@ public class AuditController extends BaseController {
@ApiOperation(value = "修改禁用审核信息", notes = "修改禁用审核信息") @ApiOperation(value = "修改禁用审核信息", notes = "修改禁用审核信息")
public Map<String, Object> updateAudit(@Validated(value = {Update.class}) Audit audit) { public Map<String, Object> updateAudit(@Validated(value = {Update.class}) Audit audit) {
boolean flag; boolean flag;
if (!AuditStatusEnum.TBCA.name().equals(audit.getStatus())) { if (AuditStatusEnum.APPROVED_FINAL.name().equals(audit.getStatus())&&AuditStatusEnum.TBC.name().equals(audit.getLevel())) {
audit.setLevel(AuditStatusEnum.TBCA.name()); audit.setLevel(AuditStatusEnum.TBCA.name());
audit.setStatus(AuditStatusEnum.TBCA.name());
} }
if (AuditStatusEnum.TBC.name().equals(audit.getLevel())) {
audit.setFirstTime(LocalDateTime.now());
if (!AuditStatusEnum.REFUSED.name().equals(audit.getStatus())) { if (!AuditStatusEnum.REFUSED.name().equals(audit.getStatus())) {
audit.setRemarks(""); audit.setFirstRemarks("");
}
}else{
audit.setSecondTime(LocalDateTime.now());
if (!AuditStatusEnum.REFUSED.name().equals(audit.getStatus())) {
audit.setFirstRemarks("");
}
} }
try { try {
if (AuditTypeEnum.ACCOUNT.name().equals(audit.getType())) { if (AuditTypeEnum.ACCOUNT.name().equals(audit.getType())) {
......
...@@ -67,6 +67,9 @@ public class ChinaMobileRestApiController extends BaseController { ...@@ -67,6 +67,9 @@ public class ChinaMobileRestApiController extends BaseController {
@Resource @Resource
private TUserServiceImpl userService; private TUserServiceImpl userService;
@Resource
private TOrganServiceImpl organService;
@Resource @Resource
private RunLogServiceImpl runLogService; private RunLogServiceImpl runLogService;
...@@ -239,6 +242,7 @@ public class ChinaMobileRestApiController extends BaseController { ...@@ -239,6 +242,7 @@ public class ChinaMobileRestApiController extends BaseController {
JSONObject resultMap = new JSONObject(true); JSONObject resultMap = new JSONObject(true);
try { try {
TUser user = userService.getById(userId); TUser user = userService.getById(userId);
TOrgan organ = organService.getById(user.getOrgId());
if (null == user) { if (null == user) {
resultMap.put("resultCode", 500); resultMap.put("resultCode", 500);
...@@ -255,7 +259,7 @@ public class ChinaMobileRestApiController extends BaseController { ...@@ -255,7 +259,7 @@ public class ChinaMobileRestApiController extends BaseController {
jsonObject.put("effectiveDate", user.getEffectiveDate()); jsonObject.put("effectiveDate", user.getEffectiveDate());
jsonObject.put("expireDate", user.getExiredDate()); jsonObject.put("expireDate", user.getExiredDate());
jsonObject.put("orgCode", user.getOrgId()); jsonObject.put("orgCode", user.getOrgId());
jsonObject.put("orgName", user.getOrgName()); jsonObject.put("orgName",organ.getName());
resultMap.put("resultCode", 200); resultMap.put("resultCode", 200);
resultMap.put("message", "成功"); resultMap.put("message", "成功");
...@@ -292,7 +296,7 @@ public class ChinaMobileRestApiController extends BaseController { ...@@ -292,7 +296,7 @@ public class ChinaMobileRestApiController extends BaseController {
* 插入机顶盒日志表 * 插入机顶盒日志表
*/ */
@ApiOperation(value = "插入机顶盒日志表", notes = "插入机顶盒日志表") @ApiOperation(value = "插入机顶盒日志表", notes = "插入机顶盒日志表")
@PostMapping(value = "/insertRunLog") @PostMapping(value = "/equitment/runLog")
public ResponseEntity<JSONObject> insertRunLog(RunLog runLog) { public ResponseEntity<JSONObject> insertRunLog(RunLog runLog) {
JSONObject resultMap = new JSONObject(); JSONObject resultMap = new JSONObject();
......
package cn.wisenergy.chnmuseum.party.web.controller; package cn.wisenergy.chnmuseum.party.web.controller;
import cn.wisenergy.chnmuseum.party.auth.SHA256PasswordEncryptionService;
import cn.wisenergy.chnmuseum.party.model.TUser; import cn.wisenergy.chnmuseum.party.model.TUser;
import cn.wisenergy.chnmuseum.party.service.impl.TUserServiceImpl; import cn.wisenergy.chnmuseum.party.service.impl.TUserServiceImpl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import cn.wisenergy.chnmuseum.party.web.controller.base.BaseController; import cn.wisenergy.chnmuseum.party.web.controller.base.BaseController;
import cn.wisenergy.chnmuseum.party.model.TBoxOperation; import cn.wisenergy.chnmuseum.party.model.TBoxOperation;
import cn.wisenergy.chnmuseum.party.service.TBoxOperationService; import cn.wisenergy.chnmuseum.party.service.TBoxOperationService;
import cn.wisenergy.chnmuseum.party.common.enums.AuditStatusEnum;
import cn.wisenergy.chnmuseum.party.common.validator.groups.Add;
import cn.wisenergy.chnmuseum.party.common.validator.groups.Update;
import cn.wisenergy.chnmuseum.party.common.vo.GenericPageParam;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
...@@ -23,13 +17,9 @@ import io.swagger.annotations.ApiOperation; ...@@ -23,13 +17,9 @@ import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.cglib.core.Local;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.stereotype.Controller;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.validation.constraints.NotNull;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -159,7 +149,7 @@ public class TBoxOperationController extends BaseController { ...@@ -159,7 +149,7 @@ public class TBoxOperationController extends BaseController {
//设置数据权限 //设置数据权限
String areaId = user.getAreaId(); String areaId = user.getAreaId();
try { try {
tBoxOperationList = tBoxOperationService.getList(status,areaId); tBoxOperationList = tBoxOperationService.getList(status,getAreaId(areaId));
return getResult(tBoxOperationList); return getResult(tBoxOperationList);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
...@@ -221,11 +211,10 @@ public class TBoxOperationController extends BaseController { ...@@ -221,11 +211,10 @@ public class TBoxOperationController extends BaseController {
public String getAreaId(String areaId){ public String getAreaId(String areaId){
if ("00".equals(areaId.substring(4))) {
areaId = areaId.substring(0, 4);
}
if ("0000".equals(areaId.substring(2))) { if ("0000".equals(areaId.substring(2))) {
areaId = areaId.substring(0, 2); areaId = areaId.substring(0, 2);
}else if ("00".equals(areaId.substring(4))) {
areaId = areaId.substring(0, 4);
} }
return areaId; return areaId;
} }
......
...@@ -21,10 +21,7 @@ ...@@ -21,10 +21,7 @@
<result column="level" property="level"/> <result column="level" property="level"/>
</resultMap> </resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
id, content, organ_id, ref_item_id, user_id, type, operation, status, create_time, first_time, second_time, is_deleted, first_remarks, second_remarks, level
</sql>
<select id="getUserList" resultMap="BaseResultMap"> <select id="getUserList" resultMap="BaseResultMap">
select a.*,o.name org_name,u.user_name user_name select a.*,o.name org_name,u.user_name user_name
...@@ -33,8 +30,7 @@ ...@@ -33,8 +30,7 @@
left join t_user u on u.id = a.user_id left join t_user u on u.id = a.user_id
where 1 = 1 where 1 = 1
<if test="user.userName != null and user.userName != ''"> <if test="user.userName != null and user.userName != ''">
and (u.user_name LIKE concat('%', #{user.userName}, '%') or a.content LIKE concat('%', #{user.userName}, and (u.user_name LIKE concat('%', #{user.userName}, '%') or a.content LIKE concat('%', #{user.userName}, '%'))
'%'))
</if> </if>
<if test="user.status != null and user.status != ''"> <if test="user.status != null and user.status != ''">
and a.status = #{user.status} and a.status = #{user.status}
......
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
<result column="create_time" property="createTime" /> <result column="create_time" property="createTime" />
<result column="update_time" property="updateTime" /> <result column="update_time" property="updateTime" />
<result column="is_deleted" property="isDeleted" /> <result column="is_deleted" property="isDeleted" />
<result column="menu_url" property="menuUrl" /> <result column="url" property="url" />
<result column="menu_name" property="menuName" /> <result column="name" property="name" />
<result column="parent_id" property="parentId" /> <result column="parent_id" property="parentId" />
<result column="is_button" property="isButton" /> <result column="is_button" property="isButton" />
<result column="level" property="level" /> <result column="level" property="level" />
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<select id="getUserMenuPerms" resultMap="BaseResultMap"> <select id="getUserMenuPerms" resultMap="BaseResultMap">
SELECT distinct SELECT distinct
m.id,m.menu_name,m.menu_url,m.parent_id,m.sort,m.is_button,m.level m.id,m.name,m.url,m.parent_id,m.sort,m.is_button,m.level
FROM FROM
ref_role_menu rm ref_role_menu rm
LEFT JOIN menu m ON m.id = rm.menu_id LEFT JOIN menu m ON m.id = rm.menu_id
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment