From 12a8ab7a175fd01a5e67234104f6429f33ce812f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Thu, 29 Apr 2021 10:46:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=86=E4=BA=AB=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E7=9A=84=E5=85=8D=E7=99=BB=E5=BD=95=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E8=AF=A6=E7=BB=86=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/xm/WebSecurityConfig.java   |  2 +-
 .../com/xm/core/ctrl/XmTaskController.java    | 27 +++++++++++++++++++
 .../com/xm/core/service/XmTaskService.java    |  6 ++++-
 .../mapper/xm/core/dao/XmTaskMapper.xml       |  4 +++
 .../test/java/com/xm/WebSecurityConfig.java   |  2 +-
 5 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/xm-bootstrap/src/main/java/com/xm/WebSecurityConfig.java b/xm-bootstrap/src/main/java/com/xm/WebSecurityConfig.java
index 95cbc651..dc351859 100644
--- a/xm-bootstrap/src/main/java/com/xm/WebSecurityConfig.java
+++ b/xm-bootstrap/src/main/java/com/xm/WebSecurityConfig.java
@@ -37,7 +37,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
      */
     @Override
     protected void configure(HttpSecurity http) throws Exception {
-        http.authorizeRequests().anyRequest().authenticated();
+        http.authorizeRequests().antMatchers("/**/xm/core/xmTask/shareTaskDetail").permitAll().anyRequest().authenticated();
         http.oauth2Client().and().logout().disable();
         http.formLogin().usernameParameter("userloginid");
         http.oauth2Login();
diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java
index 771ccbd6..c2911636 100644
--- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java
+++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java
@@ -115,6 +115,33 @@ public class XmTaskController {
 		return m;
 	}
 
+
+	@ApiOperation( value = "查询任务的信息详情，免登录",notes="taskDetail,条件之间是 and关系,模糊查询写法如 {studentName:'%才哥%'}")
+
+	@ApiResponses({
+			@ApiResponse(code = 200,response= XmTask.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
+	})
+	@RequestMapping(value="/shareTaskDetail",method=RequestMethod.GET)
+	public Map<String,Object> taskDetail( @RequestParam Map<String,Object> xmTask){
+		Tips tips=new Tips("查询成功");
+		Map<String,Object> m = new HashMap<>();
+		String id=(String) xmTask.get("id");
+		String shareKey= (String) xmTask.get("shareKey");
+		if(!StringUtils.hasText(id)){
+			tips.setFailureMsg("任务编号id必传");
+		}
+		if(!StringUtils.hasText(shareKey)){
+			tips.setFailureMsg("分享码shareKey必传");
+		}
+		//todo 检测分析妈的正确性
+		if(tips.isOk()){
+			Map<String,Object> taskDb= xmTaskService.shareTaskDetail(xmTask);
+			m.put("data",taskDb);
+			m.put("tips", tips);
+		}
+		m.put("tips", tips);
+		return m;
+	}
 	@ApiOperation( value = "新增一条xm_task信息",notes="addXmTask,主键如果为空，后台自动生成")
 	@ApiResponses({
 			@ApiResponse(code = 200,response=XmTask.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}")
diff --git a/xm-core/src/main/java/com/xm/core/service/XmTaskService.java b/xm-core/src/main/java/com/xm/core/service/XmTaskService.java
index 42f243b1..c4769b8f 100644
--- a/xm-core/src/main/java/com/xm/core/service/XmTaskService.java
+++ b/xm-core/src/main/java/com/xm/core/service/XmTaskService.java
@@ -381,7 +381,11 @@ public class XmTaskService extends BaseService {
 			this.batchUpdate(editXmTasks);
 		}
 	}
-	
+
+	public Map<String,Object> shareTaskDetail(Map<String, Object> xmTask) {
+		return this.selectOne("shareTaskDetail",xmTask);
+	}
+
 	/** 请在此类添加自定义函数 */
 }
 
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml
index 0468c773..1722cc04 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml
@@ -9,6 +9,10 @@
 		select avg(res.rate) from XM.xm_task res where res.parent_taskid = #{parentTaskid}
 	</select>
 
+	<select id="shareTaskDetail" parameterType="HashMap" resultType="HashMap">
+		SELECT res.*,m.remark from XM.xm_task res left join XM.xm_menu m on res.menu_id = m.menu_id
+		WHERE res.id=#{id}
+	</select>
 	<select id="checkExistsExecuser" parameterType="String" resultType="Long" >
 		select count(1) from XM.xm_task_execuser res where res.task_id = #{taskId} and ( res.settle_status not in('2','6'))
 	</select>
diff --git a/xm-core/src/test/java/com/xm/WebSecurityConfig.java b/xm-core/src/test/java/com/xm/WebSecurityConfig.java
index 301efcb1..ebfa0fcc 100644
--- a/xm-core/src/test/java/com/xm/WebSecurityConfig.java
+++ b/xm-core/src/test/java/com/xm/WebSecurityConfig.java
@@ -40,7 +40,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
      */
     @Override
     protected void configure(HttpSecurity http) throws Exception {
-        http.authorizeRequests().anyRequest().authenticated();
+        http.authorizeRequests().antMatchers("/**/xm/core/xmTask/shareTaskDetail").permitAll().anyRequest().authenticated();
         http.oauth2Client().and().logout().disable();
         http.formLogin().usernameParameter("userloginid");
         http.oauth2Login();