更改机构用户中心获取并更新学校方式为按代码 和dev_v2.1.0一致

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/result/CampusResult.java

@@ -0,0 +1,94 @@
+package com.qmth.distributed.print.business.bean.result;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @Description: 校区查询结果
+ * @Author: CaoZixuan
+ * @Date: 2021-08-03
+ */
+public class CampusResult {
+
+    @JsonSerialize(using = ToStringSerializer.class)
+    @ApiModelProperty(value = "校区id")
+    private Long campusId;
+
+    @ApiModelProperty(value = "校区名称")
+    private String campusName;
+
+    @ApiModelProperty(value = "校区编码")
+    private String campusCode;
+
+    @JsonSerialize(using = ToStringSerializer.class)
+    @ApiModelProperty(value = "印刷室id")
+    private Long printRoomId;
+
+    @ApiModelProperty(value = "印刷室")
+    private String printRoomName;
+
+    @JsonSerialize(using = ToStringSerializer.class)
+    @ApiModelProperty(value = "创建时间")
+    private Long createTime;
+
+    @JsonSerialize(using = ToStringSerializer.class)
+    @ApiModelProperty(value = "创建人id")
+    private Long createId;
+
+    public Long getCampusId() {
+        return campusId;
+    }
+
+    public void setCampusId(Long campusId) {
+        this.campusId = campusId;
+    }
+
+    public String getCampusName() {
+        return campusName;
+    }
+
+    public void setCampusName(String campusName) {
+        this.campusName = campusName;
+    }
+
+    public String getCampusCode() {
+        return campusCode;
+    }
+
+    public void setCampusCode(String campusCode) {
+        this.campusCode = campusCode;
+    }
+
+    public Long getPrintRoomId() {
+        return printRoomId;
+    }
+
+    public void setPrintRoomId(Long printRoomId) {
+        this.printRoomId = printRoomId;
+    }
+
+    public String getPrintRoomName() {
+        return printRoomName;
+    }
+
+    public void setPrintRoomName(String printRoomName) {
+        this.printRoomName = printRoomName;
+    }
+
+    public Long getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Long createTime) {
+        this.createTime = createTime;
+    }
+
+    public Long getCreateId() {
+        return createId;
+    }
+
+    public void setCreateId(Long createId) {
+        this.createId = createId;
+    }
+}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/BasicCampusService.java

@@ -13,4 +13,5 @@ import com.qmth.distributed.print.business.entity.BasicCampus;
  */
 public interface BasicCampusService extends IService<BasicCampus> {
 
+
 }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/OrgCenterDataDisposeServiceImpl.java

@@ -37,28 +37,12 @@ public class OrgCenterDataDisposeServiceImpl implements OrgCenterDataDisposeServ
         if (Objects.isNull(result) || result.size() == 0) {
             return;
         }
-        // 删除原有学校
+        // 禁用原有学校
         List<BasicSchool> basicSchoolList = basicSchoolService.list();
-        List<Long> oldIdList = basicSchoolList.stream().map(BasicSchool::getId).collect(Collectors.toList());
-        List<Long> newIdList = result.stream().map(e -> SystemConstant.convertIdToLong(String.valueOf(e.get("id")))).collect(Collectors.toList());
-        List<Long> needDisable = new ArrayList<>();
-        List<Long> needDelete = new ArrayList<>();
-        for (Long aLong : oldIdList) {
-            if (!newIdList.contains(aLong)) {
-                needDisable.add(aLong);
-            } else {
-                needDelete.add(aLong);
-            }
-        }
-        if (needDisable.size() > 0) {
-            basicSchoolService.update(new UpdateWrapper<BasicSchool>().lambda().set(BasicSchool::getEnable, false).in(BasicSchool::getId, needDisable));
-        }
-        if (needDelete.size() > 0) {
-            basicSchoolService.remove(new QueryWrapper<BasicSchool>().lambda().in(BasicSchool::getId, needDelete));
-        }
+        basicSchoolService.update(new UpdateWrapper<BasicSchool>().lambda().set(BasicSchool::getEnable, false).gt(BasicSchool::getId,0));
+
 
         for (Map map : result) {
-            Long id = SystemConstant.convertIdToLong(String.valueOf(map.get("id")));
             String code = String.valueOf(map.get("code"));
             String name = String.valueOf(map.get("name"));
             String logo = String.valueOf(map.get("logo"));
@@ -67,20 +51,30 @@ public class OrgCenterDataDisposeServiceImpl implements OrgCenterDataDisposeServ
             Map typeMap = JSONObject.parseObject(String.valueOf(map.get("type")));
             String typeCode = String.valueOf(typeMap.get("code"));
             String typeName = String.valueOf(typeMap.get("name"));
-            if (!Arrays.stream(OrgCenterTypeEnum.values()).map(OrgCenterTypeEnum::getTypeCode).collect(Collectors.toList()).contains(typeCode)) {
-                throw ExceptionResultEnum.ERROR.exception("机构类型在枚举中不存在 + typeCode = " + typeCode);
+
+            List<BasicSchool> oldSchoolList = basicSchoolList.stream().filter(e -> e.getCode().equals(code)).collect(Collectors.toList());
+            if (oldSchoolList.size() > 1){
+                throw ExceptionResultEnum.ERROR.exception("学校信息异常");
             }
-            if (!OrgCenterTypeEnum.PARTNER.getTypeCode().equals(typeCode)) {
-                BasicSchool school = new BasicSchool();
-                school.setId(id);
-                school.setCode(code);
-                school.setName(name);
-                school.setEnable(true);
-                school.setAccessKey(accessKey);
-                school.setAccessSecret(accessSecret);
-                school.setLogo(logo);
-                basicSchoolService.save(school);
+            Long schoolId;
+            if (oldSchoolList.size() > 0){
+                // 系统中原先就有该学校 -》 更新
+                BasicSchool oldSchool = oldSchoolList.get(0);
+                schoolId = oldSchool.getId();
+            }else {
+                // 系统中没有该学校 -》 新增 (系统中如果id被占用会报错)
+                schoolId = SystemConstant.getDbUuid();
             }
+
+            BasicSchool school = new BasicSchool();
+            school.setId(schoolId);
+            school.setCode(code);
+            school.setName(name);
+            school.setEnable(true);
+            school.setAccessKey(accessKey);
+            school.setAccessSecret(accessSecret);
+            school.setLogo(logo);
+            basicSchoolService.saveOrUpdate(school);
         }
     }
 }