工作单位管理

huimv-mobile-video/huimv-manager/src/main/java/com/huimv/manager/HuimvMobileManagerApplication.java

@@ -7,7 +7,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 /**
  * @author huimv
  */
-@EnableCaptcha
+//@EnableCaptcha
 @SpringBootApplication
 public class HuimvMobileManagerApplication {
 

huimv-mobile-video/huimv-manager/src/main/java/com/huimv/manager/constant/CommonConstant.java

@@ -0,0 +1,15 @@
+package com.huimv.manager.constant;
+
+public class CommonConstant {
+    //性别 0-女 1-男
+    public static final Integer GENDER_FEMALE = 0;
+    public static final Integer GENDER_MALE = 1;
+
+    //默认分页
+    //初始页面
+    public static final Integer PAGE_NUM = 1;
+    public static final String PAGE_NUM_STR = "1";
+    //一页数据量
+    public static final Integer PAGE_SIZE = 20;
+    public static final String PAGE_SIZE_STR = "20";
+}

huimv-mobile-video/huimv-manager/src/main/java/com/huimv/manager/interceptor/JWTInterceptor.java

@@ -37,7 +37,7 @@ public class JWTInterceptor implements HandlerInterceptor {
         // 获取token
         String token = request.getHeader("token");
         if (StringUtils.isEmpty(token)) {
-            response.sendError(403,"无token,请先登录!");
+            response.sendError(419,"无token,请先登录!");
             return false;
         }
 
@@ -61,7 +61,7 @@ public class JWTInterceptor implements HandlerInterceptor {
 
         int result = JwtUtils.verifyToken(claims);
         if (result >= 1) {
-            response.sendError(40101,"token已失效,请重新登录!");
+            response.sendError(419,"token已失效,请重新登录!");
             return false;
         }
         if (result == -1) {

huimv-mobile-video/huimv-manager/src/main/java/com/huimv/manager/modular/controller/MobileUnitManageController.java

@@ -0,0 +1,56 @@
+package com.huimv.manager.modular.controller;
+
+import com.huimv.manager.constant.CommonConstant;
+import com.huimv.manager.modular.entity.MobileUnit;
+import com.huimv.manager.modular.service.MobileUnitService;
+import com.huimv.manager.result.R;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @Author yinhao
+ * @Date 2021/4/20 11:19
+ * @Description
+ */
+
+@CrossOrigin
+@RestController
+@RequestMapping("/unitManage")
+public class MobileUnitManageController {
+
+    @Autowired
+    private MobileUnitService mobileUnitService;
+
+    @GetMapping("/findAll")
+    public R findAll(@RequestParam(value = "pageNum", defaultValue = CommonConstant.PAGE_NUM_STR) Integer pageNum,
+                     @RequestParam(value = "pageSize", defaultValue = CommonConstant.PAGE_SIZE_STR) Integer pageSize,
+                     String keyword) {
+        Page<MobileUnit> page;
+        if (StringUtils.isEmpty(keyword)) {
+            page = mobileUnitService.findAll(pageNum, pageSize);
+        } else {
+            page = mobileUnitService.findAllByKeyword(pageNum, pageSize, keyword);
+        }
+        return R.ok().put("page", page);
+    }
+
+    @PostMapping("/save")
+    public R save(MobileUnit mobileUnit) {
+        mobileUnitService.save(mobileUnit);
+        return R.ok("保存成功!");
+    }
+
+    @GetMapping("/deleteById")
+    public R deleteById(@RequestParam(value = "id") Integer id) {
+        mobileUnitService.deleteById(id);
+        return R.ok("删除成功!");
+    }
+
+    @PostMapping("/batchDeleteByIds")
+    public R batchDeleteByIds(Integer[] ids) {
+        mobileUnitService.batchDeleteByIds(ids);
+        return R.ok("批量删除成功!");
+    }
+}

huimv-mobile-video/huimv-manager/src/main/java/com/huimv/manager/modular/controller/MobileUserManageController.java

@@ -45,7 +45,7 @@ public class MobileUserManageController {
 
 
     @RequestMapping("/findAll")
-    public Result findAll(String name ,Integer pageNum , Integer pageSize){
+    public Result findAll(String name ,Integer pageNum, Integer pageSize){
         return service.findAll(name,pageNum,pageSize);
     }
 

huimv-mobile-video/huimv-manager/src/main/java/com/huimv/manager/modular/repository/MobileUnitRepository.java

@@ -1,9 +1,29 @@
 package com.huimv.manager.modular.repository;
 
 import com.huimv.manager.modular.entity.MobileUnit;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import javax.transaction.Transactional;
+import java.util.List;
 
 public interface MobileUnitRepository extends JpaRepository<MobileUnit, Integer>, JpaSpecificationExecutor<MobileUnit> {
 
+    Page<MobileUnit> findByFullNameLikeOrShortNameLike(String fullName, String shortName, Pageable pageable);
+
+
+    Page<MobileUnit> findByFullNameLike(String fullName,Pageable pageable);
+
+//    @Modifying
+//    @Transactional
+//    @Query(nativeQuery = true,value="delete from mobile_unit mu where mu.id in (:list) ")
+//    void batchDeleteByIds(@Param("list") List<Integer> list);
+
+
+    void deleteMobileUnitByIdIn(@Param("list") List<Integer> list);
 }

huimv-mobile-video/huimv-manager/src/main/java/com/huimv/manager/modular/repository/MobileUserRepository.java

@@ -14,6 +14,6 @@ public interface MobileUserRepository extends JpaRepository<MobileUser, Integer>
     MobileUser findByAccount(String account);
 
 
-    @Query(nativeQuery = true ,value = "select * from mobile_user where userName like %?1% limit ?2 , ?3")
+    @Query(nativeQuery = true ,value = "select * from mobile_user where user_name like %?1% limit ?2 , ?3")
     List<MobileUser> findAll(String name, Integer startPage, Integer pageSize);
 }

huimv-mobile-video/huimv-manager/src/main/java/com/huimv/manager/modular/service/MobileUnitService.java

@@ -0,0 +1,24 @@
+package com.huimv.manager.modular.service;
+
+import com.huimv.manager.modular.entity.MobileUnit;
+import org.springframework.data.domain.Page;
+
+/**
+ * @Author yinhao
+ * @Date 2021/4/20 11:31
+ * @Description
+ */
+public interface MobileUnitService {
+
+
+    Page<MobileUnit> findAll(Integer pageNum, Integer pageSize);
+
+    Page<MobileUnit> findAllByKeyword(Integer pageNum, Integer pageSize, String keyword);
+
+
+    void save(MobileUnit mobileUnit);
+
+    void deleteById(Integer id);
+
+    void batchDeleteByIds(Integer[] ids);
+}

huimv-mobile-video/huimv-manager/src/main/java/com/huimv/manager/modular/service/impl/MobileUnitServiceImpl.java

@@ -0,0 +1,70 @@
+package com.huimv.manager.modular.service.impl;
+
+import com.huimv.manager.modular.entity.MobileUnit;
+import com.huimv.manager.modular.repository.MobileUnitRepository;
+import com.huimv.manager.modular.service.MobileUnitService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @Author yinhao
+ * @Date 2021/4/20 12:00
+ * @Description
+ */
+@Service
+public class MobileUnitServiceImpl implements MobileUnitService {
+
+    @Autowired
+    private MobileUnitRepository mobileUnitRepository;
+
+
+    @Override
+    public Page<MobileUnit> findAll(Integer pageNum, Integer pageSize) {
+        return mobileUnitRepository.findAll(PageRequest.of(pageNum - 1, pageSize));
+    }
+
+    @Override
+    public Page<MobileUnit> findAllByKeyword(Integer pageNum, Integer pageSize, String keyword) {
+        String condition = "%" + keyword + "%";
+        return mobileUnitRepository.findByFullNameLikeOrShortNameLike(condition,condition, PageRequest.of(pageNum - 1, pageSize));
+    }
+
+    @Override
+    public void save(MobileUnit mobileUnit) {
+        boolean isAdd = null == mobileUnit.getId();
+        saveOrUpdateMobileUnit(isAdd, mobileUnit);
+    }
+
+    private void saveOrUpdateMobileUnit(boolean isAdd, MobileUnit mobileUnit) {
+        MobileUnit entity = new MobileUnit();
+        entity.setFullName(mobileUnit.getFullName());
+        entity.setShortName(mobileUnit.getShortName());
+        entity.setRemark(mobileUnit.getRemark());
+
+        if (isAdd) {
+            mobileUnitRepository.saveAndFlush(entity);
+            return;
+        }
+        entity.setId(mobileUnit.getId());
+        mobileUnitRepository.saveAndFlush(entity);
+    }
+
+    @Override
+    public void deleteById(Integer id) {
+        mobileUnitRepository.deleteById(id);
+    }
+
+    @Override
+    public void batchDeleteByIds(Integer[] ids) {
+        List<Integer> list = new ArrayList<>();
+        Collections.addAll(list, ids);
+//        mobileUnitRepository.batchDeleteByIds(list);
+        mobileUnitRepository.deleteMobileUnitByIdIn(list);
+    }
+}

huimv-mobile-video/huimv-manager/src/main/java/com/huimv/manager/modular/service/impl/MobileUserServiceImpl.java

@@ -6,13 +6,13 @@ import com.huimv.manager.enums.AuthExceptionEnum;
 import com.huimv.manager.exception.AuthException;
 import com.huimv.manager.exception.RRException;
 import com.huimv.manager.modular.entity.MobileUser;
-import com.huimv.manager.modular.entity.param.LoginParam;
 import com.huimv.manager.modular.repository.MobileUserRepository;
 import com.huimv.manager.modular.service.MobileUserService;
 import com.huimv.manager.result.R;
 import com.huimv.manager.result.Result;
 import com.huimv.manager.result.ResultStatus;
 import com.huimv.manager.util.JwtUtils;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.DigestUtils;
@@ -28,6 +28,7 @@ import java.util.Objects;
  * @Date 2021/4/19 18:11
  * @Description
  */
+@Slf4j
 @Service
 public class MobileUserServiceImpl implements MobileUserService {
 
@@ -120,6 +121,7 @@ public class MobileUserServiceImpl implements MobileUserService {
 
             return new Result(10000,ResultStatus.findSuccess,map);
         }catch (Exception e){
+            log.error(e.getMessage(),e);
             return new Result(10001,ResultStatus.findFailed,null);
         }
     }

huimv-mobile-video/huimv-manager/src/main/java/com/huimv/manager/result/Result.java

@@ -11,18 +11,18 @@ import lombok.Data;
  **/
 @Data
 public class Result {
-    private Integer  status;
+    private Integer  code;
     private String msg;
     private Object data;
 
-    public Result(Integer status, String msg, Object data) {
-        this.status = status;
+    public Result(Integer code, String msg, Object data) {
+        this.code = code;
         this.msg = msg;
         this.data = data;
     }
 
-    public Result(Integer status, String msg) {
-        this.status = status;
+    public Result(Integer code, String msg) {
+        this.code = code;
         this.msg = msg;
     }
 }