[zjm] 用户判断是否冻结

dev-file/src/main/java/com/tykj/dev/device/file/Controller/FileController.java

@@ -14,14 +14,12 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.multipart.MultipartRequest;
 
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
@@ -63,12 +61,10 @@ public class FileController {
     /**
      * 文件下载
      */
-    @ApiOperation(value = "文件下载")
-    @GetMapping("/download")
-    public void download(@RequestParam String url, @RequestParam String name, HttpServletResponse response, HttpServletRequest httpServletRequest) {
-
+    @PostMapping("/download")
+    public void download(@RequestBody FileRet fileRet, HttpServletResponse response, HttpServletRequest httpServletRequest){
+        useReportFIleService.download(fileRet.getFilePath(),fileRet.getName(),response,httpServletRequest);
     }
-
     @ApiOperation(value = "多文件上传")
     @PostMapping(value = "/many/upload")
     public ResponseEntity<List<FileRet>> manyFileUpload(HttpServletRequest request) {

dev-finalcheck/pom.xml

@@ -58,7 +58,6 @@
             <version>29.0-jre</version>
         </dependency>
 
-
     </dependencies>
 
 </project>
\ No newline at end of file

dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/SendBackService.java

@@ -12,7 +12,7 @@ import java.util.List;
 /**
  * <h4>Description : </h4>
  *
- * @Author czq
+ * @Author zjm
  * @Date 2020-08-15 18:15
  * @Version 1.0
  */
@@ -94,30 +94,36 @@ public interface SendBackService {
     ResponseEntity sendBackIn(Integer taskIdy, Integer userId, Integer type);
 
 
-    /*
-    查看业务详情，只显示表格和异常装备
+    /**
+     查看业务详情，只显示表格和异常装备
      */
     ResponseEntity bussiness(Integer task);
 
-    /*
-    查询清退单
+    /**
+     查询清退单
      */
     ResponseEntity getList(SendBackOutFormVo sendBackOutFormVo);
 
-    /*
-    造数据用
+    /**
+     造数据用
      */
     ResponseEntity save(SendBackBillDetail sendBackBillDetailEntity);
 
-    /*
-    查看此次清退的某个型号的装备
+    /**
+     查看此次清退的某个型号的装备
      */
     ResponseEntity getDeviceByModel(List<Integer> deviceList);
 
 
+    /**
+     * 保存入库单接口
+     */
     ResponseEntity saveSendBackBillDetailEntity(SendBackBillDetail sendBackBillDetailEntity);
 
 
+    /**
+     * 入库申请接口
+     */
     ResponseEntity sendBackInCheck(Integer taskId, SendBackOutVo sendBackOut, Integer userId);
 
     /**
@@ -133,5 +139,4 @@ public interface SendBackService {
      */
     ResponseEntity exceptionSelect(Integer task);
 
-
 }

dev-user/src/main/java/com/tykj/dev/device/user/config/MyUserDetailsServiceImpl.java

@@ -40,6 +40,9 @@ public class MyUserDetailsServiceImpl implements UserDetailsService {
         if (user == null) {
             throw new UsernameNotFoundException("用户名不正确");
         } else {
+            if (user.getIsDel()==1){
+                throw new UsernameNotFoundException("账号已冻结，请联系管理人员");
+            }
             List<UserRole> userRoles = userRoleService.findByUserId(user.getUserId());
             List<Integer> roleIds = new ArrayList<>();
             if (userRoles != null) {

dev-user/src/main/java/com/tykj/dev/device/user/subject/controller/UnitsController.java

 package com.tykj.dev.device.user.subject.controller;
 
 import com.tykj.dev.config.swagger.AutoDocument;
+import com.tykj.dev.device.user.subject.entity.SecurityUser;
 import com.tykj.dev.device.user.subject.service.UnitsService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
 
 /**
  * @author zjm
@@ -46,8 +49,8 @@ public class UnitsController {
 
     @GetMapping(value = "/area")
     @ApiOperation(value = "根据等级查询对应等级的单位集合", notes = "单位集合")
-    public ResponseEntity deleteUser() {
-        return ResponseEntity.ok(unitsService.findListAreaUnitsVo());
+    public ResponseEntity selectOrganizationUnits(@ApiIgnore @AuthenticationPrincipal SecurityUser securityUser) {
+        return ResponseEntity.ok(unitsService.findListAreaUnitsVo(securityUser));
     }
 
 

dev-user/src/main/java/com/tykj/dev/device/user/subject/service/MgrcertService.java

@@ -31,7 +31,6 @@ public interface MgrcertService {
 
     /**
      * 根据用户id查询用户对应对证书
-     *
      * @param userId 用户id
      * @return 证书信息
      */

dev-user/src/main/java/com/tykj/dev/device/user/subject/service/UnitsService.java

@@ -3,6 +3,7 @@ package com.tykj.dev.device.user.subject.service;
 import com.tykj.dev.device.user.base.ret.AreaVo;
 import com.tykj.dev.device.user.base.ret.UnitsTrainVo;
 import com.tykj.dev.device.user.base.ret.UnitsVo;
+import com.tykj.dev.device.user.subject.entity.SecurityUser;
 import com.tykj.dev.device.user.subject.entity.Units;
 
 import java.util.List;
@@ -20,7 +21,7 @@ public interface UnitsService extends PublicService<Units> {
 
     List<Units> findListById(Integer leven);
 
-    List<AreaVo> findListAreaUnitsVo();
+    List<AreaVo> findListAreaUnitsVo(SecurityUser securityUser);
 
     List<Units> findListlevenGreaterThanEqual(Integer leven);
 

dev-user/src/main/java/com/tykj/dev/device/user/subject/service/impl/UnitsServiceImpl.java

@@ -6,6 +6,7 @@ import com.tykj.dev.device.user.base.ret.UnitsVo;
 import com.tykj.dev.device.user.subject.dao.AreaDao;
 import com.tykj.dev.device.user.subject.dao.UnitsDao;
 import com.tykj.dev.device.user.subject.entity.Area;
+import com.tykj.dev.device.user.subject.entity.SecurityUser;
 import com.tykj.dev.device.user.subject.entity.Units;
 import com.tykj.dev.device.user.subject.service.UnitsService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,7 +30,6 @@ public class UnitsServiceImpl implements UnitsService {
     UnitsDao unitsDao;
     @Autowired
     AreaDao areaDao;
-
     @Override
     public Units findById(Integer unitId) {
         Optional<Units> unit = unitsDao.findById(unitId);
@@ -42,23 +42,53 @@ public class UnitsServiceImpl implements UnitsService {
     }
 
     @Override
-    public List<AreaVo> findListAreaUnitsVo() {
-        List<AreaVo> areaVos = new ArrayList<>();
-
-        List<Area> list = areaDao.findAll();
-        int i = 0;
-
-        for (Area area : list) {
-            AreaVo areaVo = area.toVo();
+    public List<AreaVo> findListAreaUnitsVo(SecurityUser securityUser) {
+        List<AreaVo> areaVos=new ArrayList<>();
+        //查询当前登入用户所属单位 的区域
+        Integer areaId=securityUser.getCurrentUserInfo().getUnits().getAreaId();
+        Area belongsArea= areaDao.findById(areaId).get();
+        if (belongsArea.getType()==1){
+            int i=10000;
+            AreaVo areaVo = belongsArea.toVo();
             areaVo.setFrontEnd(i++);
-            List<UnitsVo> unitsList = unitsDao.findAllByAreaId(area.getId()).stream().map(Units::toVo).collect(Collectors.toList());
-
+            List<UnitsVo> unitsList = unitsDao.findAllByAreaId(belongsArea.getId()).stream().map(Units::toVo).collect(Collectors.toList());
+            for (UnitsVo unitsVo : unitsList) {
+                unitsVo.setFrontEnd(i++);
+            }
+            areaVo.setUnits(unitsList);
+            areaVos.add(areaVo);
+        }
+        List<Area> areas= areaDao.findAllByFatherId(areaId);
+        if (areas.size()!=0) {
+            areas.forEach(area -> {
+                int i = 1;
+                AreaVo areaVo = area.toVo();
+                areaVo.setFrontEnd(i++);
+                List<UnitsVo> unitsList = unitsDao.findAllByAreaId(area.getId()).stream().map(Units::toVo).collect(Collectors.toList());
+                List<Area> countys = areaDao.findAllByFatherId(areaId);
+                if (countys != null && countys.size() != 0) {
+                    List<UnitsVo> countyUnitsList = unitsDao.findAllByAreaId(area.getId()).stream().map(Units::toVo).collect(Collectors.toList());
+                    unitsList.addAll(countyUnitsList);
+                }
+                for (UnitsVo unitsVo : unitsList) {
+                    unitsVo.setFrontEnd(i++);
+                }
+                areaVo.setUnits(unitsList);
+                areaVos.add(areaVo);
+            });
+        }else {
+            int i=0;
+            AreaVo areaVo = belongsArea.toVo();
+            areaVo.setFrontEnd(i++);
+            List<UnitsVo> unitsList = unitsDao.findAllByAreaId(belongsArea.getId()).stream().map(Units::toVo).collect(Collectors.toList());
             for (UnitsVo unitsVo : unitsList) {
                 unitsVo.setFrontEnd(i++);
             }
             areaVo.setUnits(unitsList);
             areaVos.add(areaVo);
         }
+        //查询区域下所有的区域
+        //根据区域查看
 
         return areaVos;
     }
@@ -70,17 +100,17 @@ public class UnitsServiceImpl implements UnitsService {
 
     @Override
     public List<Integer> findListSubordinateId(Integer unitsId) {
-        Integer areaId = unitsDao.findById(unitsId).get().getAreaId();
-        List<Integer> areaIds = areaDao.findAllByFatherId(areaId).stream().map(Area::getId).collect(Collectors.toList());
+      Integer areaId = unitsDao.findById(unitsId).get().getAreaId();
+      List<Integer> areaIds=areaDao.findAllByFatherId(areaId).stream().map(Area::getId).collect(Collectors.toList());
         return unitsDao.findAllByAreaIdIn(areaIds).stream().map(Units::getUnitId).collect(Collectors.toList());
     }
 
     @Override
     public List<UnitsVo> findListVoSubordinateAreaId(Integer areaId) {
-        List<UnitsVo> unitsVos = new ArrayList<>();
-        List<Integer> areaIds = areaDao.findAllByFatherId(areaId).stream().map(Area::getId).collect(Collectors.toList());
+        List<UnitsVo> unitsVos=new ArrayList<>();
+        List<Integer> areaIds=areaDao.findAllByFatherId(areaId).stream().map(Area::getId).collect(Collectors.toList());
         if (areaIds.size() != 0) {
-            unitsVos = unitsDao.findAllByAreaIdIn(areaIds).stream().map(Units::toVo).collect(Collectors.toList());
+            unitsVos= unitsDao.findAllByAreaIdIn(areaIds).stream().map(Units::toVo).collect(Collectors.toList());
         }
         return unitsVos;
     }
@@ -93,20 +123,20 @@ public class UnitsServiceImpl implements UnitsService {
     @Override
     public List<UnitsTrainVo> findListUnitsTrainVo(Integer unitsId) {
         Integer areaId = unitsDao.findById(unitsId).get().getAreaId();
-        List<Integer> areaIds = areaDao.findAllByFatherId(areaId).stream().map(Area::getId).collect(Collectors.toList());
+        List<Integer> areaIds=areaDao.findAllByFatherId(areaId).stream().map(Area::getId).collect(Collectors.toList());
         return unitsDao.findAllByAreaIdIn(areaIds).stream().map(Units::toUnitsTrainVo).collect(Collectors.toList());
     }
 
     @Override
     public List<Integer> findSuperiorByunitsId(Integer unitsId) {
-        Area area = areaDao.findById(this.findById(unitsId).getAreaId()).get();
+        Area area= areaDao.findById(this.findById(unitsId).getAreaId()).get();
         return unitsDao.findAllByAreaId(area.getFatherId()).stream().map(Units::getUnitId).collect(Collectors.toList());
     }
 
     @Override
     public Units findByAreaId(Integer unitsId) {
 
-        return unitsDao.findAllByAreaId(areaDao.findById(findById(unitsId).getAreaId()).get().getFatherId()).get(0);
+        return  unitsDao.findAllByAreaId(areaDao.findById(findById(unitsId).getAreaId()).get().getFatherId()).get(0);
 
     }
 

dev-user/src/main/java/com/tykj/dev/device/user/subject/service/impl/UserServiceImpl.java

@@ -39,6 +39,10 @@ public class UserServiceImpl implements UserService {
     public User save(User user) {
         String encode = bCryptPasswordEncoder.encode("qwer1234");
         user.setPassword(encode);
+        Units units = unitsService.findById(user.getUnitsId());
+
+
+
         return userDao.save(user);
     }