Merge remote-tracking branch 'origin/master'

cms/src/main/java/com/ym/mec/cms/controller/NewsController.java

@@ -22,15 +22,14 @@ public class NewsController extends BaseController {
 	private SysNewsInformationService sysNewsInformationService;
 
 	@ApiOperation("资讯列表分页查询")
-	@GetMapping(value = "/list", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+	@GetMapping(value = "/list")
 	public Object getList(NewsInformationQueryInfo queryInfo) {
 		return succeed(sysNewsInformationService.queryPage(queryInfo));
 	}
 
 	@ApiOperation("查询资讯详情")
 	@ApiImplicitParam(name = "id", value = "资讯ID编号", required = true, dataType = "Long", paramType = "path")
-	@GetMapping(value = "/query/{id}",
-			consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+	@GetMapping(value = "/query/{id}")
 	public Object query(@PathVariable("id") Long id) {
 
 		return succeed(sysNewsInformationService.get(id));
@@ -39,10 +38,6 @@ public class NewsController extends BaseController {
 	@ApiOperation("新增资讯")
 	@PostMapping(value = "/add", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
 	public Object add(SysNewsInformation newsInfo) {
-		Date date = new Date();
-		newsInfo.setCreateTime(date);
-		newsInfo.setUpdateTime(date);
-
 		return succeed(sysNewsInformationService.insert(newsInfo));
 	}
 

cms/src/main/java/com/ym/mec/cms/dal/entity/SysNewsInformation.java

@@ -31,12 +31,45 @@ public class SysNewsInformation {
 	@ApiModelProperty(value = "状态（1-可见 0-不可见）", required = true)
 	private NewsStatusEnum status;
 
+	@ApiModelProperty(value = "链接地址", required = true)
+	private String linkUrl;
+
+	@ApiModelProperty(value = "跳转类型_bank,_slef", required = true)
+	private String hrefTarget;
+
+	@ApiModelProperty(value = "顺序号", required = true)
+	private Integer order;
+
 	/**  */
 	private java.util.Date createTime;
 
 	/**  */
 	private java.util.Date updateTime;
 
+	public String getLinkUrl() {
+		return linkUrl;
+	}
+
+	public void setLinkUrl(String linkUrl) {
+		this.linkUrl = linkUrl;
+	}
+
+	public String getHrefTarget() {
+		return hrefTarget;
+	}
+
+	public void setHrefTarget(String hrefTarget) {
+		this.hrefTarget = hrefTarget;
+	}
+
+	public Integer getOrder() {
+		return order;
+	}
+
+	public void setOrder(Integer order) {
+		this.order = order;
+	}
+
 	public void setId(Long id) {
 		this.id = id;
 	}

cms/src/main/resources/config/mybatis/SysNewsInformationMapper.xml

@@ -43,13 +43,8 @@
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.cms.dal.entity.SysNewsInformation" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		<!--
-		<selectKey resultClass="int" keyProperty="id" > 
-		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
-		</selectKey>
-		-->
-		INSERT INTO sys_news_information (id_,title_,content_,cover_image_,type_,status_,create_time_,update_time_)
-		VALUES(#{id},#{title},#{content},#{coverImage},#{type},#{status, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},now(),now)
+		INSERT INTO sys_news_information (id_,title_,content_,cover_image_,type_,status_,create_time_,update_time_,link_url_,href_target_,order_)
+		VALUES(#{id},#{title},#{content},#{coverImage},#{type},#{status, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},now(),now,#{linkUrl},#{hrefTarget},#{order})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -74,6 +69,15 @@
 			<if test="type != null">
 				type_ = #{type},
 			</if>
+			<if test="linkUrl != null">
+				link_url_ = #{linkUrl},
+			</if>
+			<if test="hrefTarget != null">
+				href_target_ = #{hrefTarget},
+			</if>
+			<if test="order != null">
+				order_ = #{order},
+			</if>
 		</set>
 		WHERE id_ = #{id}
 	</update>

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/web/controller/RoleController.java

@@ -28,13 +28,13 @@ public class RoleController extends BaseController {
     private SysMenuService sysMenuService;
 
     @ApiOperation("根据权限id查询角色")
-    @GetMapping(value = "/{id}",consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
+    @GetMapping(value = "/{id}")
     public Object getRole(@ApiParam(value = "权限编号", required = true) @PathVariable("id") Integer id) {
         return succeed(sysRoleService.get(id));
     }
 
     @ApiOperation("删除角色")
-    @PostMapping(value = "/del/{id}",consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
+    @PostMapping(value = "/del/{id}")
     public Object delRole(@ApiParam(value = "权限编号", required = true) @PathVariable("id") Integer id) {
         return succeed(sysRoleService.delete(id));
     }
@@ -63,7 +63,7 @@ public class RoleController extends BaseController {
     }
 
     @ApiOperation("分页查询角色列表")
-    @GetMapping(value = "/queryPage",consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
+    @GetMapping(value = "/queryPage")
     public Object queryPage(QueryInfo queryInfo) {
         return succeed(sysRoleService.queryPage(queryInfo));
     }
@@ -94,7 +94,7 @@ public class RoleController extends BaseController {
 
     @ApiOperation("根据角色编号查询拥有的菜单列表")
     @ApiImplicitParams({ @ApiImplicitParam(name = "roleId", value = "角色编号", required = true, dataType = "Integer")})
-    @GetMapping(value = "/getMenus",consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
+    @GetMapping(value = "/getMenus")
     public Object getMenus(Integer roleId) {
         if(roleId == null){
             return failed(SecurityConstants.PARAM_VERIFY_EXCEPTION);

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/web/controller/UserController.java

@@ -43,7 +43,7 @@ public class UserController extends BaseController {
 	@ApiImplicitParams({ @ApiImplicitParam(name = "userType", value = "用户类型", required = false, dataType = "String"),
 			@ApiImplicitParam(name = "createStartDate", value = "开始注册时间", required = true, dataType = "String"),
 			@ApiImplicitParam(name = "createEndDate", value = "结束注册时间", required = true, dataType = "String") })
-	@GetMapping(value = "/queryPage",consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
+	@GetMapping(value = "/queryPage")
 	public Object queryPage(SysUserQueryInfo queryInfo) {
 		return succeed(sysUserService.queryPage(queryInfo));
 	}
@@ -58,7 +58,7 @@ public class UserController extends BaseController {
 		return failed();
 	}
 
-	@GetMapping(value = "/queryUserByPhone",consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
+	@GetMapping(value = "/queryUserByPhone")
 	public SysUser queryUserByPhone(String mobile) {
 		return sysUserService.queryByPhone(mobile);
 	}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/School.java

@@ -39,8 +39,8 @@ public class School {
 	private java.util.Date updateTime;
 
 	/**  */
-	@ApiModelProperty(value = "是否删除1是，0否", required = false)
-	private YesOrNoEnum delFlag;
+	@ApiModelProperty(value = "是否删除1是，0否,2停用", required = false)
+	private Integer delFlag;
 
 	/** 联系人 */
 	@ApiModelProperty(value = "联系人", required = false)
@@ -114,11 +114,11 @@ public class School {
 		return this.updateTime;
 	}
 
-	public YesOrNoEnum getDelFlag() {
+	public Integer getDelFlag() {
 		return delFlag;
 	}
 
-	public void setDelFlag(YesOrNoEnum delFlag) {
+	public void setDelFlag(Integer delFlag) {
 		this.delFlag = delFlag;
 	}
 

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

@@ -14,7 +14,7 @@
         <result column="contact_phone_" property="contactPhone"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
-        <result column="del_flag_" property="delFlag" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result column="del_flag_" property="delFlag"/>
         <result column="contact_name_" property="contactName"/>
         <result column="longitude_latitude_" property="longitudeLatitude"/>
         <result column="subsidy_" property="subsidy"/>
@@ -35,11 +35,6 @@
     <!-- 向数据库增加一条记录 -->
     <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.School" useGeneratedKeys="true" keyColumn="id"
             keyProperty="id">
-        <!--
-        <selectKey resultClass="int" keyProperty="id" >
-        SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
-        </selectKey>
-        -->
         INSERT INTO school
         (id_,name_,organ_id_,address_,contact_phone_,create_time_,update_time_,contact_name_,longitude_latitude_,subsidy_,cooperation_organ_id_,remark_)
         VALUES(#{id},#{name},#{organId},#{address},#{contactPhone},now(),now(),#{contactName},#{longitudeLatitude},#{subsidy},#{cooperationOrganId},#{remark})
@@ -50,7 +45,7 @@
         UPDATE school
         <set>
             <if test="delFlag != null">
-                del_flag_ = #{delFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+                del_flag_ = #{delFlag},
             </if>
             <if test="organId != null">
                 organ_id_ = #{organId},
@@ -93,13 +88,16 @@
 
     <!-- 分页查询 -->
     <select id="queryPage" resultMap="School" parameterType="map">
-        SELECT * FROM school ORDER BY id_
+        SELECT * FROM school
+        where del_flag_ != 1
+        ORDER BY id_
         <include refid="global.limit"/>
     </select>
 
     <!-- 查询当前表的总记录数 -->
     <select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM school
+		where del_flag_ != 1
 	</select>
     <select id="queryByOrganId" resultMap="School">
         SELECT * FROM school
@@ -108,7 +106,7 @@
                 organ_id_ = #{organId}
             </if>
             <if test="delFlag != null">
-                AND del_flag_ = #{delFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+                AND del_flag_ = #{delFlag}
             </if>
         </where>
     </select>

mec-web/src/main/java/com/ym/mec/web/controller/education/CourseHomeworkController.java

@@ -27,11 +27,8 @@ public class CourseHomeworkController extends BaseController {
     private CourseHomeworkService courseHomeworkService;
 
     @ApiOperation(value = "分页查询作业列表")
-    @GetMapping(value = "/queryPage",produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public Object queryPage(@RequestBody(required = false) CourseHomeworkQueryInfo queryInfo){
-        if(queryInfo == null){
-            queryInfo = new CourseHomeworkQueryInfo();
-        }
+    @GetMapping(value = "/queryPage")
+    public Object queryPage(CourseHomeworkQueryInfo queryInfo){
         return succeed(courseHomeworkService.queryPage(queryInfo));
     }
 

mec-web/src/main/java/com/ym/mec/web/controller/education/CourseHomeworkTemplateController.java

@@ -1,23 +1,15 @@
 package com.ym.mec.web.controller.education;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.ym.mec.biz.dal.entity.CourseHomeworkTemplate;
 import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import com.ym.mec.biz.dal.page.CourseHomeWorkTemplateQueryInfo;
 import com.ym.mec.biz.service.CourseHomeworkTemplateService;
 import com.ym.mec.common.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * @Author Joburgess
@@ -34,22 +26,22 @@ public class CourseHomeworkTemplateController extends BaseController {
 
     @ApiOperation(value = "新增作业模板")
     @PostMapping("/add")
-    public Object add(@RequestBody CourseHomeworkTemplate courseHomeworkTemplate){
+    public Object add(CourseHomeworkTemplate courseHomeworkTemplate){
         courseHomeworkTemplate.setDelFlag(YesOrNoEnum.NO);
         courseHomeworkTemplateService.insert(courseHomeworkTemplate);
         return succeed();
     }
 
     @ApiOperation(value = "删除作业模板")
-    @DeleteMapping("/del/{id}")
+    @PostMapping("/del/{id}")
     public Object del(@ApiParam(value = "科目编号", required = true) @PathVariable("id") Integer id){
         courseHomeworkTemplateService.delete(id);
         return succeed();
     }
 
     @ApiOperation(value = "修改作业模板")
-    @PutMapping("/update")
-    public Object update(@RequestBody CourseHomeworkTemplate courseHomeworkTemplate){
+    @PostMapping("/update")
+    public Object update(CourseHomeworkTemplate courseHomeworkTemplate){
         courseHomeworkTemplateService.update(courseHomeworkTemplate);
         return succeed();
     }

mec-web/src/main/java/com/ym/mec/web/controller/education/EmployeeController.java

@@ -30,7 +30,7 @@ public class EmployeeController extends BaseController {
 
     @ApiOperation(value = "根据部门获取下面的员工")
     @GetMapping("/queryEmployByOrganId")
-    public Object queryEmployByOrganId(@RequestBody EmployeeQueryInfo queryInfo) throws IOException {
+    public Object queryEmployByOrganId(EmployeeQueryInfo queryInfo) throws IOException {
         return employeeService.queryEmployByOrganId(queryInfo);
     }
 

mec-web/src/main/java/com/ym/mec/web/controller/student/StudentCourseHomeworkController.java

@@ -56,7 +56,7 @@ public class StudentCourseHomeworkController extends BaseController {
     }
 
     @ApiOperation(value = "分页查询作业列表")
-    @GetMapping(value = "/queryPage",produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    @GetMapping(value = "/queryPage")
     public Object queryPage(@RequestBody(required = false) CourseHomeworkQueryInfo queryInfo){
         if(queryInfo == null){
             queryInfo = new CourseHomeworkQueryInfo();