koul 7 лет назад
Родитель
Сommit
12dc215518
100 измененных файлов с 3335 добавлено и 20 удалено
  1. 37 4
      applications/wechat/wechat-server/pom.xml
  2. 16 3
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/WechatApplication.java
  3. 94 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/config/CodeConfig.java
  4. 19 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/config/SchoolConfig.java
  5. 86 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/config/WXConfig.java
  6. 17 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/config/WebConfigurer.java
  7. 19 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/config/WebMvcConfigurer.java
  8. 109 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/controller/ClazzAlbumController.java
  9. 127 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/controller/ClazzController.java
  10. 50 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/controller/ClazzCurriculumController.java
  11. 61 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/controller/ClazzPictureController.java
  12. 42 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/controller/FileController.java
  13. 144 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/controller/MeetingController.java
  14. 153 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/controller/NotifyController.java
  15. 105 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/controller/OaApproveController.java
  16. 116 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/controller/OaLeaveController.java
  17. 61 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/controller/OutInRecordController.java
  18. 171 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/controller/PrincipalMailboxController.java
  19. 36 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/controller/SchoolController.java
  20. 45 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/controller/StuScoreController.java
  21. 133 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/controller/TaskNotifyController.java
  22. 213 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/controller/UserController.java
  23. 169 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/controller/VoteController.java
  24. 4 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/ClazzAlbumDO.java
  25. 6 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/ClazzCurriculumDO.java
  26. 4 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/ClazzDO.java
  27. 0 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/ClazzPictureDO.java
  28. 0 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/ContentDO.java
  29. 0 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/FileDO.java
  30. 0 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/GradeDO.java
  31. 0 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/LogDO.java
  32. 12 2
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/MeetingDO.java
  33. 2 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/MeetingRecordsDO.java
  34. 0 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/MenuDO.java
  35. 0 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/MenuRoleDO.java
  36. 15 1
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/NotifyDO.java
  37. 5 1
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/NotifyrecordsDO.java
  38. 7 1
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/OaApproveDO.java
  39. 0 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/OaArticlesDO.java
  40. 5 1
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/OaLeaveDO.java
  41. 2 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/OaLeaveReplyDO.java
  42. 0 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/OutInRecordDO.java
  43. 1 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/ParentsDO.java
  44. 0 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/ParentsStuDO.java
  45. 0 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/PayCardDO.java
  46. 0 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/PayRanksDO.java
  47. 0 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/PaymentDO.java
  48. 0 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/PaymentrecordsDO.java
  49. 2 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/PrincipalMailboxDO.java
  50. 0 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/PrincipalReplyDO.java
  51. 0 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/RoleDO.java
  52. 2 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/SchoolDO.java
  53. 2 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/StuScoreDO.java
  54. 2 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/StudentDO.java
  55. 0 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/SubjectDO.java
  56. 5 1
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/TaskNotifyDO.java
  57. 2 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/TaskReplyDO.java
  58. 0 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/TeacherClazzDO.java
  59. 1 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/TeacherDO.java
  60. 0 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/UserDO.java
  61. 0 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/UserRoleDO.java
  62. 9 3
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/VoteDO.java
  63. 5 1
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/VoteElectDO.java
  64. 5 1
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/VoteOptionsDO.java
  65. 4 1
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/VoteTopicDO.java
  66. 38 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/mapper/ClazzAlbumMapper.java
  67. 27 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/mapper/ClazzCurriculumMapper.java
  68. 34 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/mapper/ClazzMapper.java
  69. 37 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/mapper/ClazzPictureMapper.java
  70. 32 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/mapper/ContentMapper.java
  71. 34 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/mapper/FileMapper.java
  72. 32 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/mapper/GradeMapper.java
  73. 32 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/mapper/LogMapper.java
  74. 37 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/mapper/MeetingMapper.java
  75. 32 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/mapper/MeetingRecordsMapper.java
  76. 32 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/mapper/MenuMapper.java
  77. 32 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/mapper/MenuRoleMapper.java
  78. 41 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/mapper/NotifyMapper.java
  79. 32 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/mapper/NotifyrecordsMapper.java
  80. 47 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/mapper/OaApproveMapper.java
  81. 34 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/mapper/OaArticlesMapper.java
  82. 41 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/mapper/OaLeaveMapper.java
  83. 34 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/mapper/OaLeaveReplyMapper.java
  84. 35 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/mapper/OutInRecordMapper.java
  85. 37 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/mapper/ParentsMapper.java
  86. 34 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/mapper/ParentsStuMapper.java
  87. 32 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/mapper/PayCardMapper.java
  88. 32 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/mapper/PayRanksMapper.java
  89. 32 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/mapper/PaymentMapper.java
  90. 32 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/mapper/PaymentrecordsMapper.java
  91. 37 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/mapper/PrincipalMailboxMapper.java
  92. 34 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/mapper/PrincipalReplyMapper.java
  93. 32 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/mapper/RoleMapper.java
  94. 32 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/mapper/SchoolMapper.java
  95. 38 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/mapper/StuScoreMapper.java
  96. 37 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/mapper/StudentMapper.java
  97. 32 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/mapper/SubjectMapper.java
  98. 38 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/mapper/TaskNotifyMapper.java
  99. 34 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/mapper/TaskReplyMapper.java
  100. 34 0
      applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/mapper/TeacherClazzMapper.java

+ 37 - 4
applications/wechat/wechat-server/pom.xml

@@ -12,6 +12,43 @@
     <artifactId>wechat-server</artifactId>
 
     <dependencies>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-httpclient</groupId>
+            <artifactId>commons-httpclient</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.aliyun</groupId>
+            <artifactId>aliyun-java-sdk-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.aliyun</groupId>
+            <artifactId>aliyun-java-sdk-dysmsapi</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jdom</groupId>
+            <artifactId>jdom</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.github.kevinsawicki</groupId>
+            <artifactId>http-request</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>net.sf.json-lib</groupId>
+            <artifactId>json-lib</artifactId>
+            <classifier>jdk15</classifier>
+        </dependency>
         <dependency>
             <groupId>com.usoftchina.smartschool</groupId>
             <artifactId>server-starter</artifactId>
@@ -52,10 +89,6 @@
             <artifactId>logstash-logback-encoder</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.github.pagehelper</groupId>
             <artifactId>pagehelper-spring-boot-starter</artifactId>

+ 16 - 3
applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/WechatApplication.java

@@ -1,23 +1,36 @@
 package com.usoftchina.smartschool.wechat;
 
+
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.web.servlet.ServletComponentScan;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+import org.springframework.web.client.RestTemplate;
 
 /**
  * @author: guq
  * @create: 2019-01-16 20:50
  **/
 @SpringBootApplication
-@MapperScan("com.usoftchina.smartschool.mapper")
+@EnableTransactionManagement
+@ServletComponentScan
+@MapperScan("com.usoftchina.smartschool.wechat.mapper")
 @EnableEurekaClient
-@EnableFeignClients("com.usoftchina.smartschool")
-@ComponentScan(basePackages = {"com.usoftchina.smartschool"})
+@EnableFeignClients("com.usoftchina.smartschool.wechat")
+@ComponentScan(basePackages = {"com.usoftchina.smartschool.wechat"})
 public class WechatApplication {
     public static void main(String[] args) {
         SpringApplication.run(WechatApplication.class, args);
     }
+
+    @Bean
+    public RestTemplate restTemplate(){
+        return new RestTemplate();
+    }
 }

+ 94 - 0
applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/config/CodeConfig.java

@@ -0,0 +1,94 @@
+package com.usoftchina.smartschool.wechat.config;
+
+public class CodeConfig {
+    private static String signName = "登录验证";
+    private static String templateCode = "SMS_89985003";
+    private static Integer codeNumber = 6;
+    private static String reqionId = "cn-hangzhou";
+    private static String accessKeyId = "LTAIf3jgw6hzVhw0";
+    private static String secret = "tvR2pvO3HtB7gay7EXFgg0SEp2rXon";
+    private static String endpointName = "cn-hangzhou";
+    private static String product = "Dysmsapi";
+    private static String domain = "dysmsapi.aliyuncs.com";
+    private static Integer sessionDate = 600000;
+
+    public static String getSignName() {
+        return signName;
+    }
+
+    public static void setSignName(String signName) {
+        CodeConfig.signName = signName;
+    }
+
+    public static String getTemplateCode() {
+        return templateCode;
+    }
+
+    public static void setTemplateCode(String templateCode) {
+        CodeConfig.templateCode = templateCode;
+    }
+
+    public static Integer getCodeNumber() {
+        return codeNumber;
+    }
+
+    public static void setCodeNumber(Integer codeNumber) {
+        CodeConfig.codeNumber = codeNumber;
+    }
+
+    public static String getReqionId() {
+        return reqionId;
+    }
+
+    public static void setReqionId(String reqionId) {
+        CodeConfig.reqionId = reqionId;
+    }
+
+    public static String getAccessKeyId() {
+        return accessKeyId;
+    }
+
+    public static void setAccessKeyId(String accessKeyId) {
+        CodeConfig.accessKeyId = accessKeyId;
+    }
+
+    public static String getSecret() {
+        return secret;
+    }
+
+    public static void setSecret(String secret) {
+        CodeConfig.secret = secret;
+    }
+
+    public static String getEndpointName() {
+        return endpointName;
+    }
+
+    public static void setEndpointName(String endpointName) {
+        CodeConfig.endpointName = endpointName;
+    }
+
+    public static String getProduct() {
+        return product;
+    }
+
+    public static void setProduct(String product) {
+        CodeConfig.product = product;
+    }
+
+    public static String getDomain() {
+        return domain;
+    }
+
+    public static void setDomain(String domain) {
+        CodeConfig.domain = domain;
+    }
+
+    public static Integer getSessionDate() {
+        return sessionDate;
+    }
+
+    public static void setSessionDate(Integer sessionDate) {
+        CodeConfig.sessionDate = sessionDate;
+    }
+}

+ 19 - 0
applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/config/SchoolConfig.java

@@ -0,0 +1,19 @@
+package com.usoftchina.smartschool.wechat.config;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+@Component
+@ConfigurationProperties(prefix="school")
+public class SchoolConfig {
+	//上传路径
+	private String uploadPath;
+
+	public String getUploadPath() {
+		return uploadPath;
+	}
+
+	public void setUploadPath(String uploadPath) {
+		this.uploadPath = uploadPath;
+	}
+}

+ 86 - 0
applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/config/WXConfig.java

@@ -0,0 +1,86 @@
+package com.usoftchina.smartschool.wechat.config;
+
+public class WXConfig {
+   private static String key = "F5B4E8E74FB0A9711CE1BFE45622510C";
+  
+   //private static String appID = "wx172657dad29220cc";
+   // private static String appID = "wx172657dad29220cc";
+    private static final String appID="wxbc1f8607137d3b8a";
+
+
+
+  
+   private static String mch_id = "1495003642";
+   //private static String secret = "462dc751130ccde1b6f6e35585e7b775";
+   // private static String secret = "4b0fc97b0b6f717972971297b78a7c5c";
+   private static final String  secret ="cadf13c4e21c2c122cb2341b341e5c22";
+  
+   private static String Trade_type = "JSAPI";
+   private static String body = "果蔬-测试";
+   private static String notify_url = "https://www.akuiguoshu.com/fruits/wxpay/wxPayNotify";
+   //private static String notify_url = "http://nf20718343.iask.in:32004/fruits/wxpay/wxPayNotify";
+   private static String cert_path = "D:/apiclient_cert.p12";
+  
+  public static String getCert_path() {
+     return cert_path;
+  }
+  
+  public static void setCert_path(String cert_path) {
+     cert_path = cert_path;
+  }
+  
+  public static String getNotify_url() {
+     return notify_url;
+  }
+  
+  public static void setNotify_url(String notify_url) {
+     notify_url = notify_url;
+  }
+  
+  public static String getBody() {
+     return body;
+  }
+  
+  public static void setBody(String body) {
+     body = body;
+  }
+  
+  public static String getTrade_type() {
+     return Trade_type;
+  }
+  
+  public static void setTrade_type(String trade_type) {
+     Trade_type = trade_type;
+  }
+  public static String getSecret() {
+     return secret;
+  }
+  
+  public static void setSecret(String secret) {
+     secret = secret;
+  }
+  
+  public static String getKey() {
+     return key;
+  }
+  
+  public static void setKey(String key) {
+     key = key;
+  }
+  
+  public static String getAppID() {
+     return appID;
+  }
+  
+  public static void setAppID(String appID) {
+     appID = appID;
+  }
+  
+  public static String getMch_id() {
+     return mch_id;
+  }
+  
+  public static void setMch_id(String mch_id) {
+     mch_id = mch_id;
+  }
+}

+ 17 - 0
applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/config/WebConfigurer.java

@@ -0,0 +1,17 @@
+package com.usoftchina.smartschool.wechat.config;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+
+@Component
+class WebConfigurer extends WebMvcConfigurer {
+    @Autowired
+    SchoolConfig schoolConfig;
+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+        //静态资源加载相对路径
+        registry.addResourceHandler("/files/**").addResourceLocations("file:///"+schoolConfig.getUploadPath());
+    }
+
+}

+ 19 - 0
applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/config/WebMvcConfigurer.java

@@ -0,0 +1,19 @@
+package com.usoftchina.smartschool.wechat.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+
+@Configuration
+public class WebMvcConfigurer extends WebMvcConfigurerAdapter {
+	
+	//解决跨域问题
+    @Override
+    public void addCorsMappings(CorsRegistry registry) {
+    	   registry.addMapping("/**")
+                   .allowedHeaders("*")
+                   .allowedOrigins("*")
+                   .allowedMethods("*")
+                   .allowCredentials(true).maxAge(3600000);
+    }
+}

+ 109 - 0
applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/controller/ClazzAlbumController.java

