Merge branch 'master' of http://gitlab.scsmile.cn/zxf/attendance-performance-platform

attendance-performance-manager-ui/admin/src/components/tools/TableButtons.vue

 <template>
   <span>
-    <el-button v-if='!noEdit'  type="text" icon="el-icon-edit"  size='mini' @click='$emit("edit", row)'  title="编辑">编辑</el-button>
+    <el-button
+      v-if="!noEdit"
+      type="text"
+      icon="el-icon-edit"
+      size="mini"
+      @click="$emit('edit', row)"
+      title="编辑"
+      >编辑</el-button
+    >
     <span>&nbsp;</span>
-    <el-button v-if='!noView' type="text" icon="el-icon-view"  size='mini' @click='$emit("view", row)'  title="查看">查看</el-button>
-     <span>&nbsp;</span>
-    <Confirm @confirm='$emit("del", row.id)' message='确定要删除该条记录吗？'>
-      <el-button v-if='!noDel' type="text" icon="el-icon-delete" size='mini'  title="删除">删除</el-button>
+    <el-button
+      v-if="!noView"
+      type="text"
+      icon="el-icon-view"
+      size="mini"
+      @click="$emit('view', row)"
+      title="查看"
+      >查看</el-button
+    >
+    <span>&nbsp;</span>
+    <el-button
+      v-if="reCheck"
+      type="text"
+      icon="el-icon-edit"
+      size="mini"
+      @click="$emit('edit', row)"
+      title="核查"
+      >核查</el-button
+    >
+    <span>&nbsp;</span>
+    <Confirm @confirm="$emit('del', row.id)" message="确定要删除该条记录吗？">
+      <el-button
+        v-if="!noDel"
+        type="text"
+        icon="el-icon-delete"
+        size="mini"
+        title="删除"
+        >删除</el-button
+      >
     </Confirm>
-    
   </span>
 </template>
 
 <script>
-import Confirm from '@/components/Confirm.vue';
+import Confirm from "@/components/Confirm.vue";
 export default {
   props: {
     noEdit: {
       type: Boolean,
-      default: false
+      default: false,
     },
     noDel: {
       type: Boolean,
-      default: false
+      default: false,
     },
     noAdd: {
       type: Boolean,
-      default: false
+      default: false,
+    },
+    reCheck: {
+      type: Boolean,
+      default: false,
     },
     noView: {
       type: Boolean,
-      default: false
+      default: false,
     },
     row: {
       type: Object,
       required: true,
-      default: () => {}
+      default: () => {},
     },
   },
   components: {
     Confirm,
   },
-  methods: {
-
-  },
+  methods: {},
   data() {
-    return {
-
-    }
-  }
-}
+    return {};
+  },
+};
 </script>
-
-

attendance-performance-manager-ui/admin/src/views/perform/attend/record/list.vue

