'控制器优化'

zhang
1 parent 0f42fbcc
Showing 4 changed files with 80 additions and 37 deletions
trunk/Message/Api/Controller/Message/ListController.class.php
trunk/Message/Apicp/Controller/Message/DetailController.class.php
trunk/Message/Apicp/Controller/Message/ListController.class.php
trunk/Message/Common/Model/MessageModel.class.php
@@ -27,7 +27,7 @@ class ListController extends AbstractController
         $page = isset($input['page']) ? intval($input['page']) : 1;
-        $message_list = $m_message->messageList($input,$page);
+        $message_list = $m_message->message_list($input,$page);
         $this->_result = $message_list;
     }
@@ -15,7 +15,7 @@ class DetailController extends \Apicp\Controller\AbstractController
      * User: <362431947@qq.com>
      * Date: 2018-10-11 Time: 11:51
      */
-    public function detail_post()
+    public function Index_post()
     {
         $input = I('post.');
@@ -25,6 +25,6 @@ class ListController extends \Apicp\Controller\AbstractController
         $m_message = new MessageModel();
-        $this->_result = $m_message->messageList($input,$page);
+        $this->_result = $m_message->message_list($input,$page);
     }
 }
 \ No newline at end of file
@@ -37,6 +37,14 @@ class MessageModel extends AbstractModel
      */
     public function message_list($conds = [],$page = 0)
     {
+        $conds = $this->check_fields($conds);
+
+        $title = isset($conds['title']) ? trim($conds['title']) : '';
+        unset($conds['title']);
+
+        $message = isset($conds['message']) ? trim($conds['message']) : '';
+        unset($conds['message']);
+
         if ($page < 1 || !$page) {
             $page = self::PAGING_DEFAULT_PAGE;
         }
@@ -44,13 +52,25 @@ class MessageModel extends AbstractModel
         $params = [];
         $wheres = [];
-        $conds['a.status'] = $this->get_st_create();
-
-
         if (!$this->_parse_where($wheres, $params, $conds)) {
             return false;
         }
+
+        $wheres[] = 'a.`status` < ?';
+        $params[] = $this->get_st_delete();
+
+        if ($title) {
+            $wheres[] = 'a.`title` LIKE ?';
+            $params[] = "%$title%";
+        }
+
+        if ($message) {
+            $wheres[] = "a.`message` LIKE ?";
+            $params[] = "%$message%";
+        }
+
+
         $page_size = self::PAGING_DEFAULT_LIMIT;
         $page_start = ($page - 1) * $page_size;
@@ -63,48 +83,34 @@ class MessageModel extends AbstractModel
         $table = $m_person->get_tname();
-        if (in_array('title',$conds)) {
-            $where = " title LIKE '?' ";
-        }
-        else{
-            $fields = array_keys($conds);
-
-            if ($fields != 'status') {
-                $field = $fields[0];
-            }
-
-            $where = "  $field = ? ";
-
-        }
-
         $sql = "SELECT a.message_id,a.title,a.message,IFNULL(b.name,'') AS `from`,IFNULL(c.name,'') AS `to`,a.checked
                 FROM __TABLE__ a 
                 LEFT JOIN {$table} b ON a.uid = b.person_id 
                 LEFT JOIN {$table} c ON a.receiver_uid = c.person_id 
-                WHERE $where";
+                WHERE " . implode(' AND ', $wheres);
         $list =  $this->_m->fetch_array($sql, $params,$option);
-        $messageList['total'] = count($list);
-        $messageList['page'] = $page;
-        $messageList['limit'] = $page_size;
-        $messageList['list'] = $list;
-        return $messageList;
+        $message_list['total'] = count($list);
+        $message_list['page'] = $page;
+        $message_list['limit'] = $page_size;
+        $message_list['list'] = $list;
+
+        return $message_list;
     }
     /**
      * 后台留言删除
      * User: <362431947@qq.com>
      * @param int $message_id
-     * @return bool
-     * Date: 2018-10-10 Time: 22:24
+     * @throws \Think\Exception
+     * Date: 2018-10-14 Time: 22:07
      */
     public function del($message_id = 0)
     {
         $this->_m->startTrans();
-
         $attachment_id = $this->getAttachmentIdByMsgId($message_id);
         // 删除相关附件图片
@@ -114,8 +120,6 @@ class MessageModel extends AbstractModel
             $attachment_del = $m_attachment->del($attachment_id);
         }
-
-
         // 删除留言
         $message_del =  $this->_m->delete($message_id);
@@ -132,11 +136,10 @@ class MessageModel extends AbstractModel
         if ($message_del && $comment_del && $attachment_del) {
             $this->_m->commit();
-            return true;
         }
         else{
             $this->_m->rollback();
-            return false;
+            E('_ERROR_DEL_MSG_FAIL');
         }
     }
@@ -266,8 +269,9 @@ class MessageModel extends AbstractModel
      * 留言审核
      * User: <362431947@qq.com>
      * @param int $message_id
-     * @return bool
-     * Date: 2018-10-11 Time: 21:32
+     * @param int $checked
+     * @throws \Think\Exception
+     * Date: 2018-10-14 Time: 22:05
      */
     public function check($message_id = 0,$checked = 1)
     {
@@ -284,11 +288,50 @@ class MessageModel extends AbstractModel
                 'checked' =>$checked,
             ];
-            return $this->update($message_id,$data,true);
+            $result =  $this->update($message_id,$data,true);
+
+            if (!$result) {
+                E('_ERROR_CHECK_MSG_FAIL');
+            }
         }
         else{
-            return false;
+            E('_ERROR_MSG_NOT_EXISTS');
+        }
+
+    }
+
+    /**
+     * 验证字段有效性
+     * User: <362431947@qq.com>
+     * @param array $conds
+     * @return array
+     * Date: 2018-10-14 Time: 19:14
+     */
+    private function check_fields($conds = [])
+    {
+        $tmp = [];
+
+        // 姓名、性别（选择）、手机号、邮箱、留言标题以及留言内容
+        $check_fields = ['name','sex','mobile','email','title','message'];
+        $check_person_fields = ['name','sex','mobile','email'];
+
+        if (!$conds) {
+            return $conds;
+        }
+
+        foreach ($conds as $key => $value) {
+            if (!$value || !in_array($key, $check_fields)) {
+                unset($conds[$key]);
+                continue;
+            }
+
+            if (in_array($key, $check_person_fields)) {
+                $k = 'b.' . $key;
+                $conds[$k] = $conds[$key];
+                unset($conds[$key]);
+            }
         }
+        return $conds;
     }
 }