@@ -0,0 +1,109 @@
+package com.usoftchina.smartschool.wechat.controller;
+
+
+import com.usoftchina.smartschool.wechat.domain.ClazzAlbumDO;
+import com.usoftchina.smartschool.wechat.service.ClazzAlbumService;
+import com.usoftchina.smartschool.wechat.utils.ResultBean;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.Assert;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 相册; InnoDB free: 5120 kB
+ *
+ * @author kl
+ * @email ${email}
+ * @date 2019-01-16 16:26:23
+ */
+
+@RestController
+@RequestMapping("/wxSchool/clazzAlbum")
+public class ClazzAlbumController {
+	@Autowired
+	private ClazzAlbumService clazzAlbumService;
+
+	/**
+	 * 创建相册
+	 * @param jsonAlbum
+	 * @return
+	 */
+	@PostMapping("/createAlbum")
+	public ResultBean createAlbum(String jsonAlbum){
+		try {
+			Assert.notNull(jsonAlbum,"请填写相应数据");
+			int i = clazzAlbumService.createAlbum(jsonAlbum);
+			if (i>0){
+				return new ResultBean("创建成功");
+			}else {
+				return new ResultBean("创建失败");
+			}
+		}catch (Exception e){
+			return new ResultBean(e);
+		}
+	}
+
+	/**
+	 * 删除相册
+	 * @param albumId
+	 * @return
+	 */
+	@GetMapping("/deleteAlbum")
+	public ResultBean deleteAlbum(@Param("albumId") Long albumId, @Param("teacherId") Long teacherId){
+		try {
+			int i = clazzAlbumService.deleteAlbum(albumId, teacherId);
+			if (i>0){
+				return new ResultBean("删除成功");
+			}else {
+				return new ResultBean("删除失败");
+			}
+		}catch (Exception e){
+			return new ResultBean(e);
+		}
+	}
+
+	/**
+	 * 修改相册
+	 * @param jsonAlbum
+	 * @return
+	 */
+	@PostMapping("/updateAlbum")
+	public ResultBean updateAlbum(String jsonAlbum){
+		try {
+			Assert.notNull(jsonAlbum,"请指定要修改的相册");
+			int i = clazzAlbumService.updateAlbum(jsonAlbum);
+			if (i>0){
+				return new ResultBean("修改失败");
+			}else {
+				return new ResultBean("修改成功");
+			}
+		}catch (Exception e){
+			return new ResultBean(e);
+		}
+	}
+
+	/**
+	 * 获取班级相册及照片  视频
+	 * @param clazzId
+	 * @param albumType
+	 * @param albumStatus
+	 * @param pageIndex
+	 * @param pageSize
+	 * @return
+	 */
+	@PostMapping("/getListPicByClazz")
+	public ResultBean getListPicByClazz(@Param("clazzId") Long clazzId, @Param("albumType")Integer albumType, @Param("albumStatus")Integer albumStatus, @Param("pageIndex")Integer pageIndex, @Param("pageSize")Integer pageSize){
+		try {
+			List<ClazzAlbumDO> albumList = clazzAlbumService.getAlbumList(clazzId, albumType, albumStatus, pageIndex, pageSize);
+			return new ResultBean(albumList);
+		}catch (Exception e){
+			return new ResultBean(e);
+		}
+	}
+	
+}

+ 127 - 0
applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/controller/ClazzController.java

@@ -0,0 +1,127 @@
+package com.usoftchina.smartschool.wechat.controller;
+
+import com.usoftchina.smartschool.wechat.domain.ClazzDO;
+import com.usoftchina.smartschool.wechat.domain.ParentsDO;
+import com.usoftchina.smartschool.wechat.domain.StudentDO;
+import com.usoftchina.smartschool.wechat.domain.TeacherDO;
+import com.usoftchina.smartschool.wechat.service.ClazzService;
+import com.usoftchina.smartschool.wechat.utils.ResultBean;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 班级表; InnoDB free: 5120 kB
+ * 
+ * @author kl
+ * @email ${email}
+ * @date 2019-01-16 16:26:27
+ */
+ 
+@RestController
+@RequestMapping("/wxSchool/clazz")
+public class ClazzController {
+	@Autowired
+	private ClazzService clazzService;
+
+	/**
+	 * 老师获取所教班级
+	 * @param teacherId
+	 * @return
+	 * @throws Exception
+	 */
+	@GetMapping("/selectClazzByTeacher")
+	public ResultBean selectClazzByTeacher(Long teacherId){
+		try {
+			List<ClazzDO> clazzDOS = clazzService.selectClazzByTeacher(teacherId);
+			return new ResultBean(clazzDOS);
+		}catch (Exception e){
+			return new ResultBean(e);
+		}
+	}
+
+	/**
+	 * 学生获取所在班级
+	 * @param stuId
+	 * @return
+	 * @throws Exception
+	 */
+	@GetMapping("/selectClazzByStu")
+	public ResultBean selectClazzByStu(Long stuId){
+		try {
+			List<ClazzDO> clazzDOS = clazzService.selectClazzByStu(stuId);
+			return new ResultBean(clazzDOS);
+		}catch (Exception e){
+			return new ResultBean(e);
+		}
+	}
+
+	/**
+	 * 老师获取所教班级的家长信息
+	 * @param teacherId
+	 * @param selectKey
+	 * @return
+	 * @throws Exception
+	 */
+	@PostMapping("/selectParentPhoneByTeacher")
+	public ResultBean selectParentPhoneByTeacher(@Param("teacherId") Long teacherId, @Param("selectKey") String selectKey){
+		try {
+			List<ClazzDO> clazzDOS = clazzService.selectParentPhoneByTeacher(teacherId, selectKey);
+			return new ResultBean(clazzDOS);
+		}catch (Exception e){
+			return new ResultBean(e);
+		}
+	}
+
+	/**
+	 * 获取学生班级的所有老师
+	 * @param stuId
+	 * @throws Exception
+	 */
+	@PostMapping("/getTeacherByStuId")
+	public ResultBean getTeacherByStuId(@Param("stuId") Long stuId, @Param("selectKey")String selectKey){
+		try {
+			List<TeacherDO> teacherByStuId = clazzService.getTeacherByStuId(stuId, selectKey);
+			return new ResultBean(teacherByStuId);
+		}catch (Exception e){
+			return new ResultBean(e);
+		}
+	}
+
+	/**
+	 * 获取学生班级的所有家长
+	 * @param clazzId
+	 * @throws Exception
+	 */
+	@PostMapping("/getParentByClazzId")
+	public ResultBean getParentByClazzId(@Param("clazzId") Long clazzId, @Param("selectKey") String selectKey){
+		try {
+			List<StudentDO> parentByClazzId = clazzService.getParentByClazzId(clazzId, selectKey);
+			return new ResultBean(parentByClazzId);
+		}catch (Exception e){
+			return new ResultBean(e);
+		}
+	}
+
+	/**
+	 * 获取所有教师的电话
+	 * @param teacherId
+	 * @param selectKey
+	 * @return
+	 */
+	@PostMapping("/getAllTeacherBySchool")
+	public ResultBean getAllTeacherBySchool(@Param("teacherId") Long teacherId, @Param("selectKey") String selectKey){
+		try {
+			List<TeacherDO> teacher = clazzService.getAllTeacherBySchool(teacherId, selectKey);
+			return new ResultBean(teacher);
+		}catch (Exception e){
+			return new ResultBean(e);
+		}
+	}
+	
+}

+ 50 - 0
applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/controller/ClazzCurriculumController.java

@@ -0,0 +1,50 @@
+package com.usoftchina.smartschool.wechat.controller;
+
+import com.usoftchina.smartschool.wechat.domain.ClazzCurriculumDO;
+import com.usoftchina.smartschool.wechat.service.ClazzCurriculumService;
+import com.usoftchina.smartschool.wechat.utils.ResultBean;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 课程表; InnoDB free: 5120 kB
+ * 
+ * @author kl
+ * @email ${email}
+ * @date 2019-01-16 16:26:24
+ */
+ 
+@RestController
+@RequestMapping("/wxSchool/clazzCurriculum")
+public class ClazzCurriculumController {
+	@Autowired
+	private ClazzCurriculumService clazzCurriculumService;
+	/** 根据学号取课程表 */
+	@GetMapping("/curriculumListByStuId")
+	public ResultBean curriculumListByStuId(@Param("stuId") Long stuId, @Param("curStatus")Integer curStatus){
+		try {
+			Map<String, Object> map = clazzCurriculumService.selectCurriculumByStuId(stuId, curStatus);
+			return new ResultBean(map);
+		}catch (Exception e){
+			return new ResultBean(e);
+		}
+	}
+
+	/** 根据工号取课程表 */
+	@GetMapping("/curriculumListByTeacherId")
+	public ResultBean curriculumListByTeacherId(@Param("teacherId") Long teacherId, @Param("curStatus")Integer curStatus){
+		try {
+			List<ClazzCurriculumDO> curriculumDOS = clazzCurriculumService.selectCurriculumByTeacherId(teacherId, curStatus);
+			return new ResultBean(curriculumDOS);
+		}catch (Exception e){
+			return new ResultBean(e);
+		}
+	}
+	
+}

+ 61 - 0
applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/controller/ClazzPictureController.java

@@ -0,0 +1,61 @@
+package com.usoftchina.smartschool.wechat.controller;
+
+import com.usoftchina.smartschool.wechat.domain.ClazzAlbumDO;
+import com.usoftchina.smartschool.wechat.domain.ClazzPictureDO;
+import com.usoftchina.smartschool.wechat.service.ClazzPictureService;
+import com.usoftchina.smartschool.wechat.utils.ResultBean;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 相片表; InnoDB free: 5120 kB
+ * 
+ * @author kl
+ * @email ${email}
+ * @date 2019-01-16 16:26:24
+ */
+ 
+@RestController
+@RequestMapping("/wxSchool/clazzPicture")
+public class ClazzPictureController {
+	@Autowired
+	private ClazzPictureService clazzPictureService;
+
+	/**
+	 * 更新相册
+	 * @param albumId
+	 * @param pictureUrls
+	 * @return
+	 */
+	@PostMapping("/savePicture")
+	public ResultBean savePicture(@Param("albumId") Long albumId, @Param("pictureUrls") String pictureUrls){
+		try {
+			String s = clazzPictureService.savePicture(albumId, pictureUrls);
+			return new ResultBean(s);
+		}catch (Exception e){
+			return new ResultBean(e);
+		}
+	}
+
+	/**
+	 * 分页获取相片
+	 * @param albumId
+	 * @param pageIndex
+	 * @param pageSize
+	 */
+	@PostMapping("/getPictureByAlbum")
+	public ResultBean getPictureByAlbum(@Param("albumId") Long albumId, @Param("pageIndex")Integer pageIndex, @Param("pageSize") Integer pageSize){
+		try {
+			ClazzAlbumDO pictureByAlbum = clazzPictureService.getPictureByAlbum(albumId, pageIndex, pageSize);
+			return new ResultBean(pictureByAlbum);
+		}catch (Exception e){
+			return new ResultBean(e);
+		}
+
+	}
+}

+ 42 - 0
applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/controller/FileController.java

@@ -0,0 +1,42 @@
+package com.usoftchina.smartschool.wechat.controller;
+
+
+import com.usoftchina.smartschool.wechat.service.FileService;
+import com.usoftchina.smartschool.wechat.utils.ResultBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * 文件表; InnoDB free: 5120 kB
+ * 
+ * @author kl
+ * @email ${email}
+ * @date 2019-01-16 16:26:27
+ */
+ 
+@RestController
+@RequestMapping("/wxSchool/file")
+public class FileController {
+	@Autowired
+	private FileService fileService;
+
+	/**
+	 * 附件上传
+	 * @param file
+	 * @return
+	 */
+	@PostMapping("/uploadFile")
+	public ResultBean uploadFile(@RequestParam("file") MultipartFile file){
+		try {
+			String s = fileService.uploadFile(file);
+			return new ResultBean(s);
+		}catch (Exception e){
+			return new ResultBean(e);
+		}
+	}
+
+}

+ 144 - 0
applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/controller/MeetingController.java

@@ -0,0 +1,144 @@
+package com.usoftchina.smartschool.wechat.controller;
+
+import com.usoftchina.smartschool.wechat.domain.MeetingDO;
+import com.usoftchina.smartschool.wechat.service.MeetingService;
+import com.usoftchina.smartschool.wechat.utils.ResultBean;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.Assert;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+
+import static com.usoftchina.smartschool.wechat.utils.ResultBean.ErrorCode.FAIL;
+
+/**
+ * 会议表; InnoDB free: 5120 kB
+ * 
+ * @author kl
+ * @email ${email}
+ * @date 2019-01-16 16:26:24
+ */
+ 
+@RestController
+@RequestMapping("/wxSchool/meeting")
+public class MeetingController {
+	@Autowired
+	private MeetingService meetingService;
+
+	/**
+	 * 创建会议
+	 * @param jsonMeeting
+	 * @return
+	 * @throws Exception
+	 */
+	@PostMapping("/createMeeting")
+	public ResultBean createMeeting(String jsonMeeting){
+		try {
+			Assert.notNull(jsonMeeting,"请填入基本信息");
+			String metting = meetingService.createMeeting(jsonMeeting);
+			return new ResultBean(metting);
+		}catch (Exception e){
+			return new ResultBean(e);
+		}
+	}
+
+	/**
+	 * 分页显示
+	 * @param teacherId
+	 * @param meetingStatus
+	 * @param pageIndex
+	 * @param pageSize
+	 */
+	@PostMapping("/meetingList")
+	public ResultBean meetingList(@Param("teacherId") Long teacherId, @Param("meetingStatus") Integer meetingStatus, @Param("pageIndex")  Integer pageIndex, @Param("pageSize") Integer pageSize){
+		try {
+			HashMap<String, Object> map = meetingService.meetingList(teacherId, meetingStatus, pageIndex, pageSize);
+			return new ResultBean(map);
+		}catch (Exception e){
+			return new ResultBean(e);
+		}
+	}
+
+	/**
+	 * 详情
+	 * @param teacherId
+	 * @param meetingId
+	 * @return
+	 */
+	@PostMapping("/getMeetingDetails")
+	public ResultBean getMeetingDetails(@Param("teacherId")Long teacherId, @Param("meetingId")Long meetingId){
+		try {
+			MeetingDO meetingDetails = meetingService.getMeetingDetails(teacherId, meetingId);
+			return new ResultBean(meetingDetails);
+		}catch (Exception e){
+			return new ResultBean(e);
+		}
+	}
+
+	/**
+	 * 会议签到
+	 * @param teacherId
+	 * @param meetingId
+	 * @return
+	 * @throws Exception
+	 */
+	@PostMapping("/meetingSign")
+	public ResultBean meetingSign(@Param("teacherId")Long teacherId, @Param("meetingId")Long meetingId){
+		try {
+			int i = meetingService.meetingSign(teacherId, meetingId);
+			if (i>0){
+				return new ResultBean("签到成功");
+			}else {
+				return new ResultBean(FAIL,"签到失败");
+			}
+		}catch (Exception e){
+			return new ResultBean(e);
+		}
+	}
+
+	/**
+	 * 结束会议
+	 * @param teacherId
+	 * @param meetingId
+	 * @return
+	 * @throws Exception
+	 */
+	@PostMapping("/endMeeting")
+	public ResultBean endMeeting(@Param("teacherId")Long teacherId, @Param("meetingId")Long meetingId) {
+		try {
+			int i = meetingService.endMeeting(teacherId, meetingId);
+			if (i>0){
+				return new ResultBean("会议结束");
+			}else {
+				return new ResultBean(FAIL,"会议结束失败,请联系管理员");
+			}
+		}catch (Exception e){
+			return new ResultBean(e);
+		}
+	}
+
+	/**
+	 * 删除会议
+	 * @param teacherId
+	 * @param meetingId
+	 * @return
+	 * @throws Exception
+	 */
+	@PostMapping("/deleteMeeting")
+	public ResultBean deleteMeeting(@Param("teacherId")Long teacherId, @Param("meetingId")Long meetingId){
+		try {
+			int i = meetingService.deleteMeeting(teacherId, meetingId);
+			if (i>0){
+				return new ResultBean("会议结束");
+			}else {
+				return new ResultBean(FAIL,"会议删除失败,请联系管理员");
+			}
+		}catch (Exception e){
+			return new ResultBean(e);
+		}
+	}
+	
+}

