Merge branch 'dev' of ssh://10.10.100.21/source/smartschool-platform into dev

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/basic/controller/SchoolController.java

@@ -4,10 +4,7 @@ import com.usoftchina.smartschool.base.Result;
 import com.usoftchina.smartschool.school.basic.service.SchoolService;
 import com.usoftchina.smartschool.school.po.SysSchool;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * 学校信息
@@ -21,13 +18,13 @@ public class SchoolController {
     @Autowired
     private SchoolService schoolService;
 
-    @RequestMapping("/read/{id}")
+    @GetMapping("/read/{id}")
     public Result getFormData(@PathVariable("id") Long id) {
         SysSchool school = schoolService.getFormData(id);
         return Result.success(school);
     }
 
-    @RequestMapping("/save")
+    @PostMapping("/save")
     public Result saveFormData(@RequestBody SysSchool school) {
         schoolService.saveFormData(school);
         return Result.success();

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/basic/controller/StudentController.java

@@ -32,7 +32,7 @@ public class StudentController {
         return Result.success(student);
     }
 
-    @PostMapping("/read/{id}")
+    @GetMapping("/read/{id}")
     public Result getFormData(@PathVariable("id") Long id) {
          StudentForm formData = studentService.getFormData(id);
         return Result.success(formData);

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/basic/service/impl/ClassServiceImpl.java

@@ -7,13 +7,12 @@ import com.usoftchina.smartschool.school.dto.DocBaseDTO;
 import com.usoftchina.smartschool.school.exception.BizExceptionCode;
 import com.usoftchina.smartschool.school.mapper.SysClazzMapper;
 import com.usoftchina.smartschool.school.mapper.SysStudentMapper;
-import com.usoftchina.smartschool.school.po.ClassForm;
-import com.usoftchina.smartschool.school.po.SysClazz;
-import com.usoftchina.smartschool.school.po.SysStudent;
-import com.usoftchina.smartschool.school.po.TeacherDetail;
+import com.usoftchina.smartschool.school.po.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -52,8 +51,52 @@ public class ClassServiceImpl implements ClassService{
         }
         SysClazz clazz = formdata.getMain();
         List<SysStudent> students = formdata.getItems1();
+        Long id = clazz.getClazz_id();
+        Long school_id = BaseContextHolder.getSchoolId();
+        school_id = 1l;
 
-        return null;
+        //插入从表数据
+        List<SysStudent> insertDetails = new ArrayList<>();
+        //更新从表数据
+        List<SysStudent> updateDetails = new ArrayList<>();
+        //新增
+        if (StringUtils.isEmpty(id) || "0".equals(id.toString())) {
+            clazz.setClazz_status(1);
+            sysClazzMapper.insertSelective(clazz);
+            for (SysStudent student : students) {
+                student.setClazz_id(clazz.getClazz_id());
+                student.setStu_status(1);
+                student.setSchool_id(school_id);
+                sysStudentMapper.insertSelective(student);
+            }
+            return new DocBaseDTO(clazz.getClazz_id());
+        }
+        //更新
+        sysClazzMapper.updateByPrimaryKeySelective(clazz);
+        //更新明细
+        for (SysStudent detail : students) {
+            detail.setClazz_id(clazz.getClazz_id());
+            if (StringUtils.isEmpty(detail.getStu_id()) || "0".equals(detail.getStu_id().toString())) {
+                insertDetails.add(detail);
+            } else {
+                updateDetails.add(detail);
+            }
+        }
+        //插入从表
+        if (insertDetails.size() > 0) {
+            Long pr_id = null;
+            for (SysStudent item : insertDetails) {
+                item.setSchool_id(school_id);
+                sysStudentMapper.insertSelective(item);
+            }
+        }
+        //更新从表
+        if (updateDetails.size() > 0) {
+            for (SysStudent item : updateDetails) {
+                sysStudentMapper.updateByPrimaryKeySelective(item);
+            }
+        }
+        return new DocBaseDTO(clazz.getClazz_id());
     }
 
     @Override

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/basic/service/impl/StudentServiceImpl.java

@@ -110,7 +110,7 @@ public class StudentServiceImpl implements StudentService{
         //插入从表
         if (insertDetails.size() > 0) {
             Long pr_id = null;
-            for (SysParents item : items) {
+            for (SysParents item : insertDetails) {
                 item.setSchool_id(schoolid);
                 sysStudentMapper.insertparent(item);
                 pr_id = item.getParent_id();
@@ -120,12 +120,11 @@ public class StudentServiceImpl implements StudentService{
         //更新从表
         if (updateDetails.size() > 0) {
             sysStudentMapper.updateParents(updateDetails);
-            for (SysParents item : items) {
+            for (SysParents item : updateDetails) {
                 sysStudentMapper.updateRelation(item.getParent_id(), id, item.getPr_relation());
             }
         }
-
-        return null;
+        return new DocBaseDTO(id, null, "student");
     }
 
     @Override

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/po/OutInRecord.java

@@ -22,6 +22,46 @@ public class OutInRecord implements Serializable{
 
     private Long school_id;
 
+    private String stu_name;
+
+    private Integer stu_sex;
+
+    private String stu_number;
+
+    private String clazz_name;
+
+    public String getStu_name() {
+        return stu_name;
+    }
+
+    public void setStu_name(String stu_name) {
+        this.stu_name = stu_name;
+    }
+
+    public Integer getStu_sex() {
+        return stu_sex;
+    }
+
+    public void setStu_sex(Integer stu_sex) {
+        this.stu_sex = stu_sex;
+    }
+
+    public String getStu_number() {
+        return stu_number;
+    }
+
+    public void setStu_number(String stu_number) {
+        this.stu_number = stu_number;
+    }
+
+    public String getClazz_name() {
+        return clazz_name;
+    }
+
+    public void setClazz_name(String clazz_name) {
+        this.clazz_name = clazz_name;
+    }
+
     public Long getRecord_id() {
         return record_id;
     }

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/wxschool/basic/service/impl/WxOaLeaveServiceImpl.java

@@ -11,6 +11,7 @@ import com.usoftchina.smartschool.wechat.api.WxPushApi;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -71,11 +72,18 @@ public class WxOaLeaveServiceImpl implements WxOaLeaveService {
                 List<Long> longs = JSON.parseArray(lvNotifier, Long.class);
                 for (Long teacherId : longs) {
                     TeacherDO teacherDO = teacherMapper.get(teacherId);
+                    System.err.println("teacherDO===="+teacherDO);
                     SchoolDO schoolDO = wxSchoolMapper.get(teacherDO.getSchoolId());
+                    System.err.println("schoolDO======"+schoolDO);
                     String stuName = studentMapper.get(lvProposer).getStuName();
+                    System.err.println("stuName======"+stuName);
+                    SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+                    String date =format.format(leave.getStartDate())  + "至" + format.format(leave.getEndDate());
+                    System.err.println("date======"+date);
                     try {
-                        wxPushApi.wxPush(schoolDO.getSchoolAppid(), schoolDO.getSchoolSecret(), teacherDO.getOpenid(), "QC8H4hQd1Fh0wqaaE3mbAxvoBC6y-XkHctIe8Kx6gcA", "您好，您有一个来自家长的请假申请",stuName,startDate + "-" + endDate, lvDetails, "", "点击查看详情", "https://school-wechat.ubtob.com/leavedetail/teacher/" + leave.getLvId());
+                        wxPushApi.wxPush(schoolDO.getSchoolAppid(), schoolDO.getSchoolSecret(), teacherDO.getOpenid(), "QC8H4hQd1Fh0wqaaE3mbAxvoBC6y-XkHctIe8Kx6gcA", "您好，您有一个来自家长的请假申请",stuName,date, leave.getLvDetails(), "", "点击查看详情", "https://school-wechat.ubtob.com/leavedetail/teacher/" + leave.getLvId());
                     }catch (Exception e){
+                        System.err.println("e======="+e);
                         e.printStackTrace();
                     }
                 }

applications/school/school-server/src/main/resources/application.yml

@@ -21,18 +21,18 @@ spring:
   messages:
     basename: i18n/messages
     encoding: UTF-8
-#  rabbitmq:
-#    host: 10.10.100.166
-#    port: 3306
-#    virtual-host: school
-#    username: root
-#    password: select111***
-#  zipkin:
-#    sender:
-#      type: rabbit
-#    locator:
-#      discovery:
-#        enabled: true
+  rabbitmq:
+    host: 10.10.100.166
+    port: 3306
+    virtual-host: school
+    username: root
+    password: select111***
+  zipkin:
+    sender:
+      type: rabbit
+    locator:
+      discovery:
+        enabled: true
   sleuth:
     sampler:
       probability: 1.0

applications/school/school-server/src/main/resources/config/application-docker-cloud.yml

@@ -0,0 +1,23 @@
+eureka:
+  instance:
+    hostname: smartschool-school-server
+    prefer-ip-address: false
+  client:
+    serviceUrl:
+      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@smartschool-eureka-server:9500/eureka/
+spring:
+  redis:
+    host: 172.27.0.13
+    port: 6379
+    password: select111***
+  datasource:
+      driver-class-name: com.mysql.jdbc.Driver
+      url: jdbc:mysql://172.27.0.15:3306/smart_campus?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
+      username: root
+      password: select111***
+      hikari:
+        minimum-idle: 5
+        maximum-pool-size: 50
+        idle-timeout: 30000
+        max-lifetime: 1800000
+        connection-timeout: 30000

applications/school/school-server/src/main/resources/mapper/OutInRecordMapper.xml

@@ -10,6 +10,10 @@
     <result column="record_remarks" property="record_remarks" jdbcType="VARCHAR" />
     <result column="stu_id" property="stu_id" jdbcType="BIGINT" />
     <result column="school_id" property="school_id" jdbcType="BIGINT" />
+    <result column="clazz_name" property="clazz_name" jdbcType="VARCHAR"/>
+    <result column="stu_name" property="stu_name" jdbcType="VARCHAR"/>
+    <result column="stu_sex" property="stu_sex" jdbcType="INTEGER"/>
+    <result column="stu_number" property="stu_number" jdbcType="VARCHAR"/>
   </resultMap>
   <sql id="Base_Column_List" >
     record_id, record_name, out_date, in_date, record_details, record_remarks,
@@ -128,13 +132,14 @@
   </update>
 
   <select id="selectByConditon" resultMap="BaseResultMap">
-    select * from out_in_record
+    select * from out_in_record left join sys_student on out_in_record.stu_id = sys_student.stu_id
+    left join sys_clazz on sys_student.clazz_id = sys_clazz.clazz_id
     <where>
       <if test="con != null">
         ${con}
       </if>
       <if test="school_id != null">
-        and school_id=#{school_id}
+        and out_in_record.school_id=#{school_id}
       </if>
     </where>
     ORDER BY record_id DESC

applications/websocket/websocket-server/src/main/resources/config/application-docker-cloud.yml

@@ -0,0 +1,23 @@
+eureka:
+  instance:
+    hostname: smartschool-websocket-server
+    prefer-ip-address: false
+  client:
+    serviceUrl:
+      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@smartschool-eureka-server:9500/eureka/
+spring:
+  redis:
+    host: 172.27.0.13
+    port: 6379
+    password: select111***
+  datasource:
+      driver-class-name: com.mysql.jdbc.Driver
+      url: jdbc:mysql://172.27.0.15:3306/smart_campus?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
+      username: root
+      password: select111***
+      hikari:
+        minimum-idle: 5
+        maximum-pool-size: 50
+        idle-timeout: 30000
+        max-lifetime: 1800000
+        connection-timeout: 30000

applications/websocket/websocket-server/src/main/resources/config/application-docker-prod.yml

@@ -6,12 +6,6 @@ eureka:
     serviceUrl:
       defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@smartschool-eureka-server:9500/eureka/
 spring:
-  rabbitmq:
-    host: 10.10.100.166
-    port: 5672
-    virtual-host: school
-    username: school
-    password: select123***
   datasource:
     url: jdbc:mysql://10.10.100.166:3306/smart_campus?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
     username: root

applications/wechat/wechat-api/src/main/java/com/usoftchina/smartschool/wechat/api/WxPushApi.java

@@ -3,7 +3,6 @@ package com.usoftchina.smartschool.wechat.api;
 
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
 @FeignClient(name = "wechat-server")

applications/wechat/wechat-server/src/main/resources/config/application-docker-cloud.yml

@@ -0,0 +1,23 @@
+eureka:
+  instance:
+    hostname: smartschool-wechat-server
+    prefer-ip-address: false
+  client:
+    serviceUrl:
+      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@smartschool-eureka-server:9500/eureka/
+spring:
+  redis:
+    host: 172.27.0.13
+    port: 6379
+    password: select111***
+  datasource:
+      driver-class-name: com.mysql.jdbc.Driver
+      url: jdbc:mysql://172.27.0.15:3306/smart_campus?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
+      username: root
+      password: select111***
+      hikari:
+        minimum-idle: 5
+        maximum-pool-size: 50
+        idle-timeout: 30000
+        max-lifetime: 1800000
+        connection-timeout: 30000

applications/wechat/wechat-server/src/main/resources/config/application-docker-prod.yml

@@ -6,12 +6,6 @@ eureka:
     serviceUrl:
       defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@smartschool-eureka-server:9500/eureka/
 spring:
-  rabbitmq:
-    host: 10.10.100.166
-    port: 5672
-    virtual-host: school
-    username: school
-    password: select123***
   datasource:
     url: jdbc:mysql://10.10.100.166:3306/smart_campus?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
     username: root

base-servers/account/account-server/src/main/resources/config/application-docker-cloud.yml

@@ -0,0 +1,23 @@
+eureka:
+  instance:
+    hostname: smartschool-school-server
+    prefer-ip-address: false
+  client:
+    serviceUrl:
+      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@smartschool-eureka-server:9500/eureka/
+spring:
+  redis:
+    host: 172.27.0.13
+    port: 6379
+    password: select111***
+  datasource:
+      driver-class-name: com.mysql.jdbc.Driver
+      url: jdbc:mysql://172.27.0.15:3306/smart_campus?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
+      username: root
+      password: select111***
+      hikari:
+        minimum-idle: 5
+        maximum-pool-size: 50
+        idle-timeout: 30000
+        max-lifetime: 1800000
+        connection-timeout: 30000

base-servers/auth/auth-server/src/main/resources/config/application-docker-cloud.yml

@@ -0,0 +1,23 @@
+eureka:
+  instance:
+    hostname: smartschool-school-server
+    prefer-ip-address: false
+  client:
+    serviceUrl:
+      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@smartschool-eureka-server:9500/eureka/
+spring:
+  redis:
+    host: 172.27.0.13
+    port: 6379
+    password: select111***
+  datasource:
+      driver-class-name: com.mysql.jdbc.Driver
+      url: jdbc:mysql://172.27.0.15:3306/smart_campus?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
+      username: root
+      password: select111***
+      hikari:
+        minimum-idle: 5
+        maximum-pool-size: 50
+        idle-timeout: 30000
+        max-lifetime: 1800000
+        connection-timeout: 30000

base-servers/eureka-server/src/main/resources/config/application-docker-cloud.yml

@@ -0,0 +1,3 @@
+eureka:
+  instance:
+    hostname: smartschool-eureka-server

base-servers/gateway-server/src/main/resources/application.yml

@@ -11,18 +11,6 @@ spring:
     user:
       name: admin
       password: select111***
-  rabbitmq:
-    host: 10.10.100.166
-    port: 5672
-    virtual-host: school
-    username: school
-    password: select123***
-  zipkin:
-    sender:
-      type: rabbit
-    locator:
-      discovery:
-        enabled: true
   sleuth:
     sampler:
       probability: 1.0

base-servers/gateway-server/src/main/resources/config/application-docker-cloud.yml

@@ -0,0 +1,7 @@
+eureka:
+  instance:
+    hostname: smartschool-gateway-server
+    prefer-ip-address: false
+  client:
+    serviceUrl:
+      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@smartschool-eureka-server:9500/eureka/

base-servers/sms/sms-server/src/main/resources/config/application-docker-cloud.yml

@@ -0,0 +1,23 @@
+eureka:
+  instance:
+    hostname: smartschool-sms-server
+    prefer-ip-address: false
+  client:
+    serviceUrl:
+      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@smartschool-eureka-server:9500/eureka/
+spring:
+  redis:
+    host: 172.27.0.13
+    port: 6379
+    password: select111***
+  datasource:
+      driver-class-name: com.mysql.jdbc.Driver
+      url: jdbc:mysql://172.27.0.15:3306/smart_campus?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
+      username: root
+      password: select111***
+      hikari:
+        minimum-idle: 5
+        maximum-pool-size: 50
+        idle-timeout: 30000
+        max-lifetime: 1800000
+        connection-timeout: 30000

base-servers/sms/sms-server/src/main/resources/config/application-docker-dev.yml

@@ -1,6 +1,6 @@
 eureka:
   instance:
-    hostname: saas-sms-server-dev
+    hostname: smartschool-sms-server-dev
     prefer-ip-address: false
   client:
     serviceUrl:

base-servers/sms/sms-server/src/main/resources/config/application-docker-prod.yml

@@ -1,6 +1,6 @@
 eureka:
   instance:
-    hostname: saas-sms-server
+    hostname: smartschool-sms-server
     prefer-ip-address: false
   client:
     serviceUrl:

frontend/pc-web/app/view/Interaction/access/List.js

@@ -5,7 +5,7 @@ Ext.define('school.view.interaction.access.List', {
     extend: 'school.view.core.base.BasePanel',
     xtype: 'interaction-access-list',
 
-    dataUrl: '/api/interaction/access/list',
+    dataUrl: '/api/school/record/list',
     initComponent: function () {
         var me = this;
         Ext.apply(this, {
@@ -13,11 +13,6 @@ Ext.define('school.view.interaction.access.List', {
                 xtype: 'textfield',
                 name: 'keyword',
                 fieldLabel: '姓名'
-            }, {
-                xtype: 'condatefield',
-                name: 'term',
-                columnWidth: 0.5,
-                fieldLabel: '日期'
             }],
 
             caller: null,
@@ -46,14 +41,15 @@ Ext.define('school.view.interaction.access.List', {
                 hiddenTools: true,
                 toolBtns: [],
                 columns: [{
-                    text: '头像',
-                    dataIndex: 'portrait'
+                    text: 'id',
+                    dataIndex: 'record_id',
+                    hidden: true
                 }, {
-                    text: '姓名',
-                    dataIndex: 'name'
+                    text: '类型',
+                    dataIndex: 'record_name'
                 }, {
-                    text: '性别',
-                    dataIndex: 'sex'
+                    text: '学生',
+                    dataIndex: 'stu_id'
                 }, {
                     text: '班级',
                     dataIndex: 'class'
@@ -65,10 +61,18 @@ Ext.define('school.view.interaction.access.List', {
                     dataIndex: 'state'
                 }, {
                     text: '时间',
-                    dataIndex: 'time',
+                    dataIndex: 'in_date',
                     xtype: 'datecolumn',
-                    format: 'Y-m-d H:i'
-                }, ]
+                    format: 'Y-m-d H:i:s',
+                    width: 150,
+                    renderer: function(v, m, r) {
+                        if(r.get('record_name') == '入校记录') {
+                            return r.get('in_date');
+                        }else {
+                            return r.get('out_date');
+                        }
+                    }
+                }]
             },
         });
         this.callParent(arguments);

frontend/pc-web/app/view/Interaction/mailbox/List.js

@@ -5,7 +5,7 @@ Ext.define('school.view.interaction.mailbox.List', {
     extend: 'school.view.core.base.BasePanel',
     xtype: 'interaction-mailbox-list',
 
-    dataUrl: '/api/interaction/mailbox/list',
+    dataUrl: '/api/school/principal/list',
     initComponent: function() {
         var me = this;
         Ext.apply(this, {
@@ -13,21 +13,8 @@ Ext.define('school.view.interaction.mailbox.List', {
                 xtype: 'textfield',
                 name: 'keyword',
                 fieldLabel: '关键字'
-            }, {
-                xtype: 'condatefield',
-                name: 'term',
-                columnWidth: 0.5,
-                fieldLabel: '日期'
             }],
 
-            caller: null,
-            _formXtype: null,
-            _title: null,
-            _deleteUrl: null,
-            _batchOpenUrl: null,
-            _batchCloseUrl: null,
-            _batchDeleteUrl: null,
-        
             gridConfig: {
                 idField: null,
                 codeField: null,
@@ -55,30 +42,21 @@ Ext.define('school.view.interaction.mailbox.List', {
                     text: '删除'
                 }],
                 columns : [{
-                    text: '编号',
-                    dataIndex: 'code',
-                    width: 150
-                }, {
                     text: '标题',
-                    dataIndex: 'name',
+                    dataIndex: 'mailboxTitle',
                     width: 120
                 }, {
                     text: '内容',
-                    dataIndex: 'gender',
-                    width: 120
-                }, {
-                    text: '附件',
-                    dataIndex: 'grade'
+                    dataIndex: 'mailboxContext',
+                    width: 300
                 }, {
+                    xtype: 'datecolumn',
                     text: '日期',
-                    dataIndex: 'class'
+                    dataIndex: 'createDate'
                 }, {
                     text: '提出人',
-                    dataIndex: 'birth',
+                    dataIndex: 'mailboxCreator',
                     width: 120
-                }, {
-                    text: '处理',
-                    dataIndex: 'open'
                 }]
             },
         });

frontend/wechat-web/src/modules/hiPages/sendMeetting/SendMeet.js

@@ -245,12 +245,12 @@ class SendMeet extends Component {
                 this.state.meetPerson.push(node.userId)
             })
         }
+        var noticeT
         if(this.state.earlyTime == 0){
-            this.setState({
-                earlyTime:1
-            })
+            noticeT = new Date().getTime()
+        }else {
+            noticeT = startT - this.state.earlyTime * 1000 * 60
         }
-        var noticeT = startT - this.state.earlyTime * 1000 * 60
         console.log('noticeT', noticeT)
         console.log('noticeT', new Date(noticeT))