1

doc/DB/compass_db_schema.txt

@@ -88,9 +88,9 @@ CREATE TABLE IF NOT EXISTS school_mst(
 	original_source int8 NOT NULL DEFAULT '0',
 	title text NOT NULL,
 	school_type varchar(64) NOT NULL,
-	front_image text NOT NULL,
-	comment text NOT NULL,
-	address text NOT NULL,
+	front_image text,
+	comment text,
+	address text,
 	province varchar(64),
 	city varchar(64),
 	district varchar(64),

src/cn/aimslib2/database/AbstractDatabaseManager.inc

@@ -71,7 +71,7 @@ class AbstractDatabaseManager{
 	 * @abstract
 	 */
 	public function getConnection(){
-		return null;
+		return $this->adaptor->con;
 	}
 	
 	/**
@@ -135,7 +135,6 @@ class AbstractDatabaseManager{
 		$sql1 .= $this->builder->createInsertValueOption($v_param);
 		
 		if (strtolower($this->dbtype) == "postgresql") {
-			// aimswebのシステムは、常にidをsequenceとして持つことを想定
 			$sql1 .= " returning id";
 		}
 		//return $this->executeQuery($sql1);
@@ -177,6 +176,7 @@ class AbstractDatabaseManager{
 			$tmp = $this->executeQuery($sql2);
 			
 			if (isset($tmp[0]["id"])) {
+				error_log("error: new id is " . $tmp[0]["id"], 0);
 				
 				$w_param = array();
 				$w_param["id"] = $tmp[0]["id"];

src/cn/compass/entity/CompassDynamicData.inc

@@ -76,8 +76,9 @@ class CompassDynamicData extends EntityBase{
 				$v_param["registration_date"] = $this->registration_date;
 			}
 
-			// insert
-			$result = $db->doInsertAndReturn($table_name, $v_param);
+			// insert doInsert
+			//$result = $db->doInsertAndReturn($table_name, $v_param);
+			$result = $db->doInsert($table_name, $v_param);
 
 			if (is_array($result) && count($result) > 0) {
 				// 

src/cn/compass/entity/SchoolMst.inc

@@ -114,9 +114,9 @@ class SchoolMst extends CompassDynamicData
 		ParamUtil::copyObj2Array($v_param, $this, "original_source");
 		ParamUtil::copyObj2Array($v_param, $this, "title");
 		ParamUtil::copyObj2Array($v_param, $this, "school_type");
-		ParamUtil::copyObj2Array($v_param, $this, "front_image");
-		ParamUtil::copyObj2Array($v_param, $this, "comment");
-		ParamUtil::copyObj2Array($v_param, $this, "address");
+		ParamUtil::copyObj2ArrayNullField($v_param, $this, "front_image");
+		ParamUtil::copyObj2ArrayNullField($v_param, $this, "comment");
+		ParamUtil::copyObj2ArrayNullField($v_param, $this, "address");
 		ParamUtil::copyObj2ArrayNullField($v_param, $this, "province");
 		ParamUtil::copyObj2ArrayNullField($v_param, $this, "city");
 		ParamUtil::copyObj2ArrayNullField($v_param, $this, "district");

src/cn/compass/entity/definition/SchoolType.inc

@@ -29,16 +29,12 @@ class SchoolType
 			$tmp = array("id"=>1, "title"=>"幼儿");
 			array_push($data, $tmp);
 			
-			$tmp = array("id"=>2, "title"=>"小学");
+			$tmp = array("id"=>2, "title"=>"小初高");
 			array_push($data, $tmp);
 			
-			$tmp = array("id"=>3, "title"=>"初中");
+			$tmp = array("id"=>3, "title"=>"职高");
 			array_push($data, $tmp);
 			
-			$tmp = array("id"=>4, "title"=>"高中");
-			array_push($data, $tmp);
-					
-			
 			$result = array();
 			foreach ($data as $row) {
 				$tmp2 = new SchoolType($row);

src/user/if/synchronize_class_dat.php

+<?php
+
+// 2.家校/家园平台班级信息同步接口
+require_once ("../user_include.inc");
+
+ErrorLogger::doOutput("Compass...synchronize_class_dat.php....Start.", 0);
+
+//获取参数
+$schoolNo = ParamUtil::getRequestString("school_no");
+$classNo = ParamUtil::getRequestString("class_no");
+$originalSource = ParamUtil::getRequestNumber("original_source", 0);
+$title = ParamUtil::getRequestString("title");
+$gradeTitle = ParamUtil::getRequestString("grade_title");
+$memberCount = ParamUtil::getRequestNumber("member_count", 0);
+
+
+//参数检查
+if(empty($schoolNo) || empty($classNo) || empty($originalSource) || empty($gradeTitle) || empty($title)) {
+	responseNG("参数错误！");
+}
+
+//originalSource为1或者2
+if($originalSource <> 1 && $originalSource <> 2) {
+	responseNG("参数错误！");
+}
+
+//判断学校是否已经登陆
+$param = array();
+$param['school_no'] = $schoolNo;
+$param['original_source'] = $originalSource;
+$param['delete_flg'] = false;
+$schoolList = SchoolMst::getList($param,'id','desc', 0, 1);
+if(empty($schoolList)) {
+	responseNG("学校不存在！");
+}
+
+$schoolMst = $schoolList[0];
+
+//年级数据登录
+$param = array();
+$param['school_no'] = $schoolNo;
+$param['original_source'] = $originalSource;
+$param['title'] = $gradeTitle;
+$param['delete_flg'] = false;
+$gradeList = GradeMst::getList($param,'id','desc', 0, 1);
+$gradeMst = new GradeMst();
+if(empty($gradeList)) {
+	$gradeMst->school_id = $schoolMst->id;
+	$gradeMst->school_no = $schoolNo;
+	$gradeMst->original_source = $originalSource;
+	$gradeMst->title = $gradeTitle;
+	$gradeMst->save();
+	//查找id
+	$param = array();
+	$param['school_no'] = $schoolNo;
+	$param['original_source'] = $originalSource;
+	$param['title'] = $gradeTitle;
+	$param['delete_flg'] = false;
+	$tmpGradeList = GradeMst::getList($param,'id','desc', 0, 1);
+	if(!empty($tmpGradeList)) {
+		$gradeMst = $tmpGradeList[0];
+	}
+} else {
+	$gradeMst = $gradeList[0];
+}
+
+//班级数据登陆
+$param = array();
+$param['school_no'] = $schoolNo;
+$param['class_no'] = $classNo;
+$param['original_source'] = $originalSource;
+$param['delete_flg'] = false;
+$classList = ClassMst::getList($param,'id','desc', 0, 1);
+if(empty($classList)) {
+	$classMst = new ClassMst();
+	$classMst->school_id = $schoolMst->id;
+	$classMst->school_no = $schoolNo;
+	$classMst->class_no = $classNo;
+	$classMst->original_source = $originalSource;
+	$classMst->grade_id = $gradeMst->id;
+	$classMst->title = $title;
+	$classMst->member_count = $memberCount;
+	$classMst->save();
+} else {
+	$classMst = $classList[0];
+	$classMst->grade_id = $gradeMst->id;
+	$classMst->title = $title;
+	$classMst->member_count = $memberCount;
+	$classMst->save();
+}
+
+ErrorLogger::doOutput("Compass...synchronize_class_dat.php....End.", 0);
+
+responseOK("更新成功！");
+
+function responseNG($message) {
+	$result = array("status"=>"NG", "message"=>$message);
+	print json_encode($result);
+	exit;
+}
+function responseOK($message) {
+	$result = array("status"=>"OK", "message"=>$message);
+	print json_encode($result);
+	exit;
+}
+?>
\ No newline at end of file

src/user/if/synchronize_school_dat.php

+<?php
+
+// 2.家校/家园平台学校信息同步接口
+require_once ("../user_include.inc");
+
+ErrorLogger::doOutput("Compass...synchronize_school_dat.php....Start.", 0);
+
+//获取参数
+$schoolNo = ParamUtil::getRequestString("school_no");
+$originalSource = ParamUtil::getRequestNumber("original_source", 0);
+$title = ParamUtil::getRequestString("title");
+$province = ParamUtil::getRequestString("province");
+$city = ParamUtil::getRequestString("city");
+$district = ParamUtil::getRequestString("district");
+$street = ParamUtil::getRequestString("street");
+
+
+//参数检查
+if(empty($schoolNo) || empty($originalSource) || empty($title)) {
+	responseNG("参数错误！");
+}
+
+//originalSource为1或者2
+if($originalSource <> 1 && $originalSource <> 2) {
+	responseNG("参数错误！");
+}
+
+//判断学校是否已经存在
+$param = array();
+$param['school_no'] = $schoolNo;
+$param['original_source'] = $originalSource;
+$param['delete_flg'] = false;
+$schoolList = SchoolMst::getList($param,'id','desc', 0, 1);
+if(empty($schoolList)) {
+	$schoolMst = new SchoolMst();
+	$schoolMst->school_no = $schoolNo;
+	$schoolMst->original_source = $originalSource;
+	$schoolMst->title = $title;
+	$schoolMst->school_type = $originalSource;//此处跟originalSource一样
+	$schoolMst->province = $province;
+	$schoolMst->city = $city;
+	$schoolMst->district = $district;
+	$schoolMst->street = $street;
+	$schoolMst->save();
+} else {
+	$schoolMst = $schoolList[0];
+	$schoolMst->title = $title;
+	$schoolMst->school_type = $originalSource;//此处跟originalSource一样
+	$schoolMst->province = $province;
+	$schoolMst->city = $city;
+	$schoolMst->district = $district;
+	$schoolMst->street = $street;
+	$schoolMst->save();
+}
+
+ErrorLogger::doOutput("Compass...synchronize_school_dat.php....End.", 0);
+
+responseOK("更新成功！");
+
+function responseNG($message) {
+	$result = array("status"=>"NG", "message"=>$message);
+	print json_encode($result);
+	exit;
+}
+function responseOK($message) {
+	$result = array("status"=>"OK", "message"=>$message);
+	print json_encode($result);
+	exit;
+}
+?>
\ No newline at end of file