+ 153 - 0
applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/controller/NotifyController.java

@@ -0,0 +1,153 @@
+package com.usoftchina.smartschool.wechat.controller;
+
+
+import com.usoftchina.smartschool.wechat.domain.NotifyDO;
+import com.usoftchina.smartschool.wechat.service.NotifyService;
+import com.usoftchina.smartschool.wechat.utils.ResultBean;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.Assert;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Map;
+
+import static com.usoftchina.smartschool.wechat.utils.ResultBean.ErrorCode.FAIL;
+
+/**
+ * 通知表; InnoDB free: 5120 kB
+ * 
+ * @author kl
+ * @email ${email}
+ * @date 2019-01-16 16:26:24
+ */
+ 
+@RestController
+@RequestMapping("/wxSchool/notify")
+public class NotifyController {
+	@Autowired
+	private NotifyService notifyService;
+
+	/**
+	 * 获取系统消息和使用帮助
+	 * @param notifyType
+	 * @param pageIndex
+	 * @param pageSize
+	 * @return
+	 */
+	@PostMapping("/selectNotifyListByType")
+	public ResultBean selectNotifyListByType(@Param("notifyType")Integer notifyType, @Param("pageIndex")Integer pageIndex, @Param("pageSize")Integer pageSize){
+		try {
+			List<NotifyDO> notifyDOS = notifyService.selectNotifyListByType(notifyType, pageIndex, pageSize);
+			return new ResultBean(notifyDOS);
+		}catch (Exception e){
+			return new ResultBean(e);
+		}
+	}
+
+	/**
+	 * 创建通知
+	 * @param jsonNotify
+	 */
+	@PostMapping("/createNotify")
+	public ResultBean createNotify(String jsonNotify){
+		try {
+			Assert.notNull(jsonNotify,"参数不能为空");
+			String notify = notifyService.createNotify(jsonNotify);
+			return new ResultBean(notify);
+		}catch (Exception e){
+			return new ResultBean(e);
+		}
+	}
+
+
+	/**
+	 * 教师分页显示
+	 * @param teacherId
+	 * @param notifyStatus
+	 * @param pageIndex
+	 * @param pageSize
+	 */
+	@PostMapping("/notifyListByTeacher")
+	public ResultBean notifyListByTeacher(@Param("teacherId")Long teacherId, @Param("notifyStatus")Integer notifyStatus, @Param("pageIndex")Integer pageIndex, @Param("pageSize")Integer pageSize){
+		try {
+			Map<String, Object> map = notifyService.notifyListByTeacher(teacherId, notifyStatus, pageIndex, pageSize);
+			return new ResultBean(map);
+		}catch (Exception e){
+			return new ResultBean(e);
+		}
+	}
+
+	/**
+	 * 家长分页显示
+	 * @param stuId
+	 * @param notifyStatus
+	 * @param pageIndex
+	 * @param pageSize
+	 */
+	@PostMapping("/notifyListByStu")
+	public ResultBean notifyListByStu(@Param("stuId")Long stuId, @Param("notifyStatus")Integer notifyStatus, @Param("pageIndex")Integer pageIndex, @Param("pageSize")Integer pageSize){
+		try {
+			List<NotifyDO> notifyDOS = notifyService.notifyListByStu(stuId, notifyStatus, pageIndex, pageSize);
+			return new ResultBean(notifyDOS);
+		}catch (Exception e){
+			return new ResultBean(e);
+		}
+	}
+
+	/**
+	 * 家长端获取通知详情
+	 * @param notifyId
+	 * @param
+	 * @return
+	 */
+	@PostMapping("/getNotifyDetails")
+	public ResultBean getNotifyDetails(@Param("notifyId")Long notifyId){
+		try {
+			NotifyDO stu = notifyService.getNotifyDetails(notifyId);
+			return new ResultBean(stu);
+		}catch (Exception e){
+			return new ResultBean(e);
+		}
+	}
+
+	/**
+	 * 教师端获取通知详情
+	 * @param notifyId
+	 * @param teacherId
+	 * @return
+	 */
+	/*@PostMapping("/getNotifyDetailsByTeacher")
+	public ResultBean getNotifyDetailsByTeacher(@Param("notifyId")Long notifyId, @Param("teacherId")Long teacherId){
+		try {
+			NotifyDO teacher = notifyService.getNotifyDetailsByTeacher(notifyId, teacherId);
+			return new ResultBean(teacher);
+		}catch (Exception e){
+			return new ResultBean(e);
+		}
+	}*/
+
+	/**
+	 * 删除创建的通知
+	 * @param notifyId
+	 * @param teacherId
+	 * @return
+	 * @throws Exception
+	 */
+	@GetMapping("/deleteNotify")
+	public ResultBean deleteNotify(@Param("notifyId")Long notifyId, @Param("teacherId")Long teacherId){
+		try {
+			int i = notifyService.deleteNotify(notifyId, teacherId);
+			if (i>0){
+				return new ResultBean("删除成功");
+			}else {
+				return new ResultBean(FAIL,"删除失败,请联系管理员");
+			}
+		}catch (Exception e){
+			return new ResultBean(e);
+		}
+	}
+}

+ 105 - 0
applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/controller/OaApproveController.java

@@ -0,0 +1,105 @@
+package com.usoftchina.smartschool.wechat.controller;
+
+
+import com.usoftchina.smartschool.wechat.service.OaApproveService;
+import com.usoftchina.smartschool.wechat.utils.ResultBean;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.Assert;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+import static com.usoftchina.smartschool.wechat.utils.ResultBean.ErrorCode.FAIL;
+
+/**
+ * oa出差/用品/请假表(教师端); InnoDB free: 5120 kB
+ * 
+ * @author kl
+ * @email ${email}
+ * @date 2019-01-16 16:26:25
+ */
+ 
+@RestController
+@RequestMapping("/wxSchool/oaApprove")
+public class OaApproveController {
+	@Autowired
+	private OaApproveService oaApproveService;
+
+	/**
+	 * 添加OA
+	 * @param oaString
+	 * @return
+	 */
+	@PostMapping("/oaCreate")
+	public ResultBean oaCreate(String oaString){
+		System.err.println(oaString);
+		try {
+			Assert.notNull(oaString,"请填写相应的单据");
+			int i = oaApproveService.oaCreate(oaString);
+			if (i>0){
+				return new ResultBean("提交成功,请等待审批");
+			}else {
+				return new ResultBean(FAIL,"提交失败,请重新提交");
+			}
+		}catch (Exception e){
+			return new ResultBean(e);
+		}
+
+	}
+
+	/**
+	 * 审批列表
+	 * @param teacherId
+	 * @param pageIndex
+	 * @param pageSize
+	 * @return
+	 */
+	@GetMapping("/oaList")
+	public ResultBean oaList(@Param("teacherId") Long teacherId, @Param("pageIndex")Integer pageIndex, @Param("pageSize")Integer pageSize){
+		try {
+			Assert.notNull(teacherId,"请联系管理员确定身份");
+			Map<String, Object> map = oaApproveService.oaList(teacherId, pageIndex, pageSize);
+			return new ResultBean(map);
+		}catch (Exception e){
+			return new ResultBean(e);
+		}
+	}
+
+	/**
+	 * 审批
+	 * @param approveId
+	 * @param status
+	 * @param approveOpinion
+	 * @return
+	 */
+	@PostMapping("/approve")
+	public ResultBean approve(@Param("teacherId") Long teacherId, @Param("approveId") Long approveId, @Param("status") Integer status, @Param("approveOpinion") String approveOpinion){
+		try {
+			String approve = oaApproveService.approve(teacherId,approveId, status, approveOpinion);
+			return new ResultBean(approve);
+		}catch (Exception e){
+			return new ResultBean(e);
+		}
+	}
+
+	/**
+	 * 审批单详情
+	 * @param approveId
+	 * @return
+	 */
+	@GetMapping("/oaDetails")
+	public ResultBean oaDetails(Long approveId){
+		try {
+			Map<String, Object> map = oaApproveService.oaDetails(approveId);
+			return new ResultBean(map);
+		}catch (Exception e){
+			return new ResultBean(e);
+		}
+
+	}
+	
+}

+ 116 - 0
applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/controller/OaLeaveController.java

@@ -0,0 +1,116 @@
+package com.usoftchina.smartschool.wechat.controller;
+
+
+import com.usoftchina.smartschool.wechat.domain.OaLeaveDO;
+import com.usoftchina.smartschool.wechat.service.OaLeaveService;
+import com.usoftchina.smartschool.wechat.utils.ResultBean;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.Assert;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+import static com.usoftchina.smartschool.wechat.utils.ResultBean.ErrorCode.FAIL;
+
+/**
+ * 学生请假表; InnoDB free: 5120 kB
+ * 
+ * @author kl
+ * @email ${email}
+ * @date 2019-01-16 16:26:25
+ */
+ 
+@RestController
+@RequestMapping("/wxSchool/oaLeave")
+public class OaLeaveController {
+	@Autowired
+	private OaLeaveService oaLeaveService;
+
+	/**
+	 * 请假条提交
+	 */
+	@PostMapping("/leaveCreate")
+	public ResultBean leaveCreate(String leaveString){
+		try {
+			Assert.notNull(leaveString,"请填入相应数据");
+			String s = oaLeaveService.leaveCreate(leaveString);
+			return new ResultBean(s);
+		}catch (Exception e){
+			return new ResultBean(e);
+		}
+	}
+
+	/**
+	 * 家长端请假条详情列表
+	 * @param stuId
+	 * @param pageIndex
+	 * @param pageSize
+	 * @return
+	 * @throws Exception
+	 */
+	@PostMapping("/leaveListByStu")
+	public ResultBean leaveListByStu(@Param("stuId") Long stuId, @Param("pageIndex") Integer pageIndex, @Param("pageSize") Integer pageSize){
+		try {
+			List<OaLeaveDO> oaLeaveDOS = oaLeaveService.leaveListByStu(stuId, pageIndex, pageSize);
+			return new ResultBean(oaLeaveDOS);
+		}catch (Exception e){
+			return new ResultBean(e);
+		}
+	}
+
+	/**
+	 * 教师端请假条详情列表
+	 * @param teacherId
+	 * @param pageIndex
+	 * @param pageSize
+	 * @return
+	 */
+	@PostMapping("/leaveListByTeacher")
+	public ResultBean leaveListByTeacher(@Param("teacherId") Long teacherId, @Param("pageIndex") Integer pageIndex, @Param("pageSize")Integer pageSize){
+		try {
+			List<OaLeaveDO> oaLeaveDOS = oaLeaveService.leaveListByTeacher(teacherId, pageIndex, pageSize);
+			return new ResultBean(oaLeaveDOS);
+		}catch (Exception e){
+			return new ResultBean(e);
+		}
+	}
+
+	/**
+	 * 请假详情
+	 * @param lvId
+	 * @return
+	 */
+	@GetMapping("/lvDetail")
+	public ResultBean lvDetail(Long lvId){
+		try {
+			OaLeaveDO oaLeaveDO = oaLeaveService.lvDetail(lvId);
+			return new ResultBean(oaLeaveDO);
+		}catch (Exception e){
+			return new ResultBean(e);
+		}
+	}
+
+	/**
+	 * 回复
+	 * @param leaveReplyString
+	 * @return
+	 */
+	@PostMapping("/lvReply")
+	public ResultBean lvReply(String leaveReplyString){
+		try {
+			Assert.notNull(leaveReplyString,"请填入要回复的内容");
+			int i = oaLeaveService.lvReply(leaveReplyString);
+			if (i>0){
+				return new ResultBean("回复成功");
+			}else {
+				return new ResultBean(FAIL,"回复失败,请联系管理员");
+			}
+		}catch (Exception e){
+			return new ResultBean(e);
+		}
+	}
+}

+ 61 - 0
applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/controller/OutInRecordController.java

@@ -0,0 +1,61 @@
+package com.usoftchina.smartschool.wechat.controller;
+
+import com.usoftchina.smartschool.wechat.domain.OutInRecordDO;
+import com.usoftchina.smartschool.wechat.service.OutInRecordService;
+import com.usoftchina.smartschool.wechat.utils.ResultBean;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 出入校通知表; InnoDB free: 5120 kB
+ * 
+ * @author kl
+ * @email ${email}
+ * @date 2019-01-16 16:26:26
+ */
+ 
+@RestController
+@RequestMapping("/wxSchool/outInRecord")
+public class OutInRecordController {
+	@Autowired
+	private OutInRecordService outInRecordService;
+
+	/**
+	 * 获取出入校记录
+	 * @param stuId
+	 * @param pageIndex
+	 * @param pageSize
+	 * @return
+	 */
+	@PostMapping("/getOutgoingList")
+	public ResultBean getOutgoingList(@Param("stuId") Long stuId, @Param("pageIndex")Integer pageIndex, @Param("pageSize")Integer pageSize){
+		try {
+			List<OutInRecordDO> outInRecordDOS = outInRecordService.selectRecordOutgoingListByStuId(stuId, pageIndex, pageSize);
+			return new ResultBean(outInRecordDOS);
+		}catch (Exception e){
+			return new ResultBean(e);
+		}
+	}
+
+	/**
+	 * 通知详情
+	 * @param recordId
+	 * @return
+	 */
+	@GetMapping("/outgoingDetail")
+	public ResultBean outgoingDetail(Long recordId){
+		try {
+			OutInRecordDO outInRecordDO = outInRecordService.outgoingDetail(recordId);
+			return new ResultBean(outInRecordDO);
+		}catch (Exception e){
+			return new ResultBean(e);
+		}
+	}
+	
+}

+ 171 - 0
applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/controller/PrincipalMailboxController.java