@@ -233,7 +233,7 @@ export default {
 
           {
             label: "处理状态",
-            prop: "processStatus",
+            prop: "checkStatus",
             formatter: this.formatter,
           },
 

attendance-performance-manager-ui/admin/src/views/perform/gowork/record/drawershow.vue

@@ -82,19 +82,6 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row>
-        <el-col :span="22">
-          <el-form-item label="异常时间：">
-            <el-date-picker
-              v-model="form.errorTime"
-              type="date"
-              placeholder="选择日期"
-              style="width: 100%;"
-            >
-            </el-date-picker>
-          </el-form-item>
-        </el-col>
-      </el-row>
       <el-row>
         <el-col :span="22">
           <el-form-item label="办件时间：">

attendance-performance-manager/src/main/java/com/mortals/xhx/base/system/role/service/RoleUserService.java

@@ -27,4 +27,11 @@ public interface RoleUserService extends ICRUDService<RoleUserEntity,Long> {
     void doDistributionUser(RoleUserQuery query);
 
     void doDistributionRole(RoleUserQuery query);
+
+
+    /**
+     * 给用户分配角色
+     * @param query
+     */
+    void assignRoleToUser(RoleUserQuery query);
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/base/system/role/service/impl/RoleUserServiceImpl.java

@@ -70,6 +70,26 @@ public class RoleUserServiceImpl extends AbstractCRUDServiceImpl<RoleUserDao,Rol
         this.dao.insertBatch(list);
     }
 
+    @Override
+    public void assignRoleToUser(RoleUserQuery query) {
+        //删除当前用户所有关联角色
+        Long userId = query.getUserId();
+        Map<String, Object> condition = new HashMap<>(1);
+        condition.put("userId", userId);
+        dao.delete(condition);
+
+        //新增用户角色
+        List<Long> roleIdList = query.getRoleIdList();
+        List<RoleUserEntity> list = new ArrayList<>();
+        for (Long roleId : roleIdList) {
+            RoleUserEntity rolseUser = new RoleUserEntity();
+            rolseUser.setRoleId(roleId);
+            rolseUser.setUserId(userId);
+            list.add(rolseUser);
+        }
+        this.save(list);
+    }
+
 
 
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/base/system/task/service/impl/TaskServiceImpl.java

@@ -4,6 +4,7 @@
 
 package com.mortals.xhx.base.system.task.service.impl;
 
+import cn.hutool.core.net.NetUtil;
 import com.mortals.framework.ap.GlobalSysInfo;
 import com.mortals.framework.common.code.ExcuteStatus;
 import com.mortals.framework.common.code.TaskExcuteStrategy;
@@ -148,7 +149,8 @@ public class TaskServiceImpl extends AbstractCRUDServiceImpl<TaskDao, TaskEntity
 
     @Override
     public void start() throws AppException {
-        final String localIp = SystemUtil.getLocalHostIp();
+       // final String localIp = SystemUtil.getLocalHostIp();
+        final String localIp = NetUtil.getLocalhostStr();
         log.info("任务执行线程启动...-->" + localIp);
         thread = new Thread(() -> {
             // 将本机上次执行而未完成的任务状态变更

attendance-performance-manager/src/main/java/com/mortals/xhx/base/system/user/model/UserEntity.java

@@ -48,7 +48,7 @@ public class UserEntity extends UserVo implements IUser {
      */
     private String qq;
     /**
-     * 用户类型(0.系统用户,1.普通用户,2.工作人员)
+     * 用户类型(0.系统用户,1.普通用户,2.工作人员,3.普通员工)
      */
     private Integer userType;
 
@@ -232,7 +232,7 @@ public class UserEntity extends UserVo implements IUser {
         this.qq = qq;
     }
     /**
-     * 获取 用户类型(0.系统用户,1.普通用户,2.工作人员)
+     * 获取 用户类型(0.系统用户,1.普通用户,2.工作人员,3.普通员工)
      * @return Integer
      */
     public Integer getUserType(){

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/web/ApiLoginController.java

@@ -6,6 +6,7 @@ import com.mortals.framework.ap.CookieService;
 import com.mortals.framework.ap.GlobalSysInfo;
 import com.mortals.framework.ap.SysConstains;
 import com.mortals.framework.common.Rest;
+import com.mortals.framework.exception.AppException;
 import com.mortals.framework.service.IAuthTokenService;
 import com.mortals.framework.service.ICacheService;
 import com.mortals.framework.service.IUser;
@@ -32,6 +33,8 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
@@ -46,34 +49,12 @@ public class ApiLoginController extends BaseJsonBodyController {
     @Autowired
     private UserService userService;
     @Autowired
-    private ValidCodeService validCodeService;
-    @Autowired
-    private ResourceService resourceService;
-    @Autowired
-    private MenuService menuService;
-    //    @Autowired
-//    private ITokenService tokenService;
-    @Autowired
-    private ICacheService cacheService;
-    @Autowired
     private IAuthTokenService authTokenService;
 
 
     @RequestMapping("login")
     public String login(@RequestBody LoginForm loginForm) throws Exception {
 
-/*
-        JSONObject ret = new JSONObject();
-        String loginName = loginForm.getLoginName();
-        String password = loginForm.getPassword();
-
-        UserPdu userPdu = new UserPdu();
-        userPdu.setLoginName(loginName);
-        userPdu.setPassword(password);
-        String resp = userFeign.portalLogin(userPdu);
-
-        return resp;
-*/
         JSONObject ret = new JSONObject();
         String loginName = loginForm.getLoginName();
         String password = loginForm.getPassword();
@@ -88,42 +69,35 @@ public class ApiLoginController extends BaseJsonBodyController {
             loginForm.validate();
             userEntity = userService.doLogin(loginName, password, ip);
             userEntity.setLastLoginAddress(ip);
-
-            recordSysLog(request, userEntity, "用户登录系统成功!");
-            // 返回拥有的菜单数据
-            Set<String> urls = resourceService.findUrlSetByUserId(userEntity.getId());
-            List<MenuEntity> outlookBarList = menuService.findTreeMenu(userEntity, urls);
+            recordSysLog(request, userEntity, "H5用户登录系统成功!");
             String currUserName = userEntity.getRealName();
             if (currUserName == null || currUserName.trim().length() == 0) {
                 currUserName = "管理员";
             }
             JSONObject data = new JSONObject();
             data.put("currUserName", currUserName);
-            data.put("barList", outlookBarList);
             data.put("id", userEntity.getId());
             data.put("userType", userEntity.getUserType());
+
+            HashSet<Integer> set = new HashSet<>();
+            set.add(1);
+            set.add(2);
+
+            if (ObjectUtils.isEmpty(userEntity.getUserType()) || !set.contains(userEntity.getUserType())) {
+                throw new AppException("当前用户不支持H5登录!");
+            }
+
             userEntity.setLoginTime(System.currentTimeMillis());
             userEntity.setToken(IdUtil.fastSimpleUUID());
             userEntity.setExpireTime(DateUtils.addCurrDate(7).getTime());
-            userEntity.setMenuUrl(generateMenuUrlCode(urls));
-
             String token = authTokenService.createToken(userEntity);
             data.put("token", token);
-            //设置token 和过期时间
-            //data.put("expiresTime", DateUtils.addCurrDate(7).getTime());
-            generateMenuUrlCode(urls);
-            //this.generateBlackCookie(request, response, loginName, urls);
             ret.put(KEY_RESULT_DATA, data);
             ret.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
             ret.put(KEY_RESULT_MSG, "用户登录系统成功!");
-            ret.put("resources", urls);
             return ret.toJSONString();
         } catch (Exception e) {
-            log.error("login error ", e);
-            if (userEntity == null) {
-                userEntity = new UserEntity();
-                userEntity.setLoginName(loginName);
-            }
+            log.error("h5 login error ", e);
             ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
             ret.put(KEY_RESULT_MSG, super.convertException(e));
             return ret.toJSONString();
@@ -136,78 +110,6 @@ public class ApiLoginController extends BaseJsonBodyController {
         super.removeCurrUser(request);
     }
 
-    @RequestMapping("index")
-    public String index() throws Exception {
-        JSONObject ret = new JSONObject();
-        IUser user = this.getCurUser();
-        if (user == null) {
-            return JSONObject.toJSONString(Rest.fail(ERROR_TOKEN_EXPIRED, ERROR_TOKEN_EXPIRED_CONTENT));
-        }
-        Set<String> urls = resourceService.findUrlSetByUserId(user.getId());
-        List<MenuEntity> outlookBarList = menuService.findTreeMenu(user, urls);
-        String currUserName = user.getRealName();
-        if (currUserName == null || currUserName.trim().length() == 0) {
-            currUserName = "管理员";
-        }
-        JSONObject data = new JSONObject();
-
-        String token = authTokenService.getToken(request);
-        data.put("token", token);
-        data.put("currUserName", currUserName);
-        data.put("barList", outlookBarList);
-        data.put("id", user.getId());
-        data.put("userType", user.getUserType());
-        ret.put(KEY_RESULT_DATA, data);
-        //this.generateBlackCookie(request, response, user.getLoginName(), urls);
-        ret.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
-        ret.put(KEY_RESULT_MSG, "用户登录系统成功!");
-        ret.put("resources", urls);
-        return ret.toJSONString();
-    }
-
-    private void generateBlackCookie(HttpServletRequest request, HttpServletResponse response, String loginName, Set<String> urls) {
-        try {
-            String cacheKey = RedisKey.KEY_MENU_CACHE + loginName;
-            String securityKey = GlobalSysInfo.getPropertyValue(SysConstains.PROP_COOKIE_SECURITY_KEY);
-            //应为Cookie会超长，所以改为仅存储key将值放入redis
-            //CookieService.setCookieForAuth(request, response, securityKey, null);
-            StringBuilder sb = new StringBuilder();
-            if (urls != null && urls.size() > 0) {
-                for (String url : urls) {
-                    int index = url.hashCode() & (Integer.MAX_VALUE - 1);
-                    sb.append(index).append(",");
-                }
-            }
-            String menuUrl = sb.toString();
-            menuUrl = AESUtil.encrypt(menuUrl, securityKey);
-            cacheService.set(cacheKey, menuUrl, 604800);
-            HttpUtil.setCookieValue(request, response, SysConstains.COOKIE_MENU, cacheKey, -1);
-
-        } catch (Throwable e) {
-
-        }
-    }
-
-
-    private String generateMenuUrlCode(Set<String> urls) {
-        try {
-            String securityKey = GlobalSysInfo.getPropertyValue(SysConstains.PROP_COOKIE_SECURITY_KEY);
-            StringBuilder sb = new StringBuilder();
-            if (urls != null && urls.size() > 0) {
-                for (String url : urls) {
-                    int index = url.hashCode() & (Integer.MAX_VALUE - 1);
-                    sb.append(index).append(",");
-                }
-            }
-            String menuUrl = sb.toString();
-            return AESUtil.encrypt(menuUrl, securityKey);
-        } catch (Throwable e) {
-            log.error("编码异常", e);
-            return null;
-
-        }
-    }
-
 
     @RequestMapping("parseToken")
     public IUser parseToken() throws Exception {

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/web/AppealApiController.java

@@ -55,7 +55,7 @@ public class AppealApiController extends BaseJsonBodyController {
     /**
      * 个人申诉绩效统计
      */
-    @PostMapping(value = "appeal/stat")
+    @PostMapping(value = "stat")
     public Rest<AppealStatInfo> appealStat() {
         String busiDesc = "H5个人申诉绩效统计";
         Rest<AppealStatInfo> rest = Rest.ok(busiDesc + " 【成功】");
@@ -72,7 +72,7 @@ public class AppealApiController extends BaseJsonBodyController {
     /**
      * 申诉列表
      */
-    @PostMapping(value = "appeal/list")
+    @PostMapping(value = "list")
     public Rest<List<PerformAttendAppealEntity>> performList(@RequestBody AppealReq appealReq) {
         String busiDesc = "个人申诉列表";
         Rest<List<PerformAttendAppealEntity>> rest = Rest.ok(busiDesc + " 【成功】");
@@ -95,8 +95,8 @@ public class AppealApiController extends BaseJsonBodyController {
     /**
      * 申诉详细
      */
-    @PostMapping(value = "appeal/detail")
-    public Rest<PerformAttendAppealEntity> performDetail(@RequestBody AppealReq appealReq) {
+    @PostMapping(value = "info")
+    public Rest<PerformAttendAppealEntity> performInfo(@RequestBody AppealReq appealReq) {
         String busiDesc = "个人申诉详细";
         Rest<PerformAttendAppealEntity> rest = Rest.ok(busiDesc + " 【成功】");
         try {
@@ -116,7 +116,7 @@ public class AppealApiController extends BaseJsonBodyController {
     /**
      * 申诉新增
      */
-    @PostMapping(value = "appeal/save")
+    @PostMapping(value = "save")
     public Rest<String> appealSave(@RequestBody PerformAttendAppealEntity appealEntity) {
         String busiDesc = "个人申诉新增";
         Rest<String> rest = Rest.ok(busiDesc + " 【成功】");