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

src/main/java/cn/wisenergy/chnmuseum/party/model/Audit.java

@@ -55,7 +55,7 @@ public class Audit implements Serializable {
     @NotBlank(message = "提交人员不能为空", groups = {Add.class})
     private String userId;
 
-    @ApiModelProperty(value = "审核内容", allowableValues = "视频内容 ASSET, 展板内容 EXHIBITION_BOARD, 学习内容 LEARNING_CONTENT, 账户 ACCOUNT")
+    @ApiModelProperty(value = "审核内容", allowableValues = "ASSET,EXHIBITION_BOARD,LEARNING_CONTENT,ACCOUNT")
     @TableField("type")
     @NotBlank(message = "0,看板；1 视频；2 学习内容；3 账号禁用不能为空", groups = {Add.class})
     private String type;
@@ -64,20 +64,21 @@ public class Audit implements Serializable {
     @TableField("operation")
     private String operation;
 
-    @ApiModelProperty(value = "审核状态", allowableValues = "待初审 TBC, 驳回 REFUSED,待复审 TBCA, 通过APPROVED_FINAL")
+    @ApiModelProperty(value = "审核状态", allowableValues = "TBC,REFUSED,TBCA,APPROVED_FINAL")
     @TableField("status")
     private String status;
 
     @ApiModelProperty("创建日期")
     @TableField(value = "create_time", fill = FieldFill.INSERT)
+    @NotNull(message = "创建日期不能为空", groups = {Add.class})
     private LocalDateTime createTime;
 
-    @ApiModelProperty("初审时间")
-    @TableField("first_time")
+    @ApiModelProperty("初审日期")
+    @TableField(value = "first_time", fill = FieldFill.INSERT_UPDATE)
     private LocalDateTime firstTime;
 
-    @ApiModelProperty("复审时间")
-    @TableField("second_time")
+    @ApiModelProperty("复审日期")
+    @TableField(value = "second_time", fill = FieldFill.INSERT_UPDATE)
     private LocalDateTime secondTime;
 
     @ApiModelProperty("0：未删除，1：已删除")
@@ -92,7 +93,7 @@ public class Audit implements Serializable {
     @TableField("second_remarks")
     private String secondRemarks;
 
-    @ApiModelProperty(value = "审核层级", allowableValues = "初审 TBC,复审 TBCA")
+    @ApiModelProperty(value = "审核层级", allowableValues = "TBC,TBCA")
     @TableField("level")
     private String level;
 

src/main/java/cn/wisenergy/chnmuseum/party/model/Menu.java

@@ -48,14 +48,14 @@ public class Menu extends Model<Menu> {
      * 菜单地址
      */
     @ApiModelProperty(value = "菜单地址")
-    @TableField("menu_url")
-    private String menuUrl;
+    @TableField("url")
+    private String url;
     /**
      * 菜单名称
      */
     @ApiModelProperty(value = "菜单名称")
-    @TableField("menu_name")
-    private String menuName;
+    @TableField("name")
+    private String name;
     /**
      * 上级菜单ID
      */
@@ -81,6 +81,27 @@ public class Menu extends Model<Menu> {
     @ApiModelProperty(value = "级别")
     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> {
         this.isDeleted = isDeleted;
     }
 
-    public String getMenuUrl() {
-        return menuUrl;
+    public String getUrl() {
+        return url;
     }
 
-    public void setMenuUrl(String menuUrl) {
-        this.menuUrl = menuUrl;
+    public void setUrl(String url) {
+        this.url = url;
     }
 
-    public String getMenuName() {
-        return menuName;
+    public String getName() {
+        return name;
     }
 
-    public void setMenuName(String menuName) {
-        this.menuName = menuName;
+    public void setName(String name) {
+        this.name = name;
     }
 
     public String getParentId() {
@@ -177,22 +198,54 @@ public class Menu extends Model<Menu> {
         this.children = children;
     }
 
-    @Override
-    protected Serializable pkVal() {
-        return this.id;
+    public String getIcon() {
+        return icon;
+    }
+
+    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
     public String toString() {
         return "Menu{" +
-                ", id=" + id +
+                "id='" + id + '\'' +
                 ", createTime=" + createTime +
                 ", updateTime=" + updateTime +
                 ", isDeleted=" + isDeleted +
-                ", menuUrl=" + menuUrl +
-                ", menuName=" + menuName +
-                ", parentId=" + parentId +
-                ", is button=" + isButton +
-                "}";
+                ", url='" + url + '\'' +
+                ", name='" + name + '\'' +
+                ", parentId='" + parentId + '\'' +
+                ", isButton=" + isButton +
+                ", sort=" + sort +
+                ", level=" + level +
+                ", icon='" + icon + '\'' +
+                ", color='" + color + '\'' +
+                ", avatar='" + avatar + '\'' +
+                ", children=" + children +
+                '}';
     }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+
 }

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/AuditController.java

@@ -24,6 +24,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -56,13 +57,12 @@ public class AuditController extends BaseController {
             @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 = "status", value = "待初审 TBC, 驳回 REFUSED,待复审 TBCA, 通过APPROVED_FINAL", paramType = "query", dataType = "String"),
-            @ApiImplicitParam(name = "level", value = "初审 TBC,复审 TBCA", 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")
     })
     public Map<String, Object> getUserList(String name, String status, String level) {
         Page<Audit> auditList;
         try {
-            TUser user1 = getcurUser();
             TUser user = new TUser();
             if (StringUtils.isNotBlank(name)) {
                 user.setUserName(name);
@@ -73,7 +73,6 @@ public class AuditController extends BaseController {
             if (StringUtils.isNotBlank(level)) {
                 user.setAuditStatus(level);
             }
-            user.setOrgCode(user1.getOrgCode());
             auditList = auditService.getUserList(getPage(), user);
             return getResult(auditList);
         } catch (Exception e) {
@@ -87,11 +86,20 @@ public class AuditController extends BaseController {
     @ApiOperation(value = "修改禁用审核信息", notes = "修改禁用审核信息")
     public Map<String, Object> updateAudit(@Validated(value = {Update.class}) Audit audit) {
         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.setStatus(AuditStatusEnum.TBCA.name());
         }
+        if (AuditStatusEnum.TBC.name().equals(audit.getLevel())) {
+            audit.setFirstTime(LocalDateTime.now());
             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 {
             if (AuditTypeEnum.ACCOUNT.name().equals(audit.getType())) {

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/ChinaMobileRestApiController.java

@@ -67,6 +67,9 @@ public class ChinaMobileRestApiController extends BaseController {
     @Resource
     private TUserServiceImpl userService;
 
+    @Resource
+    private TOrganServiceImpl organService;
+
     @Resource
     private RunLogServiceImpl runLogService;
 
@@ -239,6 +242,7 @@ public class ChinaMobileRestApiController extends BaseController {
         JSONObject resultMap = new JSONObject(true);
         try {
             TUser user = userService.getById(userId);
+            TOrgan organ = organService.getById(user.getOrgId());
 
             if (null == user) {
                 resultMap.put("resultCode", 500);
@@ -255,7 +259,7 @@ public class ChinaMobileRestApiController extends BaseController {
             jsonObject.put("effectiveDate", user.getEffectiveDate());
             jsonObject.put("expireDate", user.getExiredDate());
             jsonObject.put("orgCode", user.getOrgId());
-            jsonObject.put("orgName", user.getOrgName());
+            jsonObject.put("orgName",organ.getName());
 
             resultMap.put("resultCode", 200);
             resultMap.put("message", "成功");
@@ -292,7 +296,7 @@ public class ChinaMobileRestApiController extends BaseController {
      * 插入机顶盒日志表
      */
     @ApiOperation(value = "插入机顶盒日志表", notes = "插入机顶盒日志表")
-    @PostMapping(value = "/insertRunLog")
+    @PostMapping(value = "/equitment/runLog")
     public ResponseEntity<JSONObject> insertRunLog(RunLog runLog) {
         JSONObject resultMap = new JSONObject();
 

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/TBoxOperationController.java

 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.service.impl.TUserServiceImpl;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import cn.wisenergy.chnmuseum.party.web.controller.base.BaseController;
 import cn.wisenergy.chnmuseum.party.model.TBoxOperation;
 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.ApiImplicitParam;
@@ -23,13 +17,9 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 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.stereotype.Controller;
 
 import javax.annotation.Resource;
-import javax.validation.constraints.NotNull;
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
@@ -159,7 +149,7 @@ public class TBoxOperationController extends BaseController {
         //设置数据权限
         String areaId = user.getAreaId();
         try {
-            tBoxOperationList = tBoxOperationService.getList(status,areaId);
+            tBoxOperationList = tBoxOperationService.getList(status,getAreaId(areaId));
             return getResult(tBoxOperationList);
         } catch (Exception e) {
             e.printStackTrace();
@@ -221,11 +211,10 @@ public class TBoxOperationController extends BaseController {
 
 
     public String getAreaId(String areaId){
-        if ("00".equals(areaId.substring(4))) {
-            areaId = areaId.substring(0, 4);
-        }
         if ("0000".equals(areaId.substring(2))) {
             areaId = areaId.substring(0, 2);
+        }else if ("00".equals(areaId.substring(4))) {
+            areaId = areaId.substring(0, 4);
         }
         return areaId;
     }

src/main/resources/mapper/AuditMapper.xml

@@ -21,10 +21,7 @@
         <result column="level" property="level"/>
     </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 a.*,o.name org_name,u.user_name user_name
@@ -33,8 +30,7 @@
         left join t_user u on u.id = a.user_id
         where 1 = 1
         <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 test="user.status != null and user.status != ''">
             and a.status = #{user.status}

src/main/resources/mapper/MenuMapper.xml

@@ -8,8 +8,8 @@
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
         <result column="is_deleted" property="isDeleted" />
-        <result column="menu_url" property="menuUrl" />
-        <result column="menu_name" property="menuName" />
+        <result column="url" property="url" />
+        <result column="name" property="name" />
         <result column="parent_id" property="parentId" />
         <result column="is_button" property="isButton" />
         <result column="level" property="level" />
@@ -17,7 +17,7 @@
 
     <select id="getUserMenuPerms" resultMap="BaseResultMap">
         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
             ref_role_menu rm
         LEFT JOIN menu m ON m.id = rm.menu_id