Skip to content

D
dd_school
Commit 66f89d12 by baochunxin
Options

#G：上传二中线上配置

parent 0fd091ed
Showing with 29 additions and 9 deletions
ruoyi-admin/src/main/resources/application-druid.yml
...@@ -13,7 +13,12 @@ spring: ...@@ -13,7 +13,12 @@ spring:
url: jdbc:mysql://1.116.38.25:3986/dd_smart_school?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true url: jdbc:mysql://1.116.38.25:3986/dd_smart_school?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
username: root username: root
password: qianhe2022 password: qianhe2022
#二中
# master: # master:
# url: jdbc:mysql://10.20.100.201:3306/dd_smart_school?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
# username: root
# password: root!@#$%^123
## master:
# url: jdbc:mysql://43.143.63.140:3306/school_platform?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true # url: jdbc:mysql://43.143.63.140:3306/school_platform?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
# username: root # username: root
# password: lbt@@18062367596 # password: lbt@@18062367596
...@@ -21,10 +26,11 @@ spring: ...@@ -21,10 +26,11 @@ spring:
# url: jdbc:mysql://localhost:3306/school?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true # url: jdbc:mysql://localhost:3306/school?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
# username: root # username: root
# password: root # password: root
# 二中部署地址
# master: # master:
# url: jdbc:mysql://10.20.100.201:3306/school?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true # url: jdbc:mysql://10.20.100.201:3306/dd_smart_school?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
# username: root # username: root
# password: root # password: root!@#$%^123
# master: # master:
# url: jdbc:mysql://rm-2zert6y5n3f3499g6fo.mysql.rds.aliyuncs.com:3306/school?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true # url: jdbc:mysql://rm-2zert6y5n3f3499g6fo.mysql.rds.aliyuncs.com:3306/school?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
# username: zhxy # username: zhxy
......
ruoyi-admin/src/main/resources/application.yml
...@@ -88,6 +88,13 @@ spring: ...@@ -88,6 +88,13 @@ spring:
enabled: false enabled: false
# redis 配置 # redis 配置
redis: redis:
# #二中
# host: 10.20.100.200
# port: 6379
# # 数据库索引
# database: 10
# # 密码
# password: root@!@#123
# 地址 # 地址
# host: localhost # host: localhost
host: 1.116.38.25 host: 1.116.38.25
......
smart-campus/src/main/java/yangtz/cs/liu/dingding/controller/DingJiaXiaoController.java
...@@ -469,7 +469,9 @@ public class DingJiaXiaoController { ...@@ -469,7 +469,9 @@ public class DingJiaXiaoController {
schoolStudentParent1.setStudentId(ddUserId); schoolStudentParent1.setStudentId(ddUserId);
schoolStudentParent1.setUserId(userId); schoolStudentParent1.setUserId(userId);
schoolStudentParent1.setParentName(guarDate.getName()); schoolStudentParent1.setParentName(guarDate.getName());
schoolStudentParent1.setTelephone(guarDate.getMobile()); schoolStudentParent1.setTelephone(guarDate.getMobile
());
Integer patriarch = this.getPatriarch(guarDate.getName().substring(guarDate.getName().length() - 2)); Integer patriarch = this.getPatriarch(guarDate.getName().substring(guarDate.getName().length() - 2));
schoolStudentParent1.setRelationship(String.valueOf(patriarch)); schoolStudentParent1.setRelationship(String.valueOf(patriarch));
iSchoolStudentParentService.updateById(schoolStudentParent1); iSchoolStudentParentService.updateById(schoolStudentParent1);
...@@ -478,9 +480,6 @@ public class DingJiaXiaoController { ...@@ -478,9 +480,6 @@ public class DingJiaXiaoController {
} }
} }
} }
return "完成"; return "完成";
} }
......
smart-campus/src/main/java/yangtz/cs/liu/wechat/controller/schoolClass/WxSchoolClassController.java
...@@ -91,7 +91,8 @@ public class WxSchoolClassController extends BaseController { ...@@ -91,7 +91,8 @@ public class WxSchoolClassController extends BaseController {
@GetMapping("/getClassById/{classId}") @GetMapping("/getClassById/{classId}")
public AjaxResult getClassById(@PathVariable("classId") Long classId) { public AjaxResult getClassById(@PathVariable("classId") Long classId) {
return AjaxResult.success(schoolClassService.getById(classId)); SchoolClass byId = schoolClassService.getById(classId);
return AjaxResult.success(byId);
} }
/** /**
...@@ -141,6 +142,9 @@ public class WxSchoolClassController extends BaseController { ...@@ -141,6 +142,9 @@ public class WxSchoolClassController extends BaseController {
*/ */
@GetMapping("/getTeachers/{classId}") @GetMapping("/getTeachers/{classId}")
public AjaxResult getTeachers(@PathVariable("classId") Long classId){ public AjaxResult getTeachers(@PathVariable("classId") Long classId){
List<SchoolTeacherVO> teachers = schoolTeacherService.getTeachers(classId); List<SchoolTeacherVO> teachers = schoolTeacherService.getTeachers(classId);
return AjaxResult.success(teachers); return AjaxResult.success(teachers);
} }
......
smart-campus/src/main/resources/mapper/schoolClass/SchoolClassMapper.xml
...@@ -123,6 +123,8 @@ ...@@ -123,6 +123,8 @@
WHERE m.class_id = #{classId} and m.del_flag = '0' and t.del_flag = '0' WHERE m.class_id = #{classId} and m.del_flag = '0' and t.del_flag = '0'
</select> </select>
<select id="getTeacherClass" resultType="yangtz.cs.liu.wechat.vo.schoolClass.SchoolClassVo"> <select id="getTeacherClass" resultType="yangtz.cs.liu.wechat.vo.schoolClass.SchoolClassVo">
SELECT sg.id, SELECT sg.id,
sg.teacher_name, sg.teacher_name,
...@@ -140,8 +142,10 @@ ...@@ -140,8 +142,10 @@
sg.is_graduated, sg.is_graduated,
sg.pic_url, sg.pic_url,
sg.house_name sg.house_name
FROM school_class sg FROM school_class_mentor scm
LEFT JOIN school_class_mentor scm on scm.class_id = sg.id INNER JOIN school_class_headmaster ch
ON scm.teacher_id = ch.teacher_id
INNER JOIN school_class sg on sg.id in (scm.class_id,ch.class_id)
WHERE scm.teacher_id = #{teacherId} and sg.school_year = #{schoolYear} WHERE scm.teacher_id = #{teacherId} and sg.school_year = #{schoolYear}
and sg.del_flag = '0' and sg.del_flag = '0'
and scm.del_flag = '0' and scm.del_flag = '0'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment