修改注释

cloud-model/src/main/java/com/hssx/cloudmodel/controller/CompanyController.java

@@ -66,7 +66,6 @@ public class CompanyController {
 
     /**
      * 公司列表
-     * @param keyName
      * 参数：currentPage 当前页码，pageSize 每页条数 keyName 关键字查询
      * @return
      */

cloud-model/src/main/java/com/hssx/cloudmodel/controller/FactoryController.java

@@ -13,6 +13,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.servlet.http.HttpServletRequest;
@@ -20,7 +21,6 @@ import javax.servlet.http.HttpServletResponse;
 
 
 /**
- *
  * @author 吴涛涛
  * @since 2019-07-26
  */
@@ -35,10 +35,10 @@ public class FactoryController {
 
     /**
      * 添加/修改工厂
-     * @param factory
-     * 参数：factoryName 工厂名 factoryArea 公司地址
-     * yLng 经度  xLat 纬度
-     * @param flag 0-添加，1-修改
+     *
+     * @param factory 参数：factoryName 工厂名 factoryArea 公司地址
+     *                yLng 经度  xLat 纬度
+     * @param flag    0-添加，1-修改
      * @return
      */
     @ApiOperation("添加/修改工厂")
@@ -47,14 +47,12 @@ public class FactoryController {
     public HttpRespMsg addAndUpdateRole(Factory factory, HttpServletRequest request, Integer flag,
                                         HttpServletResponse response) {
         HttpRespMsg msg = new HttpRespMsg();
-        msg = factoryService.addAndUpdateRole(factory,flag);
+        msg = factoryService.addAndUpdateRole(factory, flag);
         return msg;
     }
 
     /**
-     *
-     * @param factory
-     * 参数：id 工厂id
+     * @param factory 参数：id 工厂id
      * @return
      */
     @ApiOperation("删除公司")
@@ -69,17 +67,16 @@ public class FactoryController {
 
     /**
      * 工厂列表
-     * @param keyName
-     * 参数: 关键字
+     * 参数: currentPage 当前页码，pageSize 每页条数 keyName 关键字查询
      * @return
      */
     @ApiOperation("工厂列表")
     @RequestMapping("/list")
     @ResponseBody
-    public HttpRespMsg deleteRole(String keyName, HttpServletRequest request,
-                                  HttpServletResponse response,PageUtil page) {
+    public HttpRespMsg deleteRole(@RequestParam(required = false) String keyName, HttpServletRequest request,
+                                  HttpServletResponse response, PageUtil page) {
         HttpRespMsg msg = new HttpRespMsg();
-        msg.data = factoryService.pageList(page,keyName);
+        msg = factoryService.pageList(page, keyName);
         return msg;
     }
 

cloud-model/src/main/java/com/hssx/cloudmodel/controller/RoleController.java

@@ -68,7 +68,6 @@ public class RoleController {
 
     /**
      * 角色列表
-     * @param keyName
      * 参数：currentPage 当前页码，pageSize 每页条数 keyName 关键字查询
      * @return
      */

cloud-model/src/main/java/com/hssx/cloudmodel/controller/SysUserController.java

@@ -25,6 +25,10 @@ public class SysUserController {
     @Autowired
     SysUserService sysUserService;
 
+    /**
+     * 參數 ：username 用戶名 password 密碼
+     * @return
+     */
     @ApiOperation(value = "系统管理员登录", notes = "登录方法")
     @RequestMapping("login")
     @ResponseBody

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/FactoryServiceImpl.java

@@ -58,7 +58,7 @@ public class FactoryServiceImpl extends ServiceImpl<FactoryMapper, Factory> impl
         PageHelper.startPage(page.getCurrentPage(),page.getPageSize());
         List<Factory> factories = factoryMapper.selectList(qw);
         PageInfo<Factory>pageInfos = new PageInfo<>(factories);
-        msg.data = factories;
-        return null;
+        msg.data = pageInfos;
+        return msg;
     }
 }