导入用户功能组织编号调整,删除机构校验

src/main/java/com/rf/psychological/device/dao/model/DeviceRelationEntity.java

@@ -1,42 +0,0 @@
-package com.rf.psychological.device.dao.model;
-
-import com.rf.psychological.base.model.BaseEntity;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-import javax.persistence.*;
-
-/**
- * @Author:zzf
- * @Date:2023/7/3:18:07
- * @Description:
- */
-
-@Entity
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-//@Table(name = "t_device_relation_info", uniqueConstraints = {
-//        @UniqueConstraint(name = "relation_unique_ecg",columnNames = "orange_mac,ecg_mac"),
-//        @UniqueConstraint(name = "relation_unique_pulse",columnNames = "orange_mac,pulse_mac"),
-//        @UniqueConstraint(name = "relation_unique_eeg",columnNames = "orange_mac,eeg_mac")
-//})
-@Table(name = "t_device_relation_info")
-@EqualsAndHashCode(callSuper=true)
-//@org.hibernate.annotations.Table(appliesTo = "t_device_relation_info", comment = "设备关联表")
-public class DeviceRelationEntity extends BaseEntity {
-
-    @Column(name = "orange_mac",columnDefinition = "varchar(50) not null  comment 'OrangePI device MAC '")
-    private String orangeMAC;
-
-    @Column(name = "ecg_mac",columnDefinition = "varchar(50) comment 'ECG device MAC '")
-    private String ecgMAC;
-
-    @Column(name = "pulse_mac",columnDefinition = "varchar(50) comment 'pulse device mac'")
-    private String pulseMAC;
-
-    @Column(name = "eeg_mac",columnDefinition = "varchar(50) comment 'eeg device mac '")
-    private String eegMac;
-}

src/main/java/com/rf/psychological/device/dao/repository/DeviceRelationRepository.java

@@ -1,13 +0,0 @@
-package com.rf.psychological.device.dao.repository;
-
-import com.rf.psychological.base.repository.BaseRepository;
-import com.rf.psychological.device.dao.model.DeviceRelationEntity;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
-
-import java.util.List;
-
-public interface DeviceRelationRepository extends BaseRepository<DeviceRelationEntity,String> {
-    @Query(value = "select id,orange_mac,ecg_mac,pulse_mac,eeg_mac from t_device_relation_info where orange_mac = :orangeMac",nativeQuery = true)
-    List<DeviceRelationEntity> findAllByOrangeMac(@Param("orangeMac") String orangeMac);
-}

src/main/java/com/rf/psychological/device/package-info.java

@@ -1,4 +0,0 @@
-package com.rf.psychological.device;
-/**
- * OrangePI 与 心电、脑电、脉搏设备的一一对应关系，群体环境查询本机MAC的绑定关系并连接
- */

src/main/java/com/rf/psychological/device/rest/DeviceRelationController.java

@@ -1,37 +0,0 @@
-package com.rf.psychological.device.rest;
-
-import com.alibaba.fastjson.JSONObject;
-import com.rf.psychological.base.rest.BaseController;
-import com.rf.psychological.device.dao.model.DeviceRelationEntity;
-import com.rf.psychological.device.service.DeviceRelationService;
-import com.rf.psychological.utils.Result;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * @Author:zzf
- * @Date:2023/7/3:18:03
- * @Description:OrangePI<--->ecg,pulse,eeg </>
- */
-@RequestMapping("/device")
-@RestController
-public class DeviceRelationController extends BaseController {
-
-    @Autowired
-    private DeviceRelationService relationService;
-
-    @GetMapping("/find/{orangeMac}")
-    public Result findRelations(@PathVariable String orangeMac){
-        List<DeviceRelationEntity> deviceRelationEntityList= this.relationService.findRelationsByOrangeMac(orangeMac);
-        return success(deviceRelationEntityList);
-    }
-
-    @PostMapping("/update")
-    public Result updateRelation(@RequestBody String json){
-        DeviceRelationEntity deviceRelation = JSONObject.toJavaObject(JSONObject.parseObject(json), DeviceRelationEntity.class);
-        this.relationService.save(deviceRelation);
-        return success();
-    }
-}

src/main/java/com/rf/psychological/device/service/DeviceRelationService.java

@@ -1,11 +0,0 @@
-package com.rf.psychological.device.service;
-
-import com.rf.psychological.device.dao.model.DeviceRelationEntity;
-
-import java.util.List;
-
-public interface DeviceRelationService {
-    List<DeviceRelationEntity> findRelationsByOrangeMac(String orangeMac);
-
-    void save(DeviceRelationEntity deviceRelation);
-}

src/main/java/com/rf/psychological/device/service/impl/DeviceRelationServiceImpl.java