@@ -0,0 +1,171 @@
+package com.usoftchina.smartschool.wechat.controller;
+
+import com.usoftchina.smartschool.wechat.service.PrincipalMailboxService;
+import com.usoftchina.smartschool.wechat.utils.ResultBean;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.Assert;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Map;
+
+import static com.usoftchina.smartschool.wechat.utils.ResultBean.ErrorCode.FAIL;
+
+/**
+ * 校长信箱表; InnoDB free: 5120 kB
+ * 
+ * @author kl
+ * @email ${email}
+ * @date 2019-01-16 16:26:26
+ */
+ 
+@RestController
+@RequestMapping("/wxSchool/principalMailbox")
+public class PrincipalMailboxController {
+	@Autowired
+	private PrincipalMailboxService principalMailboxService;
+
+	/**
+	 * 校长信箱创建
+	 * @return
+	 */
+	@PostMapping("/mailboxString")
+	public ResultBean principalMailbox(String mailboxString){
+		try {
+			Assert.notNull(mailboxString,"请填入单据相应信息");
+			Long aLong = principalMailboxService.principalMailboxCreate(mailboxString);
+			return new ResultBean(aLong);
+		}catch (Exception e){
+			return new ResultBean(e);
+		}
+	}
+
+	/**
+	 * 校长获取列表
+	 * @param teacherId
+	 * @param pageIndex
+	 * @param pageSize
+	 * @return
+	 */
+	@PostMapping("/principalMailboxListTeacher")
+	public ResultBean principalMailboxListTeacher(@Param("teacherId") Long teacherId, @Param("pageIndex") Integer pageIndex, @Param("pageSize") Integer pageSize){
+		try {
+			List<Map<String, Object>> maps = principalMailboxService.principalMailboxListTeacher(teacherId, pageIndex, pageSize);
+			return new ResultBean(maps);
+		} catch (Exception e) {
+			return new ResultBean(e);
+		}
+	}
+	/**
+	 * 家长获取列表
+	 * @param parentId
+	 * @param pageIndex
+	 * @param pageSize
+	 * @return
+	 */
+	@PostMapping("/principalMailboxListParent")
+	public ResultBean principalMailboxListParent(@Param("parentId") Long parentId, @Param("pageIndex") Integer pageIndex, @Param("pageSize") Integer pageSize){
+		try {
+			List<Map<String, Object>> maps = principalMailboxService.principalMailboxListParent(parentId, pageIndex, pageSize);
+			return new ResultBean(maps);
+		}catch (Exception e){
+			return new ResultBean(e);
+		}
+	}
+	/**
+	 * 校长查看详情
+	 * @param mailboxId
+	 * @return
+	 * @throws Exception
+	 */
+	@PostMapping("/principalMailboxDetail")
+	public ResultBean principalMailboxDetail(@Param("mailboxId") Long mailboxId){
+		try {
+			Map<String, Object> map = principalMailboxService.principalMailboxDetail(mailboxId);
+			return new ResultBean(map);
+		}catch (Exception e){
+			return new ResultBean(e);
+		}
+	}
+
+	/**
+	 * 家长查看详情
+	 * @param mailboxId
+	 * @return
+	 * @throws Exception
+	 */
+	/*@PostMapping("/principalMailboxDetailParent")
+	public ResultBean principalMailboxDetailParent(@Param("mailboxId") Long mailboxId, @Param("parentId")Long parentId){
+		try {
+			Map<String, Object> map = principalMailboxService.principalMailboxDetailParent(mailboxId, parentId);
+			return new ResultBean(map);
+		}catch (Exception e){
+			return new ResultBean(e);
+		}
+	}*/
+
+	/**
+	 * 回复
+	 * @param replyString
+	 * @return
+	 */
+	@PostMapping("/principalMailboxReply")
+	public ResultBean principalMailboxReply(String replyString){
+		try {
+			Assert.notNull(replyString,"请填写相应数据");
+			int i = principalMailboxService.principalMailboxReply(replyString);
+			if (i>0){
+				return new ResultBean("回复成功");
+			}else {
+				return new ResultBean(FAIL,"回复失败");
+			}
+		}catch (Exception e){
+			return new ResultBean(e);
+		}
+	}
+
+	/**
+	 * 家长端删除校长信箱
+	 * @param mailboxId
+	 * @param parentId
+	 * @return
+	 * @throws Exception
+	 */
+	@PostMapping("/deleteMailParent")
+	public ResultBean deleteMailParent(@Param("mailboxId") Long mailboxId, @Param("parentId")Long parentId){
+		try {
+			int i = principalMailboxService.deleteMailParent(mailboxId, parentId);
+			if (i>0){
+				return new ResultBean("已删除,谢谢您的支持");
+			}else {
+				return new ResultBean(FAIL,"删除失败,请联系管理员");
+			}
+		}catch (Exception e){
+			return new ResultBean(e);
+		}
+	}
+
+	/**
+	 * 教师端删除校长信箱
+	 * @param mailboxId
+	 * @param teacherId
+	 * @return
+	 * @throws Exception
+	 */
+	@PostMapping("/deleteMailTeacher")
+	public ResultBean deleteMailTeacher(@Param("mailboxId") Long mailboxId, @Param("teacherId")Long teacherId){
+		try {
+			int i = principalMailboxService.deleteMailTeacher(mailboxId, teacherId);
+			if (i>0){
+				return new ResultBean("删除成功");
+			}else {
+				return new ResultBean(FAIL,"删除失败");
+			}
+		}catch (Exception e){
+			return new ResultBean(e);
+		}
+	}
+}

+ 36 - 0
applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/controller/SchoolController.java

@@ -0,0 +1,36 @@
+package com.usoftchina.smartschool.wechat.controller;
+
+import com.usoftchina.smartschool.wechat.domain.SchoolDO;
+import com.usoftchina.smartschool.wechat.service.SchoolService;
+import com.usoftchina.smartschool.wechat.utils.ResultBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.ui.Model;
+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 java.util.List;
+
+/**
+ * 学校表; InnoDB free: 5120 kB
+ * 
+ * @author kl
+ * @email ${email}
+ * @date 2019-01-16 16:26:28
+ */
+ 
+@RestController
+@RequestMapping("/wxSchool/school")
+public class SchoolController {
+	@Autowired
+	private SchoolService schoolService;
+
+	@GetMapping("/schoolList")
+	public ResultBean list(){
+		//查询列表数据
+		List<SchoolDO> schoolList = schoolService.list(null);
+		return new ResultBean(schoolList);
+	}
+	
+}

+ 45 - 0
applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/controller/StuScoreController.java

@@ -0,0 +1,45 @@
+package com.usoftchina.smartschool.wechat.controller;
+
+import com.usoftchina.smartschool.wechat.service.StuScoreService;
+import com.usoftchina.smartschool.wechat.utils.ResultBean;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 分数表; InnoDB free: 5120 kB
+ * 
+ * @author kl
+ * @email ${email}
+ * @date 2019-01-16 16:26:27
+ */
+ 
+@RestController
+@RequestMapping("/wxSchool/stuScore")
+public class StuScoreController {
+	@Autowired
+	private StuScoreService stuScoreService;
+
+	/**
+	 * 获取成绩信息
+	 * @param stuId
+	 * @param pageIndex
+	 * @param pageSize
+	 * @return
+	 * @throws Exception
+	 */
+	@PostMapping("/getScoreByStu")
+	public ResultBean getScoreByStu(@Param("stuId") Long stuId, @Param("pageIndex") Integer pageIndex, @Param("pageSize") Integer pageSize){
+		try {
+			List<Map> scoreByStu = stuScoreService.getScoreByStu(stuId, pageIndex, pageSize);
+			return new ResultBean(scoreByStu);
+		}catch (Exception e){
+			return new ResultBean(e);
+		}
+	}
+}

+ 133 - 0
applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/controller/TaskNotifyController.java

@@ -0,0 +1,133 @@
+package com.usoftchina.smartschool.wechat.controller;
+
+import com.usoftchina.smartschool.wechat.service.TaskNotifyService;
+import com.usoftchina.smartschool.wechat.utils.ResultBean;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.Assert;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 作业通知表; InnoDB free: 5120 kB
+ * 
+ * @author kl
+ * @email ${email}
+ * @date 2019-01-16 16:26:29
+ */
+ 
+@RestController
+@RequestMapping("/wxSchool/taskNotify")
+public class TaskNotifyController {
+	@Autowired
+	private TaskNotifyService taskNotifyService;
+
+	/**
+	 * 发布作业
+	 * @param taskString
+	 * @return
+	 */
+	@PostMapping("/createTask")
+	public ResultBean createTask(String taskString){
+		try {
+			Assert.notNull(taskString,"请填入相应的数据");
+			int task = taskNotifyService.createTask(taskString);
+			if (task>0){
+				return new ResultBean("创建成功");
+			}else {
+				return new ResultBean("创建失败");
+			}
+		}catch (Exception e){
+			return new ResultBean(e);
+		}
+	}
+
+	/**
+	 * 教师端获取作业列表
+	 * @param teacherId
+	 * @param taskStatus
+	 * @param pageIndex
+	 * @param pageSize
+	 */
+	@PostMapping("/listTaskTeacher")
+	public ResultBean listTaskTeacher(@Param("teacherId") Long teacherId, @Param("taskStatus")Integer taskStatus, @Param("pageIndex")Integer pageIndex, @Param("pageSize")Integer pageSize){
+		try {
+			List<Map<String, Object>> maps = taskNotifyService.listTaskTeacher(teacherId, taskStatus, pageIndex, pageSize);
+			return new ResultBean(maps);
+		}catch (Exception e){
+			return new ResultBean(e);
+		}
+	}
+
+	/**
+	 * 家长端获取作业列表
+	 * @param stuId
+	 * @param taskStatus
+	 * @param pageIndex
+	 * @param pageSize
+	 */
+	@PostMapping("/listTaskStu")
+	public ResultBean listTaskStu(@Param("stuId")Long stuId, @Param("taskStatus")Integer taskStatus, @Param("pageIndex")Integer pageIndex, @Param("pageSize")Integer pageSize){
+		try {
+			List<Map<String, Object>> maps = taskNotifyService.listTaskStu(stuId, taskStatus, pageIndex, pageSize);
+			return new ResultBean(maps);
+		}catch (Exception e){
+			return new ResultBean(e);
+		}
+	}
+
+	/**
+	 *家长端获取作业详情
+	 * @param taskId
+	 * @param stuId
+	 */
+	@PostMapping("/taskDetailStu")
+	public ResultBean taskDetailStu(@Param("taskId")Long taskId, @Param("stuId")Long stuId){
+		try {
+			Map<String, Object> map = taskNotifyService.taskDetailStu(taskId, stuId);
+			return new ResultBean(map);
+		}catch (Exception e){
+			return new ResultBean(e);
+		}
+	}
+
+	/**
+	 * 教师端获取作业详情
+	 * @param taskId
+	 * @param teacherId
+	 */
+	@PostMapping("/taskDetailTeacher")
+	public ResultBean taskDetailTeacher(@Param("taskId")Long taskId, @Param("teacherId")Long teacherId){
+		try {
+			Map<String, Object> map = taskNotifyService.taskDetailTeacher(taskId, teacherId);
+			return new ResultBean(map);
+		}catch (Exception e){
+			return new ResultBean(e);
+		}
+	}
+
+	/**
+	 * 作业回复
+	 * @param taskRepayString
+	 * @return
+	 * @throws Exception
+	 */
+	@PostMapping("/taskReply")
+	public ResultBean taskReply(String taskRepayString){
+		try {
+			Assert.notNull(taskRepayString,"请填入回复信息");
+			int i = taskNotifyService.taskReply(taskRepayString);
+			if (i>0){
+				return new ResultBean("回复成功");
+			}else {
+				return new ResultBean("回复失败");
+			}
+		}catch (Exception e){
+			return new ResultBean(e);
+		}
+	}
+}

+ 213 - 0
applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/controller/UserController.java

@@ -0,0 +1,213 @@
+package com.usoftchina.smartschool.wechat.controller;
+
+import java.util.*;
+
+import com.alibaba.fastjson.JSON;
+import com.github.kevinsawicki.http.HttpRequest;
+import com.usoftchina.smartschool.wechat.domain.SchoolDO;
+import com.usoftchina.smartschool.wechat.domain.TeacherDO;
+import com.usoftchina.smartschool.wechat.service.SchoolService;
+import com.usoftchina.smartschool.wechat.service.UserService;
+import com.usoftchina.smartschool.wechat.utils.ObjectUtils;
+import com.usoftchina.smartschool.wechat.utils.ResultBean;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.Assert;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.ModelAndView;
+import javax.servlet.http.HttpServletRequest;
+
+import static com.usoftchina.smartschool.wechat.utils.ResultBean.ErrorCode.FAIL;
+
+/**
+ * 账户表; InnoDB free: 5120 kB
+ * 
+ * @author kl
+ * @email ${email}
+ * @date 2019-01-16 16:26:29
+ */
+ 
+@RestController
+@RequestMapping("/wxSchool/user")
+public class UserController {
+	@Autowired
+	private UserService userService;
+
+	@Autowired
+	private SchoolService schoolService;
+	/**
+	 * 发送验证码
+	 */
+	@GetMapping("/sendCode")
+	public ResultBean sendCode(String userPhone) {
+			try {
+				Assert.notNull(userPhone,"请填写手机号");
+				userService.sendCode(userPhone);
+				return new ResultBean("验证码已发送");
+				/*HttpSession session = request.getSession();
+				session.setAttribute("vcode",vcode);
+				session.setMaxInactiveInterval(CodeConfig.getSessionDate());*/
+			} catch (Exception e) {
+				return new ResultBean(e);
+			}
+
+	}
+
+	/** 绑定 */
+	@PostMapping("/bindOpenid")
+	public ResultBean bindOpenid(@Param("userPhone")String userPhone, @Param("code")String code, @Param("openid")String openid){
+		try {
+			Assert.notNull(userPhone,"请填入手机号");
+			Assert.notNull(code,"请输入验证码");
+			Assert.notNull(openid,"openid不能为空");
+			Map<String, Object> map = userService.bindOpenid(userPhone, code, openid);
+			return new ResultBean(map);
+		}catch (Exception e){
+			return new ResultBean(e);
+		}
+	}
+
+	@GetMapping("/isBinding")
+	public ResultBean isBinding(String openid){
+		try {
+			Assert.notNull(openid,"openid不能为空");
+			Map<String, Object> map = userService.isBinding(openid);
+			Object teacherDOS =  map.get("teacherDOS");
+			Object parentsDOS = map.get("parentsDOS");
+			if (ObjectUtils.isEmpty(teacherDOS)&&ObjectUtils.isEmpty(parentsDOS)){
+				return new ResultBean(false);
+			}else {
+				return new ResultBean(map);
+			}
+		}catch (Exception e){
+			return new ResultBean(e);
+		}
+	}
+
+	/**
+	 * 首页数据
+	 * @param schoolId
+	 */
+	@PostMapping("/homePage")
+	public ResultBean homePage(@Param("openid")String openid, @Param("schoolId") Long schoolId){
+		try {
+			Map<String, Object> map = userService.homePage(openid, schoolId);
+			return new ResultBean(map);
+		}catch (Exception e){
+			return new ResultBean(e);
+		}
+	}
+
+	/**
+	 * 获取openid回调
+	 * https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxbc1f8607137d3b8a&redirect_uri=https%3a%2f%2fwww.akuiguoshu.com%2fschool%2fuser%2fuserLogin&response_type=code&scope=snsapi_userinfo&connect_redirect=1#wechat_redirect
+	 * @param request
+	 * @return
+	 */
+	@GetMapping("/userLogin")
+	public ModelAndView userLogin(HttpServletRequest request) {
+		String code=request.getParameter("code");
+		String appId=request.getParameter("state");
+		HashMap<String, Object> map = new HashMap<>();
+		map.put("schoolAppid",appId);
+		List<SchoolDO> list = schoolService.list(map);
+		SchoolDO schoolDO = list.get(0);
+		HashMap<String, Object> params=new HashMap<>();
+		params.put("appid",appId);
+		params.put("secret",schoolDO.getSchoolSecret());
+		params.put("code", code);
+		params.put("grant_type", "authorization_code");
+		HttpRequest response= HttpRequest.get("https://api.weixin.qq.com/sns/oauth2/access_token", params, true);
+		String result=response.body();
+		String openid= JSON.parseObject(result).getString("openid");
+		//String token= JSON.parseObject(result).getString("access_token");
+		return  new ModelAndView("redirect:https://school-wechat.ubtob.com/bindMenu/open/"+openid);
+	}
+
+	/**
+	 * 获取所有老师的信息
+	 * @param schoolId
+	 * @return
+	 * @throws Exception
+	 */
+	@GetMapping("/getAllTeacher")
+	public ResultBean getAllTeacher(Long schoolId) {
+		try {
+			List<TeacherDO> allTeacher = userService.getAllTeacher(schoolId);
+			return new ResultBean(allTeacher);
+		}catch (Exception e){
+			return new ResultBean(e);
+		}
+	}
+
+	/**
+	 * 根据学号获取相应班级及教师
+	 * @param stuId
+	 * @return
+	 */
+	@GetMapping("/getTeacherByStuId")
+	public ResultBean getTeacherByStuId(Long stuId) {
+		try {
+			Map<String, Object> teacherByStuId = userService.getTeacherByStuId(stuId);
+			return new ResultBean(teacherByStuId);
+		}catch (Exception e){
+			return new ResultBean(e);
+		}
+	}
+
+	/**
+	 * 老师获取对应的学生及家长列表
+	 * @param teacherId
+	 * @return
+	 * @throws Exception
+	 */
+	@GetMapping("/getParentsByTeacherId")
+	public ResultBean getParentsByTeacherId(Long teacherId) {
+		try {
+			List<Map<String, Object>> parentsByTeacherId = userService.getParentsByTeacherId(teacherId);
+			return new ResultBean(parentsByTeacherId);
+		}catch (Exception e){
+			return new ResultBean(e);
+		}
+	}
+
+	/**
+	 * 教师端获得所在班级的所有人员
+	 * @param teacherId
+	 */
+	@GetMapping("/getClazzByTeacherId")
+	public ResultBean getClazzByTeacherId(Long teacherId) {
+		try {
+			List<Map<String, Object>> clazzByTeacherId = userService.getClazzByTeacherId(teacherId);
+			return new ResultBean(clazzByTeacherId);
+		}catch (Exception e){
+			return new ResultBean(e);
+		}
+	}
+
+	/**
+	 * 修改手机号
+	 * @param userPhone
+	 * @param openid
+	 * @param code
+	 * @return
+	 * @throws Exception
+	 */
+	@PostMapping("/updatePhone")
+	public ResultBean updatePhone(@Param("userPhone") String userPhone, @Param("openid") String openid, @Param("code") String code){
+		try {
+			int i = userService.updatePhone(userPhone, openid, code);
+			if (i>0){
+				return new ResultBean("修改成功");
+			}else {
+				return new ResultBean(FAIL, "修改失败,请联系管理员");
+			}
+		}catch (Exception e){
+			return new ResultBean(e);
+		}
+	}
+	
+}

