Merge remote-tracking branch 'origin/master'

mec-biz/src/main/resources/config/mybatis/ResourceRespositoryMapper.xml

@@ -23,23 +23,32 @@
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.ResourceRespository" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		<!--
-		<selectKey resultClass="int" keyProperty="id" > 
-		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
-		</selectKey>
-		-->
-		INSERT INTO resource_respository (id_,name_,url_,del_flag_,create_time_,update_time_) VALUES(#{id},#{name},#{url},#{delFlag},#{createTime},#{updateTime})
+		INSERT INTO resource_respository (id_,name_,url_,del_flag_,create_time_,update_time_)
+		VALUES(#{id},#{name},#{url},#{delFlag},now(),now())
 	</insert>
 	
 	
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="ResourceRespository" parameterType="map">
-		SELECT * FROM resource_respository <include refid="global.limit"/>
+		SELECT * FROM resource_respository
+		<where>
+			del_flag_ != 1
+			<if test="search != null">
+				AND name_ LIKE CONCAT('%',#{search},'%')
+			</if>
+		</where>
+		<include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM resource_respository
+		SELECT COUNT(id_) FROM resource_respository
+		<where>
+			del_flag_ != 1
+			<if test="search != null">
+				AND name_ LIKE CONCAT('%',#{search},'%')
+			</if>
+		</where>
 	</select>
 </mapper>

mec-student/src/main/java/com/ym/mec/student/controller/ResourceRepositoryController.java

@@ -0,0 +1,32 @@
+package com.ym.mec.student.controller;
+
+import com.ym.mec.biz.service.ResourceRespositoryService;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.page.QueryInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+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;
+
+@RequestMapping("resourceRepository")
+@Api(tags = "资源服务")
+@RestController
+public class ResourceRepositoryController extends BaseController {
+
+    @Autowired
+    private ResourceRespositoryService resourceRepositoryService;
+
+    @ApiOperation(value = "获取资源")
+    @GetMapping("/get")
+    public Object get(Integer id){
+        return succeed(resourceRepositoryService.get(id));
+    }
+
+    @ApiOperation(value = "获取资源列表")
+    @GetMapping("/queryPage")
+    public Object queryPage(QueryInfo queryInfo){
+        return succeed(resourceRepositoryService.queryPage(queryInfo));
+    }
+}

mec-teacher/src/main/java/com/ym/mec/teacher/controller/ResourceRepositoryController.java

@@ -0,0 +1,32 @@
+package com.ym.mec.teacher.controller;
+
+import com.ym.mec.biz.service.ResourceRespositoryService;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.page.QueryInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+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;
+
+@RequestMapping("resourceRepository")
+@Api(tags = "资源服务")
+@RestController
+public class ResourceRepositoryController extends BaseController {
+
+    @Autowired
+    private ResourceRespositoryService resourceRepositoryService;
+
+    @ApiOperation(value = "获取资源")
+    @GetMapping("/get")
+    public Object get(Integer id){
+        return succeed(resourceRepositoryService.get(id));
+    }
+
+    @ApiOperation(value = "获取资源列表")
+    @GetMapping("/queryPage")
+    public Object queryPage(QueryInfo queryInfo){
+        return succeed(resourceRepositoryService.queryPage(queryInfo));
+    }
+}

mec-web/src/main/java/com/ym/mec/web/controller/ResourceRepositoryController.java

@@ -0,0 +1,42 @@
+package com.ym.mec.web.controller;
+
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.dao.EmployeeDao;
+import com.ym.mec.biz.dal.dao.TeacherDao;
+import com.ym.mec.biz.dal.entity.Employee;
+import com.ym.mec.biz.dal.entity.ResourceRespository;
+import com.ym.mec.biz.dal.entity.School;
+import com.ym.mec.biz.dal.entity.Teacher;
+import com.ym.mec.biz.dal.page.SchoolQueryInfo;
+import com.ym.mec.biz.service.ResourceRespositoryService;
+import com.ym.mec.biz.service.SchoolService;
+import com.ym.mec.common.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+
+@RequestMapping("resourceRepository")
+@Api(tags = "资源服务")
+@RestController
+public class ResourceRepositoryController extends BaseController {
+
+    @Autowired
+    private ResourceRespositoryService resourceRepositoryService;
+
+    @ApiOperation(value = "新增")
+    @PostMapping("/add")
+    @PreAuthorize("@pcs.hasPermissions('resourceRepository/add')")
+    public Object add(ResourceRespository resourceRepository){
+        resourceRepositoryService.insert(resourceRepository);
+        return succeed();
+    }
+}