@@ -1,30 +0,0 @@
-package com.rf.psychological.device.service.impl;
-
-import com.rf.psychological.device.dao.model.DeviceRelationEntity;
-import com.rf.psychological.device.dao.repository.DeviceRelationRepository;
-import com.rf.psychological.device.service.DeviceRelationService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * @Author:zzf
- * @Date:2023/7/3:18:04
- * @Description:
- */
-@Service
-public class DeviceRelationServiceImpl implements DeviceRelationService {
-
-    @Autowired
-    private DeviceRelationRepository repository;
-    @Override
-    public List<DeviceRelationEntity> findRelationsByOrangeMac(String orangeMac) {
-        return repository.findAllByOrangeMac(orangeMac);
-    }
-
-    @Override
-    public void save(DeviceRelationEntity deviceRelation) {
-        this.repository.save(deviceRelation);
-    }
-}

src/main/java/com/rf/psychological/institution/repository/InstitutionRepository.java

@@ -31,4 +31,7 @@ public interface InstitutionRepository extends BaseRepository<InstitutionEntity,
     //@Query(value = "select id,institution_name,institution_no,login_name,password from t_institution_info  where institution_no = :institutionNo", nativeQuery = true)
     //InstitutionEntity findByInstitutionNo(@Param("institutionNo") String institutionNo);
     InstitutionEntity findByInstitutionNo(String institutionNo);
+
+
+    void  deleteByInstitutionNo(String institutionNo);
 }

src/main/java/com/rf/psychological/institution/rest/InstitutionController.java

@@ -2,6 +2,8 @@ package com.rf.psychological.institution.rest;
 
 import com.alibaba.fastjson.JSONObject;
 import com.rf.psychological.base.rest.BaseController;
+import com.rf.psychological.structure.dao.model.StructureEntity;
+import com.rf.psychological.structure.service.StructureService;
 import com.rf.psychological.user.dao.model.UserEntity;
 import com.rf.psychological.dao.vo.SaveInstitutionVO;
 import com.rf.psychological.enums.UserRole;
@@ -22,6 +24,7 @@ import com.rf.psychological.scale.dao.model.UserRecordEntity;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
@@ -50,6 +53,9 @@ public class InstitutionController extends BaseController {
     @Autowired
     private UserRecordService userRecordService;
 
+    @Autowired
+    private StructureService structureService;
+
     /**
      * 获取机构列表
      *
@@ -345,12 +351,15 @@ public class InstitutionController extends BaseController {
 
     @SafetyProcess
     @OperationLogAnnotation
-    @GetMapping("/del/{institutionId}")
+    @GetMapping("/del/{institutionNo}")
     @ApiOperation(value = "删除机构")
-    public Result mineTest(@PathVariable String institutionId) {
-
+    public Result deleteInstitution( @PathVariable String institutionNo) {
         try {
-            this.institutionService.delInstitution(institutionId);
+            List<StructureEntity> list = structureService.findByInstitutionNo(institutionNo);
+            if (CollectionUtils.isNotEmpty(list)){
+                return fail("存在组织架构不允许删除");
+            }
+            this.institutionService.delInstitution(institutionNo);
             return success();
         } catch (Exception e) {
             e.printStackTrace();

src/main/java/com/rf/psychological/institution/service/impl/InstitutionServiceImpl.java

@@ -57,9 +57,9 @@ public class InstitutionServiceImpl implements InstitutionService {
     }
 
     @Override
-    @CacheEvict(value = "institution",allEntries = true)
-    public void delInstitution(String institutionId) {
-        this.institutionRepository.deleteById(institutionId);
+    @CacheEvict(value = "institution",key = "#institutionNo",allEntries = false)
+    public void delInstitution(String institutionNo) {
+        this.institutionRepository.deleteByInstitutionNo(institutionNo);
     }
 
     /**

src/main/java/com/rf/psychological/rest/ServerController.java

@@ -1008,7 +1008,6 @@ public class ServerController extends BaseController {
                     } else {
                         testResults += jsonObject.getString("name") + ":" + jsonObject.getJSONArray("value").getString(0) + ";";
                     }
-
                 }
             }
         }
@@ -1095,6 +1094,7 @@ public class ServerController extends BaseController {
                 tempUserDB.setInstitutionNo(institutionNo);
                 tempUserDB.setUserStatus(Constant.USER_STATUS_NORMAL);
                 tempUserDB.setGId(orgNum.toString());
+                tempUserDB.setStructureNo(orgNum.toString());
                 tempUserDB.setModel(mobile.toString());
                 tempUserDB.setRoleType(UserRole.COMMON.getType());
                 String idCardStr = idCard.toString();