+ 169 - 0
applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/controller/VoteController.java

@@ -0,0 +1,169 @@
+package com.usoftchina.smartschool.wechat.controller;
+
+import com.usoftchina.smartschool.wechat.domain.VoteDO;
+import com.usoftchina.smartschool.wechat.service.VoteService;
+import com.usoftchina.smartschool.wechat.utils.ResultBean;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.Assert;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Map;
+
+import static com.usoftchina.smartschool.wechat.utils.ResultBean.ErrorCode.FAIL;
+
+/**
+ * 投票单; InnoDB free: 5120 kB
+ * 
+ * @author kl
+ * @email ${email}
+ * @date 2019-01-16 16:26:30
+ */
+ 
+@RestController
+@RequestMapping("/wxSchool/vote")
+public class VoteController {
+	@Autowired
+	private VoteService voteService;
+
+	/** 创建投票单
+	 *
+	 * @param voteString
+	 * @return
+	 */
+	@PostMapping("/voteCreate")
+	public ResultBean voteCreate(String voteString){
+		try {
+			Assert.notNull(voteString,"请填入相应的单据");
+			String s = voteService.voteCreate(voteString);
+			return new ResultBean(s);
+		}catch (Exception e){
+			return new ResultBean(e);
+		}
+	}
+	/**
+	 *  家长投票单列表
+	 * @param stuId
+	 * @param pageIndex
+	 * @param pageSize
+	 * @param voteType
+	 * @return
+	 */
+	@PostMapping("/voteListStu")
+	public ResultBean voteListStu(@Param("stuId") Long stuId, @Param("pageIndex")Integer pageIndex, @Param("pageSize")Integer pageSize, @Param("voteType") Integer voteType){
+		try {
+			List<VoteDO> voteDOS = voteService.voteListStu(stuId, pageIndex, pageSize, voteType);
+			return new ResultBean(voteDOS);
+		}catch (Exception e){
+			return new ResultBean(e);
+		}
+	}
+
+	/**
+	 * 教师投票单列表
+	 * @param teacherId
+	 * @param pageIndex
+	 * @param pageSize
+	 * @param voteType
+	 * @return
+	 */
+	@PostMapping("/voteListForTeacher")
+	public ResultBean voteListForTeacher(@Param("teacherId") Long teacherId, @Param("pageIndex")Integer pageIndex, @Param("pageSize")Integer pageSize, @Param("voteType") Integer voteType){
+		try {
+			Map<String, Object> map = voteService.voteListForTeacher(teacherId, pageIndex, pageSize, voteType);
+			return new ResultBean(map);
+		}catch (Exception e){
+			return new ResultBean(e);
+		}
+	}
+
+	/**
+	 * 教师端投票
+	 * @param optionIds
+	 * @param voteId
+	 * @param teacherId
+	 * @return
+	 * @throws Exception
+	 */
+	@PostMapping("/voteActionTeacher")
+	public ResultBean voteActionTeacher(@Param("optionIds") String optionIds, @Param("voteId")Long voteId, @Param("teacherId")Long teacherId){
+		try {
+			String s = voteService.voteActionTeacher(optionIds, voteId, teacherId);
+			return new ResultBean(s);
+		}catch (Exception e){
+			return new ResultBean(e);
+		}
+	}
+
+
+	/**
+	 * 家长端投票
+	 * @param optionIds
+	 * @param voteId
+	 * @param parentId
+	 * @return
+	 * @throws Exception
+	 */
+	@PostMapping("/voteActionParent")
+	public ResultBean voteActionParent(@Param("optionIds") String optionIds, @Param("voteId")Long voteId, @Param("parentId")Long parentId,@Param("stuId")Long stuId) {
+		try {
+			String s = voteService.voteActionParent(optionIds, voteId, parentId,stuId);
+			return new ResultBean(s);
+		}catch (Exception e){
+			return new ResultBean(e);
+		}
+	}
+
+	/**
+	 * 家长端投票单详情
+	 * @param voteId
+	 * @return
+	 */
+	@PostMapping("/voteDetailStu")
+	public ResultBean voteDetailStu(@Param("stuId") Long stuId, @Param("voteId") Long voteId){
+		try {
+			VoteDO voteDO = voteService.voteDetailStu(stuId, voteId);
+			return new ResultBean(voteDO);
+		}catch (Exception e){
+			return new ResultBean(e);
+		}
+	}
+
+
+	/**
+	 * 教师端投票单详情
+	 * @param voteId
+	 * @return
+	 */
+	@PostMapping("/voteDetailTeacher")
+	public ResultBean voteDetailTeacher(@Param("teacherId") Long teacherId, @Param("voteId") Long voteId){
+		try {
+			VoteDO voteDO = voteService.voteDetailTeacher(teacherId, voteId);
+			return new ResultBean(voteDO);
+		}catch (Exception e){
+			return new ResultBean(e);
+		}
+	}
+
+	/**
+	 * 删除投票单
+	 * @param teacherId
+	 * @param voteId
+	 */
+	@PostMapping("/deleteVote")
+	public ResultBean deleteVote(@Param("teacherId") Long teacherId, @Param("voteId") Long voteId){
+		try {
+			int i = voteService.deleteVote(teacherId, voteId);
+			if (i>0){
+				return new ResultBean("删除成功");
+			}else {
+				return new ResultBean(FAIL,"删除失败,请联系管理员");
+			}
+		}catch (Exception e){
+			return new ResultBean(e);
+		}
+	}
+}

+ 4 - 0
applications/wechat/wechat-api/src/main/java/com/usoftchina/smartschool/wechat/domain/ClazzAlbumDO.java → applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/ClazzAlbumDO.java

@@ -36,6 +36,10 @@ public class ClazzAlbumDO implements Serializable {
 	private Long clazzId;
 	//学校
 	private Long schoolId;
+	//备注
+	private String albumRemarks;
+
+	private Integer albumCount;
 
 	private List<ClazzPictureDO> clazzPictureDOS;
 

+ 6 - 0
applications/wechat/wechat-api/src/main/java/com/usoftchina/smartschool/wechat/domain/ClazzCurriculumDO.java → applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/ClazzCurriculumDO.java

@@ -24,16 +24,22 @@ public class ClazzCurriculumDO implements Serializable {
 	private Integer curLessons;
 	//星期一科目
 	private Long curMon;
+	private String curMonSubject;
 	//星期二科目
 	private Long curTues;
+	private String curTuesSubject;
 	//星期三科目
 	private Long curWed;
+	private String curWedSubject;
 	//星期四科目
 	private Long curThur;
+	private String curThurSubject;
 	//星期五科目
 	private Long curFri;
+	private String curFriSubject;
 	//星期六科目
 	private Long curSat;
+	private String curSatSubject;
 	//开始时间
 	private Date curStartTime;
 	//结束时间

+ 4 - 0
applications/wechat/wechat-api/src/main/java/com/usoftchina/smartschool/wechat/domain/ClazzDO.java → applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/ClazzDO.java

@@ -31,6 +31,10 @@ public class ClazzDO implements Serializable {
 	//年级编号
 	private Long gradeId;
 
+	private String gradeName;
+
+	private List<StudentDO> studentDOS;
+
 	//private List<ClazzAlbumDO> clazzAlbumDOS;
 
 

+ 0 - 0
applications/wechat/wechat-api/src/main/java/com/usoftchina/smartschool/wechat/domain/ClazzPictureDO.java → applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/ClazzPictureDO.java


+ 0 - 0
applications/wechat/wechat-api/src/main/java/com/usoftchina/smartschool/wechat/domain/ContentDO.java → applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/ContentDO.java


+ 0 - 0
applications/wechat/wechat-api/src/main/java/com/usoftchina/smartschool/wechat/domain/FileDO.java → applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/FileDO.java


+ 0 - 0
applications/wechat/wechat-api/src/main/java/com/usoftchina/smartschool/wechat/domain/GradeDO.java → applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/GradeDO.java


+ 0 - 0
applications/wechat/wechat-api/src/main/java/com/usoftchina/smartschool/wechat/domain/LogDO.java → applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/LogDO.java


+ 12 - 2
applications/wechat/wechat-api/src/main/java/com/usoftchina/smartschool/wechat/domain/MeetingDO.java → applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/MeetingDO.java

@@ -4,7 +4,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
-
+import java.util.List;
 
 
 /**
@@ -24,12 +24,15 @@ public class MeetingDO implements Serializable {
 	private String meetingName;
 	//详情
 	private String meetingDetails;
-	//状态  1发布   2草稿  
+	//状态  1发布   0草稿 2开始  3结束
 	private Integer meetingStatus;
 	//附件
 	private String meetingFiles;
+	private List<String> enclosure;
 	//创建人
 	private Long meetingCreator;
+	private String teacherName;
+	private String teacherPhoto;
 	//会议地址
 	private String meetingAddress;
 	//创建时间
@@ -42,8 +45,15 @@ public class MeetingDO implements Serializable {
 	private Date reminderDate;
 	//备注
 	private String meetingRemarks;
+
+	private String meetingNotifier;
+
+	private Integer meetingSign;
 	//学校
 	private Long schoolId;
 
+	private List<MeetingRecordsDO> sign;
+
+	private List<MeetingRecordsDO> unSign;
 
 }

+ 2 - 0
applications/wechat/wechat-api/src/main/java/com/usoftchina/smartschool/wechat/domain/MeetingRecordsDO.java → applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/MeetingRecordsDO.java

@@ -24,6 +24,8 @@ public class MeetingRecordsDO implements Serializable {
 	private Long meetingId;
 	//教师
 	private Long teacherId;
+	private String teacherName;
+	private String teacherPhoto;
 	//状态  1未读   2已读   3已签到
 	private Integer isRead;
 	//阅读时间

+ 0 - 0
applications/wechat/wechat-api/src/main/java/com/usoftchina/smartschool/wechat/domain/MenuDO.java → applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/MenuDO.java


+ 0 - 0
applications/wechat/wechat-api/src/main/java/com/usoftchina/smartschool/wechat/domain/MenuRoleDO.java → applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/MenuRoleDO.java


+ 15 - 1
applications/wechat/wechat-api/src/main/java/com/usoftchina/smartschool/wechat/domain/NotifyDO.java → applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/NotifyDO.java

@@ -4,7 +4,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
-
+import java.util.List;
 
 
 /**
@@ -30,6 +30,8 @@ public class NotifyDO implements Serializable {
 	private String notifyFiles;
 	//创建人
 	private Long notifyCreator;
+	private String teacherName;
+	private String teacherPhoto;
 	//创建时间
 	private Date createDate;
 	//状态 1发布  2草稿
@@ -37,5 +39,17 @@ public class NotifyDO implements Serializable {
 	//备注
 	private String notifyRemarks;
 
+	private Long schoolId;
+
+	private String notifyTeacher;
+
+	private String notifyStu;
+
+	private Integer isRead;
+
+	private List<NotifyrecordsDO> read;
+
+	private List<NotifyrecordsDO> unRead;
+
 
 }

+ 5 - 1
applications/wechat/wechat-api/src/main/java/com/usoftchina/smartschool/wechat/domain/NotifyrecordsDO.java → applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/NotifyrecordsDO.java

@@ -23,9 +23,13 @@ public class NotifyrecordsDO implements Serializable {
 	//通知
 	private Long notifyId;
 	//家长
-	private Integer parentId;
+	private Long stuId;
+	private String stuName;
+	private String stuPhoto;
 	//教师
 	private Long teacherId;
+	private String teacherName;
+	private String teacherPhoto;
 	//阅读  1未读  2已读
 	private Integer isRead;
 	//阅读时间

+ 7 - 1
applications/wechat/wechat-api/src/main/java/com/usoftchina/smartschool/wechat/domain/OaApproveDO.java → applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/OaApproveDO.java

@@ -4,7 +4,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
-
+import java.util.List;
 
 
 /**
@@ -30,8 +30,12 @@ public class OaApproveDO implements Serializable {
 	private Integer appType;
 	//申请人
 	private Long proposer;
+	private String proposerName;
+	private String proposerPhoto;
 	//审批人
 	private Long approver;
+	private String approverName;
+	private String approverPhoto;
 	//创建时间
 	private Date creatDate;
 	//审批时间
@@ -51,5 +55,7 @@ public class OaApproveDO implements Serializable {
 	//学校
 	private Long schoolId;
 
+	private List<OaArticlesDO> oaArticlesDOS;
+
 
 }

+ 0 - 0
applications/wechat/wechat-api/src/main/java/com/usoftchina/smartschool/wechat/domain/OaArticlesDO.java → applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/OaArticlesDO.java


+ 5 - 1
applications/wechat/wechat-api/src/main/java/com/usoftchina/smartschool/wechat/domain/OaLeaveDO.java → applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/OaLeaveDO.java

@@ -4,7 +4,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
-
+import java.util.List;
 
 
 /**
@@ -28,6 +28,7 @@ public class OaLeaveDO implements Serializable {
 	private Integer lvType;
 	//申请人
 	private Long lvProposer;
+	private String proposerName;
 	//状态 1发布   2草稿
 	private Integer lvStatus;
 	//申请时间
@@ -44,8 +45,11 @@ public class OaLeaveDO implements Serializable {
 	private String lvNotifier;
 	//附件
 	private String lvFiles;
+	private List<String> enclosure;
 	//学校
 	private Long schoolId;
 
+	private List<OaLeaveReplyDO> oaLeaveReplyDOS;
+
 
 }

+ 2 - 0
applications/wechat/wechat-api/src/main/java/com/usoftchina/smartschool/wechat/domain/OaLeaveReplyDO.java → applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/OaLeaveReplyDO.java

@@ -28,6 +28,8 @@ public class OaLeaveReplyDO implements Serializable {
 	private String replyContent;
 	//回复人
 	private Long teacherId;
+	private String teacherName;
+	private String teacherPhoto;
 	//学生请假单
 	private Long lvId;
 

+ 0 - 0
applications/wechat/wechat-api/src/main/java/com/usoftchina/smartschool/wechat/domain/OutInRecordDO.java → applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/OutInRecordDO.java


+ 1 - 0
applications/wechat/wechat-api/src/main/java/com/usoftchina/smartschool/wechat/domain/ParentsDO.java → applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/ParentsDO.java

@@ -27,6 +27,7 @@ public class ParentsDO implements Serializable {
 	private String openid;
 	//学校编号
 	private Long schoolId;
+	private String schoolName;
 	//姓名
 	private String parentsName;
 	//生日

+ 0 - 0
applications/wechat/wechat-api/src/main/java/com/usoftchina/smartschool/wechat/domain/ParentsStuDO.java → applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/ParentsStuDO.java


+ 0 - 0
applications/wechat/wechat-api/src/main/java/com/usoftchina/smartschool/wechat/domain/PayCardDO.java → applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/PayCardDO.java


+ 0 - 0
applications/wechat/wechat-api/src/main/java/com/usoftchina/smartschool/wechat/domain/PayRanksDO.java → applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/PayRanksDO.java


+ 0 - 0
applications/wechat/wechat-api/src/main/java/com/usoftchina/smartschool/wechat/domain/PaymentDO.java → applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/PaymentDO.java


+ 0 - 0
applications/wechat/wechat-api/src/main/java/com/usoftchina/smartschool/wechat/domain/PaymentrecordsDO.java → applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/PaymentrecordsDO.java


+ 2 - 0
applications/wechat/wechat-api/src/main/java/com/usoftchina/smartschool/wechat/domain/PrincipalMailboxDO.java → applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/PrincipalMailboxDO.java

@@ -39,5 +39,7 @@ public class PrincipalMailboxDO implements Serializable {
 	//通知人
 	private Long notifier;
 
+	private Long schoolId;
+
 
 }

+ 0 - 0
applications/wechat/wechat-api/src/main/java/com/usoftchina/smartschool/wechat/domain/PrincipalReplyDO.java → applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/PrincipalReplyDO.java


+ 0 - 0
applications/wechat/wechat-api/src/main/java/com/usoftchina/smartschool/wechat/domain/RoleDO.java → applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/RoleDO.java


+ 2 - 0
applications/wechat/wechat-api/src/main/java/com/usoftchina/smartschool/wechat/domain/SchoolDO.java → applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/SchoolDO.java

@@ -35,5 +35,7 @@ public class SchoolDO implements Serializable {
 	//公众号密钥
 	private String schoolSecret;
 
+	private Long teacherId;
+
 
 }

+ 2 - 0
applications/wechat/wechat-api/src/main/java/com/usoftchina/smartschool/wechat/domain/StuScoreDO.java → applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/StuScoreDO.java

@@ -24,10 +24,12 @@ public class StuScoreDO implements Serializable {
 	private String scoreType;
 	//考试科目
 	private Long subjectId;
+	private String subjectName;
 	//名称
 	private String scoreName;
 	//学生
 	private Long stuId;
+	private String stuName;
 	//分值
 	private Double scoreTotal;
 	//得分

+ 2 - 0
applications/wechat/wechat-api/src/main/java/com/usoftchina/smartschool/wechat/domain/StudentDO.java → applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/StudentDO.java

@@ -43,6 +43,8 @@ public class StudentDO implements Serializable {
 	private Integer stuStatus;
 	//备注
 	private String stuRemarks;
+	//是否写入硬件 1写入  0不写入
+	private Integer stuIsWrite;
 	//班级
 	private Long clazzId;
 	private Map<String,Object> clazzMap;

+ 0 - 0
applications/wechat/wechat-api/src/main/java/com/usoftchina/smartschool/wechat/domain/SubjectDO.java → applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/SubjectDO.java


+ 5 - 1
applications/wechat/wechat-api/src/main/java/com/usoftchina/smartschool/wechat/domain/TaskNotifyDO.java → applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/TaskNotifyDO.java

@@ -28,7 +28,7 @@ public class TaskNotifyDO implements Serializable {
 	private String taskContext;
 	//附件
 	private String taskFiles;
-	//状态   1发布    2草稿    3已回复
+	//状态   1发布    0草稿    3已回复
 	private Integer taskStatus;
 	//创建时间
 	private Date createDate;
@@ -39,5 +39,9 @@ public class TaskNotifyDO implements Serializable {
 	//创建人
 	private Long taskCreator;
 
+	private Long schoolId;
+	//通知人
+	private String taskNotifier;
+
 
 }

+ 2 - 0
applications/wechat/wechat-api/src/main/java/com/usoftchina/smartschool/wechat/domain/TaskReplyDO.java → applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/TaskReplyDO.java

@@ -31,5 +31,7 @@ public class TaskReplyDO implements Serializable {
 	//回复人
 	private Long parentId;
 
+	private Long stuId;
+
 
 }

+ 0 - 0
applications/wechat/wechat-api/src/main/java/com/usoftchina/smartschool/wechat/domain/TeacherClazzDO.java → applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/TeacherClazzDO.java


+ 1 - 0
applications/wechat/wechat-api/src/main/java/com/usoftchina/smartschool/wechat/domain/TeacherDO.java → applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/TeacherDO.java

@@ -27,6 +27,7 @@ public class TeacherDO implements Serializable {
 	private String userPhone;
 	//学号编号
 	private Long schoolId;
+	private String schoolName;
 	//工号
 	private String teacherNumber;
 	//姓名

+ 0 - 0
applications/wechat/wechat-api/src/main/java/com/usoftchina/smartschool/wechat/domain/UserDO.java → applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/UserDO.java


+ 0 - 0
applications/wechat/wechat-api/src/main/java/com/usoftchina/smartschool/wechat/domain/UserRoleDO.java → applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/UserRoleDO.java


+ 9 - 3
applications/wechat/wechat-api/src/main/java/com/usoftchina/smartschool/wechat/domain/VoteDO.java → applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/VoteDO.java

@@ -4,7 +4,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
-
+import java.util.List;
 
 
 /**
@@ -26,22 +26,28 @@ public class VoteDO implements Serializable {
 	private Integer voteType;
 	//创建人
 	private Long creator;
+	private String teacherName;
+	private String teacherPhoto;
 	//创建时间
 	private Date creatDate;
 	//截至时间
 	private Date voteEndDate;
 	//投票时间
 	private Date voteDate;
-	//投票人
-	private String voter;
+	//家长
+	private String stuIds;
+	//教师
+	private String teacherIds;
 	//附件
 	private String voteFile;
+	private List<String> enclosure;
 	//备注
 	private String voteRemarks;
 	//状态 1使用  2闲置
 	private Integer voteStatus;
 	//学校
 	private Long schoolId;
+	private List<VoteTopicDO> voteTopicDOS;
 
 
 }

+ 5 - 1
applications/wechat/wechat-api/src/main/java/com/usoftchina/smartschool/wechat/domain/VoteElectDO.java → applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/VoteElectDO.java

@@ -27,7 +27,11 @@ public class VoteElectDO implements Serializable {
 	//投票单
 	private Long voteId;
 	//投票人
-	private Long userId;
+	private Long teacherId;
+
+	private Long parentId;
+
+	private Long stuId;
 
 
 }

+ 5 - 1
applications/wechat/wechat-api/src/main/java/com/usoftchina/smartschool/wechat/domain/VoteOptionsDO.java → applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/VoteOptionsDO.java

@@ -4,7 +4,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
-
+import java.util.List;
 
 
 /**
@@ -26,8 +26,12 @@ public class VoteOptionsDO implements Serializable {
 	private Integer optionStatus;
 	//附件
 	private String optionFiles;
+	private List<String> enclosure;
 	//题目
 	private Long topicId;
 
+	private Integer count;
+	private Double percent;
+
 
 }

+ 4 - 1
applications/wechat/wechat-api/src/main/java/com/usoftchina/smartschool/wechat/domain/VoteTopicDO.java → applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/domain/VoteTopicDO.java

@@ -4,7 +4,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
-
+import java.util.List;
 
 
 /**
@@ -28,6 +28,7 @@ public class VoteTopicDO implements Serializable {
 	private Integer topicStatus;
 	//附件
 	private String topicFiles;
+	private List<String> enclosure;
 	//创建者
 	private Long creator;
 	//创建时间
@@ -35,5 +36,7 @@ public class VoteTopicDO implements Serializable {
 	//投票表
 	private Long voteId;
 
+	private List<VoteOptionsDO> voteOptionsDOS;
+
 
 }

+ 38 - 0
applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/mapper/ClazzAlbumMapper.java

@@ -0,0 +1,38 @@
+package com.usoftchina.smartschool.wechat.mapper;
+
+import com.usoftchina.smartschool.wechat.domain.ClazzAlbumDO;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 相册; InnoDB free: 5120 kB
+ * @author kl
+ * @email ${email}
+ * @date 2019-01-16 16:26:23
+ */
+@Mapper
+public interface ClazzAlbumMapper {
+
+	ClazzAlbumDO get(Long albumId);
+	
+	List<ClazzAlbumDO> list(Map<String, Object> map);
+	
+	int count(Map<String, Object> map);
+	
+	int save(ClazzAlbumDO clazzAlbum);
+	
+	int update(ClazzAlbumDO clazzAlbum);
+	
+	int remove(Long album_id);
+	
+	int batchRemove(Long[] albumIds);
+
+	List<ClazzAlbumDO> getListByClazzId(Long clazzId);
+
+	List<ClazzAlbumDO> listByClazzId(@Param("clazzId") Long clazzId, @Param("albumType")Integer albumType, @Param("albumStatus")Integer albumStatus, @Param("pageStart")Integer pageStart, @Param("pageSize")Integer pageSize);
+
+}

+ 27 - 0
applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/mapper/ClazzCurriculumMapper.java

@@ -0,0 +1,27 @@
+package com.usoftchina.smartschool.wechat.mapper;
+
+
+import java.util.List;
+
+import com.usoftchina.smartschool.wechat.domain.ClazzCurriculumDO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 课程表; InnoDB free: 5120 kB
+ * @author kl
+ * @email ${email}
+ * @date 2019-01-16 16:26:24
+ */
+@Mapper
+public interface ClazzCurriculumMapper {
+
+	/** 通过学号  取课程表 */
+	public List<ClazzCurriculumDO> selectCurriculumByStuId(@Param("stuId") Long stuId, @Param("curStatus") Integer curStatus);
+
+	/** 拿到相应教师在某个班级所教课程的名称 */
+	//List<String> selectCurriculumByteacherId(@Param("schId") Long schId, @Param("userId") Long userId);
+
+	/** 通过学号  取课程表 */
+	public List<ClazzCurriculumDO> selectCurriculumByteacherId(@Param("teacherId") Long teacherId, @Param("curStatus") Integer curStatus);
+}

+ 34 - 0
applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/mapper/ClazzMapper.java

@@ -0,0 +1,34 @@
+package com.usoftchina.smartschool.wechat.mapper;
+
+import com.usoftchina.smartschool.wechat.domain.ClazzDO;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 班级表; InnoDB free: 5120 kB
+ * @author kl
+ * @email ${email}
+ * @date 2019-01-16 16:26:27
+ */
+@Mapper
+public interface ClazzMapper {
+
+	ClazzDO get(Long clazzId);
+	
+	List<ClazzDO> list(Map<String, Object> map);
+	
+	int count(Map<String, Object> map);
+	
+	int save(ClazzDO clazz);
+	
+	int update(ClazzDO clazz);
+	
+	int remove(Long clazz_id);
+	
+	int batchRemove(Long[] clazzIds);
+
+	List<Long> getByClazzId(Long clazzId);
+}

+ 37 - 0
applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/mapper/ClazzPictureMapper.java

@@ -0,0 +1,37 @@
+package com.usoftchina.smartschool.wechat.mapper;
+
+import com.usoftchina.smartschool.wechat.domain.ClazzPictureDO;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 相片表; InnoDB free: 5120 kB
+ * @author kl
+ * @email ${email}
+ * @date 2019-01-16 16:26:24
+ */
+@Mapper
+public interface ClazzPictureMapper {
+
+	ClazzPictureDO get(Long picId);
+	
+	List<ClazzPictureDO> list(Map<String, Object> map);
+	
+	int count(Map<String, Object> map);
+	
+	int save(ClazzPictureDO clazzPicture);
+	
+	int update(ClazzPictureDO clazzPicture);
+	
+	int remove(Long pic_id);
+	
+	int batchRemove(Long[] picIds);
+
+	List<ClazzPictureDO> listByAlbumId(Long albumId);
+
+	List<ClazzPictureDO> getPictureByAlbum(@Param("albumId") Long albumId, @Param("pageStart")Integer pageStart, @Param("pageSize") Integer pageSize);
+}

+ 32 - 0
applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/mapper/ContentMapper.java

@@ -0,0 +1,32 @@
+package com.usoftchina.smartschool.wechat.mapper;
+
+import com.usoftchina.smartschool.wechat.domain.ContentDO;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 新闻资讯; InnoDB free: 5120 kB
+ * @author kl
+ * @email ${email}
+ * @date 2019-01-16 16:26:24
+ */
+@Mapper
+public interface ContentMapper {
+
+	ContentDO get(Long conId);
+	
+	List<ContentDO> list(Map<String, Object> map);
+	
+	int count(Map<String, Object> map);
+	
+	int save(ContentDO content);
+	
+	int update(ContentDO content);
+	
+	int remove(Long con_id);
+	
+	int batchRemove(Long[] conIds);
+}

+ 34 - 0
applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/mapper/FileMapper.java

@@ -0,0 +1,34 @@
+package com.usoftchina.smartschool.wechat.mapper;
+
+import com.usoftchina.smartschool.wechat.domain.FileDO;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 文件表; InnoDB free: 5120 kB
+ * @author kl
+ * @email ${email}
+ * @date 2019-01-16 16:26:27
+ */
+@Mapper
+public interface FileMapper {
+
+	FileDO get(Long fileId);
+	
+	List<FileDO> list(Map<String, Object> map);
+	
+	int count(Map<String, Object> map);
+	
+	int save(FileDO file);
+	
+	int update(FileDO file);
+	
+	int remove(Long file_id);
+	
+	int batchRemove(Long[] fileIds);
+
+	int removeByUrl(String fileUrl);
+}

+ 32 - 0
applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/mapper/GradeMapper.java

@@ -0,0 +1,32 @@
+package com.usoftchina.smartschool.wechat.mapper;
+
+import com.usoftchina.smartschool.wechat.domain.GradeDO;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 年级表; InnoDB free: 5120 kB
+ * @author kl
+ * @email ${email}
+ * @date 2019-01-16 16:26:27
+ */
+@Mapper
+public interface GradeMapper {
+
+	GradeDO get(Long gradeId);
+	
+	List<GradeDO> list(Map<String, Object> map);
+	
+	int count(Map<String, Object> map);
+	
+	int save(GradeDO grade);
+	
+	int update(GradeDO grade);
+	
+	int remove(Long grade_id);
+	
+	int batchRemove(Long[] gradeIds);
+}

+ 32 - 0
applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/mapper/LogMapper.java

@@ -0,0 +1,32 @@
+package com.usoftchina.smartschool.wechat.mapper;
+
+import com.usoftchina.smartschool.wechat.domain.LogDO;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 系统日志; InnoDB free: 5120 kB
+ * @author kl
+ * @email ${email}
+ * @date 2019-01-16 16:26:27
+ */
+@Mapper
+public interface LogMapper {
+
+	LogDO get(Long id);
+	
+	List<LogDO> list(Map<String, Object> map);
+	
+	int count(Map<String, Object> map);
+	
+	int save(LogDO log);
+	
+	int update(LogDO log);
+	
+	int remove(Long id);
+	
+	int batchRemove(Long[] ids);
+}

+ 37 - 0
applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/mapper/MeetingMapper.java

@@ -0,0 +1,37 @@
+package com.usoftchina.smartschool.wechat.mapper;
+
+import com.usoftchina.smartschool.wechat.domain.MeetingDO;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 会议表; InnoDB free: 5120 kB
+ * @author kl
+ * @email ${email}
+ * @date 2019-01-16 16:26:24
+ */
+@Mapper
+public interface MeetingMapper {
+
+	MeetingDO get(Long meetingId);
+	
+	List<MeetingDO> list(Map<String, Object> map);
+	
+	int count(Map<String, Object> map);
+	
+	int save(MeetingDO meeting);
+	
+	int update(MeetingDO meeting);
+	
+	int remove(Long meeting_id);
+	
+	int batchRemove(Long[] meetingIds);
+
+	List<MeetingDO> selectMeetingListByCreator(@Param("meetingCreator") Long meetingCreator, @Param("meetingStatus") Integer meetingStatus, @Param("pageStart") Integer pageStart, @Param("pageSize") Integer pageSize);
+
+	List<MeetingDO> selectMeetingListByLike(@Param("meetingNotifier") String meetingNotifier, @Param("meetingStatus") Integer meetingStatus, @Param("pageStart") Integer pageStart, @Param("pageSize") Integer pageSize);
+}

+ 32 - 0
applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/mapper/MeetingRecordsMapper.java

@@ -0,0 +1,32 @@
+package com.usoftchina.smartschool.wechat.mapper;
+
+import com.usoftchina.smartschool.wechat.domain.MeetingRecordsDO;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 会议签到表; InnoDB free: 5120 kB
+ * @author kl
+ * @email ${email}
+ * @date 2019-01-16 16:26:24
+ */
+@Mapper
+public interface MeetingRecordsMapper {
+
+	MeetingRecordsDO get(Long meetingRecordId);
+	
+	List<MeetingRecordsDO> list(Map<String, Object> map);
+	
+	int count(Map<String, Object> map);
+	
+	int save(MeetingRecordsDO meetingRecords);
+	
+	int update(MeetingRecordsDO meetingRecords);
+	
+	int remove(Long meeting_record_id);
+	
+	int batchRemove(Long[] meetingRecordIds);
+}

+ 32 - 0
applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/mapper/MenuMapper.java

@@ -0,0 +1,32 @@
+package com.usoftchina.smartschool.wechat.mapper;
+
+import com.usoftchina.smartschool.wechat.domain.MenuDO;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 菜单表; InnoDB free: 5120 kB
+ * @author kl
+ * @email ${email}
+ * @date 2019-01-16 16:26:28
+ */
+@Mapper
+public interface MenuMapper {
+
+	MenuDO get(Long menuId);
+	
+	List<MenuDO> list(Map<String, Object> map);
+	
+	int count(Map<String, Object> map);
+	
+	int save(MenuDO menu);
+	
+	int update(MenuDO menu);
+	
+	int remove(Long menu_id);
+	
+	int batchRemove(Long[] menuIds);
+}

+ 32 - 0
applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/mapper/MenuRoleMapper.java

@@ -0,0 +1,32 @@
+package com.usoftchina.smartschool.wechat.mapper;
+
+import com.usoftchina.smartschool.wechat.domain.MenuRoleDO;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 菜单角色关系表; InnoDB free: 5120 kB
+ * @author kl
+ * @email ${email}
+ * @date 2019-01-16 16:26:28
+ */
+@Mapper
+public interface MenuRoleMapper {
+
+	MenuRoleDO get(Long menuRoleId);
+	
+	List<MenuRoleDO> list(Map<String, Object> map);
+	
+	int count(Map<String, Object> map);
+	
+	int save(MenuRoleDO menuRole);
+	
+	int update(MenuRoleDO menuRole);
+	
+	int remove(Long menu_role_id);
+	
+	int batchRemove(Long[] menuRoleIds);
+}

+ 41 - 0
applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/mapper/NotifyMapper.java

@@ -0,0 +1,41 @@
+package com.usoftchina.smartschool.wechat.mapper;
+
+import com.usoftchina.smartschool.wechat.domain.NotifyDO;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 通知表; InnoDB free: 5120 kB
+ * @author kl
+ * @email ${email}
+ * @date 2019-01-16 16:26:24
+ */
+@Mapper
+public interface NotifyMapper {
+
+	NotifyDO get(Long notifyId);
+	
+	List<NotifyDO> list(Map<String, Object> map);
+	
+	int count(Map<String, Object> map);
+	
+	int save(NotifyDO notify);
+	
+	int update(NotifyDO notify);
+	
+	int remove(Long notify_id);
+	
+	int batchRemove(Long[] notifyIds);
+
+	List<NotifyDO> selectNotifyListByType(@Param("notifyType") Integer notifyType, @Param("pageStart") Integer pageStart, @Param("pageSize") Integer pageSize);
+
+	List<NotifyDO> selectNotifyListByCreator(@Param("teacherId") Long teacherId,@Param("notifyStatus") Integer notifyStatus, @Param("pageStart") Integer pageStart, @Param("pageSize") Integer pageSize);
+
+	List<NotifyDO> selectNotifyListLikeTeacher(@Param("teacherId") String teacherId,@Param("notifyStatus") Integer notifyStatus, @Param("pageStart") Integer pageStart, @Param("pageSize") Integer pageSize);
+
+	List<NotifyDO> selectNotifyListLikeStu(@Param("stuId") String stuId,@Param("notifyStatus") Integer notifyStatus, @Param("pageStart") Integer pageStart, @Param("pageSize") Integer pageSize);
+}

+ 32 - 0
applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/mapper/NotifyrecordsMapper.java

@@ -0,0 +1,32 @@
+package com.usoftchina.smartschool.wechat.mapper;
+
+import com.usoftchina.smartschool.wechat.domain.NotifyrecordsDO;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 读取通知详情表; InnoDB free: 5120 kB
+ * @author kl
+ * @email ${email}
+ * @date 2019-01-16 16:26:25
+ */
+@Mapper
+public interface NotifyrecordsMapper {
+
+	NotifyrecordsDO get(Long reId);
+	
+	List<NotifyrecordsDO> list(Map<String, Object> map);
+	
+	int count(Map<String, Object> map);
+	
+	int save(NotifyrecordsDO notifyrecords);
+	
+	int update(NotifyrecordsDO notifyrecords);
+	
+	int remove(Long re_id);
+	
+	int batchRemove(Long[] reIds);
+}

+ 47 - 0
applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/mapper/OaApproveMapper.java

@@ -0,0 +1,47 @@
+package com.usoftchina.smartschool.wechat.mapper;
+
+import com.usoftchina.smartschool.wechat.domain.OaApproveDO;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * oa出差/用品/请假表(教师端); InnoDB free: 5120 kB
+ * @author kl
+ * @email ${email}
+ * @date 2019-01-16 16:26:25
+ */
+@Mapper
+public interface OaApproveMapper {
+
+	OaApproveDO get(Long approveId);
+	
+	List<OaApproveDO> list(Map<String, Object> map);
+	
+	int count(Map<String, Object> map);
+	
+	int save(OaApproveDO oaApprove);
+	
+	int update(OaApproveDO oaApprove);
+	
+	int remove(Long approve_id);
+	
+	int batchRemove(Long[] approveIds);
+
+	/**
+	 *我发起的
+     * @param proposer
+     * @return
+			 */
+	public List<OaApproveDO> selectOaApproveListByProposer(@Param("proposer") Long proposer, @Param("pageStart") Integer pageStart, @Param("pageSize") Integer pageSize);
+
+	/**
+	 * 我要审批的,和审批的
+	 * @param approver
+	 * @return
+	 */
+	public List<OaApproveDO> selectOaApproveListByApprover(@Param("approver") Long approver, @Param("pageStart") Integer pageStart, @Param("pageSize") Integer pageSize);
+}

+ 34 - 0
applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/mapper/OaArticlesMapper.java

@@ -0,0 +1,34 @@
+package com.usoftchina.smartschool.wechat.mapper;
+
+import com.usoftchina.smartschool.wechat.domain.OaArticlesDO;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 用品详情表; InnoDB free: 5120 kB
+ * @author kl
+ * @email ${email}
+ * @date 2019-01-16 16:26:25
+ */
+@Mapper
+public interface OaArticlesMapper {
+
+	OaArticlesDO get(Long artId);
+	
+	List<OaArticlesDO> list(Map<String, Object> map);
+	
+	int count(Map<String, Object> map);
+	
+	int save(OaArticlesDO oaArticles);
+	
+	int update(OaArticlesDO oaArticles);
+	
+	int remove(Long art_id);
+	
+	int batchRemove(Long[] artIds);
+
+	List<OaArticlesDO> selectListByApproveId(Long approveId);
+}

+ 41 - 0
applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/mapper/OaLeaveMapper.java

@@ -0,0 +1,41 @@
+package com.usoftchina.smartschool.wechat.mapper;
+
+import com.usoftchina.smartschool.wechat.domain.OaLeaveDO;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 学生请假表; InnoDB free: 5120 kB
+ * @author kl
+ * @email ${email}
+ * @date 2019-01-16 16:26:25
+ */
+@Mapper
+public interface OaLeaveMapper {
+
+	OaLeaveDO get(Long lvId);
+	
+	List<OaLeaveDO> list(Map<String, Object> map);
+	
+	int count(Map<String, Object> map);
+	
+	int save(OaLeaveDO oaLeave);
+	
+	int update(OaLeaveDO oaLeave);
+	
+	int remove(Long lv_id);
+	
+	int batchRemove(Long[] lvIds);
+
+	List<OaLeaveDO> selectLeaveListByStu(@Param("stuId") Long stuId, @Param("pageStart") Integer pageStart, @Param("pageSize") Integer pageSize);
+
+	public List<OaLeaveDO> selectLeaveListByTeacher(@Param("teacherId") String teacherId, @Param("pageStart") Integer pageStart, @Param("pageSize") Integer pageSize);
+
+	//public List<Leave> leaveListBylvPro(@Param("userId") Long userId, @Param("pageStart") Integer pageStart, @Param("pageSize") Integer pageSize);
+
+	//public List<Leave> leaveListBylvApprover(@Param("userId") Long userId, @Param("pageStart") Integer pageStart, @Param("pageSize") Integer pageSize);
+}

+ 34 - 0
applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/mapper/OaLeaveReplyMapper.java

@@ -0,0 +1,34 @@
+package com.usoftchina.smartschool.wechat.mapper;
+
+import com.usoftchina.smartschool.wechat.domain.OaLeaveReplyDO;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 请假回复表; InnoDB free: 5120 kB
+ * @author kl
+ * @email ${email}
+ * @date 2019-01-16 16:26:25
+ */
+@Mapper
+public interface OaLeaveReplyMapper {
+
+	OaLeaveReplyDO get(Long replyId);
+	
+	List<OaLeaveReplyDO> list(Map<String, Object> map);
+	
+	int count(Map<String, Object> map);
+	
+	int save(OaLeaveReplyDO oaLeaveReply);
+	
+	int update(OaLeaveReplyDO oaLeaveReply);
+	
+	int remove(Long reply_id);
+	
+	int batchRemove(Long[] replyIds);
+
+	List<OaLeaveReplyDO> selectLeaveMessageListByLvId(Long lvId);
+}

+ 35 - 0
applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/mapper/OutInRecordMapper.java

@@ -0,0 +1,35 @@
+package com.usoftchina.smartschool.wechat.mapper;
+
+import com.usoftchina.smartschool.wechat.domain.OutInRecordDO;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 出入校通知表; InnoDB free: 5120 kB
+ * @author kl
+ * @email ${email}
+ * @date 2019-01-16 16:26:26
+ */
+@Mapper
+public interface OutInRecordMapper {
+
+	OutInRecordDO get(Long recordId);
+	
+	List<OutInRecordDO> list(Map<String, Object> map);
+	
+	int count(Map<String, Object> map);
+	
+	int save(OutInRecordDO outInRecord);
+	
+	int update(OutInRecordDO outInRecord);
+	
+	int remove(Long record_id);
+	
+	int batchRemove(Long[] recordIds);
+
+	public List<OutInRecordDO> selectOutInRecordDOListByStuId(@Param("stuId") Long stuId, @Param("pageStart") Integer pageStart, @Param("pageSize") Integer pageSize);
+}

+ 37 - 0
applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/mapper/ParentsMapper.java

@@ -0,0 +1,37 @@
+package com.usoftchina.smartschool.wechat.mapper;
+
+import com.usoftchina.smartschool.wechat.domain.ParentsDO;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 家长表; InnoDB free: 5120 kB
+ * @author kl
+ * @email ${email}
+ * @date 2019-01-16 16:26:28
+ */
+@Mapper
+public interface ParentsMapper {
+
+	ParentsDO get(Long parentId);
+	
+	List<ParentsDO> list(Map<String, Object> map);
+	
+	int count(Map<String, Object> map);
+	
+	int save(ParentsDO parents);
+	
+	int update(ParentsDO parents);
+	
+	int remove(Long parent_id);
+	
+	int batchRemove(Long[] parentIds);
+
+	ParentsDO getBySchoolAndOpenid(@Param("schoolId") Long schoolId, @Param("openid") String openid);
+
+	List<ParentsDO> getByStuId(Long stuId);
+}

+ 34 - 0
applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/mapper/ParentsStuMapper.java

@@ -0,0 +1,34 @@
+package com.usoftchina.smartschool.wechat.mapper;
+
+import com.usoftchina.smartschool.wechat.domain.ParentsStuDO;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 家长学生关联表; InnoDB free: 5120 kB
+ * @author kl
+ * @email ${email}
+ * @date 2019-01-16 16:26:28
+ */
+@Mapper
+public interface ParentsStuMapper {
+
+	ParentsStuDO get(Long parentStuId);
+	
+	List<ParentsStuDO> list(Map<String, Object> map);
+	
+	int count(Map<String, Object> map);
+	
+	int save(ParentsStuDO parentsStu);
+	
+	int update(ParentsStuDO parentsStu);
+	
+	int remove(Long parent_stu_id);
+	
+	int batchRemove(Long[] parentStuIds);
+
+	List<ParentsStuDO> listByStuId(Long stuId);
+}

+ 32 - 0
applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/mapper/PayCardMapper.java

@@ -0,0 +1,32 @@
+package com.usoftchina.smartschool.wechat.mapper;
+
+import com.usoftchina.smartschool.wechat.domain.PayCardDO;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 校园充值卡; InnoDB free: 5120 kB
+ * @author kl
+ * @email ${email}
+ * @date 2019-01-16 16:26:26
+ */
+@Mapper
+public interface PayCardMapper {
+
+	PayCardDO get(Long cardId);
+	
+	List<PayCardDO> list(Map<String, Object> map);
+	
+	int count(Map<String, Object> map);
+	
+	int save(PayCardDO payCard);
+	
+	int update(PayCardDO payCard);
+	
+	int remove(Long card_id);
+	
+	int batchRemove(Long[] cardIds);
+}

+ 32 - 0
applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/mapper/PayRanksMapper.java

@@ -0,0 +1,32 @@
+package com.usoftchina.smartschool.wechat.mapper;
+
+import com.usoftchina.smartschool.wechat.domain.PayRanksDO;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 充值消费详情表; InnoDB free: 5120 kB
+ * @author kl
+ * @email ${email}
+ * @date 2019-01-16 16:26:26
+ */
+@Mapper
+public interface PayRanksMapper {
+
+	PayRanksDO get(Long rankId);
+	
+	List<PayRanksDO> list(Map<String, Object> map);
+	
+	int count(Map<String, Object> map);
+	
+	int save(PayRanksDO payRanks);
+	
+	int update(PayRanksDO payRanks);
+	
+	int remove(Long rank_id);
+	
+	int batchRemove(Long[] rankIds);
+}

+ 32 - 0
applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/mapper/PaymentMapper.java

@@ -0,0 +1,32 @@
+package com.usoftchina.smartschool.wechat.mapper;
+
+import com.usoftchina.smartschool.wechat.domain.PaymentDO;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 交费表; InnoDB free: 5120 kB
+ * @author kl
+ * @email ${email}
+ * @date 2019-01-16 16:26:26
+ */
+@Mapper
+public interface PaymentMapper {
+
+	PaymentDO get(Long payId);
+	
+	List<PaymentDO> list(Map<String, Object> map);
+	
+	int count(Map<String, Object> map);
+	
+	int save(PaymentDO payment);
+	
+	int update(PaymentDO payment);
+	
+	int remove(Long pay_id);
+	
+	int batchRemove(Long[] payIds);
+}

+ 32 - 0
applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/mapper/PaymentrecordsMapper.java

@@ -0,0 +1,32 @@
+package com.usoftchina.smartschool.wechat.mapper;
+
+import com.usoftchina.smartschool.wechat.domain.PaymentrecordsDO;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 交费详情表; InnoDB free: 5120 kB
+ * @author kl
+ * @email ${email}
+ * @date 2019-01-16 16:26:26
+ */
+@Mapper
+public interface PaymentrecordsMapper {
+
+	PaymentrecordsDO get(Long stuPaymentId);
+	
+	List<PaymentrecordsDO> list(Map<String, Object> map);
+	
+	int count(Map<String, Object> map);
+	
+	int save(PaymentrecordsDO paymentrecords);
+	
+	int update(PaymentrecordsDO paymentrecords);
+	
+	int remove(Long stu_payment_id);
+	
+	int batchRemove(Long[] stuPaymentIds);
+}

+ 37 - 0
applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/mapper/PrincipalMailboxMapper.java

@@ -0,0 +1,37 @@
+package com.usoftchina.smartschool.wechat.mapper;
+
+import com.usoftchina.smartschool.wechat.domain.PrincipalMailboxDO;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 校长信箱表; InnoDB free: 5120 kB
+ * @author kl
+ * @email ${email}
+ * @date 2019-01-16 16:26:26
+ */
+@Mapper
+public interface PrincipalMailboxMapper {
+
+	PrincipalMailboxDO get(Long mailboxId);
+	
+	List<PrincipalMailboxDO> list(Map<String, Object> map);
+	
+	int count(Map<String, Object> map);
+	
+	int save(PrincipalMailboxDO principalMailbox);
+	
+	int update(PrincipalMailboxDO principalMailbox);
+	
+	int remove(Long mailbox_id);
+	
+	int batchRemove(Long[] mailboxIds);
+
+	List<PrincipalMailboxDO> teacherList(@Param("teacherId")Long teacherId,@Param("pageStart")Integer pageStart,@Param("pageSize")Integer pageSize);
+
+	List<PrincipalMailboxDO> parentList(@Param("parentId")Long parentId,@Param("pageStart")Integer pageStart,@Param("pageSize")Integer pageSize);
+}

+ 34 - 0
applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/mapper/PrincipalReplyMapper.java

@@ -0,0 +1,34 @@
+package com.usoftchina.smartschool.wechat.mapper;
+
+import com.usoftchina.smartschool.wechat.domain.PrincipalReplyDO;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 校长信箱回复表; InnoDB free: 5120 kB
+ * @author kl
+ * @email ${email}
+ * @date 2019-01-16 16:26:27
+ */
+@Mapper
+public interface PrincipalReplyMapper {
+
+	PrincipalReplyDO get(Long replyId);
+	
+	List<PrincipalReplyDO> list(Map<String, Object> map);
+	
+	int count(Map<String, Object> map);
+	
+	int save(PrincipalReplyDO principalReply);
+	
+	int update(PrincipalReplyDO principalReply);
+	
+	int remove(Long reply_id);
+	
+	int batchRemove(Long[] replyIds);
+
+	List<PrincipalReplyDO> listByMailboxId(Long mailboxId);
+}

+ 32 - 0
applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/mapper/RoleMapper.java

@@ -0,0 +1,32 @@
+package com.usoftchina.smartschool.wechat.mapper;
+
+import com.usoftchina.smartschool.wechat.domain.RoleDO;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 角色表; InnoDB free: 5120 kB
+ * @author kl
+ * @email ${email}
+ * @date 2019-01-16 16:26:28
+ */
+@Mapper
+public interface RoleMapper {
+
+	RoleDO get(Long roleId);
+	
+	List<RoleDO> list(Map<String, Object> map);
+	
+	int count(Map<String, Object> map);
+	
+	int save(RoleDO role);
+	
+	int update(RoleDO role);
+	
+	int remove(Long role_id);
+	
+	int batchRemove(Long[] roleIds);
+}

+ 32 - 0
applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/mapper/SchoolMapper.java

@@ -0,0 +1,32 @@
+package com.usoftchina.smartschool.wechat.mapper;
+
+import com.usoftchina.smartschool.wechat.domain.SchoolDO;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 学校表; InnoDB free: 5120 kB
+ * @author kl
+ * @email ${email}
+ * @date 2019-01-16 16:26:28
+ */
+@Mapper
+public interface SchoolMapper {
+
+	SchoolDO get(Long schoolId);
+	
+	List<SchoolDO> list(Map<String, Object> map);
+	
+	int count(Map<String, Object> map);
+	
+	int save(SchoolDO school);
+	
+	int update(SchoolDO school);
+	
+	int remove(Long school_id);
+	
+	int batchRemove(Long[] schoolIds);
+}

+ 38 - 0
applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/mapper/StuScoreMapper.java

@@ -0,0 +1,38 @@
+package com.usoftchina.smartschool.wechat.mapper;
+
+import com.usoftchina.smartschool.wechat.domain.StuScoreDO;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 分数表; InnoDB free: 5120 kB
+ * @author kl
+ * @email ${email}
+ * @date 2019-01-16 16:26:27
+ */
+@Mapper
+public interface StuScoreMapper {
+
+	StuScoreDO get(Long scoreId);
+	
+	List<StuScoreDO> list(Map<String, Object> map);
+	
+	int count(Map<String, Object> map);
+	
+	int save(StuScoreDO stuScore);
+	
+	int update(StuScoreDO stuScore);
+	
+	int remove(Long score_id);
+	
+	int batchRemove(Long[] scoreIds);
+
+	List<StuScoreDO> listByStu(@Param("stuId") Long stuId, @Param("pageStart")Integer pageStart, @Param("pageSize")Integer pageSize);
+
+	public List<StuScoreDO> selectScoreListByStuId(@Param("stuIds") List stuIds, @Param("scoreType") String scoreType, @Param("subjectId") Long subjectId);
+
+}

+ 37 - 0
applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/mapper/StudentMapper.java

@@ -0,0 +1,37 @@
+package com.usoftchina.smartschool.wechat.mapper;
+
+import com.usoftchina.smartschool.wechat.domain.StudentDO;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 学生表; InnoDB free: 5120 kB
+ * @author kl
+ * @email ${email}
+ * @date 2019-01-16 16:26:29
+ */
+@Mapper
+public interface StudentMapper {
+
+	StudentDO get(Long stuId);
+	
+	List<StudentDO> list(Map<String, Object> map);
+	
+	int count(Map<String, Object> map);
+	
+	int save(StudentDO student);
+	
+	int update(StudentDO student);
+	
+	int remove(Long stu_id);
+	
+	int batchRemove(Long[] stuIds);
+
+	List<StudentDO> listByClazzId(Long clazzId);
+
+	List<Long> selectStuIdsByClazzId(Long clazzId);
+}

+ 32 - 0
applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/mapper/SubjectMapper.java

@@ -0,0 +1,32 @@
+package com.usoftchina.smartschool.wechat.mapper;
+
+import com.usoftchina.smartschool.wechat.domain.SubjectDO;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 科目表; InnoDB free: 5120 kB
+ * @author kl
+ * @email ${email}
+ * @date 2019-01-16 16:26:27
+ */
+@Mapper
+public interface SubjectMapper {
+
+	SubjectDO get(Long subjectId);
+	
+	List<SubjectDO> list(Map<String, Object> map);
+	
+	int count(Map<String, Object> map);
+	
+	int save(SubjectDO subject);
+	
+	int update(SubjectDO subject);
+	
+	int remove(Long subject_id);
+	
+	int batchRemove(Long[] subjectIds);
+}

+ 38 - 0
applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/mapper/TaskNotifyMapper.java

@@ -0,0 +1,38 @@
+package com.usoftchina.smartschool.wechat.mapper;
+
+import com.usoftchina.smartschool.wechat.domain.TaskNotifyDO;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 作业通知表; InnoDB free: 5120 kB
+ * @author kl
+ * @email ${email}
+ * @date 2019-01-16 16:26:29
+ */
+@Mapper
+public interface TaskNotifyMapper {
+
+	TaskNotifyDO get(Long taskId);
+	
+	List<TaskNotifyDO> list(Map<String, Object> map);
+	
+	int count(Map<String, Object> map);
+	
+	int save(TaskNotifyDO taskNotify);
+	
+	int update(TaskNotifyDO taskNotify);
+	
+	int remove(Long task_id);
+	
+	int batchRemove(Long[] taskIds);
+
+	List<TaskNotifyDO> selectListByTeacher(@Param("teacherId") Long teacherId, @Param("taskStatus") Integer taskStatus, @Param("pageStart") Integer pageStart, @Param("pageSize") Integer pageSize);
+
+	List<TaskNotifyDO> selectListByStu(@Param("stuId") String stuId, @Param("taskStatus") Integer taskStatus, @Param("pageStart") Integer pageStart, @Param("pageSize") Integer pageSize);
+
+}

+ 34 - 0
applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/mapper/TaskReplyMapper.java

@@ -0,0 +1,34 @@
+package com.usoftchina.smartschool.wechat.mapper;
+
+import com.usoftchina.smartschool.wechat.domain.TaskReplyDO;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 作业回复表; InnoDB free: 5120 kB
+ * @author kl
+ * @email ${email}
+ * @date 2019-01-16 16:26:29
+ */
+@Mapper
+public interface TaskReplyMapper {
+
+	TaskReplyDO get(Long taskReplayId);
+	
+	List<TaskReplyDO> list(Map<String, Object> map);
+	
+	int count(Map<String, Object> map);
+	
+	int save(TaskReplyDO taskReply);
+	
+	int update(TaskReplyDO taskReply);
+	
+	int remove(Long task_replay_id);
+	
+	int batchRemove(Long[] taskReplayIds);
+
+	List<TaskReplyDO> listByTaskId(Long taskId);
+}

+ 34 - 0
applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/mapper/TeacherClazzMapper.java

@@ -0,0 +1,34 @@
+package com.usoftchina.smartschool.wechat.mapper;
+
+import com.usoftchina.smartschool.wechat.domain.TeacherClazzDO;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 教师、班级、科目关联表; InnoDB free: 5120 kB
+ * @author kl
+ * @email ${email}
+ * @date 2019-01-16 16:26:29
+ */
+@Mapper
+public interface TeacherClazzMapper {
+
+	TeacherClazzDO get(Long teacherClazzId);
+	
+	List<TeacherClazzDO> list(Map<String, Object> map);
+	
+	int count(Map<String, Object> map);
+	
+	int save(TeacherClazzDO teacherClazz);
+	
+	int update(TeacherClazzDO teacherClazz);
+	
+	int remove(Long teacher_clazz_id);
+	
+	int batchRemove(Long[] teacherClazzIds);
+
+	List<TeacherClazzDO> listByTeacherId(Long teacherId);
+}

Некоторые файлы не были показаны из-за большого количества измененных файлов