update .gitignore

.classpath

@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="test" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

.gitignore

@@ -1 +1,33 @@
+.idea
+# Created by .ignore support plugin (hsz.mobi)
+### Java template
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+*rebel.xml
+.rebel-remote.xml.bak
+.rebel.xml.bak
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
+/.rebel-remote.xml.bak
+/.rebel.xml.bak
 /target/

.project

@@ -1,42 +1,42 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>v_sys</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.common.project.facet.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
-		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
-		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
-	</natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>v_sys</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
+	</natures>
+</projectDescription>

.settings/org.eclipse.core.resources.prefs

@@ -1,4 +1,4 @@
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/main/resources=utf-8
-encoding/<project>=UTF-8
+eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding//src/main/resources=utf-8
+encoding/<project>=UTF-8

.settings/org.eclipse.jdt.core.prefs

@@ -1,11 +1,11 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
-org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.8
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=1.8

.settings/org.eclipse.wst.common.component

@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-    <wb-module deploy-name="ssj-sys">
-        <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
-        <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-        <property name="context-root" value="ssj-sys"/>
-        <property name="java-output-path" value="/v_sys/target/classes"/>
-    </wb-module>
-</project-modules>
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+    <wb-module deploy-name="ssj-sys">
+        <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
+        <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
+        <property name="context-root" value="ssj-sys"/>
+        <property name="java-output-path" value="/v_sys/target/classes"/>
+    </wb-module>
+</project-modules>

.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
-  <fixed facet="wst.jsdt.web"/>
-  <installed facet="java" version="1.8"/>
-  <installed facet="jst.web" version="3.1"/>
-  <installed facet="wst.jsdt.web" version="1.0"/>
-</faceted-project>
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <fixed facet="wst.jsdt.web"/>
+  <installed facet="java" version="1.8"/>
+  <installed facet="jst.web" version="3.1"/>
+  <installed facet="wst.jsdt.web" version="1.0"/>
+</faceted-project>

.settings/org.eclipse.wst.validation.prefs

@@ -1,2 +1,2 @@
-disabled=06target
-eclipse.preferences.version=1
+disabled=06target
+eclipse.preferences.version=1

src/main/java/com/ssj/api/domain/model/RoleTypeModel.java

@@ -1,42 +1,42 @@
-package com.ssj.api.domain.model;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class RoleTypeModel {
-	
-	private Integer roleType;
-	
-	private String roleName;
-	
-	private String[] modules;
-
-	public Integer getRoleType() {
-		return roleType;
-	}
-
-	public void setRoleType(Integer roleType) {
-		this.roleType = roleType;
-	}
-
-	public String getRoleName() {
-		return roleName;
-	}
-
-	public void setRoleName(String roleName) {
-		this.roleName = roleName;
-	}
-
-	public String[] getModules() {
-		return modules;
-	}
-
-	public void setModules(String[] modules) {
-		this.modules = modules;
-	}
-
-	
-	
-	
-
-}
+package com.ssj.api.domain.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class RoleTypeModel {
+	
+	private Integer roleType;
+	
+	private String roleName;
+	
+	private String[] modules;
+
+	public Integer getRoleType() {
+		return roleType;
+	}
+
+	public void setRoleType(Integer roleType) {
+		this.roleType = roleType;
+	}
+
+	public String getRoleName() {
+		return roleName;
+	}
+
+	public void setRoleName(String roleName) {
+		this.roleName = roleName;
+	}
+
+	public String[] getModules() {
+		return modules;
+	}
+
+	public void setModules(String[] modules) {
+		this.modules = modules;
+	}
+
+	
+	
+	
+
+}

src/main/java/com/ssj/api/domain/vo/UserBaseRequestVo.java

@@ -1,19 +1,19 @@
-package com.ssj.api.domain.vo;
-
-import com.ssj.bean.common.framework.core.domain.BaseRequest;
-
-public class UserBaseRequestVo extends BaseRequest {
-	
-	private static final long serialVersionUID = 1L;
-	
-	private String userId;
-
-	public String getUserId() {
-		return userId;
-	}
-
-	public void setUserId(String userId) {
-		this.userId = userId;
-	}
-	
-}
+package com.ssj.api.domain.vo;
+
+import com.ssj.bean.common.framework.core.domain.BaseRequest;
+
+public class UserBaseRequestVo extends BaseRequest {
+	
+	private static final long serialVersionUID = 1L;
+	
+	private String userId;
+
+	public String getUserId() {
+		return userId;
+	}
+
+	public void setUserId(String userId) {
+		this.userId = userId;
+	}
+	
+}

src/main/java/com/ssj/api/domain/vo/train/TrainExamUserSaveVo.java

@@ -1,40 +1,40 @@
-package com.ssj.api.domain.vo.train;
-
-import com.ssj.bean.common.framework.core.domain.BaseRequest;
-
-public class TrainExamUserSaveVo extends BaseRequest {
-	
-	private static final long serialVersionUID = 1L;
-	
-	private String videoId;
-
-	private String answer;
-	
-	private Integer score;
-	
-	public String getVideoId() {
-		return videoId;
-	}
-
-	public void setVideoId(String videoId) {
-		this.videoId = videoId;
-	}
-
-	public String getAnswer() {
-		return answer;
-	}
-
-	public void setAnswer(String answer) {
-		this.answer = answer;
-	}
-
-	public Integer getScore() {
-		return score;
-	}
-
-	public void setScore(Integer score) {
-		this.score = score;
-	}
-
-	
-}
+package com.ssj.api.domain.vo.train;
+
+import com.ssj.bean.common.framework.core.domain.BaseRequest;
+
+public class TrainExamUserSaveVo extends BaseRequest {
+	
+	private static final long serialVersionUID = 1L;
+	
+	private String videoId;
+
+	private String answer;
+	
+	private Integer score;
+	
+	public String getVideoId() {
+		return videoId;
+	}
+
+	public void setVideoId(String videoId) {
+		this.videoId = videoId;
+	}
+
+	public String getAnswer() {
+		return answer;
+	}
+
+	public void setAnswer(String answer) {
+		this.answer = answer;
+	}
+
+	public Integer getScore() {
+		return score;
+	}
+
+	public void setScore(Integer score) {
+		this.score = score;
+	}
+
+	
+}

src/main/java/com/ssj/api/domain/vo/train/TrainExamVo.java

@@ -1,20 +1,20 @@
-package com.ssj.api.domain.vo.train;
-
-import com.ssj.bean.common.framework.core.domain.BaseRequest;
-
-public class TrainExamVo extends BaseRequest {
-	
-	private static final long serialVersionUID = 1L;
-	
-	private String videoId;
-
-	public String getVideoId() {
-		return videoId;
-	}
-
-	public void setVideoId(String videoId) {
-		this.videoId = videoId;
-	}
-
-	
-}
+package com.ssj.api.domain.vo.train;
+
+import com.ssj.bean.common.framework.core.domain.BaseRequest;
+
+public class TrainExamVo extends BaseRequest {
+	
+	private static final long serialVersionUID = 1L;
+	
+	private String videoId;
+
+	public String getVideoId() {
+		return videoId;
+	}
+
+	public void setVideoId(String videoId) {
+		this.videoId = videoId;
+	}
+
+	
+}

src/main/java/com/ssj/api/domain/vo/train/TrainLoginVo.java

@@ -1,29 +1,29 @@
-package com.ssj.api.domain.vo.train;
-
-import com.ssj.bean.common.framework.core.domain.BaseRequest;
-
-public class TrainLoginVo extends BaseRequest {
-	
-	private static final long serialVersionUID = 1L;
-	
-	private String loginName;
-	
-	private String password;
-
-	public String getLoginName() {
-		return loginName;
-	}
-
-	public void setLoginName(String loginName) {
-		this.loginName = loginName;
-	}
-
-	public String getPassword() {
-		return password;
-	}
-
-	public void setPassword(String password) {
-		this.password = password;
-	}
-	
-}
+package com.ssj.api.domain.vo.train;
+
+import com.ssj.bean.common.framework.core.domain.BaseRequest;
+
+public class TrainLoginVo extends BaseRequest {
+	
+	private static final long serialVersionUID = 1L;
+	
+	private String loginName;
+	
+	private String password;
+
+	public String getLoginName() {
+		return loginName;
+	}
+
+	public void setLoginName(String loginName) {
+		this.loginName = loginName;
+	}
+
+	public String getPassword() {
+		return password;
+	}
+
+	public void setPassword(String password) {
+		this.password = password;
+	}
+	
+}

src/main/java/com/ssj/api/domain/vo/train/TrainVideoFileVo.java

@@ -1,60 +1,60 @@
-package com.ssj.api.domain.vo.train;
-
-import com.ssj.bean.common.framework.core.domain.BaseRequest;
-
-public class TrainVideoFileVo extends BaseRequest {
-	
-	private static final long serialVersionUID = 1L;
-	
-	private Integer pageNo;
-	
-	private Integer pageSize;
-	
-	private Integer roleType;
-	
-	private String module;
-	
-	private String name;
-
-	public Integer getPageNo() {
-		return pageNo;
-	}
-
-	public void setPageNo(Integer pageNo) {
-		this.pageNo = pageNo;
-	}
-
-	public Integer getPageSize() {
-		return pageSize;
-	}
-
-	public void setPageSize(Integer pageSize) {
-		this.pageSize = pageSize;
-	}
-
-	public Integer getRoleType() {
-		return roleType;
-	}
-
-	public void setRoleType(Integer roleType) {
-		this.roleType = roleType;
-	}
-
-	public String getModule() {
-		return module;
-	}
-
-	public void setModule(String module) {
-		this.module = module;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-	
-	
-}
+package com.ssj.api.domain.vo.train;
+
+import com.ssj.bean.common.framework.core.domain.BaseRequest;
+
+public class TrainVideoFileVo extends BaseRequest {
+	
+	private static final long serialVersionUID = 1L;
+	
+	private Integer pageNo;
+	
+	private Integer pageSize;
+	
+	private Integer roleType;
+	
+	private String module;
+	
+	private String name;
+
+	public Integer getPageNo() {
+		return pageNo;
+	}
+
+	public void setPageNo(Integer pageNo) {
+		this.pageNo = pageNo;
+	}
+
+	public Integer getPageSize() {
+		return pageSize;
+	}
+
+	public void setPageSize(Integer pageSize) {
+		this.pageSize = pageSize;
+	}
+
+	public Integer getRoleType() {
+		return roleType;
+	}
+
+	public void setRoleType(Integer roleType) {
+		this.roleType = roleType;
+	}
+
+	public String getModule() {
+		return module;
+	}
+
+	public void setModule(String module) {
+		this.module = module;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+	
+	
+}

src/main/java/com/ssj/api/domain/vo/train/TrainVideoVo.java

@@ -1,29 +1,29 @@
-package com.ssj.api.domain.vo.train;
-
-import com.ssj.bean.common.framework.core.domain.BaseRequest;
-
-public class TrainVideoVo extends BaseRequest {
-	
-	private static final long serialVersionUID = 1L;
-	
-	private Integer roleType;
-	
-	private String module;
-
-	public Integer getRoleType() {
-		return roleType;
-	}
-
-	public void setRoleType(Integer roleType) {
-		this.roleType = roleType;
-	}
-
-	public String getModule() {
-		return module;
-	}
-
-	public void setModule(String module) {
-		this.module = module;
-	}
-
-}
+package com.ssj.api.domain.vo.train;
+
+import com.ssj.bean.common.framework.core.domain.BaseRequest;
+
+public class TrainVideoVo extends BaseRequest {
+	
+	private static final long serialVersionUID = 1L;
+	
+	private Integer roleType;
+	
+	private String module;
+
+	public Integer getRoleType() {
+		return roleType;
+	}
+
+	public void setRoleType(Integer roleType) {
+		this.roleType = roleType;
+	}
+
+	public String getModule() {
+		return module;
+	}
+
+	public void setModule(String module) {
+		this.module = module;
+	}
+
+}

src/main/java/com/ssj/dao/sys/analysis/dao/AnalysisQueryDao.java

@@ -1,75 +1,75 @@
-package com.ssj.dao.sys.analysis.dao;
-
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-
-import com.ssj.bean.sys.analysis.bean.Analysis;
-
-
-public interface AnalysisQueryDao {
-
-	//type=1月份的消费币的总量
-	public Long countLibJoinConsumeSumByLibService(String date);
-	
-	//type=1的总端口数
-	public Long countFxMerchantSumByPortNum();
-	
-	//type=1的月top10
-	public List<Map<String,Object>> countFxMerchantSumByTop(String date);
-	
-	//月机构会员的统计列表
-	public Page<Map<String, Object>> countFxMerchantServiceByDate(Map<String, Object> params, Pageable pageable);
-	
-	public Page<Map<String, Object>> countFxMerchantServiceByVipDate(Map<String, Object> params, Pageable pageable);
-
-	//公用查询方式
-	public Page<Map<String, Object>> countFxMerchantCommonByCountDate(Map<String, Object> params, Pageable pageable);
-	
-	//公用查询明细方式
-	public Page<Map<String, Object>> countFxMerchantCommonByVipDate(Map<String, Object> params, Pageable pageable);
-	
-	public Page<Map<String, Object>> countFxMerchantCommonByUserDate(Map<String, Object> params, Pageable pageable);
-	
-	//查出时间内的记录
-	public Analysis getAnalysisByDay(String libId,String userId,String vipId,Integer source,Integer type,String dayTime);
-	
-	
-	//查出一周内和上周的功能使用总数
-	public Map<String, Object> countAnalysisCountCommonByCountDate(Map<String, Object> params);
-	
-	//召回机构数据（1周不用机构）
-	public Map<String, Object> countRecallCommonByCountDate(Map<String, Object> params);
-	
-	//上传作业的人数
-	public Map<String, Object> countUploadWorkCommonByCountDate(Map<String, Object> params);
-	
-	//返回指定机构的活跃人数
-	public Integer countActiveNumCommonByLibCountWeek(Map<String, Object> params);
-	
-	//返回指定机构的会员人数
-	public Integer countMemberNumCommonByLibCountWeek(Map<String, Object> params);
-	
-	//查出一周内和上周的机构活泼数（账号活跃占比50%以上)
-	public Map<String, Object> countAnalysisWeekCountCommonByCountCurDate(Map<String, Object> params);
-	
-	
-	//新机构（1个月内）活泼数,老机构（持续用3个月）
-	public List<Map<String, Object>> countAnalysisWeekCountCommonByCountMonthDate(Map<String, Object> params);
-	
-	//新签机构1周内账号开通数（校长&教师)
-	public List<Map<String, Object>> countLibJoinCountCommonByCountDate(Map<String, Object> params);
-	
-	//新签机构2周内学生账号激活
-	public Map<String, Object> countVipActivateCountCommonByCountDate(Map<String, Object> params);
-	
-	//统计时间的type数量
-	public List<Map<String, Object>> countAnalysisCountCommonByCountTask();
-	
-
-	
-	
-	
-}
+package com.ssj.dao.sys.analysis.dao;
+
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+
+import com.ssj.bean.sys.analysis.bean.Analysis;
+
+
+public interface AnalysisQueryDao {
+
+	//type=1月份的消费币的总量
+	public Long countLibJoinConsumeSumByLibService(String date);
+	
+	//type=1的总端口数
+	public Long countFxMerchantSumByPortNum();
+	
+	//type=1的月top10
+	public List<Map<String,Object>> countFxMerchantSumByTop(String date);
+	
+	//月机构会员的统计列表
+	public Page<Map<String, Object>> countFxMerchantServiceByDate(Map<String, Object> params, Pageable pageable);
+	
+	public Page<Map<String, Object>> countFxMerchantServiceByVipDate(Map<String, Object> params, Pageable pageable);
+
+	//公用查询方式
+	public Page<Map<String, Object>> countFxMerchantCommonByCountDate(Map<String, Object> params, Pageable pageable);
+	
+	//公用查询明细方式
+	public Page<Map<String, Object>> countFxMerchantCommonByVipDate(Map<String, Object> params, Pageable pageable);
+	
+	public Page<Map<String, Object>> countFxMerchantCommonByUserDate(Map<String, Object> params, Pageable pageable);
+	
+	//查出时间内的记录
+	public Analysis getAnalysisByDay(String libId,String userId,String vipId,Integer source,Integer type,String dayTime);
+	
+	
+	//查出一周内和上周的功能使用总数
+	public Map<String, Object> countAnalysisCountCommonByCountDate(Map<String, Object> params);
+	
+	//召回机构数据（1周不用机构）
+	public Map<String, Object> countRecallCommonByCountDate(Map<String, Object> params);
+	
+	//上传作业的人数
+	public Map<String, Object> countUploadWorkCommonByCountDate(Map<String, Object> params);
+	
+	//返回指定机构的活跃人数
+	public Integer countActiveNumCommonByLibCountWeek(Map<String, Object> params);
+	
+	//返回指定机构的会员人数
+	public Integer countMemberNumCommonByLibCountWeek(Map<String, Object> params);
+	
+	//查出一周内和上周的机构活泼数（账号活跃占比50%以上)
+	public Map<String, Object> countAnalysisWeekCountCommonByCountCurDate(Map<String, Object> params);
+	
+	
+	//新机构（1个月内）活泼数,老机构（持续用3个月）
+	public List<Map<String, Object>> countAnalysisWeekCountCommonByCountMonthDate(Map<String, Object> params);
+	
+	//新签机构1周内账号开通数（校长&教师)
+	public List<Map<String, Object>> countLibJoinCountCommonByCountDate(Map<String, Object> params);
+	
+	//新签机构2周内学生账号激活
+	public Map<String, Object> countVipActivateCountCommonByCountDate(Map<String, Object> params);
+	
+	//统计时间的type数量
+	public List<Map<String, Object>> countAnalysisCountCommonByCountTask();
+	
+
+	
+	
+	
+}

src/main/java/com/ssj/dao/sys/analysis/dao/impl/AnalysisQueryDaoImpl.java

@@ -1,404 +1,404 @@
-package com.ssj.dao.sys.analysis.dao.impl;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.stereotype.Repository;
-
-import com.ssj.bean.sys.analysis.bean.Analysis;
-import com.ssj.dao.sys.analysis.dao.AnalysisQueryDao;
-import com.ssj.framework.core.persistence.PagingHibernateJdbcDao;
-
-@Repository
-public class AnalysisQueryDaoImpl  implements AnalysisQueryDao {
-
-    @Autowired
-    private PagingHibernateJdbcDao dao;
-    
-
-	@Override
-	public Long countLibJoinConsumeSumByLibService(String date) {
-		Long count=new Long(0);
-		StringBuilder sb = new StringBuilder();
-        sb.append(" SELECT IFNULL(SUM(t.lib_service),0) as count from tb_lib_join_consume t LEFT JOIN fx_merchant m ON t.from_merchant_id=m.id WHERE m.type=1 AND t.type in ('2') AND date_format(t.create_time, '%Y-%m') =?  ");
-        List<Object> param = new ArrayList<>();
-        param.add(date);
-        List<Map<String, Object>> list=dao.findMap(sb.toString(), param.toArray());
-        if(list!=null && list.size()>0) {
-        	count=Long.parseLong(list.get(0).get("count").toString());
-        }
-        return count;
-	}
-
-	@Override
-	public Long countFxMerchantSumByPortNum() {
-		Long count=new Long(0);
-		StringBuilder sb = new StringBuilder();
-        sb.append(" SELECT IFNULL(SUM(t.port_num),0) as count from  fx_merchant t WHERE t.type=1 ");
-        List<Object> param = new ArrayList<>();
-        List<Map<String, Object>> list=dao.findMap(sb.toString(), param.toArray());
-        if(list!=null && list.size()>0) {
-        	count=Long.parseLong(list.get(0).get("count").toString());
-        }
-        return count;
-	}
-
-	@Override
-	public List<Map<String,Object>> countFxMerchantSumByTop(String date) {
-		StringBuilder sb = new StringBuilder();
-        sb.append(" SELECT *,IFNULL(count/lib_service,0) as lcount from ( ");
-        sb.append(" SELECT ");
-        sb.append(" (SELECT IFNULL(SUM(c.lib_service),0) from tb_lib_join_consume c WHERE c.type in ('2') AND date_format(c.create_time, '%Y-%m') =? AND c.from_merchant_id=t.id ) as count,	");
-        sb.append(" t.lib_service,");
-        sb.append(" t.unit_name");
-        sb.append(" from fx_merchant t WHERE t.type=1 ");
-        sb.append(" ) as tmp ORDER BY lcount desc LIMIT 10 ");
-        
-        List<Object> param = new ArrayList<>();
-        param.add(date);
-        return dao.findMap(sb.toString(), param.toArray());
-	}
-
-	@Override
-	public Page<Map<String, Object>> countFxMerchantServiceByDate(Map<String, Object> params, Pageable pageable) {
-		StringBuilder sb = new StringBuilder();
-        sb.append("  SELECT ");
-        sb.append("  t.id,t.unit_name,j.league_name, ");
-        sb.append("  	( SELECT COUNT(DISTINCT s.vip_id) from tb_lib_vip_service s WHERE s.lib_id=t.lib_id AND date_format(s.start_time, '%Y-%m') =? 	) as count_1, ");
-        sb.append("  	( SELECT COUNT(DISTINCT s.vip_id) from tb_lib_vip_service s WHERE s.lib_id=t.lib_id AND date_format(s.end_time, '%Y-%m') =? ) as count_2, ");
-        sb.append("  	( SELECT COUNT(DISTINCT s.vip_id) from tb_lib_vip_service s WHERE s.lib_id=t.lib_id AND date_format(s.end_time, '%Y-%m') >=? ) as count_3, ");
-        sb.append("  	( SELECT COUNT(DISTINCT s.vip_id) from tb_lib_vip_service s WHERE s.lib_id=t.lib_id AND date_format(s.end_time, '%Y-%m') >? ) as count_4");
-        sb.append(" from fx_merchant t  ");
-        sb.append(" LEFT JOIN  tb_lib_join j ON t.lib_id=j.id ");
-        sb.append(" WHERE t.type=1 AND t.lib_id is NOT null ");
-        List<Object> param = new ArrayList<>();
-        param.add(params.get("date"));
-        param.add(params.get("date"));
-        param.add(params.get("date"));
-        param.add(params.get("date"));
-        if(params.get("unitName")!=null && StringUtils.isNotEmpty(params.get("unitName").toString())) {
-        	 sb.append(" and t.unit_name like concat('%',?,'%')  ");
-        	 param.add(params.get("unitName"));
-        }
-        sb.append(" ORDER BY count_1 desc,count_2 desc,count_3 desc,count_4 desc ");
-        return dao.findPage(sb.toString(),param.toArray(),pageable);
-	}
-    
-	@Override
-	public Page<Map<String, Object>> countFxMerchantServiceByVipDate(Map<String, Object> params, Pageable pageable) {
-		StringBuilder sb = new StringBuilder();
-		List<Object> param = new ArrayList<>();
-		 
-        String type=params.get("type")!=null ? params.get("type").toString() : "1";
-       
-        switch (type) {
-			case "1":
-				sb.append(" SELECT s.vip_id,u.wx_name,u.photo,v.parent_name,v.child_name,s.start_time,s.end_time from tb_lib_vip_service s  ");
-				sb.append(" LEFT JOIN fx_merchant t ON s.lib_id=t.lib_id ");
-				sb.append(" LEFT JOIN tb_lib_vip v ON s.vip_id=v.id ");
-				sb.append(" LEFT JOIN tb_user u ON v.user_id=u.id ");
-				sb.append(" WHERE date_format(s.start_time, '%Y-%m') =?");
-				sb.append(" AND t.id=? ");
-				param.add(params.get("date"));
-				param.add(params.get("id"));
-				if(params.get("name")!=null && StringUtils.isNotEmpty(params.get("name").toString())) {
-					sb.append(" AND v.child_name like concat('%',?,'%')  ");
-					param.add(params.get("name"));
-				}
-				sb.append(" GROUP BY s.vip_id ORDER BY s.start_time DESC ");
-				return dao.findPage(sb.toString(),param.toArray(),pageable);
-			case "2":
-				sb.append(" SELECT s.vip_id,u.wx_name,u.photo,v.parent_name,v.child_name,s.start_time,s.end_time from tb_lib_vip_service s  ");
-				sb.append(" LEFT JOIN fx_merchant t ON s.lib_id=t.lib_id ");
-				sb.append(" LEFT JOIN tb_lib_vip v ON s.vip_id=v.id ");
-				sb.append(" LEFT JOIN tb_user u ON v.user_id=u.id ");
-				sb.append(" WHERE date_format(s.end_time, '%Y-%m') =?");
-				sb.append(" AND t.id=? ");
-				param.add(params.get("date"));
-				param.add(params.get("id"));
-				if(params.get("name")!=null && StringUtils.isNotEmpty(params.get("name").toString())) {
-					sb.append(" AND v.child_name like concat('%',?,'%')  ");
-					param.add(params.get("name"));
-				}
-				sb.append(" GROUP BY s.vip_id ORDER BY s.start_time DESC ");
-				return dao.findPage(sb.toString(),param.toArray(),pageable);
-			case "3":
-				sb.append(" SELECT s.vip_id,u.wx_name,u.photo,v.parent_name,v.child_name,s.start_time,s.end_time from tb_lib_vip_service s  ");
-				sb.append(" LEFT JOIN fx_merchant t ON s.lib_id=t.lib_id ");
-				sb.append(" LEFT JOIN tb_lib_vip v ON s.vip_id=v.id ");
-				sb.append(" LEFT JOIN tb_user u ON v.user_id=u.id ");
-				sb.append(" WHERE date_format(s.end_time, '%Y-%m') >=?");
-				sb.append(" AND t.id=? ");
-				param.add(params.get("date"));
-				param.add(params.get("id"));
-				if(params.get("name")!=null && StringUtils.isNotEmpty(params.get("name").toString())) {
-					sb.append(" AND v.child_name like concat('%',?,'%')  ");
-					param.add(params.get("name"));
-				}
-				sb.append(" GROUP BY s.vip_id ORDER BY s.start_time DESC ");
-				return dao.findPage(sb.toString(),param.toArray(),pageable);
-			case "4":
-				sb.append(" SELECT s.vip_id,u.wx_name,u.photo,v.parent_name,v.child_name,s.start_time,s.end_time from tb_lib_vip_service s  ");
-				sb.append(" LEFT JOIN fx_merchant t ON s.lib_id=t.lib_id ");
-				sb.append(" LEFT JOIN tb_lib_vip v ON s.vip_id=v.id ");
-				sb.append(" LEFT JOIN tb_user u ON v.user_id=u.id ");
-				sb.append(" WHERE date_format(s.end_time, '%Y-%m') =?");
-				sb.append(" AND t.id=? ");
-				param.add(params.get("date"));
-				param.add(params.get("id"));
-				if(params.get("name")!=null && StringUtils.isNotEmpty(params.get("name").toString())) {
-					sb.append(" AND v.child_name like concat('%',?,'%')  ");
-					param.add(params.get("name"));
-				}
-				sb.append(" GROUP BY s.vip_id ORDER BY s.start_time DESC ");
-				return dao.findPage(sb.toString(),param.toArray(),pageable);
-			default:
-				return null;
-		}
-       
-	}
-    
-	
-	@Override
-	public Page<Map<String, Object>> countFxMerchantCommonByCountDate(Map<String, Object> params, Pageable pageable) {
-		StringBuilder sb = new StringBuilder();
-		String[] types=params.get("types").toString().split(";");
-		List<Object> param = new ArrayList<>();
-        sb.append("  SELECT ");
-        sb.append("  t.id,t.unit_name,j.id as lib_id, j.league_name");
-        for (int i = 0; i < types.length; i++) {
-        	 sb.append(" , ( SELECT IFNULL(SUM(a.count),0) from tb_analysis_count a WHERE a.lib_id=t.lib_id AND a.type=? AND a.source=? AND a.day_time>=? AND a.day_time<=? ) as count_"+i );
-        	 param.add(types[i]);
-        	 param.add(params.get("source"));
-        	 param.add(params.get("date"));
-        	 param.add(params.get("date2"));
-		}
-        sb.append(" from fx_merchant t  ");
-        sb.append(" LEFT JOIN  tb_lib_join j ON t.lib_id=j.id ");
-        sb.append(" WHERE t.type=1 AND t.lib_id is NOT null ");
-        if(params.get("unitName")!=null && StringUtils.isNotEmpty(params.get("unitName").toString())) {
-        	 sb.append(" and t.unit_name like concat('%',?,'%')  ");
-        	 param.add(params.get("unitName"));
-        }
-        for (int i = 0; i < types.length; i++) {
-        	if(i==0) {
-        		sb.append(" ORDER BY count_"+i+" desc ");
-        	}else {
-        		sb.append("  , count_"+i+" desc ");
-        	}
-        }
-        return dao.findPage(sb.toString(),param.toArray(),pageable);
-	}
-	
-	@Override
-	public Page<Map<String, Object>> countFxMerchantCommonByVipDate(Map<String, Object> params, Pageable pageable) {
-		StringBuilder sb = new StringBuilder();
-		List<Object> param = new ArrayList<>();
-        sb.append(" SELECT t.user_id,t.vip_id,u.wx_name,u.photo,v.parent_name,v.child_name,t.create_time ");
-        sb.append(" from tb_analysis t  ");
-        sb.append(" LEFT JOIN tb_lib_vip v ON t.vip_id=v.id ");
-        sb.append(" LEFT JOIN tb_user u ON v.user_id=u.id ");
-        sb.append(" WHERE t.lib_id=? AND t.type=? AND t.source =? AND TO_DAYS(t.create_time)>=TO_DAYS(?) AND TO_DAYS(t.create_time)<=TO_DAYS(?)  ");
-        param.add(params.get("libId"));
-        param.add(params.get("type"));
-        param.add(params.get("source"));
-        param.add(params.get("date"));
-        param.add(params.get("date2"));
-        if(params.get("name")!=null && StringUtils.isNotEmpty(params.get("name").toString())) {
-        	 sb.append(" and v.child_name like concat('%',?,'%')  ");
-        	 param.add(params.get("name"));
-        }
-        sb.append(" GROUP BY TO_DAYS(t.create_time),t.vip_id ORDER BY t.create_time asc ");
-        return dao.findPage(sb.toString(),param.toArray(),pageable);
-	}
-	
-	
-	
-	@Override
-	public Page<Map<String, Object>> countFxMerchantCommonByUserDate(Map<String, Object> params, Pageable pageable) {
-		StringBuilder sb = new StringBuilder();
-		List<Object> param = new ArrayList<>();
-        sb.append(" SELECT t.user_id,u.wx_name,u.photo,u.user_name,t.create_time ");
-        sb.append(" from tb_analysis t  ");
-        sb.append(" LEFT JOIN tb_user u ON t.user_id=u.id ");
-        sb.append(" WHERE t.lib_id=? AND t.type=? AND t.source =? AND TO_DAYS(t.create_time)>=TO_DAYS(?) AND TO_DAYS(t.create_time)<=TO_DAYS(?)  ");
-        param.add(params.get("libId"));
-        param.add(params.get("type"));
-        param.add(params.get("source"));
-        param.add(params.get("date"));
-        param.add(params.get("date2"));
-        if(params.get("name")!=null && StringUtils.isNotEmpty(params.get("name").toString())) {
-        	 sb.append(" and u.user_name like concat('%',?,'%')  ");
-        	 param.add(params.get("name"));
-        }
-        sb.append(" GROUP BY TO_DAYS(t.create_time),t.user_id ORDER BY t.create_time asc ");
-        return dao.findPage(sb.toString(),param.toArray(),pageable);
-	}
-
-	@Override
-	public Analysis getAnalysisByDay(String libId, String userId, String vipId, Integer source, Integer type,String dayTime) {
-		StringBuilder sb = new StringBuilder();
-		List<Object> param = new ArrayList<>();
-        sb.append(" SELECT * FROM `tb_analysis` t WHERE t.source=? AND t.type=? AND t.day_time=? AND t.lib_id=? ");
-        param.add(source);
-        param.add(type);
-        param.add(dayTime);
-        param.add(libId);
-        if(StringUtils.isNotEmpty(userId)) {
-       	 	sb.append(" AND t.user_id=? ");
-       	 	param.add(userId);
-        }
-        if(StringUtils.isNotEmpty(userId)) {
-          	sb.append(" AND t.vip_id=? ");
-          	param.add(vipId);
-        }
-        sb.append(" LIMIT 1 ");
-        List<Analysis> list=dao.findList(sb.toString(),param.toArray(),Analysis.class);
-        return list!=null && list.size()>0 ? list.get(0) : null ;
-	}
-	
-	
-	
-	
-	@Override
-	public Map<String, Object> countAnalysisCountCommonByCountDate(Map<String, Object> params) {
-		StringBuilder sb = new StringBuilder();
-		String[] types=params.get("types").toString().split(";");
-		List<Object> param = new ArrayList<>();
-        sb.append("  SELECT 1 ");
-        for (int i = 0; i < types.length; i++) {
-        	 sb.append(" , ( SELECT IFNULL(SUM(t.count),0) as count from tb_analysis_count t WHERE t.source=? AND t.type=? AND t.day_time>=? AND t.day_time<=?  ) as count_"+i );
-        	 param.add(params.get("source"));
-        	 param.add(types[i]);
-        	 param.add(params.get("date"));
-        	 param.add(params.get("date2"));
-        	 
-        	 sb.append(" , ( SELECT IFNULL(SUM(t.count),0) as count from tb_analysis_count t WHERE t.source=? AND t.type=? AND t.day_time>=? AND t.day_time<=?  ) as count_"+i+"_"+i );
-        	 param.add(params.get("source"));
-        	 param.add(types[i]);
-        	 param.add(params.get("date3"));
-        	 param.add(params.get("date4"));
-		}
-        List<Map<String, Object>>  list=dao.findMap(sb.toString(),param.toArray());
-        return list!=null && list.size()>0 ? list.get(0) : new HashMap<String, Object>();
-	}
-	
-	
-	
-	@Override
-	public Map<String, Object> countRecallCommonByCountDate(Map<String, Object> params) {
-		StringBuilder sb = new StringBuilder();
-		List<Object> param = new ArrayList<>();
-        sb.append("	SELECT 	");
-      	sb.append("	IFNULL((SELECT COUNT(lib_id) from tb_analysis_count a WHERE a.day_time>=? AND a.day_time<=? GROUP BY a.lib_id),0)  as count_0, " );
-    	sb.append(" IFNULL((SELECT COUNT(lib_id) from tb_analysis_count a WHERE a.day_time>=? AND a.day_time<=? GROUP BY a.lib_id),0)  as count_1 ");
-      	param.add(params.get("date"));
-    	param.add(params.get("date2"));
-    	param.add(params.get("date3"));
-    	param.add(params.get("date4"));
-    	List<Map<String, Object>>  list=dao.findMap(sb.toString(),param.toArray());
-        return list!=null && list.size()>0 ? list.get(0) : new HashMap<String, Object>();
-	}
-	
-	
-	@Override
-	public Map<String, Object> countUploadWorkCommonByCountDate(Map<String, Object> params) {
-		StringBuilder sb = new StringBuilder();
-		List<Object> param = new ArrayList<>();
-        sb.append("	SELECT  	");
-      	sb.append("	 (SELECT IFNULL(count(1),0) from (SELECT t.vip_id,count(t.day_time) as count from tb_analysis t WHERE t.type=3 AND t.day_time>=? AND t.day_time<=? GROUP BY t.vip_id HAVING count>=3) as tmp) as count_0, " );
-    	sb.append("  (SELECT IFNULL(count(1),0) from (SELECT t.vip_id,count(t.day_time) as count from tb_analysis t WHERE t.type=3 AND t.day_time>=? AND t.day_time<=? GROUP BY t.vip_id HAVING count>=3) as tmp) as count_1 ");
-      	param.add(params.get("date"));
-    	param.add(params.get("date2"));
-    	param.add(params.get("date3"));
-    	param.add(params.get("date4"));
-    	List<Map<String, Object>>  list=dao.findMap(sb.toString(),param.toArray());
-        return list!=null && list.size()>0 ? list.get(0) : new HashMap<String, Object>();
-	}
-	
-	@Override
-	public Integer countActiveNumCommonByLibCountWeek(Map<String, Object> params) {
-		StringBuilder sb = new StringBuilder();
-		List<Object> param = new ArrayList<>();
-      	sb.append("	SELECT IFNULL(count(1),0) as count from (SELECT t.vip_id,count(t.day_time) as count from tb_analysis t WHERE t.lib_id=? AND t.type=3 AND DATE_FORMAT(t.day_time,'%Y')=DATE_FORMAT(DATE_FORMAT(DATE_SUB(NOW(),INTERVAL 1 DAY),'%Y-%m-%d'),'%Y') AND DATE_FORMAT(t.day_time,'%Y')=DATE_FORMAT(DATE_FORMAT(DATE_SUB(NOW(),INTERVAL 1 DAY),'%Y-%m-%d'),'%u') GROUP BY t.vip_id HAVING count>=3) as tmp" );
-    	param.add(params.get("libId"));
-    	List<Map<String, Object>>  list=dao.findMap(sb.toString(),param.toArray());
-        return list!=null && list.size()>0 ? (int)list.get(0).get("count") : 0;
-	}
-	
-	
-	public Integer countMemberNumCommonByLibCountWeek(Map<String, Object> params) {
-		StringBuilder sb = new StringBuilder();
-		List<Object> param = new ArrayList<>();
-      	sb.append("	SELECT COUNT(1) as count from tb_lib_vip t WHERE t.lib_id=? " );
-    	param.add(params.get("libId"));
-    	List<Map<String, Object>>  list=dao.findMap(sb.toString(),param.toArray());
-        return list!=null && list.size()>0 ? (int)list.get(0).get("count") : 0;
-	}
-
-	@Override
-	public Map<String, Object> countAnalysisWeekCountCommonByCountCurDate(Map<String, Object> params) {
-		StringBuilder sb = new StringBuilder();
-		List<Object> param = new ArrayList<>();
-        sb.append("	SELECT ");
-      	sb.append("	 (SELECT COUNT(DISTINCT t.lib_id) from tb_analysis_week t WHERE t.year_week=? AND t.active_ratio>=50) as count_0, " );
-    	sb.append("  (SELECT COUNT(DISTINCT t.lib_id) from tb_analysis_week t WHERE t.year_week=? AND t.active_ratio>=50) as count_1, ");
-    	sb.append("	 (SELECT COUNT(1) from fx_merchant t WHERE t.type=1 AND t.lib_id is NOT NULL) as count_2	");
-      	param.add(params.get("date"));
-    	param.add(params.get("date2"));
-    	List<Map<String, Object>>  list=dao.findMap(sb.toString(),param.toArray());
-        return list!=null && list.size()>0 ? list.get(0) : new HashMap<String, Object>();
-	}
-
-	@Override
-	public List<Map<String, Object>> countAnalysisWeekCountCommonByCountMonthDate(Map<String, Object> params) {
-		StringBuilder sb = new StringBuilder();
-		List<Object> param = new ArrayList<>();
-      	sb.append("	 SELECT t.lib_id,COUNT(DISTINCT t.year_week) as count from tb_analysis_week t WHERE t.year_week>=? AND t.year_week<=? GROUP BY t.lib_id HAVING count>=?" );
-      	param.add(params.get("date"));
-    	param.add(params.get("date2"));
-    	param.add(params.get("count"));
-    	return dao.findMap(sb.toString(),param.toArray());
-	}
-
-	@Override
-	public List<Map<String, Object>> countLibJoinCountCommonByCountDate(Map<String, Object> params) {
-		StringBuilder sb = new StringBuilder();
-		List<Object> param = new ArrayList<>();
-      	sb.append("	 SELECT t.id,COUNT(m.id) as count from tb_lib_join t LEFT JOIN tb_lib_manager m ON t.id=m.lib_id  " );
-       	sb.append("	WHERE TO_DAYS(t.create_time) >=TO_DAYS(?) AND TO_DAYS(t.create_time) <=TO_DAYS(?) ");
-       	sb.append(" GROUP BY t.id HAVING count<=0 	");
-      	param.add(params.get("date"));
-    	param.add(params.get("date2"));
-    	return dao.findMap(sb.toString(),param.toArray());
-	}
-
-	@Override
-	public Map<String, Object> countVipActivateCountCommonByCountDate(Map<String, Object> params) {
-		StringBuilder sb = new StringBuilder();
-		List<Object> param = new ArrayList<>();
-      	sb.append("	 SELECT  " );
-       	sb.append(" (SELECT count(1) from tb_lib_vip t WHERE TO_DAYS(t.activate_time)>=TO_DAYS(?) AND TO_DAYS(t.activate_time)>=TO_DAYS(?)) AS count_0, ");
-       	sb.append(" (SELECT count(1) from tb_lib_vip t WHERE t.activate_time is NOT null ) AS count_1	");
-      	param.add(params.get("date"));
-    	param.add(params.get("date2"));
-    	List<Map<String, Object>>  list=dao.findMap(sb.toString(),param.toArray());
-        return list!=null && list.size()>0 ? list.get(0) : new HashMap<String, Object>();
-	}
-
-	@Override
-	public List<Map<String, Object>> countAnalysisCountCommonByCountTask() {
-		StringBuilder sb = new StringBuilder();
-		List<Object> param = new ArrayList<>();
-      	sb.append("	SELECT t.lib_id,t.source,t.type,DATE_FORMAT(t.create_time,'%Y-%m-%d') as day_time,IF(type=3,COUNT(DISTINCT t.user_id),COUNT(DISTINCT t.vip_id)) as count from tb_analysis t WHERE  TO_DAYS(t.create_time)=TO_DAYS(DATE_SUB(NOW(),INTERVAL 1 DAY)) GROUP BY t.lib_id,t.source,t.type " );
-    	return dao.findMap(sb.toString(),param.toArray());
-	}
-
-	
-}
+package com.ssj.dao.sys.analysis.dao.impl;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Repository;
+
+import com.ssj.bean.sys.analysis.bean.Analysis;
+import com.ssj.dao.sys.analysis.dao.AnalysisQueryDao;
+import com.ssj.framework.core.persistence.PagingHibernateJdbcDao;
+
+@Repository
+public class AnalysisQueryDaoImpl  implements AnalysisQueryDao {
+
+    @Autowired
+    private PagingHibernateJdbcDao dao;
+    
+
+	@Override
+	public Long countLibJoinConsumeSumByLibService(String date) {
+		Long count=new Long(0);
+		StringBuilder sb = new StringBuilder();
+        sb.append(" SELECT IFNULL(SUM(t.lib_service),0) as count from tb_lib_join_consume t LEFT JOIN fx_merchant m ON t.from_merchant_id=m.id WHERE m.type=1 AND t.type in ('2') AND date_format(t.create_time, '%Y-%m') =?  ");
+        List<Object> param = new ArrayList<>();
+        param.add(date);
+        List<Map<String, Object>> list=dao.findMap(sb.toString(), param.toArray());
+        if(list!=null && list.size()>0) {
+        	count=Long.parseLong(list.get(0).get("count").toString());
+        }
+        return count;
+	}
+
+	@Override
+	public Long countFxMerchantSumByPortNum() {
+		Long count=new Long(0);
+		StringBuilder sb = new StringBuilder();
+        sb.append(" SELECT IFNULL(SUM(t.port_num),0) as count from  fx_merchant t WHERE t.type=1 ");
+        List<Object> param = new ArrayList<>();
+        List<Map<String, Object>> list=dao.findMap(sb.toString(), param.toArray());
+        if(list!=null && list.size()>0) {
+        	count=Long.parseLong(list.get(0).get("count").toString());
+        }
+        return count;
+	}
+
+	@Override
+	public List<Map<String,Object>> countFxMerchantSumByTop(String date) {
+		StringBuilder sb = new StringBuilder();
+        sb.append(" SELECT *,IFNULL(count/lib_service,0) as lcount from ( ");
+        sb.append(" SELECT ");
+        sb.append(" (SELECT IFNULL(SUM(c.lib_service),0) from tb_lib_join_consume c WHERE c.type in ('2') AND date_format(c.create_time, '%Y-%m') =? AND c.from_merchant_id=t.id ) as count,	");
+        sb.append(" t.lib_service,");
+        sb.append(" t.unit_name");
+        sb.append(" from fx_merchant t WHERE t.type=1 ");
+        sb.append(" ) as tmp ORDER BY lcount desc LIMIT 10 ");
+        
+        List<Object> param = new ArrayList<>();
+        param.add(date);
+        return dao.findMap(sb.toString(), param.toArray());
+	}
+
+	@Override
+	public Page<Map<String, Object>> countFxMerchantServiceByDate(Map<String, Object> params, Pageable pageable) {
+		StringBuilder sb = new StringBuilder();
+        sb.append("  SELECT ");
+        sb.append("  t.id,t.unit_name,j.league_name, ");
+        sb.append("  	( SELECT COUNT(DISTINCT s.vip_id) from tb_lib_vip_service s WHERE s.lib_id=t.lib_id AND date_format(s.start_time, '%Y-%m') =? 	) as count_1, ");
+        sb.append("  	( SELECT COUNT(DISTINCT s.vip_id) from tb_lib_vip_service s WHERE s.lib_id=t.lib_id AND date_format(s.end_time, '%Y-%m') =? ) as count_2, ");
+        sb.append("  	( SELECT COUNT(DISTINCT s.vip_id) from tb_lib_vip_service s WHERE s.lib_id=t.lib_id AND date_format(s.end_time, '%Y-%m') >=? ) as count_3, ");
+        sb.append("  	( SELECT COUNT(DISTINCT s.vip_id) from tb_lib_vip_service s WHERE s.lib_id=t.lib_id AND date_format(s.end_time, '%Y-%m') >? ) as count_4");
+        sb.append(" from fx_merchant t  ");
+        sb.append(" LEFT JOIN  tb_lib_join j ON t.lib_id=j.id ");
+        sb.append(" WHERE t.type=1 AND t.lib_id is NOT null ");
+        List<Object> param = new ArrayList<>();
+        param.add(params.get("date"));
+        param.add(params.get("date"));
+        param.add(params.get("date"));
+        param.add(params.get("date"));
+        if(params.get("unitName")!=null && StringUtils.isNotEmpty(params.get("unitName").toString())) {
+        	 sb.append(" and t.unit_name like concat('%',?,'%')  ");
+        	 param.add(params.get("unitName"));
+        }
+        sb.append(" ORDER BY count_1 desc,count_2 desc,count_3 desc,count_4 desc ");
+        return dao.findPage(sb.toString(),param.toArray(),pageable);
+	}
+    
+	@Override
+	public Page<Map<String, Object>> countFxMerchantServiceByVipDate(Map<String, Object> params, Pageable pageable) {
+		StringBuilder sb = new StringBuilder();
+		List<Object> param = new ArrayList<>();
+		 
+        String type=params.get("type")!=null ? params.get("type").toString() : "1";
+       
+        switch (type) {
+			case "1":
+				sb.append(" SELECT s.vip_id,u.wx_name,u.photo,v.parent_name,v.child_name,s.start_time,s.end_time from tb_lib_vip_service s  ");
+				sb.append(" LEFT JOIN fx_merchant t ON s.lib_id=t.lib_id ");
+				sb.append(" LEFT JOIN tb_lib_vip v ON s.vip_id=v.id ");
+				sb.append(" LEFT JOIN tb_user u ON v.user_id=u.id ");
+				sb.append(" WHERE date_format(s.start_time, '%Y-%m') =?");
+				sb.append(" AND t.id=? ");
+				param.add(params.get("date"));
+				param.add(params.get("id"));
+				if(params.get("name")!=null && StringUtils.isNotEmpty(params.get("name").toString())) {
+					sb.append(" AND v.child_name like concat('%',?,'%')  ");
+					param.add(params.get("name"));
+				}
+				sb.append(" GROUP BY s.vip_id ORDER BY s.start_time DESC ");
+				return dao.findPage(sb.toString(),param.toArray(),pageable);
+			case "2":
+				sb.append(" SELECT s.vip_id,u.wx_name,u.photo,v.parent_name,v.child_name,s.start_time,s.end_time from tb_lib_vip_service s  ");
+				sb.append(" LEFT JOIN fx_merchant t ON s.lib_id=t.lib_id ");
+				sb.append(" LEFT JOIN tb_lib_vip v ON s.vip_id=v.id ");
+				sb.append(" LEFT JOIN tb_user u ON v.user_id=u.id ");
+				sb.append(" WHERE date_format(s.end_time, '%Y-%m') =?");
+				sb.append(" AND t.id=? ");
+				param.add(params.get("date"));
+				param.add(params.get("id"));
+				if(params.get("name")!=null && StringUtils.isNotEmpty(params.get("name").toString())) {
+					sb.append(" AND v.child_name like concat('%',?,'%')  ");
+					param.add(params.get("name"));
+				}
+				sb.append(" GROUP BY s.vip_id ORDER BY s.start_time DESC ");
+				return dao.findPage(sb.toString(),param.toArray(),pageable);
+			case "3":
+				sb.append(" SELECT s.vip_id,u.wx_name,u.photo,v.parent_name,v.child_name,s.start_time,s.end_time from tb_lib_vip_service s  ");
+				sb.append(" LEFT JOIN fx_merchant t ON s.lib_id=t.lib_id ");
+				sb.append(" LEFT JOIN tb_lib_vip v ON s.vip_id=v.id ");
+				sb.append(" LEFT JOIN tb_user u ON v.user_id=u.id ");
+				sb.append(" WHERE date_format(s.end_time, '%Y-%m') >=?");
+				sb.append(" AND t.id=? ");
+				param.add(params.get("date"));
+				param.add(params.get("id"));
+				if(params.get("name")!=null && StringUtils.isNotEmpty(params.get("name").toString())) {
+					sb.append(" AND v.child_name like concat('%',?,'%')  ");
+					param.add(params.get("name"));
+				}
+				sb.append(" GROUP BY s.vip_id ORDER BY s.start_time DESC ");
+				return dao.findPage(sb.toString(),param.toArray(),pageable);
+			case "4":
+				sb.append(" SELECT s.vip_id,u.wx_name,u.photo,v.parent_name,v.child_name,s.start_time,s.end_time from tb_lib_vip_service s  ");
+				sb.append(" LEFT JOIN fx_merchant t ON s.lib_id=t.lib_id ");
+				sb.append(" LEFT JOIN tb_lib_vip v ON s.vip_id=v.id ");
+				sb.append(" LEFT JOIN tb_user u ON v.user_id=u.id ");
+				sb.append(" WHERE date_format(s.end_time, '%Y-%m') =?");
+				sb.append(" AND t.id=? ");
+				param.add(params.get("date"));
+				param.add(params.get("id"));
+				if(params.get("name")!=null && StringUtils.isNotEmpty(params.get("name").toString())) {
+					sb.append(" AND v.child_name like concat('%',?,'%')  ");
+					param.add(params.get("name"));
+				}
+				sb.append(" GROUP BY s.vip_id ORDER BY s.start_time DESC ");
+				return dao.findPage(sb.toString(),param.toArray(),pageable);
+			default:
+				return null;
+		}
+       
+	}
+    
+	
+	@Override
+	public Page<Map<String, Object>> countFxMerchantCommonByCountDate(Map<String, Object> params, Pageable pageable) {
+		StringBuilder sb = new StringBuilder();
+		String[] types=params.get("types").toString().split(";");
+		List<Object> param = new ArrayList<>();
+        sb.append("  SELECT ");
+        sb.append("  t.id,t.unit_name,j.id as lib_id, j.league_name");
+        for (int i = 0; i < types.length; i++) {
+        	 sb.append(" , ( SELECT IFNULL(SUM(a.count),0) from tb_analysis_count a WHERE a.lib_id=t.lib_id AND a.type=? AND a.source=? AND a.day_time>=? AND a.day_time<=? ) as count_"+i );
+        	 param.add(types[i]);
+        	 param.add(params.get("source"));
+        	 param.add(params.get("date"));
+        	 param.add(params.get("date2"));
+		}
+        sb.append(" from fx_merchant t  ");
+        sb.append(" LEFT JOIN  tb_lib_join j ON t.lib_id=j.id ");
+        sb.append(" WHERE t.type=1 AND t.lib_id is NOT null ");
+        if(params.get("unitName")!=null && StringUtils.isNotEmpty(params.get("unitName").toString())) {
+        	 sb.append(" and t.unit_name like concat('%',?,'%')  ");
+        	 param.add(params.get("unitName"));
+        }
+        for (int i = 0; i < types.length; i++) {
+        	if(i==0) {
+        		sb.append(" ORDER BY count_"+i+" desc ");
+        	}else {
+        		sb.append("  , count_"+i+" desc ");
+        	}
+        }
+        return dao.findPage(sb.toString(),param.toArray(),pageable);
+	}
+	
+	@Override
+	public Page<Map<String, Object>> countFxMerchantCommonByVipDate(Map<String, Object> params, Pageable pageable) {
+		StringBuilder sb = new StringBuilder();
+		List<Object> param = new ArrayList<>();
+        sb.append(" SELECT t.user_id,t.vip_id,u.wx_name,u.photo,v.parent_name,v.child_name,t.create_time ");
+        sb.append(" from tb_analysis t  ");
+        sb.append(" LEFT JOIN tb_lib_vip v ON t.vip_id=v.id ");
+        sb.append(" LEFT JOIN tb_user u ON v.user_id=u.id ");
+        sb.append(" WHERE t.lib_id=? AND t.type=? AND t.source =? AND TO_DAYS(t.create_time)>=TO_DAYS(?) AND TO_DAYS(t.create_time)<=TO_DAYS(?)  ");
+        param.add(params.get("libId"));
+        param.add(params.get("type"));
+        param.add(params.get("source"));
+        param.add(params.get("date"));
+        param.add(params.get("date2"));
+        if(params.get("name")!=null && StringUtils.isNotEmpty(params.get("name").toString())) {
+        	 sb.append(" and v.child_name like concat('%',?,'%')  ");
+        	 param.add(params.get("name"));
+        }
+        sb.append(" GROUP BY TO_DAYS(t.create_time),t.vip_id ORDER BY t.create_time asc ");
+        return dao.findPage(sb.toString(),param.toArray(),pageable);
+	}
+	
+	
+	
+	@Override
+	public Page<Map<String, Object>> countFxMerchantCommonByUserDate(Map<String, Object> params, Pageable pageable) {
+		StringBuilder sb = new StringBuilder();
+		List<Object> param = new ArrayList<>();
+        sb.append(" SELECT t.user_id,u.wx_name,u.photo,u.user_name,t.create_time ");
+        sb.append(" from tb_analysis t  ");
+        sb.append(" LEFT JOIN tb_user u ON t.user_id=u.id ");
+        sb.append(" WHERE t.lib_id=? AND t.type=? AND t.source =? AND TO_DAYS(t.create_time)>=TO_DAYS(?) AND TO_DAYS(t.create_time)<=TO_DAYS(?)  ");
+        param.add(params.get("libId"));
+        param.add(params.get("type"));
+        param.add(params.get("source"));
+        param.add(params.get("date"));
+        param.add(params.get("date2"));
+        if(params.get("name")!=null && StringUtils.isNotEmpty(params.get("name").toString())) {
+        	 sb.append(" and u.user_name like concat('%',?,'%')  ");
+        	 param.add(params.get("name"));
+        }
+        sb.append(" GROUP BY TO_DAYS(t.create_time),t.user_id ORDER BY t.create_time asc ");
+        return dao.findPage(sb.toString(),param.toArray(),pageable);
+	}
+
+	@Override
+	public Analysis getAnalysisByDay(String libId, String userId, String vipId, Integer source, Integer type,String dayTime) {
+		StringBuilder sb = new StringBuilder();
+		List<Object> param = new ArrayList<>();
+        sb.append(" SELECT * FROM `tb_analysis` t WHERE t.source=? AND t.type=? AND t.day_time=? AND t.lib_id=? ");
+        param.add(source);
+        param.add(type);
+        param.add(dayTime);
+        param.add(libId);
+        if(StringUtils.isNotEmpty(userId)) {
+       	 	sb.append(" AND t.user_id=? ");
+       	 	param.add(userId);
+        }
+        if(StringUtils.isNotEmpty(userId)) {
+          	sb.append(" AND t.vip_id=? ");
+          	param.add(vipId);
+        }
+        sb.append(" LIMIT 1 ");
+        List<Analysis> list=dao.findList(sb.toString(),param.toArray(),Analysis.class);
+        return list!=null && list.size()>0 ? list.get(0) : null ;
+	}
+	
+	
+	
+	
+	@Override
+	public Map<String, Object> countAnalysisCountCommonByCountDate(Map<String, Object> params) {
+		StringBuilder sb = new StringBuilder();
+		String[] types=params.get("types").toString().split(";");
+		List<Object> param = new ArrayList<>();
+        sb.append("  SELECT 1 ");
+        for (int i = 0; i < types.length; i++) {
+        	 sb.append(" , ( SELECT IFNULL(SUM(t.count),0) as count from tb_analysis_count t WHERE t.source=? AND t.type=? AND t.day_time>=? AND t.day_time<=?  ) as count_"+i );
+        	 param.add(params.get("source"));
+        	 param.add(types[i]);
+        	 param.add(params.get("date"));
+        	 param.add(params.get("date2"));
+        	 
+        	 sb.append(" , ( SELECT IFNULL(SUM(t.count),0) as count from tb_analysis_count t WHERE t.source=? AND t.type=? AND t.day_time>=? AND t.day_time<=?  ) as count_"+i+"_"+i );
+        	 param.add(params.get("source"));
+        	 param.add(types[i]);
+        	 param.add(params.get("date3"));
+        	 param.add(params.get("date4"));
+		}
+        List<Map<String, Object>>  list=dao.findMap(sb.toString(),param.toArray());
+        return list!=null && list.size()>0 ? list.get(0) : new HashMap<String, Object>();
+	}
+	
+	
+	
+	@Override
+	public Map<String, Object> countRecallCommonByCountDate(Map<String, Object> params) {
+		StringBuilder sb = new StringBuilder();
+		List<Object> param = new ArrayList<>();
+        sb.append("	SELECT 	");
+      	sb.append("	IFNULL((SELECT COUNT(lib_id) from tb_analysis_count a WHERE a.day_time>=? AND a.day_time<=? GROUP BY a.lib_id),0)  as count_0, " );
+    	sb.append(" IFNULL((SELECT COUNT(lib_id) from tb_analysis_count a WHERE a.day_time>=? AND a.day_time<=? GROUP BY a.lib_id),0)  as count_1 ");
+      	param.add(params.get("date"));
+    	param.add(params.get("date2"));
+    	param.add(params.get("date3"));
+    	param.add(params.get("date4"));
+    	List<Map<String, Object>>  list=dao.findMap(sb.toString(),param.toArray());
+        return list!=null && list.size()>0 ? list.get(0) : new HashMap<String, Object>();
+	}
+	
+	
+	@Override
+	public Map<String, Object> countUploadWorkCommonByCountDate(Map<String, Object> params) {
+		StringBuilder sb = new StringBuilder();
+		List<Object> param = new ArrayList<>();
+        sb.append("	SELECT  	");
+      	sb.append("	 (SELECT IFNULL(count(1),0) from (SELECT t.vip_id,count(t.day_time) as count from tb_analysis t WHERE t.type=3 AND t.day_time>=? AND t.day_time<=? GROUP BY t.vip_id HAVING count>=3) as tmp) as count_0, " );
+    	sb.append("  (SELECT IFNULL(count(1),0) from (SELECT t.vip_id,count(t.day_time) as count from tb_analysis t WHERE t.type=3 AND t.day_time>=? AND t.day_time<=? GROUP BY t.vip_id HAVING count>=3) as tmp) as count_1 ");
+      	param.add(params.get("date"));
+    	param.add(params.get("date2"));
+    	param.add(params.get("date3"));
+    	param.add(params.get("date4"));
+    	List<Map<String, Object>>  list=dao.findMap(sb.toString(),param.toArray());
+        return list!=null && list.size()>0 ? list.get(0) : new HashMap<String, Object>();
+	}
+	
+	@Override
+	public Integer countActiveNumCommonByLibCountWeek(Map<String, Object> params) {
+		StringBuilder sb = new StringBuilder();
+		List<Object> param = new ArrayList<>();
+      	sb.append("	SELECT IFNULL(count(1),0) as count from (SELECT t.vip_id,count(t.day_time) as count from tb_analysis t WHERE t.lib_id=? AND t.type=3 AND DATE_FORMAT(t.day_time,'%Y')=DATE_FORMAT(DATE_FORMAT(DATE_SUB(NOW(),INTERVAL 1 DAY),'%Y-%m-%d'),'%Y') AND DATE_FORMAT(t.day_time,'%Y')=DATE_FORMAT(DATE_FORMAT(DATE_SUB(NOW(),INTERVAL 1 DAY),'%Y-%m-%d'),'%u') GROUP BY t.vip_id HAVING count>=3) as tmp" );
+    	param.add(params.get("libId"));
+    	List<Map<String, Object>>  list=dao.findMap(sb.toString(),param.toArray());
+        return list!=null && list.size()>0 ? (int)list.get(0).get("count") : 0;
+	}
+	
+	
+	public Integer countMemberNumCommonByLibCountWeek(Map<String, Object> params) {
+		StringBuilder sb = new StringBuilder();
+		List<Object> param = new ArrayList<>();
+      	sb.append("	SELECT COUNT(1) as count from tb_lib_vip t WHERE t.lib_id=? " );
+    	param.add(params.get("libId"));
+    	List<Map<String, Object>>  list=dao.findMap(sb.toString(),param.toArray());
+        return list!=null && list.size()>0 ? (int)list.get(0).get("count") : 0;
+	}
+
+	@Override
+	public Map<String, Object> countAnalysisWeekCountCommonByCountCurDate(Map<String, Object> params) {
+		StringBuilder sb = new StringBuilder();
+		List<Object> param = new ArrayList<>();
+        sb.append("	SELECT ");
+      	sb.append("	 (SELECT COUNT(DISTINCT t.lib_id) from tb_analysis_week t WHERE t.year_week=? AND t.active_ratio>=50) as count_0, " );
+    	sb.append("  (SELECT COUNT(DISTINCT t.lib_id) from tb_analysis_week t WHERE t.year_week=? AND t.active_ratio>=50) as count_1, ");
+    	sb.append("	 (SELECT COUNT(1) from fx_merchant t WHERE t.type=1 AND t.lib_id is NOT NULL) as count_2	");
+      	param.add(params.get("date"));
+    	param.add(params.get("date2"));
+    	List<Map<String, Object>>  list=dao.findMap(sb.toString(),param.toArray());
+        return list!=null && list.size()>0 ? list.get(0) : new HashMap<String, Object>();
+	}
+
+	@Override
+	public List<Map<String, Object>> countAnalysisWeekCountCommonByCountMonthDate(Map<String, Object> params) {
+		StringBuilder sb = new StringBuilder();
+		List<Object> param = new ArrayList<>();
+      	sb.append("	 SELECT t.lib_id,COUNT(DISTINCT t.year_week) as count from tb_analysis_week t WHERE t.year_week>=? AND t.year_week<=? GROUP BY t.lib_id HAVING count>=?" );
+      	param.add(params.get("date"));
+    	param.add(params.get("date2"));
+    	param.add(params.get("count"));
+    	return dao.findMap(sb.toString(),param.toArray());
+	}
+
+	@Override
+	public List<Map<String, Object>> countLibJoinCountCommonByCountDate(Map<String, Object> params) {
+		StringBuilder sb = new StringBuilder();
+		List<Object> param = new ArrayList<>();
+      	sb.append("	 SELECT t.id,COUNT(m.id) as count from tb_lib_join t LEFT JOIN tb_lib_manager m ON t.id=m.lib_id  " );
+       	sb.append("	WHERE TO_DAYS(t.create_time) >=TO_DAYS(?) AND TO_DAYS(t.create_time) <=TO_DAYS(?) ");
+       	sb.append(" GROUP BY t.id HAVING count<=0 	");
+      	param.add(params.get("date"));
+    	param.add(params.get("date2"));
+    	return dao.findMap(sb.toString(),param.toArray());
+	}
+
+	@Override
+	public Map<String, Object> countVipActivateCountCommonByCountDate(Map<String, Object> params) {
+		StringBuilder sb = new StringBuilder();
+		List<Object> param = new ArrayList<>();
+      	sb.append("	 SELECT  " );
+       	sb.append(" (SELECT count(1) from tb_lib_vip t WHERE TO_DAYS(t.activate_time)>=TO_DAYS(?) AND TO_DAYS(t.activate_time)>=TO_DAYS(?)) AS count_0, ");
+       	sb.append(" (SELECT count(1) from tb_lib_vip t WHERE t.activate_time is NOT null ) AS count_1	");
+      	param.add(params.get("date"));
+    	param.add(params.get("date2"));
+    	List<Map<String, Object>>  list=dao.findMap(sb.toString(),param.toArray());
+        return list!=null && list.size()>0 ? list.get(0) : new HashMap<String, Object>();
+	}
+
+	@Override
+	public List<Map<String, Object>> countAnalysisCountCommonByCountTask() {
+		StringBuilder sb = new StringBuilder();
+		List<Object> param = new ArrayList<>();
+      	sb.append("	SELECT t.lib_id,t.source,t.type,DATE_FORMAT(t.create_time,'%Y-%m-%d') as day_time,IF(type=3,COUNT(DISTINCT t.user_id),COUNT(DISTINCT t.vip_id)) as count from tb_analysis t WHERE  TO_DAYS(t.create_time)=TO_DAYS(DATE_SUB(NOW(),INTERVAL 1 DAY)) GROUP BY t.lib_id,t.source,t.type " );
+    	return dao.findMap(sb.toString(),param.toArray());
+	}
+
+	
+}

src/main/java/com/ssj/dao/sys/train/dao/TrainQueryDao.java

@@ -1,27 +1,27 @@
-package com.ssj.dao.sys.train.dao;
-
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-
-public interface TrainQueryDao {
-
-	public Page<Map<String, Object>> findTrainVideoInfoByPage(Map<String, Object> params, Pageable pageable);
-	
-	public Page<Map<String, Object>> findMerchantTeaNumByPage(Map<String, Object> params, Pageable pageable);
-	
-	public Page<Map<String, Object>> findTeaInfoNumByPage(Map<String, Object> params, Pageable pageable);
-	
-	public Map<String, Object> findTrainVideoUserByPage(Map<String, Object> params);
-
-	public List<Map<String, Object>> findTrainVideoUserByUserId(String userId);
-	
-	public List<Map<String, Object>> findTrainVideoUserByRoleType(String userId,Integer roleType,String module);
-	
-	public List<Map<String, Object>> findVideoFileByType();
-	
-	public Page<Map<String, Object>> findVideoFileByPage(Map<String, Object> params, Pageable pageable);
-
-}
+package com.ssj.dao.sys.train.dao;
+
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+
+public interface TrainQueryDao {
+
+	public Page<Map<String, Object>> findTrainVideoInfoByPage(Map<String, Object> params, Pageable pageable);
+	
+	public Page<Map<String, Object>> findMerchantTeaNumByPage(Map<String, Object> params, Pageable pageable);
+	
+	public Page<Map<String, Object>> findTeaInfoNumByPage(Map<String, Object> params, Pageable pageable);
+	
+	public Map<String, Object> findTrainVideoUserByPage(Map<String, Object> params);
+
+	public List<Map<String, Object>> findTrainVideoUserByUserId(String userId);
+	
+	public List<Map<String, Object>> findTrainVideoUserByRoleType(String userId,Integer roleType,String module);
+	
+	public List<Map<String, Object>> findVideoFileByType();
+	
+	public Page<Map<String, Object>> findVideoFileByPage(Map<String, Object> params, Pageable pageable);
+
+}

src/main/java/com/ssj/dao/sys/train/dao/impl/TrainQueryDaoImpl.java

@@ -1,232 +1,232 @@
-package com.ssj.dao.sys.train.dao.impl;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.stereotype.Repository;
-
-import com.ssj.dao.sys.train.dao.TrainQueryDao;
-import com.ssj.framework.core.persistence.PagingHibernateJdbcDao;
-
-@Repository
-public class TrainQueryDaoImpl  implements TrainQueryDao {
-
-    @Autowired
-    private PagingHibernateJdbcDao dao;
-    
-    @Override
-	public Page<Map<String, Object>> findTrainVideoInfoByPage(Map<String, Object> params, Pageable pageable) {
-		StringBuilder sb = new StringBuilder();
-		List<Object> param = new ArrayList<>();
-        sb.append(" SELECT * from tr_video_info t WHERE 1=1 ");
-        if(params.get("roleType")!=null && StringUtils.isNotEmpty(params.get("roleType").toString())) {
-       	 	sb.append(" t.role_type=?  ");
-       	 	param.add(params.get("roleType"));
-        }
-        if(params.get("module")!=null && StringUtils.isNotEmpty(params.get("module").toString())) {
-        	sb.append(" and t.module like concat('%',?,'%')  ");
-        	param.add(params.get("module"));
-        }
-        if(params.get("title")!=null && StringUtils.isNotEmpty(params.get("title").toString())) {
-       	  	sb.append(" and t.title like concat('%',?,'%')  ");
-       	  	param.add(params.get("title"));
-        }
-        if(params.get("status")!=null && StringUtils.isNotEmpty(params.get("status").toString())) {
-       	  	sb.append(" and t.status =? ");
-       	  	param.add(params.get("status"));
-        }
-        sb.append(" ORDER BY t.indes ASC,t.create_time DESC ");
-        return dao.findPage(sb.toString(),param.toArray(),pageable);
-	}
-
-	@Override
-	public Page<Map<String, Object>> findMerchantTeaNumByPage(Map<String, Object> params, Pageable pageable) {
-		StringBuilder sb = new StringBuilder();
-		List<Object> param = new ArrayList<>();
-        sb.append(" SELECT 	t.unit_name,t.id,t.pos_code,t.lib_id, ");
-        sb.append(" (SELECT COUNT(DISTINCT m.id) from tr_video_info m WHERE m.role_type=1 AND m.`status`=1 ) as role_num_1, ");
-        sb.append(" (SELECT COUNT(DISTINCT m.id) from tr_video_info m WHERE m.role_type=2 AND m.`status`=1 ) as role_num_2, ");
-        sb.append(" (SELECT COUNT(DISTINCT m.id) from tr_video_info m WHERE m.role_type=3 AND m.`status`=1 ) as role_num_3, ");
-        sb.append(" (SELECT COUNT(DISTINCT m.id) from tr_video_info m WHERE m.role_type=4 AND m.`status`=1 ) as role_num_4, ");
-        sb.append(" (SELECT COUNT(DISTINCT m.user_id) from tb_lib_manager m WHERE m.type=6 AND m.lib_id=t.lib_id) as pal_num, ");
-        sb.append(" (SELECT COUNT(DISTINCT m.user_id) from tb_lib_manager m WHERE m.lib_id=t.lib_id) as tea_num ");
-        sb.append(" from fx_merchant t WHERE 1=1 AND t.lib_id is not null ");
-        if(params.get("unitName")!=null && StringUtils.isNotEmpty(params.get("unitName").toString())) {
-       	 	sb.append(" AND t.unit_name like concat('%',?,'%') ");
-       	 	param.add(params.get("unitName"));
-        }
-        sb.append(" ORDER BY t.create_time desc ");
-        return dao.findPage(sb.toString(),param.toArray(),pageable);
-	}
-
-	@Override
-	public Page<Map<String, Object>> findTeaInfoNumByPage(Map<String, Object> params, Pageable pageable) {
-		StringBuilder sb = new StringBuilder();
-		List<Object> param = new ArrayList<>();
-        sb.append(" SELECT   *, ");
-        sb.append(" ( SELECT IFNULL(COUNT(DISTINCT u.user_id),0) from tr_video_user u LEFT JOIN tr_video_info i ON u.video_id=i.id WHERE i.`status`=1 AND u.`status`=1 AND u.role_type=1 AND u.user_id=t.user_id 	) as role_count_1,");
-        sb.append(" ( SELECT IFNULL(COUNT(DISTINCT u.user_id),0) from tr_video_user u LEFT JOIN tr_video_info i ON u.video_id=i.id WHERE i.`status`=1 AND u.`status`=1 AND u.role_type=2 AND u.user_id=t.user_id 	) as role_count_2,");
-        sb.append(" ( SELECT IFNULL(COUNT(DISTINCT u.user_id),0) from tr_video_user u LEFT JOIN tr_video_info i ON u.video_id=i.id WHERE i.`status`=1 AND u.`status`=1 AND u.role_type=3 AND u.user_id=t.user_id 	) as role_count_3,");
-        sb.append(" ( SELECT IFNULL(COUNT(DISTINCT u.user_id),0) from tr_video_user u LEFT JOIN tr_video_info i ON u.video_id=i.id WHERE i.`status`=1 AND u.`status`=1 AND u.role_type=4 AND u.user_id=t.user_id 	) as role_count_4,");
-       
-        sb.append(" (SELECT COUNT(DISTINCT m.id) from tr_video_info m WHERE m.role_type=1 AND m.`status`=1) as role_num_1, ");
-        sb.append(" (SELECT COUNT(DISTINCT m.id) from tr_video_info m WHERE m.role_type=2 AND m.`status`=1) as role_num_2, ");
-        sb.append(" (SELECT COUNT(DISTINCT m.id) from tr_video_info m WHERE m.role_type=3 AND m.`status`=1) as role_num_3, ");
-        sb.append(" (SELECT COUNT(DISTINCT m.id) from tr_video_info m WHERE m.role_type=4 AND m.`status`=1) as role_num_4  ");
-        
-        sb.append(" from tb_lib_manager t WHERE 1=1 ");
-        sb.append(" AND t.lib_id=?   ");
-        param.add(params.get("libId"));
-       
-        if(params.get("type")!=null && StringUtils.isNotEmpty(params.get("type").toString())) {
-        	 sb.append(" AND t.type=? ");
-        	 param.add(params.get("type"));
-        }
-        if(params.get("name")!=null && StringUtils.isNotEmpty(params.get("name").toString())) {
-        	sb.append(" AND t.name like concat('%',?,'%') ");
-       	 	param.add(params.get("name"));
-        }
-        sb.append(" GROUP BY t.user_id ");
-        sb.append(" ORDER BY t.create_time desc ");
-        return dao.findPage(sb.toString(),param.toArray(),pageable);
-	}
-	
-	
-	
-	@Override
-	public Map<String, Object> findTrainVideoUserByPage(Map<String, Object> params) {
-		StringBuilder sb = new StringBuilder();
-		List<Object> param = new ArrayList<>();
-		sb.append(" SELECT  ");
-		sb.append(" 	(SELECT COUNT(*)  from ( ");
-		sb.append(" 		SELECT  u.user_id,COUNT(DISTINCT u.video_id) AS count from tr_video_user u");
-		sb.append(" 		LEFT JOIN tr_video_info i ON u.video_id=i.id");
-		sb.append(" 		LEFT JOIN tb_lib_manager m ON u.user_id=m.user_id");
-		sb.append(" 		WHERE i.`status`=1 AND u.`status`=1 AND u.role_type=1 AND m.lib_id=? ");
-		sb.append(" 		GROUP BY u.user_id ");
-		sb.append(" 		HAVING count>=? ");
-		sb.append(" 	) as tmp) as role_count_1, ");
-		param.add(params.get("lib_id"));
-	    param.add(params.get("role_num_1"));
-		
-		sb.append(" 	(SELECT COUNT(*)  from ( ");
-		sb.append(" 		SELECT  u.user_id,COUNT(DISTINCT u.video_id) AS count from tr_video_user u");
-		sb.append(" 		LEFT JOIN tr_video_info i ON u.video_id=i.id");
-		sb.append(" 		LEFT JOIN tb_lib_manager m ON u.user_id=m.user_id");
-		sb.append(" 		WHERE i.`status`=1 AND u.`status`=1 AND u.role_type=2 AND m.lib_id=? ");
-		sb.append(" 		GROUP BY u.user_id ");
-		sb.append(" 		HAVING count>=? ");
-		sb.append(" 	) as tmp) as role_count_2, ");
-		param.add(params.get("lib_id"));
-	    param.add(params.get("role_num_2"));
-	    
-	    
-	    sb.append(" 	(SELECT COUNT(*)  from ( ");
-		sb.append(" 		SELECT  u.user_id,COUNT(DISTINCT u.video_id) AS count from tr_video_user u");
-		sb.append(" 		LEFT JOIN tr_video_info i ON u.video_id=i.id");
-		sb.append(" 		LEFT JOIN tb_lib_manager m ON u.user_id=m.user_id");
-		sb.append(" 		WHERE i.`status`=1 AND u.`status`=1 AND u.role_type=3 AND m.lib_id=? ");
-		sb.append(" 		GROUP BY u.user_id ");
-		sb.append(" 		HAVING count>=? ");
-		sb.append(" 	) as tmp) as role_count_3, ");
-		param.add(params.get("lib_id"));
-	    param.add(params.get("role_num_3"));
-	    
-	    sb.append(" 	(SELECT COUNT(*)  from ( ");
-  		sb.append(" 		SELECT  u.user_id,COUNT(DISTINCT u.video_id) AS count from tr_video_user u");
-  		sb.append(" 		LEFT JOIN tr_video_info i ON u.video_id=i.id");
-  		sb.append(" 		LEFT JOIN tb_lib_manager m ON u.user_id=m.user_id");
-  		sb.append(" 		WHERE i.`status`=1 AND u.`status`=1 AND u.role_type=4 AND m.lib_id=? ");
-  		sb.append(" 		GROUP BY u.user_id ");
-  		sb.append(" 		HAVING count>=? ");
-  		sb.append(" 	) as tmp) as role_count_4 ");
-  		param.add(params.get("lib_id"));
-  	    param.add(params.get("role_num_4"));
-  	    
-  	    List<Map<String, Object>> list= dao.findMap(sb.toString(),param.toArray());
-  	    
-        return list!=null && list.size()>0 ? list.get(0): new HashMap<String, Object>();
-	}
-
-	@Override
-	public List<Map<String, Object>> findTrainVideoUserByUserId(String userId) {
-		StringBuilder sb = new StringBuilder();
-		List<Object> param = new ArrayList<>();
-        sb.append(" SELECT ");
-        sb.append(" t.role_type as role_type, ");
-        sb.append(" COUNT(*) as count_num,  ");
-        sb.append(" ( ");
-        sb.append("  	SELECT COUNT(DISTINCT u.video_id)  from tr_video_user u ");
-        sb.append("  	LEFT JOIN tr_video_info i ON u.video_id=i.id");
-        sb.append("  	WHERE i.`status`=1 AND u.`status`=1 AND t.role_type=u.role_type AND u.user_id=? ");
-        sb.append(" ) as success_num ");
-        sb.append(" from tr_video_info t WHERE t.`status`=1 GROUP BY t.role_type ORDER BY t.role_type ");
-        param.add(userId);
-        return dao.findMap(sb.toString(),param.toArray());
-	}
-
-	@Override
-	public List<Map<String, Object>> findTrainVideoUserByRoleType(String userId, Integer roleType, String module) {
-		StringBuilder sb = new StringBuilder();
-		List<Object> param = new ArrayList<>();
-        sb.append(" SELECT *, ");
-        sb.append(" (SELECT count(DISTINCT u.video_id) from tr_video_user u WHERE u.video_id=t.id AND u.user_id=? AND u.`status`=1  ) as un_lock ");
-        sb.append(" from tr_video_info t   ");
-        sb.append(" WHERE t.`status`=1  ");
-        param.add(userId);
-        if(roleType!=null) {
-	        sb.append("  AND t.role_type=?  ");
-	     	param.add(roleType);
-        }
-        if(StringUtils.isNotEmpty(module)) {
-        	sb.append("  AND t.module=?  ");
-        	param.add(module);
-        }
-        sb.append("  ORDER BY t.indes asc ");
-        return dao.findMap(sb.toString(),param.toArray());
-	}
-
-	@Override
-	public List<Map<String, Object>> findVideoFileByType() {
-		StringBuilder sb = new StringBuilder();
-		List<Object> param = new ArrayList<>();
-        sb.append(" SELECT t.role_type,	t.url, ");
-        sb.append(" (SELECT count(1) from `tr_video_file` f WHERE f.`status`=1 AND f.type=2 AND f.role_type=t.role_type) as num  ");
-        sb.append(" FROM  `tr_video_file` t WHERE  t.`status`=1 AND t.type=1 GROUP BY t.role_type  ORDER BY t.role_type ASC ");
-        return dao.findMap(sb.toString(),param.toArray());
-	}
-
-	@Override
-	public Page<Map<String, Object>> findVideoFileByPage(Map<String, Object> params, Pageable pageable) {
-		StringBuilder sb = new StringBuilder();
-		List<Object> param = new ArrayList<>();
-        sb.append(" SELECT * from tr_video_file t WHERE t.`status`=1  ");
-        if(params.get("type")!=null && StringUtils.isNotEmpty(params.get("type").toString())) {
-       	 	sb.append(" AND t.type=?  ");
-       	 	param.add(params.get("type"));
-        }
-        if(params.get("roleType")!=null && StringUtils.isNotEmpty(params.get("roleType").toString())) {
-       	 	sb.append(" AND t.role_type=?  ");
-       	 	param.add(params.get("roleType"));
-        }
-        if(params.get("module")!=null && StringUtils.isNotEmpty(params.get("module").toString())) {
-        	sb.append(" AND t.module=?  ");
-        	param.add(params.get("module"));
-        }
-        if(params.get("name")!=null && StringUtils.isNotEmpty(params.get("name").toString())) {
-       	  	sb.append(" AND t.title like concat('%',?,'%')  ");
-       	  	param.add(params.get("name"));
-        }
-        sb.append("  ORDER BY t.create_time DESC ");
-        return dao.findPage(sb.toString(),param.toArray(),pageable);
-	}
-
-	
-	
-}
+package com.ssj.dao.sys.train.dao.impl;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Repository;
+
+import com.ssj.dao.sys.train.dao.TrainQueryDao;
+import com.ssj.framework.core.persistence.PagingHibernateJdbcDao;
+
+@Repository
+public class TrainQueryDaoImpl  implements TrainQueryDao {
+
+    @Autowired
+    private PagingHibernateJdbcDao dao;
+    
+    @Override
+	public Page<Map<String, Object>> findTrainVideoInfoByPage(Map<String, Object> params, Pageable pageable) {
+		StringBuilder sb = new StringBuilder();
+		List<Object> param = new ArrayList<>();
+        sb.append(" SELECT * from tr_video_info t WHERE 1=1 ");
+        if(params.get("roleType")!=null && StringUtils.isNotEmpty(params.get("roleType").toString())) {
+       	 	sb.append(" t.role_type=?  ");
+       	 	param.add(params.get("roleType"));
+        }
+        if(params.get("module")!=null && StringUtils.isNotEmpty(params.get("module").toString())) {
+        	sb.append(" and t.module like concat('%',?,'%')  ");
+        	param.add(params.get("module"));
+        }
+        if(params.get("title")!=null && StringUtils.isNotEmpty(params.get("title").toString())) {
+       	  	sb.append(" and t.title like concat('%',?,'%')  ");
+       	  	param.add(params.get("title"));
+        }
+        if(params.get("status")!=null && StringUtils.isNotEmpty(params.get("status").toString())) {
+       	  	sb.append(" and t.status =? ");
+       	  	param.add(params.get("status"));
+        }
+        sb.append(" ORDER BY t.indes ASC,t.create_time DESC ");
+        return dao.findPage(sb.toString(),param.toArray(),pageable);
+	}
+
+	@Override
+	public Page<Map<String, Object>> findMerchantTeaNumByPage(Map<String, Object> params, Pageable pageable) {
+		StringBuilder sb = new StringBuilder();
+		List<Object> param = new ArrayList<>();
+        sb.append(" SELECT 	t.unit_name,t.id,t.pos_code,t.lib_id, ");
+        sb.append(" (SELECT COUNT(DISTINCT m.id) from tr_video_info m WHERE m.role_type=1 AND m.`status`=1 ) as role_num_1, ");
+        sb.append(" (SELECT COUNT(DISTINCT m.id) from tr_video_info m WHERE m.role_type=2 AND m.`status`=1 ) as role_num_2, ");
+        sb.append(" (SELECT COUNT(DISTINCT m.id) from tr_video_info m WHERE m.role_type=3 AND m.`status`=1 ) as role_num_3, ");
+        sb.append(" (SELECT COUNT(DISTINCT m.id) from tr_video_info m WHERE m.role_type=4 AND m.`status`=1 ) as role_num_4, ");
+        sb.append(" (SELECT COUNT(DISTINCT m.user_id) from tb_lib_manager m WHERE m.type=6 AND m.lib_id=t.lib_id) as pal_num, ");
+        sb.append(" (SELECT COUNT(DISTINCT m.user_id) from tb_lib_manager m WHERE m.lib_id=t.lib_id) as tea_num ");
+        sb.append(" from fx_merchant t WHERE 1=1 AND t.lib_id is not null ");
+        if(params.get("unitName")!=null && StringUtils.isNotEmpty(params.get("unitName").toString())) {
+       	 	sb.append(" AND t.unit_name like concat('%',?,'%') ");
+       	 	param.add(params.get("unitName"));
+        }
+        sb.append(" ORDER BY t.create_time desc ");
+        return dao.findPage(sb.toString(),param.toArray(),pageable);
+	}
+
+	@Override
+	public Page<Map<String, Object>> findTeaInfoNumByPage(Map<String, Object> params, Pageable pageable) {
+		StringBuilder sb = new StringBuilder();
+		List<Object> param = new ArrayList<>();
+        sb.append(" SELECT   *, ");
+        sb.append(" ( SELECT IFNULL(COUNT(DISTINCT u.user_id),0) from tr_video_user u LEFT JOIN tr_video_info i ON u.video_id=i.id WHERE i.`status`=1 AND u.`status`=1 AND u.role_type=1 AND u.user_id=t.user_id 	) as role_count_1,");
+        sb.append(" ( SELECT IFNULL(COUNT(DISTINCT u.user_id),0) from tr_video_user u LEFT JOIN tr_video_info i ON u.video_id=i.id WHERE i.`status`=1 AND u.`status`=1 AND u.role_type=2 AND u.user_id=t.user_id 	) as role_count_2,");
+        sb.append(" ( SELECT IFNULL(COUNT(DISTINCT u.user_id),0) from tr_video_user u LEFT JOIN tr_video_info i ON u.video_id=i.id WHERE i.`status`=1 AND u.`status`=1 AND u.role_type=3 AND u.user_id=t.user_id 	) as role_count_3,");
+        sb.append(" ( SELECT IFNULL(COUNT(DISTINCT u.user_id),0) from tr_video_user u LEFT JOIN tr_video_info i ON u.video_id=i.id WHERE i.`status`=1 AND u.`status`=1 AND u.role_type=4 AND u.user_id=t.user_id 	) as role_count_4,");
+       
+        sb.append(" (SELECT COUNT(DISTINCT m.id) from tr_video_info m WHERE m.role_type=1 AND m.`status`=1) as role_num_1, ");
+        sb.append(" (SELECT COUNT(DISTINCT m.id) from tr_video_info m WHERE m.role_type=2 AND m.`status`=1) as role_num_2, ");
+        sb.append(" (SELECT COUNT(DISTINCT m.id) from tr_video_info m WHERE m.role_type=3 AND m.`status`=1) as role_num_3, ");
+        sb.append(" (SELECT COUNT(DISTINCT m.id) from tr_video_info m WHERE m.role_type=4 AND m.`status`=1) as role_num_4  ");
+        
+        sb.append(" from tb_lib_manager t WHERE 1=1 ");
+        sb.append(" AND t.lib_id=?   ");
+        param.add(params.get("libId"));
+       
+        if(params.get("type")!=null && StringUtils.isNotEmpty(params.get("type").toString())) {
+        	 sb.append(" AND t.type=? ");
+        	 param.add(params.get("type"));
+        }
+        if(params.get("name")!=null && StringUtils.isNotEmpty(params.get("name").toString())) {
+        	sb.append(" AND t.name like concat('%',?,'%') ");
+       	 	param.add(params.get("name"));
+        }
+        sb.append(" GROUP BY t.user_id ");
+        sb.append(" ORDER BY t.create_time desc ");
+        return dao.findPage(sb.toString(),param.toArray(),pageable);
+	}
+	
+	
+	
+	@Override
+	public Map<String, Object> findTrainVideoUserByPage(Map<String, Object> params) {
+		StringBuilder sb = new StringBuilder();
+		List<Object> param = new ArrayList<>();
+		sb.append(" SELECT  ");
+		sb.append(" 	(SELECT COUNT(*)  from ( ");
+		sb.append(" 		SELECT  u.user_id,COUNT(DISTINCT u.video_id) AS count from tr_video_user u");
+		sb.append(" 		LEFT JOIN tr_video_info i ON u.video_id=i.id");
+		sb.append(" 		LEFT JOIN tb_lib_manager m ON u.user_id=m.user_id");
+		sb.append(" 		WHERE i.`status`=1 AND u.`status`=1 AND u.role_type=1 AND m.lib_id=? ");
+		sb.append(" 		GROUP BY u.user_id ");
+		sb.append(" 		HAVING count>=? ");
+		sb.append(" 	) as tmp) as role_count_1, ");
+		param.add(params.get("lib_id"));
+	    param.add(params.get("role_num_1"));
+		
+		sb.append(" 	(SELECT COUNT(*)  from ( ");
+		sb.append(" 		SELECT  u.user_id,COUNT(DISTINCT u.video_id) AS count from tr_video_user u");
+		sb.append(" 		LEFT JOIN tr_video_info i ON u.video_id=i.id");
+		sb.append(" 		LEFT JOIN tb_lib_manager m ON u.user_id=m.user_id");
+		sb.append(" 		WHERE i.`status`=1 AND u.`status`=1 AND u.role_type=2 AND m.lib_id=? ");
+		sb.append(" 		GROUP BY u.user_id ");
+		sb.append(" 		HAVING count>=? ");
+		sb.append(" 	) as tmp) as role_count_2, ");
+		param.add(params.get("lib_id"));
+	    param.add(params.get("role_num_2"));
+	    
+	    
+	    sb.append(" 	(SELECT COUNT(*)  from ( ");
+		sb.append(" 		SELECT  u.user_id,COUNT(DISTINCT u.video_id) AS count from tr_video_user u");
+		sb.append(" 		LEFT JOIN tr_video_info i ON u.video_id=i.id");
+		sb.append(" 		LEFT JOIN tb_lib_manager m ON u.user_id=m.user_id");
+		sb.append(" 		WHERE i.`status`=1 AND u.`status`=1 AND u.role_type=3 AND m.lib_id=? ");
+		sb.append(" 		GROUP BY u.user_id ");
+		sb.append(" 		HAVING count>=? ");
+		sb.append(" 	) as tmp) as role_count_3, ");
+		param.add(params.get("lib_id"));
+	    param.add(params.get("role_num_3"));
+	    
+	    sb.append(" 	(SELECT COUNT(*)  from ( ");
+  		sb.append(" 		SELECT  u.user_id,COUNT(DISTINCT u.video_id) AS count from tr_video_user u");
+  		sb.append(" 		LEFT JOIN tr_video_info i ON u.video_id=i.id");
+  		sb.append(" 		LEFT JOIN tb_lib_manager m ON u.user_id=m.user_id");
+  		sb.append(" 		WHERE i.`status`=1 AND u.`status`=1 AND u.role_type=4 AND m.lib_id=? ");
+  		sb.append(" 		GROUP BY u.user_id ");
+  		sb.append(" 		HAVING count>=? ");
+  		sb.append(" 	) as tmp) as role_count_4 ");
+  		param.add(params.get("lib_id"));
+  	    param.add(params.get("role_num_4"));
+  	    
+  	    List<Map<String, Object>> list= dao.findMap(sb.toString(),param.toArray());
+  	    
+        return list!=null && list.size()>0 ? list.get(0): new HashMap<String, Object>();
+	}
+
+	@Override
+	public List<Map<String, Object>> findTrainVideoUserByUserId(String userId) {
+		StringBuilder sb = new StringBuilder();
+		List<Object> param = new ArrayList<>();
+        sb.append(" SELECT ");
+        sb.append(" t.role_type as role_type, ");
+        sb.append(" COUNT(*) as count_num,  ");
+        sb.append(" ( ");
+        sb.append("  	SELECT COUNT(DISTINCT u.video_id)  from tr_video_user u ");
+        sb.append("  	LEFT JOIN tr_video_info i ON u.video_id=i.id");
+        sb.append("  	WHERE i.`status`=1 AND u.`status`=1 AND t.role_type=u.role_type AND u.user_id=? ");
+        sb.append(" ) as success_num ");
+        sb.append(" from tr_video_info t WHERE t.`status`=1 GROUP BY t.role_type ORDER BY t.role_type ");
+        param.add(userId);
+        return dao.findMap(sb.toString(),param.toArray());
+	}
+
+	@Override
+	public List<Map<String, Object>> findTrainVideoUserByRoleType(String userId, Integer roleType, String module) {
+		StringBuilder sb = new StringBuilder();
+		List<Object> param = new ArrayList<>();
+        sb.append(" SELECT *, ");
+        sb.append(" (SELECT count(DISTINCT u.video_id) from tr_video_user u WHERE u.video_id=t.id AND u.user_id=? AND u.`status`=1  ) as un_lock ");
+        sb.append(" from tr_video_info t   ");
+        sb.append(" WHERE t.`status`=1  ");
+        param.add(userId);
+        if(roleType!=null) {
+	        sb.append("  AND t.role_type=?  ");
+	     	param.add(roleType);
+        }
+        if(StringUtils.isNotEmpty(module)) {
+        	sb.append("  AND t.module=?  ");
+        	param.add(module);
+        }
+        sb.append("  ORDER BY t.indes asc ");
+        return dao.findMap(sb.toString(),param.toArray());
+	}
+
+	@Override
+	public List<Map<String, Object>> findVideoFileByType() {
+		StringBuilder sb = new StringBuilder();
+		List<Object> param = new ArrayList<>();
+        sb.append(" SELECT t.role_type,	t.url, ");
+        sb.append(" (SELECT count(1) from `tr_video_file` f WHERE f.`status`=1 AND f.type=2 AND f.role_type=t.role_type) as num  ");
+        sb.append(" FROM  `tr_video_file` t WHERE  t.`status`=1 AND t.type=1 GROUP BY t.role_type  ORDER BY t.role_type ASC ");
+        return dao.findMap(sb.toString(),param.toArray());
+	}
+
+	@Override
+	public Page<Map<String, Object>> findVideoFileByPage(Map<String, Object> params, Pageable pageable) {
+		StringBuilder sb = new StringBuilder();
+		List<Object> param = new ArrayList<>();
+        sb.append(" SELECT * from tr_video_file t WHERE t.`status`=1  ");
+        if(params.get("type")!=null && StringUtils.isNotEmpty(params.get("type").toString())) {
+       	 	sb.append(" AND t.type=?  ");
+       	 	param.add(params.get("type"));
+        }
+        if(params.get("roleType")!=null && StringUtils.isNotEmpty(params.get("roleType").toString())) {
+       	 	sb.append(" AND t.role_type=?  ");
+       	 	param.add(params.get("roleType"));
+        }
+        if(params.get("module")!=null && StringUtils.isNotEmpty(params.get("module").toString())) {
+        	sb.append(" AND t.module=?  ");
+        	param.add(params.get("module"));
+        }
+        if(params.get("name")!=null && StringUtils.isNotEmpty(params.get("name").toString())) {
+       	  	sb.append(" AND t.title like concat('%',?,'%')  ");
+       	  	param.add(params.get("name"));
+        }
+        sb.append("  ORDER BY t.create_time DESC ");
+        return dao.findPage(sb.toString(),param.toArray(),pageable);
+	}
+
+	
+	
+}

src/main/java/com/ssj/service/sys/analysis/service/AnalysisCountService.java

@@ -1,20 +1,20 @@
-package com.ssj.service.sys.analysis.service;
-
-import java.util.Map;
-
-import com.ssj.bean.sys.analysis.bean.AnalysisCount;
-import com.ssj.framework.core.common.service.BaseService;
-
-public interface AnalysisCountService extends BaseService<AnalysisCount, String> {
-	
-	public void runTaskAnalysisCount();
-	
-	public AnalysisCount getAnalysisCountByDay(String libId,Integer source,Integer type,String dayTime);
-	
-	public Map<String, Object> countAnalysisCountCommonByCountDate(Map<String, Object> params);
-	
-	public Map<String, Object> countRecallCommonByCountDate(Map<String, Object> params);
-	
-	public Map<String, Object> countUploadWorkCommonByCountDate(Map<String, Object> params);
-	
-}
+package com.ssj.service.sys.analysis.service;
+
+import java.util.Map;
+
+import com.ssj.bean.sys.analysis.bean.AnalysisCount;
+import com.ssj.framework.core.common.service.BaseService;
+
+public interface AnalysisCountService extends BaseService<AnalysisCount, String> {
+	
+	public void runTaskAnalysisCount();
+	
+	public AnalysisCount getAnalysisCountByDay(String libId,Integer source,Integer type,String dayTime);
+	
+	public Map<String, Object> countAnalysisCountCommonByCountDate(Map<String, Object> params);
+	
+	public Map<String, Object> countRecallCommonByCountDate(Map<String, Object> params);
+	
+	public Map<String, Object> countUploadWorkCommonByCountDate(Map<String, Object> params);
+	
+}

src/main/java/com/ssj/service/sys/analysis/service/AnalysisService.java

@@ -1,35 +1,35 @@
-package com.ssj.service.sys.analysis.service;
-
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-
-import com.ssj.bean.sys.analysis.bean.Analysis;
-import com.ssj.framework.core.common.service.BaseService;
-
-public interface AnalysisService extends BaseService<Analysis, String> {
-	
-	public boolean save(String libId,String userId,String vipId,Integer source,Integer type);
-	
-	public Analysis getAnalysisByDay(String libId,String userId,String vipId,Integer source,Integer type,String dayTime);
-
-	public Long countLibJoinConsumeSumByLibService(String date);
-	
-	public Long countFxMerchantSumByPortNum();
-	
-	public List<Map<String,Object>> countFxMerchantSumByTop(String date);
-	
-	public Page<Map<String, Object>> countFxMerchantServiceByDate(Map<String, Object> params, Pageable pageable);
-	
-	public Page<Map<String, Object>> countFxMerchantServiceByVipDate(Map<String, Object> params, Pageable pageable);
-	
-	public Page<Map<String, Object>> countFxMerchantCommonByCountDate(Map<String, Object> params, Pageable pageable);
-	
-	public Page<Map<String, Object>> countFxMerchantCommonByVipDate(Map<String, Object> params, Pageable pageable);
-	
-	public Page<Map<String, Object>> countFxMerchantCommonByUserDate(Map<String, Object> params, Pageable pageable);
-	
-	
-}
+package com.ssj.service.sys.analysis.service;
+
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+
+import com.ssj.bean.sys.analysis.bean.Analysis;
+import com.ssj.framework.core.common.service.BaseService;
+
+public interface AnalysisService extends BaseService<Analysis, String> {
+	
+	public boolean save(String libId,String userId,String vipId,Integer source,Integer type);
+	
+	public Analysis getAnalysisByDay(String libId,String userId,String vipId,Integer source,Integer type,String dayTime);
+
+	public Long countLibJoinConsumeSumByLibService(String date);
+	
+	public Long countFxMerchantSumByPortNum();
+	
+	public List<Map<String,Object>> countFxMerchantSumByTop(String date);
+	
+	public Page<Map<String, Object>> countFxMerchantServiceByDate(Map<String, Object> params, Pageable pageable);
+	
+	public Page<Map<String, Object>> countFxMerchantServiceByVipDate(Map<String, Object> params, Pageable pageable);
+	
+	public Page<Map<String, Object>> countFxMerchantCommonByCountDate(Map<String, Object> params, Pageable pageable);
+	
+	public Page<Map<String, Object>> countFxMerchantCommonByVipDate(Map<String, Object> params, Pageable pageable);
+	
+	public Page<Map<String, Object>> countFxMerchantCommonByUserDate(Map<String, Object> params, Pageable pageable);
+	
+	
+}

src/main/java/com/ssj/service/sys/analysis/service/AnalysisWeekService.java

@@ -1,20 +1,20 @@
-package com.ssj.service.sys.analysis.service;
-
-import java.util.Map;
-
-import com.ssj.bean.sys.analysis.bean.AnalysisWeek;
-import com.ssj.framework.core.common.service.BaseService;
-
-public interface AnalysisWeekService extends BaseService<AnalysisWeek, String> {
-	
-	void runTaskByAnalysisWeek();
-	
-	public Map<String, Object> countAnalysisWeekCountCommonByCountCurDate(Map<String, Object> params);
-	
-	public Map<String, Object> countAnalysisWeekCountCommonByCountMonthDate(Map<String, Object> params);
-	
-	public Map<String, Object> countLibJoinCountCommonByCountDate(Map<String, Object> params);
-	
-	public Map<String, Object> countVipActivateCountCommonByCountDate(Map<String, Object> params);
-	
-}
+package com.ssj.service.sys.analysis.service;
+
+import java.util.Map;
+
+import com.ssj.bean.sys.analysis.bean.AnalysisWeek;
+import com.ssj.framework.core.common.service.BaseService;
+
+public interface AnalysisWeekService extends BaseService<AnalysisWeek, String> {
+	
+	void runTaskByAnalysisWeek();
+	
+	public Map<String, Object> countAnalysisWeekCountCommonByCountCurDate(Map<String, Object> params);
+	
+	public Map<String, Object> countAnalysisWeekCountCommonByCountMonthDate(Map<String, Object> params);
+	
+	public Map<String, Object> countLibJoinCountCommonByCountDate(Map<String, Object> params);
+	
+	public Map<String, Object> countVipActivateCountCommonByCountDate(Map<String, Object> params);
+	
+}

src/main/resources/rebel.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  This is the JRebel configuration file. It maps the running application to your IDE workspace, enabling JRebel reloading for this project.
-  Refer to https://manuals.zeroturnaround.com/jrebel/standalone/config.html for more information.
--->
-<application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_1.xsd">
-
-	<classpath>
-		<dir name="F:/IdeaProjects/aijia/ssj-sys/target/classes">
-		</dir>
-	</classpath>
-
-</application>

target/classes/application-common-dev.properties

@@ -1,70 +0,0 @@
-#\u5F00\u53D1\u73AF\u5883\u6253\u5305\u65B9\u5F0F-\u914D\u7F6E\uFF08\u9ED8\u8BA4\uFF09
-
-spring.datasource.url=jdbc:mysql://47.112.200.206:8066/aijia?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&rewriteBatchedStatements=true
-spring.datasource.username=root
-spring.datasource.password=ssj1QAZxsw2!@
-#spring.datasource.url=jdbc:mysql://120.79.215.176:8066/ssj?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
-#spring.datasource.username=ssj_user
-#spring.datasource.password=ssjUser!@123
-
-spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
-spring.datasource.initialSize=10
-spring.datasource.minIdle=10
-spring.datasource.maxActive=30
-spring.datasource.maxWait=60000
-spring.datasource.timeBetweenEvictionRunsMillis=60000
-spring.datasource.minEvictableIdleTimeMillis=30000
-spring.datasource.validationQuery=SELECT 1
-spring.datasource.testWhileIdle=true
-spring.datasource.testOnBorrow=false
-spring.datasource.testOnReturn=false
-spring.datasource.poolPreparedStatements=true
-spring.datasource.maxPoolPreparedStatementPerConnectionSize=20
-spring.datasource.filters=stat,wall,slf4j
-spring.datasource.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
-
-
-config-redis.database=4
-spring.redis.database=0
-
-#spring.redis.host=120.79.157.115
-#spring.redis.port=6379
-spring.redis.password=dc1qazxsw2!@
-#spring.redis.pool.max-active=8
-#spring.redis.pool.max-wait=-1
-#spring.redis.pool.max-idle=8
-#spring.redis.pool.min-idle=0
-spring.redis.timeout=3000
-spring.redis.block-when-exhausted=true
-
-
-
-#spring.redis.cluster.nodes=120.79.157.115:6379
-spring.redis.cluster.nodes=47.106.111.166:6380,47.106.111.166:6381,47.106.111.166:6382,47.106.111.166:6383,47.106.111.166:6384,47.106.111.166:6385
-spring.redis.cluster.timeout=30
-
-spring.redis.cluster.pool.max-active=8
-spring.redis.cluster.pool.max-wait=-1
-spring.redis.cluster.pool.max-idle=8
-spring.redis.cluster.pool.min-idle=0
-
-
-spring.jmx.enabled=false
-
-spring.rabbitmq.host=192.168.1.153
-spring.rabbitmq.port=5672
-spring.rabbitmq.username=admin1
-spring.rabbitmq.password=admin1
-spring.rabbitmq.publisher-confirms=true  
-spring.rabbitmq.publisher-returns=true
-
-#/**\u6CE8\u610F\u8FD9\u91CC\u7684\u6CE8\u89E3\u662Fdubbo\u7684\u6CE8\u89E3\uFF0C\u8FD9\u91CC\u6CA1\u6709\u4F7F\u7528\u6CE8\u518C\u4E2D\u5FC3\uFF0C\u4E3A\u76F4\u8FDE\u65B9\u5F0F\uFF0C\u5404\u81EA\u672C\u5730\u5F00\u53D1\u53EF\u4EE5\u653E\u5F00 \uFF08dubbo://ip:\u670D\u52A1\u7AEF\u53E3\uFF09
-#dubbo.reference.url = dubbo://127.0.0.1:9394
-spring.thymeleaf.cache=false
-
-
-
-#spring.elasticsearch.cluster.host=47.112.253.242,47.112.250.240,47.112.232.110
-#spring.elasticsearch.cluster.host=119.23.8.52,120.79.157.115,120.79.229.124
-#mybatis热加载
-

target/classes/application-common-prod.properties

@@ -1,52 +0,0 @@
-#\u6B63\u5F0F\u73AF\u5883\u6253\u5305\u65B9\u5F0F-\u914D\u7F6E
-spring.datasource.url=jdbc:mysql://172.18.30.187:8066/ssj?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
-spring.datasource.username=ssj_user
-spring.datasource.password=ssjUser!@123
-
-spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
-spring.datasource.initialSize=10
-spring.datasource.minIdle=10
-spring.datasource.maxActive=300
-spring.datasource.maxWait=60000
-spring.datasource.timeBetweenEvictionRunsMillis=60000
-spring.datasource.minEvictableIdleTimeMillis=30000
-spring.datasource.validationQuery=SELECT 1
-spring.datasource.testWhileIdle=true
-spring.datasource.testOnBorrow=false
-spring.datasource.testOnReturn=false
-spring.datasource.poolPreparedStatements=true
-spring.datasource.maxPoolPreparedStatementPerConnectionSize=20
-spring.datasource.filters=stat,wall,slf4j
-spring.datasource.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
-
-spring.redis.password=zhidian@1QAZxsw2
-spring.redis.timeout=3000
-spring.redis.block-when-exhausted=true
-
-
-
-spring.redis.cluster.nodes=172.18.164.135:6380,172.18.164.135:6381,172.18.164.135:6382,172.18.164.135:6383,172.18.164.135:6384,172.18.164.135:6385
-spring.redis.cluster.timeout=30
-
-spring.redis.cluster.pool.max-active=80
-spring.redis.cluster.pool.max-wait=-1
-spring.redis.cluster.pool.max-idle=80
-spring.redis.cluster.pool.min-idle=10
-
-spring.jmx.enabled=false
-
-spring.rabbitmq.host=172.18.30.187
-spring.rabbitmq.port=5672
-spring.rabbitmq.username=guest
-spring.rabbitmq.password=guest
-spring.rabbitmq.publisher-confirms=true  
-spring.rabbitmq.publisher-returns=true
-
-
-spring.thymeleaf.cache=false
-#\u76D1\u63A7\u4E2D\u5FC3\u534F\u8BAE\uFF0C\u5982\u679C\u4E3Aprotocol="registry"\uFF0C\u8868\u793A\u4ECE\u6CE8\u518C\u4E2D\u5FC3\u53D1\u73B0\u76D1\u63A7\u4E2D\u5FC3\u5730\u5740\uFF0C\u5426\u5219\u76F4\u8FDE\u76D1\u63A7\u4E2D\u5FC3\u3002
-# http://39.108.210.183:8086/applications.html
-# \u4EE5\u4E0B\u914D\u7F6E\u4E3A\u4E24\u9009\u4E00
-# dubbo.monitor.address=172.18.30.187:7070
-# dubbo.monitor.protocol=registry
-

target/classes/application-common.properties

@@ -1,29 +0,0 @@
-#ȫ�ֹ�������
-server.tomcat.uri-encoding=utf-8
-
-logging.level.root=INFO
-logging.config=classpath:logback.xml
-
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
-
-spring.jpa.database = MYSQL
-spring.jpa.hibernate.ddl-auto=none
-spring.jpa.show-sql=true     
-spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5Dialect
-spring.jpa.hibernate.implicit_naming_strategy=org.hibernate.boot.model.naming.ImplicitNamingStrategyJpaCompliantImpl
-spring.jpa.hibernate.physical_naming_strategy=com.ssj.framework.spring.jpa.PhysicalNamingStrategyImpl
-spring.jpa.open-in-view=true
-session.expire=1800
-spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
-spring.jackson.time-zone=GMT+8
-spring.servlet.multipart.maxFileSize=200MB
-spring.servlet.multipart.maxRequestSize=5000MB
-spring.servlet.multipart.enabled=false 
-
-spring.thymeleaf.cache=false
-spring.thymeleaf.prefix=classpath:/templates/
-mybatis.config-locations=classpath:mybatis/mybatis-config.xml
-mybatis.mapper-locations=classpath:mybatis/mapper/*.xml
-mybatis-plus.config-location=classpath:mybatis/mybatis-config.xml
-mybatis-plus.mapper-locations=classpath:mybatis/mapper/*.xml
-mybatis-plus.refresh-mapper=false

target/classes/application.properties

@@ -1,15 +0,0 @@
-spring.application.name=ssj-sys-web
-server.port=8080
-logger.level=info
-
-spring.profiles.active=common,common-dev
-
-spring.mvc.static-path-pattern=/static/**  
-
-spring.thymeleaf.prefix=classpath:/templates/
-spring.thymeleaf.suffix=.html
-spring.thymeleaf.mode=HTML5
-spring.thymeleaf.encoding=UTF-8
-spring.thymeleaf.servlet.content-type=text/html
-spring.thymeleaf.cash=false
-debug=true

target/classes/easemob.properties

@@ -1,6 +0,0 @@
-#easemob
-ORG_NAME = 1104180903253294
-APP_NAME = sishujia
-GRANT_TYPE= client_credentials
-CLIENT_ID = YXA62TJxEK9WEei-0V0Ub81C9A
-CLIENT_SECRET = YXA6zvq1O5T23rx2DbnJvCrNYu0Ci3I

target/classes/logback.xml

@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration scan="true" scanPeriod="120 seconds">
-
-	<property resource="application.properties" />
-
-	<!-- 彩色日志 -->
-	<!-- 彩色日志依赖的渲染类 -->
-	<conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter" />
-	<conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter" />
-	<conversionRule conversionWord="wEx" converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter" />
-	<!-- 彩色日志格式 -->
-	<property name="CONSOLE_LOG_PATTERN" value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
-
-	<!-- appender -->
-	<appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
-
-
-
-
-		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-			<level>${logger.level}</level>
-		</filter>
-		<!-- encoder 默认配置为PatternLayoutEncoder -->
-		<encoder>
-			<pattern>
-				${CONSOLE_LOG_PATTERN}
-			</pattern>
-			<charset>UTF-8</charset>
-		</encoder>
-	</appender>
-	<appender name="file" class="ch.qos.logback.core.rolling.RollingFileAppender">
-
-
-		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-			<!--日志文件输出的文件名 -->
-			<FileNamePattern>/www/logs/${spring.application.name}.%d{yyyy-MM-dd}.%i.log</FileNamePattern>
-			<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-				<maxFileSize>100MB</maxFileSize>
-			</timeBasedFileNamingAndTriggeringPolicy>
-			<!--日志文件保留天数 -->
-			<MaxHistory>10</MaxHistory>
-		</rollingPolicy>
-		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-			<pattern>
-				%d{yyyy-MM-dd HH:mm:ss.SSS} [%t] %-5level %logger.%M - %m%n
-			</pattern>
-			<charset>UTF-8</charset>
-		</encoder>
-	</appender>
-
-
-
-
-	<appender name="exceptionAdvice-log" class="ch.qos.logback.core.rolling.RollingFileAppender">
-
-
-		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-			<!--日志文件输出的文件名 -->
-			<FileNamePattern>/www/logs/exceptionAdvice/exception-${spring.application.name}.%d{yyyy-MM-dd}.%i.log</FileNamePattern>
-			<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-				<maxFileSize>100MB</maxFileSize>
-			</timeBasedFileNamingAndTriggeringPolicy>
-			<!--日志文件保留天数 -->
-			<MaxHistory>10</MaxHistory>
-		</rollingPolicy>
-		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-			<pattern>
-				%d{yyyy-MM-dd HH:mm:ss.SSS} [%t] %-5level %logger.%M - %m%n
-			</pattern>
-			<charset>UTF-8</charset>
-		</encoder>
-	</appender>
-
-
-
-
-
-
-
-	<appender name="aijia-all-system" class="ch.qos.logback.core.rolling.RollingFileAppender">
-
-		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-			<!--日志文件输出的文件名 -->
-			<FileNamePattern>/www/logs/systemlog/system-${spring.application.name}.%d{yyyy-MM-dd}.%i.log</FileNamePattern>
-			<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-				<maxFileSize>100MB</maxFileSize>
-			</timeBasedFileNamingAndTriggeringPolicy>
-			<!--日志文件保留天数 -->
-			<MaxHistory>10</MaxHistory>
-		</rollingPolicy>
-		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-			<pattern>
-				%d{yyyy-MM-dd HH:mm:ss.SSS} [%t] %-5level %logger.%M - %m%n
-			</pattern>
-			<charset>UTF-8</charset>
-		</encoder>
-	</appender>
-
-	
-	
-	  <!-- 1. 输出SQL 到控制台和文件-->
-	 <logger name="org.hibernate.SQL" additivity="false"  >
-	    <level value="info" />
-	    <appender-ref ref="file" />
-	    <appender-ref ref="stdout" />
-	</logger>
-	 <!-- 2. 输出SQL 的参数到控制台和文件-->
-	<logger name="org.hibernate.type.descriptor.sql.BasicBinder" additivity="false" level="${logger.level}" >
-		<level>${logger.level}</level>
-	    <appender-ref ref="file" />
-	    <appender-ref ref="stdout" />
-	</logger>
-
-	<!-- root logger -->
-	<root level="info">
-		<appender-ref ref="stdout" />
-		<appender-ref ref="file" />
-	</root>
-
-    <logger name="com.alibaba.dubbo" level="ERROR"/>
-    <logger name="org.apache.zookeeper.ZooKeeper" level="ERROR"/>
-
-	
-	<!-- custom logger -->
-	<logger name="com.ssj" level="debug" additivity="false">
-		<appender-ref ref="stdout" />
-		<appender-ref ref="file" />
-	</logger>
-
-	<logger name="aijia" level="info">
-		<appender-ref ref="aijia-all-system"/>
-	</logger>
-	<logger name="exceptionAdvice" level="error">
-		<appender-ref ref="exceptionAdvice-log"/>
-	</logger>
-
-</configuration>

target/classes/mybatis/mapper/CommentTemplateMapper.xml

@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.ssj.service.mapper.CommentTemplateMapper">
-    <select id="findByHomeworkPictureId" resultType="com.ssj.service.conch.parents.v1.dto.CommentTemplateDTO">
-        select scon_comment_template.module, scon_comment_template.comment
-        from scon_composition_comment,
-             scon_comment_template
-        where scon_composition_comment.comment_template_id = scon_comment_template.id
-          and scon_composition_comment.homework_picture_id = #{homeworkPictureId}
-        order by scon_comment_template.sort
-    </select>
-
-    <select id="countModuleAndLevelById" resultType="java.util.HashMap">
-        select module, count(distinct scon_comment_template.`rank`) levelCount
-        from scon_comment_template
-        where id in
-        <foreach collection="list" open="(" item="id" separator="," close=")">
-            #{id}
-        </foreach>
-        group by module
-    </select>
-
-    <!--查询模板内容-->
-    <select id="findCommentByIds" resultType="com.ssj.bean.sys.template.CommentTemplate">
-       select * from scon_comment_template where id in
-        <foreach collection="list" item="id" index="index" open="(" close=")" separator=",">
-            #{id}
-        </foreach>
-       order by sort
-    </select>
-
-    <!--查询作文评语类型维度-->
-    <select id="findCommentTypeAndModuleByGrade" resultType="com.ssj.bean.sys.template.CommentTemplate">
-        select type, module from scon_comment_template where grade regexp #{grade}
-        group by type, module
-        order by sort
-    </select>
-
-    <!--查询作文评语类型维度详情, module数据有问题，好像有换行符-->
-    <select id="findCommentDetailByTypeAndModule" resultType="com.ssj.bean.sys.template.CommentTemplate">
-       select ct.id, ct.rank, ct.comment, if(cc.id is null, 0, 1) type  from  scon_comment_template ct
-       left join scon_composition_comment cc
-       on ct.id=cc.comment_template_id and cc.homework_picture_id=#{homeworkPictureId}
-       where ct.grade regexp #{grade} and type=#{type}
-       and ct.module regexp #{module} order by ct.sort
-    </select>
-
-    <select id="countSelectedCompositionComment" resultType="java.lang.Integer">
-        select count(distinct selected.comment_template_id)
-        from (select * from scon_composition_comment where homework_picture_id = #{homeworkPictureId}) selected
-                 join scon_comment_template
-                      on selected.comment_template_id = scon_comment_template.id and scon_comment_template.module = #{compositionCommentModule}
-    </select>
-</mapper>

target/classes/mybatis/mapper/ConchDerverMapper.xml

@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.ssj.service.mapper.ConchDerverMapper" >
-    <resultMap id="BaseResultMap" type="com.ssj.bean.conch.conch.domain.ConchDerver" >
-        <id column="id" property="id" jdbcType="VARCHAR" />
-        <result column="derver" property="derver" jdbcType="VARCHAR" />
-        <result column="imei" property="imei" jdbcType="VARCHAR" />
-        <result column="simcard" property="simcard" jdbcType="VARCHAR"/>
-    </resultMap>
-    
-    <sql id="Base_Column_List" >
-        id, derver, imei, simcard
-    </sql>
-
-    <select id="findAllConchDerver" resultMap="BaseResultMap"  >
-       SELECT 
-       <include refid="Base_Column_List" />
-	   FROM conch_derver
-    </select>
-
-    <!-- 新增条件查询 -->
-    <select id="findByDerver" parameterType="java.lang.String" resultType="hashMap">
-        select
-        <include refid="Base_Column_List" />
-        from conch_derver
-        where 1=1
-        <if test="derver != null and derver!=''">
-            and derver = #{derver}
-        </if>
-        order by id desc
-    </select>
-
-    <!-- 新增条件查询 -->
-    <select id="findDerverBySelective" parameterType="hashMap" resultType="hashMap">
-        select
-        <include refid="Base_Column_List" />
-        from conch_derver
-        where 1=1
-        <if test="derver != null and derver!=''">
-            and derver = #{derver}
-        </if>
-    </select>
-</mapper>

target/classes/mybatis/mapper/CorrectSysMapper.xml

@@ -1,737 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.ssj.mapper.correctsys.CorrectSysMapper">
-    <select id="findUncorrectHomeworkListByPage" resultType="java.util.Map" parameterType="java.util.Map">
-    </select>
-
-    <sql id="tbLibManager" >
-       t.id,
-       t.name,
-       t.course_name courseName,
-       t.user_id userId,
-       t.t_photo tPhoto,
-       t.is_online isOnline,
-       t.is_banned isBanned,
-       t.banned_time bannedTime,
-       t.type,
-       t.login_time loginTime,
-       t.is_cancelled isCancelled,
-       t.cancelled_time cancelledTime,
-       t.telephone,
-       t.create_time createTime,
-       t.state
-    </sql>
-
-    <select id="findManagerListByPage" resultType="com.ssj.bean.mybatis.ManagerMBDto" parameterType="java.util.Map">
-        select <include refid="tbLibManager" />
-               ,case when t.type = 12 then (select count(1) from tb_lib_manager where state = 1 and type in(8,13) and parent_id = t.user_id)
-                   else (select count(1)+1 from tb_lib_manager where state = 1 and type in(8,11,13) and parent_id = t.user_id ) end groupCount
-        from tb_lib_manager t
-        where t.type in (11,12)
-        and t.state = 1
-        <if test="map.subject != null and map.subject != '' ">
-        and t.course_name regexp #{map.subject}
-        </if>
-        order by t.type desc,t.name
-    </select>
-
-    <select id="findTeacherListByPage" resultType="com.ssj.bean.mybatis.ManagerMBDto" parameterType="hashMap">
-        select t.* from
-        (select <include refid="tbLibManager" />
-        <!--1重点：本月新上线、无底薪；3一般：上个月上线无底薪；2放⼼：上个⽉有底薪-->
-        <if test="map.addTag != null and map.addTag != '' ">
-            ,CASE
-            WHEN date_format(create_time, '%Y-%m') = date_format(now(), '%Y-%m') THEN 1
-            WHEN (SELECT convert(IFNULL(s.basic_salary,0),DECIMAL(9,2)) FROM tb_lib_salary_info s
-                WHERE s.user_id = t.user_id AND s.`month` REGEXP date_format(date_sub(now(), INTERVAL 1 MONTH),'%Y-%m') LIMIT 1)>0
-            THEN 2
-            ELSE 3 END tag
-        </if>
-          from tb_lib_manager t
-         where 1 = 1
-           and t.state = 1
-        <if test="map.grade != null and map.grade != '' ">
-            and t.grade regexp #{map.grade}
-        </if>
-        <if test="map.subject != null and map.subject != '' ">
-            and t.course_name regexp #{map.subject}
-        </if>
-        <if test="map.teacherName != null and map.teacherName != '' ">
-            and t.name regexp #{map.teacherName}
-        </if>
-        <!--注销老师只显示近七天注销的-->
-        <if test="map.GTE_cancelledTime != null and map.GTE_cancelledTime != '' ">
-            and (t.cancelled_time >= #{map.GTE_cancelledTime} or cancelled_time is null)
-        </if>
-        <!--只筛选出该天有作业的老师-->
-        <if test="map.selectTime != null and map.selectTime != '' ">
-            <if test="map.teacherIds.size() > 0">
-                and t.user_id in
-                <foreach collection="map.teacherIds" index="i" item="teacherId" open="(" close=")" separator=",">
-                    #{teacherId}
-                </foreach>
-            </if>
-        </if>
-        <!--批改老师-->
-        <if test='map.type == "8" '>
-            <!--校区管理员-->
-            <if test='map.role  == "11"'>
-                and t.type in (8, 11)
-            </if>
-            <!--超级管理员-->
-            <if test='map.role  == "12"'>
-                and t.type =8
-            </if>
-        </if>
-        <!--匹配知识点老师-->
-        <if test='map.type == "13" '>
-            and t.type = 13
-        </if>
-        <if test="map.parentId != null and map.parentId != '' ">
-            and (t.parent_id = #{map.parentId} or t.user_id=#{map.parentId})
-        </if>
-        ) t
-        <if test="map.tag != null and map.tag != '' ">
-            where t.tag = #{map.tag}
-        </if>
-        <!--排序方式：未质检在线（里面按照未质检数量降序）；未质检离线（里面按照未质检数量降序）；已质检在线；已质检离线-->
-        order by
-        <if test="map.orderField != null and map.orderField != '' ">
-            ${map.orderField},
-        </if>
-        t.isCancelled, t.isBanned,
-        t.isOnline desc,t.name
-    </select>
-
-    <select id="countByManagerId" resultType="java.util.Map" parameterType="java.util.Map">
-        select  sum(t.operate_nums) operate_nums,
-                sum(t.is_feedback) feedback_count,
-                sum(case when t.check_date is not null then 1 else 0 end) check_count,
-                sum(t.is_check_error)+sum(t.correct_nums) wrong_count
-         from (
-            select t2.*,(case when ((t1.is_mark in (0,2) and t1.is_feedback = 1) or t1.is_mark not in (0,2)) then 1 else 0 end) is_feedback
-            from scon_homework_picture t1
-            join scon_homework_picture_correct t2 on t1.id = t2.homework_picture_id and t2.type=8
-            where t1.service_type=1
-            and t1.teacher_id in
-                (select user_id from tb_lib_manager
-                where state = 1
-                and type in(8,11,13)
-                and parent_id = #{map.managerId}
-                union
-                select user_id
-                from tb_lib_manager
-                where state = 1
-                and type in (8, 11, 13)
-                and user_id = #{map.managerId}
-                )
-            <!--and ((t1.is_mark in (0,2) and t1.is_feedback = 1) or t1.is_mark not in (0,2))-->
-        <if test="map.before_createTime != null and map.before_createTime != '' ">
-            and t1.create_time >= #{map.before_createTime}
-        </if>
-        <if test="map.before_allotTime != null and map.before_allotTime != '' ">
-            and t2.allot_time >= #{map.before_allotTime}
-        </if>
-            union all
-            select t2.*,(case when ((t1.is_mark in (0,2) and t1.is_know_feedback = 1) or t1.is_mark not in (0,2)) then 1 else 0 end) is_feedback
-            from scon_homework_picture t1
-            join scon_homework_picture_correct t2 on t1.id = t2.homework_picture_id and t2.type=13
-            where t1.service_type=1
-            and t1.know_teacher_id in
-                (select user_id from tb_lib_manager
-                where state = 1
-                and type in(8,11,13)
-                and parent_id = #{map.managerId}
-                union
-                select user_id from tb_lib_manager
-                where state = 1
-                and type in(8,11,13)
-                and user_id = #{map.managerId}
-                )
-            <!--and ((t1.is_mark in (0,2) and t1.is_know_feedback = 1) or t1.is_mark not in (0,2))-->
-    <if test="map.before_createTime != null and map.before_createTime != '' ">
-        and t1.create_time >= #{map.before_createTime}
-    </if>
-    <if test="map.before_allotTime != null and map.before_allotTime != '' ">
-        and t2.allot_time >= #{map.before_allotTime}
-    </if>
-    ) t
-    </select>
-
-    <select id="countByTeacherId" resultType="com.ssj.bean.mybatis.CountMBDto" parameterType="java.util.Map">
-        <if test="map.teacherId != null and map.teacherId != '' ">
-         select t1.homework_id homeworkId,
-                sum(case when (t1.is_mark in (0,2) and t1.is_feedback = 1) or t1.is_mark not in (0,2) then 1 else 0 end) feedbackCount,
-                sum(case when t2.check_date is not null then 1 else 0 end) checkCount,
-                case when sum(case when t2.start_time is not null and t2.end_time is null then 1 else 0 end)>0 then '批改中'
-                    when sum(case when t1.is_mark in (0,2) and t1.is_feedback = 0 then 1 else 0 end)>0 then '未批改'
-                    else '批改完' end status
-            from scon_homework_picture t1
-            join scon_homework_picture_correct t2 on t1.id = t2.homework_picture_id
-            where 1=1
-            and t1.service_type=1
-            and t2.type = 8
-            <!--and ((t1.is_mark in (0,2) and t1.is_feedback = 1) or t1.is_mark not in (0,2))-->
-            and t1.teacher_id regexp #{map.teacherId}
-        </if>
-        <if test="map.knowTeacherId != null and map.knowTeacherId != '' ">
-         select t1.homework_id,
-                sum(case when (t1.is_mark in (0,2) and t1.is_needing_know =1 and t1.is_know_feedback = 1) then 1 else 0 end) feedback_count,
-                sum(case when t2.check_date is not null then 1 else 0 end) check_count,
-                case when sum(case when t2.start_time is not null and t2.end_time is null then 1 else 0 end)>0 then '批改中'
-                    when sum(case when t1.is_mark in (0,2) and t1.is_needing_know = 1 and t1.is_know_feedback = 0 then 1 else 0 end)>0 then '未批改'
-                    else '批改完' end status
-            from scon_homework_picture t1
-            join scon_homework_picture_correct t2 on t1.id = t2.homework_picture_id
-            where 1=1
-            and t1.service_type=1
-            and t2.type = 13
-            <!--and ((t1.is_mark in (0,2) and t1.is_know_feedback = 1) or t1.is_mark not in (0,2))-->
-            and t1.know_teacher_id regexp #{map.knowTeacherId}
-        </if>
-        <if test="map.allotTime != null and map.allotTime != '' ">
-            and t1.allot_time >= #{map.allotTime}
-        </if>
-        <if test="map.GTE_createTime != null and map.GTE_createTime != '' ">
-            and t1.create_time >= #{map.GTE_createTime}
-        </if>
-        <if test="map.EQ_createTime != null and map.EQ_createTime != '' ">
-            and t1.create_time regexp #{map.EQ_createTime}
-        </if>
-        group by t1.homework_id
-    </select>
-
-    <select id="studentHomeworkNoFeedbackList" resultType="com.ssj.bean.mybatis.StudentHomeworkMBDto" parameterType="hashMap">
-        select t.* from
-        (select t.id                                                                       homeworkId,
-        <if test='map.type == "8" '>
-            t1.teacher_id                                                              teacherId,
-            (select name
-            from tb_lib_manager
-            where t1.teacher_id = user_id
-            and type in (8, 11, 12, 13, 14)
-            limit 1)                                                                  teacherName,
-            case
-            <!--1.未分配2.已分配未批改3.批改中4.批改完-->
-            when t1.teacher_id is null or t1.teacher_id = '' then 1
-            when sum(case when t2.start_time is not null and t2.end_time is not null then 1 else 0 end) = count(t1.id) then 4
-            when sum(case when t2.start_time is not null then 1 else 0 end) > 0 then 3
-            else 2 end                                                                 status,
-        </if>
-        <if test='map.type == "13" '>
-            t1.know_teacher_id                                                              teacherId,
-            (select name
-            from tb_lib_manager
-            where t1.know_teacher_id = user_id
-            and type in (8, 11, 12, 13, 14)
-            limit 1)                                                                    teacherName,
-            case
-            when t1.know_teacher_id is null or t1.know_teacher_id = '' then 1
-            when sum(case when t2.start_time is not null and t2.end_time is null then 1 else 0 end) > 0 then 3
-            when sum(case when t2.start_time is not null and t2.end_time is not null then 1 else 0 end) = count(t1.id) then 4
-            else 2 end                                                                  status,
-        </if>
-        t.vip_id                                                                   vipId,
-        t3.child_name                                                              name,
-        t.subject,
-        count(t1.id)                                                               picNums,
-        date_format(min(t2.start_time), '%Y-%m-%d %H:%i:%S')                       correctStartTime,
-        date_format(min(t2.allot_time), '%Y-%m-%d %H:%i:%S')                       allotTime,
-        date_format(min(t1.create_time), '%Y-%m-%d %H:%i:%S')                      uploadTime,
-        UNIX_TIMESTAMP(now()) - UNIX_TIMESTAMP(ifnull(min(t1.create_time), now())) waitLong1,
-        UNIX_TIMESTAMP(now()) - UNIX_TIMESTAMP(ifnull(max(t2.allot_time), now()))  waitLong2,
-        UNIX_TIMESTAMP(now()) - UNIX_TIMESTAMP(ifnull((select max(hpc.end_time) from scon_homework_picture_correct hpc where t.id=hpc.homework_id and hpc.type=8), now()))    waitLong3
-        from scon_homework t
-                 join scon_homework_picture t1 on t.id = t1.homework_id
-                 left join scon_homework_picture_correct t2 on t1.id = t2.homework_picture_id and t2.type = #{map.type}
-                 join tb_lib_vip t3 on t.vip_id = t3.id
-        where 1 = 1
-        and t1.service_type=1
-        <if test='map.type == "8" '>
-            <!--超级管理员显示未分配的作业、分配老师未批改的作业、批改中的作业-->
-            <if test='map.role  == "superManager"'>
-                and exists(
-                select 1
-                from scon_homework_picture s
-                where s.is_mark in (0, 2)
-                and s.service_type=1
-                and s.is_feedback = 0
-                and s.teacher_id = t1.teacher_id
-                and s.homework_id = t.id
-                UNION
-                select 1
-                from scon_homework_picture s
-                where s.is_mark in (0, 2)
-                and s.service_type=1
-                and s.is_feedback = 0
-                and s.teacher_id is null
-                and s.homework_id = t.id
-                )
-            </if>
-            <!--校区管理员只显示其组下的，包含自己-->
-            <if test='map.role  == "manager"'>
-                and t1.teacher_id in
-                (
-                select user_id from tb_lib_manager
-                where state = 1
-                and type in(8,11,13)
-                and  parent_id = #{map.managerId}
-                UNION
-                select user_id from tb_lib_manager
-                where state = 1
-                and type in(8,11,13)
-                and  user_id = #{map.managerId}
-                )
-                <!--校区管理员显示分配老师未批改的作业、批改中的作业-->
-                and exists(
-                select 1
-                from scon_homework_picture s
-                where 1 = 1
-                and s.service_type=1
-                and s.is_mark in (0, 2)
-                and s.is_feedback = 0
-                and s.teacher_id = t1.teacher_id
-                and s.homework_id = t.id
-                )
-            </if>
-        </if>
-        <if test='map.type == "13" '>
-            <if test='map.role  == "superManager"'>
-                and exists(
-                select 1
-                from scon_homework_picture s
-                where 1 = 1
-                and s.service_type=1
-                and s.is_mark in (0, 2)
-                and s.is_needing_know = 1
-                and s.is_know_feedback = 0
-                and s.know_teacher_id is null
-                and s.homework_id = t.id
-                AND s.teacher_id IS NOT NULL
-                AND s.is_feedback = 1
-                union
-                select 1
-                from scon_homework_picture s
-                where 1 = 1
-                and s.service_type=1
-                and s.is_mark in (0, 2)
-                and s.is_needing_know = 1
-                and s.is_know_feedback = 0
-                and s.know_teacher_id = t1.know_teacher_id
-                and s.homework_id = t.id
-                AND s.teacher_id IS NOT NULL
-                AND s.is_feedback = 1
-                )
-            </if>
-            <!--校区管理员只显示其组下的，包含自己-->
-            <if test='map.role  == "manager"'>
-                and t1.know_teacher_id in
-                (
-                select user_id from tb_lib_manager
-                where state = 1
-                and type in(8,11,13)
-                and parent_id = #{map.managerId}
-                union
-                select user_id from tb_lib_manager
-                where state = 1
-                and type in(8,11,13)
-                and user_id = #{map.managerId}
-                )
-                <!--校区管理员显示分配老师未批改的作业、批改中的作业-->
-                and exists(
-                select 1
-                from scon_homework_picture s
-                where 1 = 1
-                and s.service_type=1
-                and s.is_mark in (0, 2)
-                and s.is_needing_know = 1
-                and s.is_know_feedback = 0
-                and s.know_teacher_id = t1.know_teacher_id
-                and s.homework_id = t.id
-                AND s.teacher_id IS NOT NULL
-                AND s.is_feedback = 1
-                )
-            </if>
-            <!--匹配知识点的作业：需要此作业已批改完-->
-            and t1.teacher_id is not null
-            and t1.is_feedback = 1
-        </if>
-        <if test="map.value != null and map.value != '' ">
-            and t3.child_name regexp #{map.value}
-        </if>
-        <if test="map.createTime != null and map.createTime != '' ">
-            and t.create_time >= #{map.createTime}
-            and t1.create_time >= #{map.createTime}
-        </if>
-        group by homeworkId, teacherId) t
-        <!--排除掉批改完的作业，此作业出现的情况为一份作业部分分给了老师且批改完，部分未分老师-->
-        where t.status in(1,2,3)
-        order by t.status, t.uploadTime
-    </select>
-
-    <select id="studentHomeworkDetail" resultType="com.ssj.bean.mybatis.HomeworkPictureMBDto" parameterType="hashMap">
-        select t1.id,
-        t1.vip_id                                                vipId,
-        date_format(t3.create_time, '%Y-%m-%d')                  createDate,
-        t1.create_time                                           createTime,
-        t2.allot_time                                            allotTime,
-        t3.subject,
-        t2.start_time                                            startTime,
-        t2.start_time                                            beginTime,
-        t2.end_time                                              endTime,
-        t1.is_feedback                                           isFeedback,
-        t1.is_know_feedback                                      isKnowFeedback,
-        (select child_name from tb_lib_vip where t3.vip_id = id) childName,
-        t1.is_mark                                               isMark,
-        t1.teacher_id                                            teacherId,
-        (select name from tb_lib_manager where user_id = t1.teacher_id and type in (8,11,12,13,14) limit 1) teacherName,
-        (select t_photo from tb_lib_manager where user_id = t1.teacher_id and type in (8,11,12,13,14) limit 1) teacherImg,
-        t1.know_teacher_id                                       knowTeacherId,
-        (select name from tb_lib_manager where user_id = t1.know_teacher_id and type in (8,11,12,13,14) limit 1) knowTeacherName,
-        (select t_photo from tb_lib_manager where user_id = t1.know_teacher_id and type in (8,11,12,13,14) limit 1) knowTeacherImg,
-        t1.file_key                                              fileKey,
-        t1.corrected_picture_url                                 correctedPictureUrl,
-        t1.composition_comment                                   compositionComment,
-        t2.checker                                               checker,
-        t2.check_date                                            checkDate,
-        t1.is_checker_correct                                    isCheckerCorrect,
-        t2.is_check_error                                        isCheckError,
-        ''                                                       checkerImgUrl,
-        ifnull(t2.type, 0)                                       type
-        from scon_homework_picture t1
-            left join scon_homework_picture_correct t2 on t1.id = t2.homework_picture_id
-            <if test="map.type != null and map.type != '' ">
-                and t2.type = #{map.type}
-            </if>
-            left join scon_homework t3 on t1.homework_id = t3.id
-        where 1=1
-            and t1.service_type=1
-        <if test="map.isDelete != null and map.isDelete != '' ">
-            and t1.is_delete = #{map.isDelete}
-        </if>
-        <if test="map.homeworkId != null and map.homeworkId != '' ">
-            and t1.homework_id = #{map.homeworkId}
-        </if>
-        <if test='map.type == "8" '>
-            order by t1.teacher_id desc
-        </if>
-        <if test='map.type == "13" '>
-            order by t1.know_teacher_id desc
-        </if>
-
-    </select>
-
-    <select id="findStudentHomeworkListByPage" resultType="com.ssj.bean.mybatis.StudentHomeworkMBDto" parameterType="hashMap">
-        SELECT
-        distinct t.id homeworkId,
-        t.vip_id vipId,
-        t2.child_name NAME,
-        t2.img_url imgUrl,
-        t.SUBJECT,
-        t.grade,
-        t.create_time createTime
-        FROM
-        scon_homework t
-        left join scon_homework_picture t1
-        on t.id=t1.homework_id
-        left JOIN tb_lib_vip t2 ON t1.vip_id = t2.id
-        where t1.service_type=1
-        <if test="map.value != null and map.value != '' ">
-            and t2.child_name regexp #{map.value}
-        </if>
-        <if test="map.GTE_createTime != null and map.GTE_createTime != '' ">
-            and t.create_time >= #{map.GTE_createTime}
-        </if>
-        order by t.create_time desc
-    </select>
-
-    <select id="findTeacherAllotByPage" resultType="com.ssj.bean.mybatis.ManagerMBDto" parameterType="java.util.Map">
-        select <include refid="tbLibManager" />
-        from tb_lib_manager t
-        where t.state = 1
-        and t.is_online = 1
-        <if test="map.name != null and map.name != '' ">
-            and t.name regexp #{map.name}
-        </if>
-        <if test="map.subject != null and map.subject != '' ">
-            and t.course_name regexp #{map.subject}
-        </if>
-        <if test="map.grade != null and map.grade != '' ">
-            and t.grade regexp #{map.grade}
-        </if>
-        <if test="map.parentId != null and map.parentId != '' ">
-            and (t.parent_id = #{map.parentId} or t.user_id= #{map.parentId})
-        </if>
-        <if test='map.type == "8" '>
-            and t.type in (8, 11)
-        </if>
-        <if test='map.type == "13" '>
-            and t.type = 13
-        </if>
-    </select>
-
-    <select id="findTeacherByPage" resultType="com.ssj.bean.mybatis.ManagerMBDto">
-        select <include refid="tbLibManager" />
-        from tb_lib_manager t
-        where t.state = 1
-        <if test="map.teacherName != null and map.teacherName != '' ">
-            and t.name regexp #{map.teacherName}
-        </if>
-        <if test="map.subject != null and map.subject != '' ">
-            and t.course_name regexp #{map.subject}
-        </if>
-        <if test="map.grade != null and map.grade != '' ">
-            and t.grade regexp #{map.grade}
-        </if>
-        <if test="map.parentId != null and map.parentId != '' ">
-            and (t.parent_id = #{map.parentId} or t.user_id= #{map.parentId})
-        </if>
-        <if test='map.type == "8" '>
-            <if test='map.role == "superManager" '>
-                and t.type =8
-            </if>
-            and t.type in (8, 11)
-        </if>
-        <if test='map.type == "13" '>
-            and t.type = 13
-        </if>
-        <!--查出某天有作业的老师-->
-        <if test="map.timeType != null and map.timeType != '' ">
-            <if test="teacherIds.size() > 0">
-            and t.user_id in
-            <foreach collection="teacherIds" index="i" item="teacherId" open="(" close=")" separator=",">
-                #{teacherId}
-            </foreach>
-            </if>
-        </if>
-        <if test="noTeacherIds.size() > 0">
-            and t.user_id not in
-            <foreach collection="noTeacherIds" index="i" item="teacherId" open="(" close=")" separator=",">
-                #{teacherId}
-            </foreach>
-        </if>
-
-        order by t.type desc,t.is_online desc,t.is_cancelled,t.login_time desc,t.is_banned
-    </select>
-
-    <select id="getWaitCount" resultType="Long" parameterType="java.util.Map">
-        select count(1)
-        from scon_homework_picture s1
-        where 1=1
-            and s1.service_type=1
-        <if test="map.beginTime != null and map.beginTime != '' ">
-            and s1.create_time >= #{map.beginTime}
-        </if>
-        <if test='map.type == "8" '>
-            and s1.teacher_id = #{map.teacherId}
-            and s1.is_feedback = 0 and s1.is_mark in (0, 2)
-        </if>
-        <if test='map.type == "13" '>
-            and s1.know_teacher_id = #{map.teacherId}
-            and s1.is_know_feedback = 0
-        </if>
-    </select>
-
-    <select id="findAttendByTeacherId" resultType="java.util.Map" parameterType="java.util.Map">
-        select  count(distinct t1.teacher_id) as count,avg(ifnull( t1.judge_level,4)) as avg_judge
-        from   tb_teacher_assessment t1
-        LEFT JOIN tb_lib_manager t2
-        ON t1.teacher_id = t2.user_id
-        where
-        t2.state = 1
-        <if test="map.userId !=null and map.userId !='' ">
-            <if test=' map.role=="superManager" '>
-                AND t2.parent_id = #{map.userId}
-            </if>
-            <if test=' map.role=="manager" '>
-                AND (t2.parent_id = #{map.userId} or t2.user_id=#{map.userId})
-            </if>
-        </if>
-    </select>
-
-    <select id="findUnCheckTeacherList" resultType="com.ssj.bean.mybatis.ManagerMBDto" parameterType="java.util.Map">
-        select  t.teacher_id userId,
-                (select is_online from tb_lib_manager where type in (8,11) and user_id = t.teacher_id limit 1) isOnline,
-                sum(t.uncheck_nums)                                                                      uncheckNums
-        from (select t1.teacher_id, t1.homework_id, count(1) uncheck_nums
-                        from scon_homework_picture t1
-                       join scon_homework_picture_correct t2
-                            on t1.id = t2.homework_picture_id and t2.type = 8 and t2.check_date is null
-            where t1.teacher_id is not null
-            and t1.service_type=1
-        <if test="map.GTE_createTime != null and map.GTE_createTime != '' ">
-            and t1.create_time >= #{map.GTE_createTime}
-        </if>
-        <if test="map.createTime != null and map.createTime != '' ">
-            and t1.create_time regexp #{map.createTime}
-        </if>
-        <if test="map.subject != null and map.subject != '' ">
-            and t1.subject = #{map.subject}
-        </if>
-              group by t1.teacher_id, t1.homework_id
-             ) t
-        where not exists(
-                select 1
-                from scon_homework_picture s
-                where 1 = 1
-                  and s.service_type=1
-                  and s.is_delete = 0
-                  and s.is_mark in (0, 2)
-                  and s.is_feedback = 0
-                  and s.homework_id = t.homework_id
-                  and s.teacher_id = t.teacher_id
-        <if test="map.GTE_createTime != null and map.GTE_createTime != '' ">
-            and s.create_time >= #{map.GTE_createTime}
-        </if>
-        <if test="map.createTime != null and map.createTime != '' ">
-            and s.create_time regexp #{map.createTime}
-        </if>
-            )
-        group by t.teacher_id
-        order by isOnline desc, uncheckNums desc
-    </select>
-
-    <select id="findUnCheckKnowTeacherList" resultType="com.ssj.bean.mybatis.ManagerMBDto" parameterType="java.util.Map">
-        select t.know_teacher_id userId,
-               (select is_online from tb_lib_manager where type =13 and user_id = t.know_teacher_id limit 1) isOnline,
-               sum(t.uncheck_nums)                                                                      uncheckNums
-        from (select t1.know_teacher_id, t1.homework_id, count(1) uncheck_nums
-              from scon_homework_picture t1
-                       join scon_homework_picture_correct t2
-                            on t1.id = t2.homework_picture_id and t2.type = 13 and t2.check_date is null
-              where t1.know_teacher_id is not null
-                and t1.service_type=1
-            <if test="map.GTE_createTime != null and map.GTE_createTime != '' ">
-                and t1.create_time >= #{map.GTE_createTime}
-            </if>
-            <if test="map.createTime != null and map.createTime != '' ">
-                and t1.create_time regexp #{map.createTime}
-            </if>
-            <if test="map.subject != null and map.subject != '' ">
-                and t1.subject = #{map.subject}
-            </if>
-              group by t1.know_teacher_id, t1.homework_id
-             ) t
-        where not exists(
-                select 1
-                from scon_homework_picture s
-                where 1 = 1
-                  and s.service_type=1
-                  and s.is_know_feedback = 0
-                  and s.homework_id = t.homework_id
-                  and s.know_teacher_id = t.know_teacher_id
-        <if test="map.GTE_createTime != null and map.GTE_createTime != '' ">
-            and s.create_time >= #{map.GTE_createTime}
-        </if>
-        <if test="map.createTime != null and map.createTime != '' ">
-            and s.create_time regexp #{map.createTime}
-        </if>
-            )
-        group by t.know_teacher_id
-        order by isOnline desc, uncheckNums desc
-    </select>
-
-    <select id="findTeacherInfo"  resultType="java.util.Map">
-        select t1.name,t1.t_photo,t2.teacher_num from tb_lib_manager t1
-               left join tb_lib_salary_integration t2
-               on t1.user_id=t2.teacher_id
-         where
-          t1.user_id=#{teacherId}
-          and t1.type =8
-          limit 1000
-    </select>
-
-    <select id="findLoginDateByPage" resultType="string" parameterType="java.util.Map">
-        select arrange_date
-        from tb_lib_login_info
-        where 1=1
-        and teacher_id = #{map.teacherId}
-        and arrange_date >= #{map.startDate}
-        <!--and arrange_date &lt; #{map.endDate}-->
-        group by arrange_date
-        order by arrange_date desc
-    </select>
-
-    <select id="findUserRoleByPage" resultType="com.ssj.bean.mybatis.ManagerMBDto" parameterType="java.util.Map">
-        select <include refid="tbLibManager" />
-        from tb_lib_manager t
-        where 1=1
-        <if test="map.state != null and map.state != '' ">
-            and t.state = #{map.state}
-        </if>
-        <if test="map.teacherName != null and map.teacherName != '' ">
-            and t.name regexp #{map.teacherName}
-        </if>
-        <if test="map.subject != null and map.subject != '' ">
-            and t.course_name regexp #{map.subject}
-        </if>
-        <if test="map.grade != null and map.grade != '' ">
-            and t.grade regexp #{map.grade}
-        </if>
-        <if test="map.type != null and map.type != '' ">
-            and t.type = #{map.type}
-        </if>
-        <if test="map.types != null and map.types.size() > 0">
-            and t.type in
-            <foreach collection="map.types" index="i" item="type" open="(" close=")" separator=",">
-                #{type}
-            </foreach>
-        </if>
-        <if test="map.LIKE_value != null and map.LIKE_value != '' ">
-            and t.name regexp #{map.LIKE_value}
-        </if>
-        <if test="map.isOnline != null and map.isOnline != '' ">
-            and t.is_online regexp #{map.isOnline}
-        </if>
-        <if test="map.isBanned != null and map.isBanned != '' ">
-            and t.is_banned regexp #{map.isBanned}
-        </if>
-        <if test="map.isCancelled != null and map.isCancelled != '' ">
-            and t.is_cancelled regexp #{map.isCancelled}
-        </if>
-        order by t.type,t.is_online desc,t.is_cancelled,t.login_time desc,t.is_banned
-    </select>
-
-    <select id="findOnedayTeacherOfFeedbackHomework" resultType="com.ssj.bean.mybatis.ManagerMBDto" parameterType="String">
-        select t.teacher_id userId, max(t.maxEndTime) maxEndTime,sum(t.uncheckCount) uncheckCount
-         from (
-                  select s.teacher_id,
-                         s.homework_id,
-                         sum(case
-                                 when s.is_delete = 0 and s.is_mark in (0, 2) and s.is_feedback = 0 then 1
-                                 else 0 end) no_feedback_count,
-                         sum(case when s1.check_date is null then 1 else 0 end) uncheckCount,
-                         max(s1.end_time)    maxEndTime
-                  from scon_homework_picture s
-                           join scon_homework_picture_correct s1 on s.id = s1.homework_picture_id and s1.type = 8
-                  where 1 = 1
-                    and s.teacher_id is not null
-                    and s.create_time ${operate} #{date}
-                  group by s.teacher_id, s.homework_id
-              ) t
-         where t.no_feedback_count = 0
-         group by t.teacher_id
-         order by uncheckCount desc,maxEndTime
-    </select>
-
-    <select id="findOnedayKnowTeacherOfFeedbackHomework" resultType="com.ssj.bean.mybatis.ManagerMBDto" parameterType="String">
-        select t.know_teacher_id userId, max(t.maxEndTime) maxEndTime,sum(t.uncheckCount) uncheckCount
-        from (
-                 select s.know_teacher_id,
-                        s.homework_id,
-                        sum(case
-                                when s.is_delete = 0 and s.is_needing_know = 1 and s.is_know_feedback = 0 then 1
-                                else 0 end) no_feedback_count,
-                        sum(case when s1.check_date is null then 1 else 0 end) uncheckCount,
-                        max(s1.end_time)    maxEndTime
-                 from scon_homework_picture s
-                          join scon_homework_picture_correct s1 on s.id = s1.homework_picture_id and s1.type = 13
-                 where 1 = 1
-                   and s.know_teacher_id is not null
-                   and s.create_time ${operate} #{date}
-                 group by s.know_teacher_id, s.homework_id) t
-        where t.no_feedback_count = 0
-        group by t.know_teacher_id
-        order by uncheckCount desc,maxEndTime
-    </select>
-</mapper>

target/classes/mybatis/mapper/CuratorMapper.xml

@@ -1,556 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.ssj.service.mapper.CuratorMapper">
-    <select id="findMyInfo" resultType="com.ssj.service.conch.curator.dto.CuratorDTO">
-        select tb_lib_manager.name      curator_name,
-               tb_lib_manager.telephone phone,
-               tb_lib_manager.lib_id,
-               tb_lib_join.league_name  lib_name
-        from tb_lib_manager,
-             tb_lib_join
-        where tb_lib_manager.lib_id = tb_lib_join.id
-          and tb_lib_manager.user_id = #{curatorUserId}
-          and tb_lib_manager.type = 4
-          and tb_lib_manager.state = 1
-        limit 1
-    </select>
-
-    <select id="findApplyInfo" resultType="com.ssj.service.conch.curator.dto.CuratorDTO">
-        select tb_lib_manager_audit.name      curator_name,
-               tb_lib_manager_audit.telephone phone,
-               tb_lib_manager_audit.lib_id,
-               tb_lib_join.league_name  lib_name
-        from tb_lib_manager_audit,
-             tb_lib_join
-        where tb_lib_manager_audit.lib_id = tb_lib_join.id
-          and tb_lib_manager_audit.user_id = #{curatorUserId}
-          and tb_lib_manager_audit.type = 4
-        limit 1
-    </select>
-
-    <!--校长端老师列表-->
-    <select id="findCuratorTeacherList" resultType="com.ssj.bean.conch.curator.dto.CuratorTeacherListDto">
-        select lm.user_id teacher_id, group_concat(lm.type) teacher_type_list, group_concat(distinct course_name) subject,
-        lm.name,  lm.t_photo img_url, lm.telephone phone,ct.class_sum from tb_lib_manager lm
-        left join (select teacher_id, count(class_id) class_sum from tb_class_teacher where  status=1 and lib_id=#{libId} group by teacher_id) ct
-        on ct.teacher_id=lm.user_id
-        where lm.type in
-        <foreach collection="types" open="(" item="type" separator="," close=")">
-            #{type}
-        </foreach>
-        <if test="searchKey != null and searchKey != '' ">
-            and lm.name regexp #{searchKey}
-        </if>
-        and lm.state=1 and lm.lib_id=#{libId}
-        group by lm.user_id
-    </select>
-
-    <!--老师详情-->
-    <select id="findCuratorTeacherDetailData" resultType="com.ssj.bean.conch.curator.dto.CuratorTeacherListDto">
-        select lm.user_id teacher_id, group_concat(lm.type) teacher_type_list, group_concat(distinct course_name) subject,
-        lm.name,  lm.t_photo img_url, lm.telephone phone from tb_lib_manager lm
-        where lm.state = 1 and lm.user_id=#{teacherId} and lm.type in
-        <foreach collection="types" open="(" item="type" separator="," close=")">
-            #{type}
-        </foreach>
-        group by lm.user_id
-    </select>
-
-    <!--老师详情-->
-    <select id="findCuratorTeacherDetailDataV1" resultType="com.ssj.bean.conch.curator.dto.CuratorTeacherListDto">
-        select lm.user_id teacher_id, group_concat(lm.type) teacher_type_list, group_concat(distinct course_name) subject,
-        lm.name,  lm.t_photo img_url, lm.telephone phone from tb_lib_manager lm
-        where lm.state = 1 and lm.user_id=#{teacherId} and lm.lib_id=#{libId} and lm.type in
-        <foreach collection="types" open="(" item="type" separator="," close=")">
-            #{type}
-        </foreach>
-        group by lm.user_id
-    </select>
-
-    <!--查询老师详情的班级列表-->
-    <select id="findTeacherDetailClassList" resultType="com.ssj.bean.conch.curator.dto.TeacherDetailClassListDto">
-        select c.id class_id, c.class_name, if(c.status=2, 1, 0) is_default from tb_class_teacher ct
-        left join tb_class c on ct.class_id=c.id
-        where ct.teacher_id=#{teacherId} and ct.status=1 and c.status in (1, 2)
-    </select>
-
-    <!--查询老师详情的班级列表-->
-    <select id="findTeacherDetailClassListV1" resultType="com.ssj.bean.conch.curator.dto.TeacherDetailClassListDto">
-        select c.id class_id, c.class_name, if(c.status=2, 1, 0) is_default from tb_class_teacher ct
-        left join tb_class c on ct.class_id=c.id
-        where ct.teacher_id=#{teacherId} and ct.lib_id=#{libId} and ct.status=1 and c.status in (1, 2)
-    </select>
-
-    <!--查询班级列表的学生数-->
-    <select id="findClassStudentCount" resultType="com.ssj.bean.conch.curator.dto.TeacherDetailClassListDto">
-        select class_id, count(1) student_sum from tb_class_student
-        where class_id in
-        <foreach collection="classIds" open="(" item="classId" separator="," close=")">
-            #{classId}
-        </foreach>
-        and status = 1
-        group by class_id
-    </select>
-
-    <!--查询班级列表的学生数-->
-    <select id="findClassTeacherCount" resultType="com.ssj.bean.conch.curator.dto.TeacherDetailClassListDto">
-        select class_id, count(1) teacher_sum from tb_class_teacher
-        where class_id in
-        <foreach collection="classIds" open="(" item="classId" separator="," close=")">
-            #{classId}
-        </foreach>
-        and status = 1
-        group by class_id
-    </select>
-
-    <!--查询老师不在的的班级列表-->
-    <select id="findTeacherNotInClassList" resultType="com.ssj.bean.conch.curator.dto.TeacherDetailClassListDto">
-        select  class.id class_id, class.class_name, if(class.status=2, 1, 0) is_default  from tb_class class
-        left join tb_class_teacher teacher on class.id=teacher.class_id
-        and  teacher.status=1
-        and  teacher.teacher_id = #{teacherId}
-        where class.lib_id=#{libId} and class.status in (1, 2) and teacher.id is null
-    </select>
-
-    <select id="findClassStudentDetail" resultType="java.util.Map">
-        select t.class_name className,t.id classId, t1.vip_id vipId,t2.child_name childName,t2.img_url imgUrl,t2.grade grade,t3.mobile phone,
-        (
-        select IF(ts.species='S999',999,correct_type)  from tb_lib_vip_service ts
-        where ts.vip_id=t1.vip_id
-        and ts.stat = 1
-        and ts.species in ('S003','S999')
-        and to_days(ts.start_time) &lt;=to_days(now())
-        and to_days(ts.end_time) >= to_days(now())
-        ORDER BY ts.species,ts.service_sort,ts.correct_type,ts.start_time limit 1
-        ) as correctType
-        from tb_class t left join tb_class_student t1
-        on t.id=t1.class_id
-        left join tb_lib_vip t2
-        on t1.vip_id=t2.id
-        left join tb_user t3
-        on t2.user_id=t3.id
-        where
-        <if test="classId != null and classId != '' ">
-             t.id=#{classId}
-        </if>
-        and t1.status=1
-        and t2.stat=1
-        <if test="name != null and name != '' ">
-            and t2.child_name regexp #{name}
-        </if>
-
-    </select>
-
-    <select id="findClassStudentDetailByLibId" resultType="java.util.Map">
-        select t.class_name className,t.id classId, t1.vip_id vipId,t2.child_name childName,t2.img_url imgUrl,t2.grade grade,t3.mobile phone,
-        (
-        select IF(ts.species='S999',999,correct_type)  from tb_lib_vip_service ts
-        where ts.vip_id=t1.vip_id
-        and ts.stat = 1
-        and ts.species in ('S003','S999')
-        and to_days(ts.start_time) &lt;=to_days(now())
-        and to_days(ts.end_time) >= to_days(now())
-        ORDER BY ts.species,ts.service_sort,ts.correct_type,ts.start_time limit 1
-        ) as correctType
-        from tb_class t left join tb_class_student t1
-        on t.id=t1.class_id
-        left join tb_lib_vip t2
-        on t1.vip_id=t2.id
-        left join tb_user t3
-        on t2.user_id=t3.id
-        where
-        <if test="libId != null and libId != '' ">
-            t.lib_id=#{libId}
-        </if>
-        and t1.status=1
-        and t2.stat=1
-        <if test="name != null and name != '' ">
-            and t2.child_name regexp #{name}
-        </if>
-
-    </select>
-
-    <!--查询其余的学生列表-->
-    <select id="findOtherClassStudentDetail" resultType="java.util.Map">
-        select t.class_name className,t.id classId, t1.vip_id vipId,t2.child_name childName,t2.img_url imgUrl,t2.grade grade,t3.mobile phone,
-        (
-        select IF(ts.species='S999',999,correct_type)  from tb_lib_vip_service ts
-        where ts.vip_id=t1.vip_id
-        and ts.stat = 1
-        and ts.species in ('S003','S999')
-        and to_days(ts.start_time) &lt;=to_days(now())
-        and to_days(ts.end_time) >= to_days(now())
-        ORDER BY ts.species,ts.service_sort,ts.correct_type,ts.start_time limit 1
-        ) as correctType
-        from tb_class t left join tb_class_student t1
-        on t.id=t1.class_id
-        left join tb_lib_vip t2
-        on t1.vip_id=t2.id
-        left join tb_user t3
-        on t2.user_id=t3.id
-        where
-        <if test="classId != null and classId != '' ">
-            t.id !=#{classId}
-        </if>
-        and t1.status=1
-        and t2.stat=1
-        and t.lib_id=#{libId}
-        <if test="name != null and name != '' ">
-            and t2.child_name regexp #{name}
-        </if>
-
-    </select>
-
-    <select id="findClassList"  resultType="java.util.Map">
-        select t1.id                             classId,
-               t1.class_name                     className,
-               (select count(distinct t2.vip_id)
-                from tb_class_student t2,
-                     tb_lib_subscribe ls
-                where t2.class_id = t1.id
-                  and t2.status = 1
-                  and ls.vip_id = t2.vip_id
-                  and to_days(ls.ryke_time) = to_days(now())
-                  and ls.lib_id = #{libId}
-                  and ls.stat = '1'
-                  and ls.flow_stat in ('3', '4')
-                  and t2.vip_id is not null)     signedStudentCount,
-               (select count(distinct t2.vip_id)
-                from tb_class_student t2,tb_lib_vip t3
-                where t2.vip_id = t3.id
-                  and t2.lib_id = t3.lib_id
-                  and t2.class_id = t1.id
-                  and t2.status = 1
-                  and t2.vip_id is not null)     studentSum,
-               (select count(distinct t3.teacher_id)
-                from tb_class_teacher t3
-                where t3.class_id = t1.id
-                  and t3.lib_id = t1.lib_id
-                  and t3.status = 1
-                  and exists(
-                        select t4.user_id
-                        from tb_lib_manager t4
-                        where t4.lib_id = t1.lib_id
-                          and t4.user_id = t3.teacher_id
-                          and t4.state = 1
-                          and t4.type in (2, 10, 15)
-                          and t4.is_cancelled = 0
-                    )
-                  and t3.teacher_id is not null) teacherSum
-        from tb_class t1
-        where t1.lib_id = #{libId}
-          and t1.status in (1, 2)
-        order by t1.status desc, t1.create_time
-    </select>
-
-    <!--查询学生不在的的班级列表-->
-    <select id="findStudentNotInClass"  resultType="java.util.Map">
-
-        select t1.id classId,t1.class_name className,
-        (
-        select count(distinct t2.vip_id) from tb_class_student t2 where
-        t2.class_id=t1.id
-        and t2.status=1
-        and t2.vip_id is not null
-        ) as studentSum,
-        (
-        select count(distinct t3.teacher_id) from tb_class_teacher t3
-        where t3.class_id=t1.id  and t3.lib_id=t1.lib_id
-        and t3.status=1
-        and exists(
-        select t4.user_id from tb_lib_manager t4
-        where t4.lib_id=t1.lib_id
-        and t4.user_id=t3.teacher_id
-        and t4.state=1
-        and t4.type in(2,10,15)
-        and t4.is_cancelled=0
-        )
-        and t3.teacher_id is not null
-        ) as teacherSum
-        from tb_class t1
-        where
-        <if test="libId != null and libId != '' ">
-            t1.lib_id =#{libId}
-        </if>
-        <if test="classId != null and classId != '' ">
-          and  t1.id !=#{classId}
-        </if>
-        and t1.status in(1,2)
-        order by t1.status desc,t1.create_time
-    </select>
-
-    <select id="getTodayStudentHomeworkSum"  resultType="java.util.Map">
-        select sum(case when s.is_delete = 0  then 1 else 0 end)   homeworkNum,
-				sum(case when s.is_delete = 0 and s.is_feedback = 1  then 1 else 0 end ) feedbackNum1,
-				sum(case when s.is_delete = 0 and s.is_feedback = 0 and s.is_mark in(1,3) then 1 else 0 end ) feedbackNum2
-                from scon_homework_picture s where s.vip_id = #{vipId} and s.is_delete = 0 and TO_DAYS(s.create_time) = TO_DAYS(NOW())
-    </select>
-
-    <select id="getUploadHomeworkSumByClassId"  resultType="java.lang.Integer">
-        select count(*) from (
-            select s.vip_id from scon_homework_picture s where s.vip_id in (
-                select t1.vip_id from tb_class t left join tb_class_student t1
-                    on t.id=t1.class_id
-                    left join tb_lib_vip t2
-                    on t1.vip_id=t2.id
-                    where t.id=#{classId}
-                    and t1.status=1
-                    and t2.stat=1)
-            and TO_DAYS(s.create_time) = TO_DAYS(NOW()) and s.is_delete = 0 GROUP BY s.vip_id) as sss
-    </select>
-
-    <select id="getNoCorrectSumByClassId"  resultType="java.lang.Integer">
-            select count(*) from (
-                select s.vip_id from scon_homework_picture s where s.vip_id in (
-                    select t1.vip_id from tb_class t left join tb_class_student t1
-                        on t.id=t1.class_id
-                        left join tb_lib_vip t2
-                        on t1.vip_id=t2.id
-                        where t.id=#{classId}
-                        and t1.status=1
-                        and t2.stat=1)
-                and TO_DAYS(s.create_time) = TO_DAYS(NOW()) and s.is_delete = 0 and s.is_feedback = 0 and is_mark in (0, 2)  GROUP BY s.vip_id) as sss
-    </select>
-
-    <select id="getStudentSumByClassId"  resultType="java.lang.Integer">
-        select count(*) from (
-            select  t1.vip_id from tb_class t left join tb_class_student t1
-                    on t.id=t1.class_id
-                    left join tb_lib_vip t2
-                    on t1.vip_id=t2.id
-                    where t.id=#{classId}
-                    and t1.status=1
-                    and t2.stat=1) as sss
-    </select>
-
-    <select id="renewStudentList" resultType="java.util.Map">
-        select t.id         vipId,
-        t.child_name childName,
-        t.img_url    imgUrl,
-        t.grade,
-        (select concat(IF(ts.species = 'S999', 999, ts.correct_type), '#S', ts.end_time)
-        from tb_lib_vip_service ts
-        where ts.stat = 1
-        and ts.species in ('S003', 'S999')
-        and to_days(ts.start_time) &lt;= to_days(now())
-        and to_days(ts.end_time) >= to_days(now())
-        and t.id = ts.vip_id
-        ORDER BY ts.species, ts.service_sort, ts.correct_type, ts.start_time
-        limit 1
-        )            serviceInfo,
-        (select tc.class_name from tb_class_student tcs,tb_class tc
-        where tcs.class_id = tc.id and t.id = tcs.vip_id and tcs.status = 1 and tc.status>0 limit 1) className
-        from tb_lib_vip t
-        where 1 = 1
-        <if test="map.libId != null and map.libId != '' ">
-            and t.lib_id=#{map.libId}
-        </if>
-        <if test="map.classIdList != null and map.classIdList.size() > 0">
-            and exists(select 1 from tb_class_student tc where t.id = tc.vip_id and status = 1
-                and tc.class_id in
-                <foreach collection="map.classIdList" index="i" item="classId" open="(" close=")" separator=",">
-                    #{classId}
-                </foreach>
-                )
-        </if>
-    </select>
-    <select id="getUploadHomeworkSumByLibId" resultType="java.lang.Integer">
-        select count(*) from (
-            select s.id from scon_homework_picture s where s.vip_id in (
-                select t2.id from  tb_lib_vip t2
-                    where t2.lib_id=#{libId}
-                    and t2.stat=1)
-            and TO_DAYS(s.create_time) = TO_DAYS(NOW()) and s.is_delete = 0 GROUP BY s.vip_id) as sss
-    </select>
-
-    <select id="homeworkIndex" resultType="java.util.Map">
-            select t11.vip_id,t.id,t12.child_name,t12.grade,t13.league_name,t12.school,count(1) as pictureCount,group_concat(t11.file_key) as file_keys,t11.create_time,t.`subject`
-                   ,count(IF(t11.corrected_picture_url is not null,true,null)) as correctedCount,group_concat(t11.corrected_picture_url) as corrected_keys
-                   ,count(IF(t.subject='语文',true,null)) as count1,count(IF(t.subject='数学',true,null)) as count2,count(IF(t.subject='英语',true,null)) as count3
-                     from scon_homework t
-                left join scon_homework_picture t11 on t.id = t11.homework_id
-                left join tb_lib_vip t12 on t11.vip_id = t12.id
-                left join tb_lib_join t13 on t12.lib_id = t13.id
-                where t11.create_time regexp #{queryDate}
-                  and t12.lib_id=#{libId} and t11.is_delete = 0
-                <if test="searchValue != '' ">
-                    and t12.child_name regexp #{searchValue}
-                </if>
-                group  by t11.vip_id
-                order by t.subject,t11.create_time desc
-    </select>
-
-    <select id="findPageStudentList" resultType="java.util.Map">
-        select distinct t.class_name className,t.id classId, t1.vip_id vipId,t2.child_name childName,t2.img_url imgUrl,t2.grade grade,t3.mobile phone
-        from tb_class t left join tb_class_student t1
-        on t.id=t1.class_id
-        left join tb_lib_vip t2 on t1.vip_id=t2.id
-        left join tb_user t3 on t2.user_id=t3.id
-        left join tb_lib_vip_service t4 on t2.id = t4.vip_id
-            where t.lib_id=#{map.libId}
-             and t1.status=1
-             and t2.stat=1
-        <if test="map.searchValue != null and map.searchValue != '' ">
-            and t2.child_name regexp #{map.searchValue}
-        </if>
-        <if test="map.startDate != null and map.startDate != '' ">
-            and to_days(t4.end_time) >= to_days(#{map.startDate})
-        </if>
-        <if test="map.endDate != null and map.endDate != '' ">
-            and to_days(#{map.endDate}) >= to_days(t4.end_time)
-        </if>
-        <if test="map.stat != null and map.stat != '' ">
-            and t4.stat=#{map.stat}
-        </if>
-        <if test="map.classId != null and map.classId != '' ">
-            and t.id=#{map.classId}
-        </if>
-        <if test="map.serviceType != null and map.serviceType != '' and map.serviceType=='S999'">
-            and t4.species='S999'
-        </if>
-        <if test="map.serviceType != null and map.serviceType != '' and map.serviceType!='S999'">
-            and t4.correct_type=#{map.serviceType}
-        </if>
-        group by t2.id
-    </select>
-
-    <select id="findServiceListByVipId" resultType="java.util.Map">
-         select  t.start_time,t.end_time,case when t.stat=1 then '有效' else '无效' end stat,
-         case when t.species='S999' then '内部用户' when t.correct_type=0 then '无服务' when  t.correct_type=1 then '平台服务(家长购买)'
-              when t.correct_type=2 then '校区服务' when t.correct_type=4 then '平台服务(机构购买)' when t.correct_type=0 then '服务已关闭' else '批改服务'
-              end as correct_type
-         from tb_lib_vip_service t
-         where t.vip_id=#{map.vipId} and t.species in ('S003', 'S999')
-        <if test="map.startDate != null and map.startDate != '' ">
-            and to_days(t.end_time) >= to_days(#{map.startDate})
-        </if>
-        <if test="map.endDate != null and map.endDate != '' ">
-            and to_days(#{map.endDate}) >= to_days(t.end_time)
-        </if>
-        <if test="map.stat != null and map.stat != '' ">
-            and t.stat=#{map.stat}
-        </if>
-        <if test="map.serviceType != null and map.serviceType != '' and map.serviceType=='S999'">
-            and t.species='S999'
-        </if>
-        <if test="map.serviceType != null and map.serviceType != '' and map.serviceType!='S999'">
-            and t.correct_type=#{map.serviceType}
-        </if>
-        order by t.end_time desc
-    </select>
-
-    <select id="findClassListBySys" resultType="java.util.Map">
-        select t1.id                             classId,
-               t1.class_name                     className,
-               (select count(distinct t2.vip_id)
-                from tb_class_student t2,
-                     tb_lib_subscribe ls
-                where t2.class_id = t1.id
-                  and t2.status = 1
-                  and ls.vip_id = t2.vip_id
-                  and to_days(ls.ryke_time) = to_days(now())
-                  and ls.lib_id = #{libId}
-                  and ls.stat = '1'
-                  and ls.flow_stat in ('3', '4')
-                  and t2.vip_id is not null)     signedStudentCount,
-               (select count(distinct t2.vip_id)
-                from tb_class_student t2,tb_lib_vip t3
-                where t2.vip_id = t3.id
-                  and t2.lib_id = t3.lib_id
-                  and t2.class_id = t1.id
-                  and t2.status = 1
-                  and t2.vip_id is not null)     studentSum,
-               (select count(distinct t3.teacher_id)
-                from tb_class_teacher t3
-                where t3.class_id = t1.id
-                  and t3.lib_id = t1.lib_id
-                  and t3.status = 1
-                  and exists(
-                        select t4.user_id
-                        from tb_lib_manager t4
-                        where t4.lib_id = t1.lib_id
-                          and t4.user_id = t3.teacher_id
-                          and t4.state = 1
-                          and t4.type in (2, 10, 15)
-                          and t4.is_cancelled = 0
-                    )
-                  and t3.teacher_id is not null) teacherSum
-        from tb_class t1
-        where t1.lib_id = #{libId}
-          and t1.status in (1, 2)
-        <if test="searchValue != null and searchValue != '' ">
-            and t1.class_name regexp #{searchValue}
-        </if>
-        <if test="teacherId != null and teacherId != '' ">
-            and t1.id in (
-                select class_id from tb_class_teacher where status = 1
-                and teacher_id=#{teacherId}
-            )
-        </if>
-        order by t1.status desc, t1.create_time
-    </select>
-
-    <select id="findCuratorTeacherListBySys" resultType="com.ssj.bean.conch.curator.dto.CuratorTeacherListDto">
-        select lm.user_id teacher_id, group_concat(distinct  lm.type) teacher_type_list, group_concat(distinct lm.course_name) subject,
-        lm.name,  lm.t_photo img_url, lm.telephone phone,count(distinct ct.class_id) as class_sum from tb_lib_manager lm
-        left join tb_class_teacher ct on ct.teacher_id=lm.user_id and lm.lib_id = ct.lib_id and ct.status = 1
-        where lm.type in
-        <foreach collection="types" open="(" item="type" separator="," close=")">
-            #{type}
-        </foreach>
-        <if test="searchKey != null and searchKey != '' ">
-            and lm.name regexp #{searchKey}
-        </if>
-        <if test="classId != null and classId != '' ">
-            and ct.class_id = #{classId}
-        </if>
-        and lm.state=1 and lm.lib_id=#{libId} and  lm.is_cancelled = 0
-        group by lm.user_id
-    </select>
-
-    <select id="allLibIndex" resultType="java.util.Map">
-        select count(1) as totolCount,count(if(t.subject='语文',true,null)) as chineseCount,count(if(t.subject='数学',true,null)) as shuxueCount,count(if(t.subject='英语',true,null)) as englishCount from
-        scon_homework_picture t
-        left join tb_lib_vip t1 on t.vip_id = t1.id
-        where t.is_delete = 0 and t1.lib_id is not null
-        <if test="queryDate != null and queryDate != '' ">
-            and t.create_time regexp #{queryDate}
-        </if>
-    </select>
-    <select id="searchHomeworkAllTop" resultType="java.util.Map">
-        SELECT sum(totolCount) as totolCount,a.lib_id,b.league_name from (
-            select count(1) as totolCount,t1.lib_id
-            from scon_homework_picture t
-            left join tb_lib_vip t1 on t.vip_id = t1.id
-            where is_delete = 0 and t1.lib_id is not null
-            <if test="startDate != null and startDate != '' ">
-                and t.create_time >= #{startDate}
-            </if>
-            <if test="endDate != null and endDate != '' ">
-                and #{endDate} >= t.create_time
-            </if>
-            <if test="subject != null and subject != '' ">
-                and t.subject = #{subject}
-            </if>
-            group  by t1.lib_id
-            order by totolCount desc)a join tb_lib_join b on a.lib_id = b.id
-            GROUP BY a.lib_id
-            order by totolCount desc
-    </select>
-    <select id="searchActiveTop" resultType="java.util.Map">
-        select  t2.league_name,t1.lib_id ,
-        (select count(1) from tb_lib_vip a where a.lib_id = t1.lib_id) as all_vips,
-        count(distinct  t.vip_id) as active_count
-        from scon_homework t
-        left join tb_lib_vip t1 on t.vip_id = t1.id
-        join tb_lib_join t2 on t1.lib_id = t2.id
-        where  t1.lib_id is not null
-        <if test="startDate != null and startDate != '' ">
-            and t.create_time >= #{startDate}
-        </if>
-        <if test="endDate != null and endDate != '' ">
-            and #{endDate} >= t.create_time
-        </if>
-        group  by t1.lib_id
-    </select>
-</mapper>

target/classes/mybatis/mapper/GameMapper.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.ssj.service.mapper.GameMapper">
-    <select id="findPage" resultType="com.ssj.service.conch.game.dto.RanklistDto">
-        select name, photo, sex, score
-        from tb_game_ranklist
-        where tb_game_ranklist.level > 0
-          and #{maxCreateTime} >= tb_game_ranklist.create_time
-        order by tb_game_ranklist.score desc
-    </select>
-
-    <select id="findHistory" resultType="com.ssj.service.conch.game.dto.HistoryDto">
-        select id gameRecordId, score, create_time
-        from tb_game_record
-        where user_id = #{userId}
-          and #{req.maxCreateTime} > create_time
-        order by create_time desc
-    </select>
-</mapper>

target/classes/mybatis/mapper/HomeworkMapper.xml

@@ -1,400 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.ssj.service.mapper.HomeworkMapper">
-    <update id="deleteWrongQuestionKnowledgeCount">
-        update scon_knowledge_wrong_question_count
-        set mastered = 1
-        where homework_id = #{homeworkId}
-          and how_detail_id = #{knowHowDetailId}
-          and knowledge_version = #{knowledgeVersion}
-    </update>
-
-    <update id="updateNeedUpdateWrongQuestionKnowledgeCount">
-        update scon_homework set scon_homework.need_update_wrong_question_knowledge_count = #{newNeedUpdateWrongQuestionKnowledgeCount}
-        where id in
-          <foreach collection="homeworkIdSet" open="(" item="homeworkId" separator="," close=")">
-              #{homeworkId}
-          </foreach>
-    </update>
-
-    <delete id="deleteWrongQuestionKnowledgeCountByHomeworkId">
-        delete kwqc from scon_knowledge_wrong_question_count kwqc
-        where kwqc.homework_id = #{homeworkId}
-    </delete>
-
-    <delete id="deleteWrongQuestionKnowledgeCountWhichNeedUpdate">
-        delete kwqc
-        from scon_knowledge_wrong_question_count kwqc, scon_homework h
-        where kwqc.homework_id = h.id and h.need_update_wrong_question_knowledge_count = 1
-    </delete>
-
-    <select id="findMinCreateTime" resultType="java.util.Date">
-        select min(create_time) from scon_homework
-    </select>
-
-    <select id="countHomeworkData" resultType="com.ssj.bean.sys.homework.domain.HomeworkCount">
-        select scon_homework.id                                                                               homework_id,
-               scon_homework.vip_id,
-               scon_homework.grade,
-               scon_homework.subject,
-               scon_homework.used_time,
-               scon_homework.create_time                                                                      homework_time,
-               sum(if(scon_homework_how_details.id is not null and scon_homework_how_details.wrong_question_id is null,
-                      ifnull(scon_homework_how_details.detail_count, 0), 0)) /
-               if(count(distinct kmt_homework_wrong_question.id) = 0, 1, count(distinct kmt_homework_wrong_question.id)) +
-               count(distinct if(kmt_homework_wrong_question.type = 1, kmt_homework_wrong_question.id, null)) wrong_count,
-               sum(if(scon_homework_how_details.id is not null and scon_homework_how_details.wrong_question_id is null,
-                      ifnull(scon_homework_how_details.total_count, 1), 0)) /
-               if(count(distinct kmt_homework_wrong_question.id) = 0, 1, count(distinct kmt_homework_wrong_question.id)) +
-               count(distinct kmt_homework_wrong_question.id)                                                 total_count
-        from scon_homework
-                 left join scon_homework_how_details on scon_homework_how_details.homework_id = scon_homework.id
-                 left join kmt_homework_wrong_question on kmt_homework_wrong_question.homework_id = scon_homework.id and
-                                                          kmt_homework_wrong_question.is_delete = 0
-        where scon_homework.create_time between #{beginDateTimeStr} and #{endDateTimeStr}
-        group by scon_homework.create_time, scon_homework.id
-    </select>
-
-    <select id="countHomeworkDataByHomeworkId" resultType="com.ssj.bean.sys.homework.domain.HomeworkCount">
-        select scon_homework.id                                                                               homework_id,
-               scon_homework.vip_id,
-               scon_homework.grade,
-               scon_homework.subject,
-               scon_homework.used_time,
-               scon_homework.create_time                                                                      homework_time,
-               sum(if(scon_homework_how_details.id is not null and scon_homework_how_details.wrong_question_id is null,
-                      ifnull(scon_homework_how_details.detail_count, 0), 0)) /
-               if(count(distinct kmt_homework_wrong_question.id) = 0, 1, count(distinct kmt_homework_wrong_question.id)) +
-               count(distinct if(kmt_homework_wrong_question.type = 1, kmt_homework_wrong_question.id, null)) wrong_count,
-               sum(if(scon_homework_how_details.id is not null and scon_homework_how_details.wrong_question_id is null,
-                      ifnull(scon_homework_how_details.total_count, 1), 0)) /
-               if(count(distinct kmt_homework_wrong_question.id) = 0, 1, count(distinct kmt_homework_wrong_question.id)) +
-               count(distinct kmt_homework_wrong_question.id)                                                 total_count
-        from scon_homework
-                 left join scon_homework_how_details on scon_homework_how_details.homework_id = scon_homework.id
-                 left join kmt_homework_wrong_question on kmt_homework_wrong_question.homework_id = scon_homework.id and
-                                                          kmt_homework_wrong_question.is_delete = 0
-        where scon_homework.id = #{homeworkId}
-        group by scon_homework.id
-    </select>
-
-    <select id="findHomeworkAccuracyRateList" resultType="com.ssj.service.conch.parents.dto.HomeworkAccuracyRateDto">
-        select scon_homework_count.homework_time date,
-               scon_homework_count.accuracy_rate rate,
-               scon_homework_count.wrong_count,
-               scon_homework_count.total_count
-        from scon_homework_count
-        where scon_homework_count.vip_id = #{vipId}
-          and scon_homework_count.homework_time > #{beginTimeStr}
-          and #{endTimeStr} > scon_homework_count.homework_time
-    </select>
-
-    <!--查询近七天的作业记录-->
-    <select id="findConchHomeworkRecord" resultType="com.ssj.bean.conch.conch.domain.HomeworkRecord">
-        select homework_id, subject, date(create_time) date, sum(if(is_feedback = 0 and is_mark in (0, 2), 1, 0)) not_corrected_count,
-               if(count(if(is_feedback = 1 or is_mark = 1 or is_mark = 3, 1, 0)) = sum(if(is_feedback = 1 or is_mark = 1 or is_mark = 3, 1, 0)), 5, 0) type,
-               min(file_key) homework_picture_url
-        from scon_homework_picture where vip_id=#{vipId}
-            and create_time between #{beginTime} and #{endTime}
-            and is_delete = 0
-        group by homework_id, subject, date
-        order by date desc
-    </select>
-
-    <!--查询某个作业记录-->
-    <select id="findOneConchHomeworkRecord" resultType="com.ssj.bean.conch.conch.domain.HomeworkRecord">
-        select homework_id, subject, date(create_time) date,
-               if(count(if(is_feedback = 1 or is_mark = 1 or is_mark = 3, 1, 0)) = sum(if(is_feedback = 1 or is_mark = 1 or is_mark = 3, 1, 0)), 5, 0) type,
-               min(file_key) homework_picture_url
-        from scon_homework_picture where homework_id=#{homeworkId}
-        group by homework_id, subject, date
-    </select>
-
-    <!--查询近两天待处理记录-->
-    <select id="findConchHandleTask" resultType="com.ssj.bean.conch.conch.domain.HomeworkRecord">
-        select id, file_key homework_picture_url, subject, homework_id, date(create_time) date, is_mark type from scon_homework_picture
-        where create_time between  #{beginTime} and #{endTime} and vip_id=#{vipId} and is_mark in (1, 3)
-    </select>
-
-    <select id="countMonthlyHomeworkData" resultType="com.ssj.bean.sys.homework.domain.HomeworkCount">
-        select vip_id,
-               homework_id,
-               grade,
-               ifnull(sum(used_time), 0)                              used_time,
-               count(distinct date_format(homework_time, '%Y-%m-%d')) homework_days,
-               ifnull(sum(wrong_count), 0)                            wrong_count,
-               ifnull(sum(total_count), 0)                            total_count
-        from scon_homework_count
-        where data_type = 1
-          and homework_time > #{beginDateTimeStr}
-          and #{endDateTimeStr} > homework_time
-        group by vip_id, grade
-    </select>
-
-    <select id="findByVipIdAndMonth" resultType="com.ssj.bean.sys.homework.domain.HomeworkCount">
-        select * from scon_homework_count where vip_id = #{vipId} and grade = #{grade} and data_type = 2 and homework_month = #{month}
-    </select>
-
-    <select id="findMinHomeworkMonth" resultType="java.lang.String">
-        select homework_month from scon_homework_count where data_type = 1 order by homework_time limit 1
-    </select>
-
-    <select id="findVipIdNeedPushWeeklyNotify" resultType="java.lang.String">
-        select vip_id
-        from scon_homework_count
-        where homework_time > #{beginDateTimeStr}
-          and #{endDateTimeStr} > homework_time
-          and data_type = 1
-        group by vip_id
-    </select>
-
-    <select id="findVipIdNeedPushMonthlyNotify" resultType="java.lang.String">
-        select vip_id from scon_homework_count where data_type = 2 and homework_month = #{month}
-    </select>
-
-    <select id="findByVipId" resultType="com.ssj.service.conch.conch.dto.RankDTO">
-        select user_name, img_url, ranking_num, rowno as `index`, vip_id
-        from (select a.child_name      as     user_name,
-                     a.img_url,
-                     a.vip_id,
-                     a.ranking_num,
-                     (@rowno := @rowno + 1) as rowno
-              from (select tb_lib_vip.child_name,
-                           tb_lib_vip.img_url,
-                           tb_lib_vip.id vip_id,
-                           scon_homework_ranking.ranking_num,
-                           scon_homework_ranking.update_time
-                    from scon_homework_ranking,
-                         tb_lib_vip
-                    where scon_homework_ranking.vip_id = tb_lib_vip.id) as a,
-                   (select @rowno := 0) as row
-              order by a.ranking_num desc, a.update_time desc) as temp
-        where temp.vip_id = #{vipId}
-    </select>
-
-    <!--查询批改老师作业列表的质检中状态-->
-    <select id="findHomeworkCheckStatus" resultType="com.ssj.bean.conch.conch.dto.HomeworkCheckStatusDto">
-        select hpc.homework_id, count(hpc.check_start_time) count_check_start_time, count(hpc.check_end_time) count_check_end_time, count(1) total_count
-        from scon_homework_picture_correct hpc, scon_homework_picture hp where hpc.homework_picture_id=hp.id
-        <if test="type == 8">
-            and hpc.type=8 and hp.teacher_id=#{teacherId}
-        </if>
-        <if test="type == 13">
-            and hpc.type=13 and hp.know_teacher_id=#{teacherId}
-        </if>
-        and hp.homework_id in
-        <foreach collection="homeworkIds" item="id" index="index" open="(" close=")" separator=",">
-            #{id}
-        </foreach>
-        group by hpc.homework_id
-    </select>
-
-    <select id="countWeeklyHomeworkData" resultType="com.ssj.bean.sys.homework.domain.StudentWeeklyReport">
-        select vip_id, subject, sum(wrong_count) wrong_count, sum(total_count) total_count
-        from scon_homework_count
-        where data_type = 1
-          and homework_time > #{beginDateTime}
-          and #{endDateTime} > homework_time
-        group by vip_id, subject
-    </select>
-
-    <select id="findWeeklyReportHistory" resultType="com.ssj.service.conch.parents.v2.dto.StudentWeeklyReportDTO">
-        select vip_id,
-               group_concat(subject)              subject_str,
-               group_concat(accuracy_rate)        accuracy_rate_str,
-               sum(total_knowledge_num)           total_knowledge_num,
-               sum(master_well_knowledge_num)     master_well_knowledge_num,
-               sum(master_infirmly_knowledge_num) master_infirmly_knowledge_num,
-               sum(not_mastered_knowledge_num)    not_mastered_knowledge_num,
-               begin_date begin_time,
-               end_date end_time
-        from scon_student_weekly_report
-        where vip_id = #{vipId}
-        group by vip_id, begin_date
-        order by begin_date desc
-        limit 30
-    </select>
-
-    <select id="findMonthlyReportHistory" resultType="com.ssj.service.conch.parents.v2.dto.MonthlyReportDTO">
-        select accuracy_rate learning_score,
-               homework_month,
-               transcended_student_proportion,
-               increased_score
-        from scon_homework_count
-        where data_type = 2
-          and vip_id = #{vipId}
-        order by homework_month desc
-        limit 12
-    </select>
-
-    <select id="countWrongQuestion" resultType="java.lang.Integer">
-        select count(*)
-        from scon_homework_how_details, scon_homework
-        where scon_homework_how_details.homework_id = scon_homework.id
-          and scon_homework_how_details.is_wrong_ques_delete = 0
-          <if test="type == 2">
-              and scon_homework_how_details.wrong_question_id is not null
-          </if>
-          <if test="type != 2">
-              and scon_homework_how_details.detail_count > 0
-          </if>
-          and scon_homework_how_details.how_detail_id in
-          <foreach collection="knowledgeIdList" open="(" item="knowledgeId" separator="," close=")">
-              #{knowledgeId}
-          </foreach>
-          and knowledge_version = #{version}
-          and scon_homework.vip_id = #{vipId}
-          <if test="beginDateTimeStr != ''">
-              and scon_homework.create_time > #{beginDateTimeStr}
-          </if>
-          <if test="endDateTimeStr != ''">
-              and #{endDateTimeStr} > scon_homework.create_time
-          </if>
-    </select>
-
-    <select id="findWrongQuestionId" resultType="java.lang.String">
-        <foreach collection="knowHowDetailList" open="" item="knowHowDetail" separator=" union " close="">
-            select distinct kmt_homework_wrong_question.question_id
-            from scon_homework,
-                 scon_homework_how_details,
-                 kmt_homework_wrong_question
-            where scon_homework.id = scon_homework_how_details.homework_id
-              and scon_homework_how_details.wrong_question_id = kmt_homework_wrong_question.id
-              and kmt_homework_wrong_question.is_delete = 0
-              and scon_homework.vip_id = #{vipId}
-              <if test="beginDateTimeStr != ''">
-                  and scon_homework.create_time > #{beginDateTimeStr}
-              </if>
-              <if test="endDateTimeStr != ''">
-                  and #{endDateTimeStr} > scon_homework.create_time
-              </if>
-              and scon_homework_how_details.how_detail_id = #{knowHowDetail.knowHowDetailId}
-              and scon_homework_how_details.knowledge_version = #{knowHowDetail.knowledgeVersion}
-        </foreach>
-    </select>
-
-    <select id="findWeeklyReportByVipIdAndSubjectAndBeginDate" resultType="com.ssj.bean.sys.homework.domain.StudentWeeklyReport">
-        select *
-        from scon_student_weekly_report
-        where vip_id = #{vipId}
-            and subject = #{subject}
-            and begin_date = #{beginDate}
-    </select>
-
-    <select id="findWrongQuestionHowDetailKdId" resultType="java.lang.String">
-        select kmt_exercise_question_know.how_details_kd_id
-        from kmt_exercise_question_know
-                 inner join (select kmt_homework_wrong_question.question_id
-                             from scon_homework,
-                                  scon_homework_how_details,
-                                  kmt_homework_wrong_question
-                             where scon_homework.id = scon_homework_how_details.homework_id
-                               and scon_homework_how_details.wrong_question_id = kmt_homework_wrong_question.id
-                               and scon_homework.vip_id = #{vipId}
-                               and scon_homework.create_time between #{beginTime} and #{endTime}
-                               and scon_homework_how_details.how_detail_id in
-                               <foreach collection="knowHowDetailIdSet" open="(" item="knowHowDetailId" separator="," close=")">
-                                   #{knowHowDetailId}
-                               </foreach>
-                               ) temp
-                            on kmt_exercise_question_know.question_id = temp.question_id
-                                and how_details_kd_id is not null
-    </select>
-
-    <select id="findMonthlyReport" resultType="com.ssj.bean.sys.homework.domain.HomeworkCount">
-        select * from scon_homework_count where data_type = 2
-    </select>
-
-    <select id="countWrongQuestionGroupByKnowledge" resultType="com.ssj.bean.sys.homework.domain.KnowledgeWrongQuestionCount">
-        select homework.id homework_id,
-               homework.vip_id,
-               homework.subject,
-               homework.create_time homework_time,
-               scon_homework_how_details.how_detail_id,
-               scon_homework_how_details.knowledge_version,
-               scon_homework_how_details.grade,
-               scon_homework_how_details.semester,
-               zyb_know_how_details_sort.module,
-               zyb_know_how_details_sort.two_module,
-               zyb_know_how_details_sort.alias knowledge_name,
-               count(distinct scon_homework_how_details.homework_picture_id) wrong_count,
-               count(distinct scon_homework_how_details.wrong_question_id) question_status,
-               scon_homework_how_details.is_wrong_ques_delete mastered
-        from (select id, vip_id, subject, create_time
-              from scon_homework
-              where
-                <choose>
-                    <when test="homeworkId != null and homeworkId != ''">
-                        id = #{homeworkId}
-                        limit 1
-                    </when>
-                    <otherwise>
-                        need_update_wrong_question_knowledge_count = 1
-                        limit #{pageSize}
-                    </otherwise>
-                </choose>
-              ) homework
-                 join scon_homework_how_details on homework.id = scon_homework_how_details.homework_id
-                 join zyb_know_how_details_sort
-                     on scon_homework_how_details.how_detail_id = zyb_know_how_details_sort.how_details_id
-                        and scon_homework_how_details.grade = zyb_know_how_details_sort.grade
-                        and scon_homework_how_details.semester = zyb_know_how_details_sort.semester
-                        and scon_homework_how_details.knowledge_version = zyb_know_how_details_sort.type
-                        and zyb_know_how_details_sort.stat = 2
-                        and zyb_know_how_details_sort.lib_id = 'SSJ'
-        where scon_homework_how_details.detail_count > 0
-        group by homework.vip_id, scon_homework_how_details.how_detail_id, scon_homework_how_details.knowledge_version,
-                 scon_homework_how_details.grade,
-                 scon_homework_how_details.semester
-    </select>
-
-    <!--单科批改详情作业图片列表-->
-    <select id="findHomeworkCorrectDetailByHomeworkId" resultType="com.ssj.bean.sys.homework.domain.HomeworkPicture">
-        select id, file_key, is_feedback, is_mark, teacher_id, corrected_picture_url, is_composition,homework_comment, create_time from scon_homework_picture
-        where homework_id=#{homeworkId} AND is_delete=0 ORDER BY create_time ASC
-    </select>
-
-    <select id="countOthersAndAccuracyRateLessThan" resultType="java.util.Map">
-        select sum(if(#{accuracyRate} > others.accuracy_rate, 1, 0)) accuracyRateLessThanCount, count(*) othersCount
-        from scon_homework_count others
-        where others.homework_month = #{targetMonthStr}
-          and others.data_type = 2
-          and others.vip_id &lt;> #{vipId}
-          and others.grade = #{grade}
-    </select>
-
-    <select id="findMonthlyReportByMonth" resultType="com.ssj.bean.sys.homework.domain.HomeworkCount">
-        select * from scon_homework_count where data_type = 2
-            <if test="targetMonthStr != null and targetMonthStr.length > 0">
-                and homework_month = #{targetMonthStr}
-            </if>
-    </select>
-
-    <select id="findWrongQuestionKnowledgeCount" resultType="com.ssj.bean.sys.homework.domain.KnowledgeWrongQuestionCount">
-        select * from scon_knowledge_wrong_question_count where 1 > question_status
-    </select>
-
-    <select id="findHomeworkInfoYesterday" resultType="java.util.Map">
-        select homework.vip_id, homework.subject, homework.grade
-        from (select vip_id, subject, grade
-              from scon_homework
-              where scon_homework.create_time > #{yesterdayDate}) homework
-                 join tb_lib_vip on homework.vip_id = tb_lib_vip.id and tb_lib_vip.stat = '1'
-    </select>
-
-    <!--查询没有作业采集到的知识点-->
-    <select id="findNoLearnKnowledgeList" resultType="java.lang.String">
-        select detail.how_details_id from scon_homework_how_details t1
-            left join scon_homework h on t1.homework_id=h.id
-            right join zyb_know_how_details_sort detail
-            on t1.how_detail_id=detail.how_details_id and t1.grade=detail.grade
-            and t1.semester=2 and t1.knowledge_version=detail.type and h.vip_id=#{vipId}
-        where detail.stat=2 and detail.grade=#{grade} and detail.course_name=#{subject} and detail.semester=#{semester}
-         and detail.type=#{versionType} and t1.id is null
-    </select>
-
-    <select id="findStudentTermTrainDetailIdByVipId" resultType="com.ssj.bean.conch.conch.domain.SconStudentTermtainData">
-        select * from scon_student_termtain_data where vip_id=#{vipId} and type=#{type} and storage_data_type = 0
-    </select>
-
-</mapper>

target/classes/mybatis/mapper/KmtKnowledgeMapper.xml

@@ -1,259 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.ssj.mapper.knowledge.KmtKnowledgeMapper">
-    <select id="findByHowDetailIdAndTypeAndGradeAndSemester" resultType="com.ssj.bean.weixin.zyb.domain.ZuoybKnowHowDetailsSort">
-      select * from zyb_know_how_details_sort khds where khds.how_details_id in
-      <foreach collection="howDetailIds" index="i" item="id" open="(" close=")" separator=",">
-          #{id}
-      </foreach>
-       and grade=#{grade} and semester = #{semester} and type=#{type} and lib_id='SSJ'
-  </select>
-
-    <select id="findHowDetailsSortByHowDetailIdAndType" resultType="com.ssj.bean.weixin.zyb.domain.ZuoybKnowHowDetailsSort">
-        select * from zyb_know_how_details_sort where how_details_id = #{howDetailId} and type = #{type} and stat = 2 and lib_id = 'SSJ'
-    </select>
-
-    <select id="findHowSortByHowIdAndType" resultType="com.ssj.bean.weixin.zyb.domain.ZuoybKnowHowDetailsSort">
-        select * from zyb_know_how_details_sort where how_id = #{howId} and type = #{type} and stat = 1 and lib_id = 'SSJ'
-    </select>
-
-    <select id="findKnowledgeInfoByHowDetailIdAndType" resultType="java.util.Map">
-        select detailSort.how_details_id,
-               howSort.alias how_name,
-               detailSort.alias knowledge_name,
-               if(detailSort.course_name = '英语', detailSort.module, detailSort.two_module) module
-        from zyb_know_how_details_sort detailSort,
-             zyb_know_how_details_sort howSort
-        where detailSort.how_id = howSort.how_id
-          and howSort.type = detailSort.type
-          and howSort.stat = 1
-          and detailSort.how_details_id in
-          <foreach collection="howDetailIdSet" open="(" item="howDetailId" separator="," close=")">
-              #{howDetailId}
-          </foreach>
-          and detailSort.type = #{type}
-          and detailSort.stat = 2
-    </select>
-
-    <select id="findKnowledgeListByModule" resultType="com.ssj.service.conch.parents.v2.dto.WrongBookKnowledgeDTO2">
-        select group_concat(how_details_id) know_how_detail_id_str,
-               alias knowledge_alias,
-               0 wrong_question_sum,
-               group_concat(#{version}) knowledge_version_str
-        from zyb_know_how_details_sort
-        where course_name = #{subject}
-          and grade = #{grade}
-          and semester = #{semester}
-          and type = #{version}
-          <if test="subject == '英语'">
-              and module = #{module}
-          </if>
-          <if test="subject == '语文' || subject == '数学'">
-              and two_module = #{module}
-          </if>
-        group by alias
-    </select>
-
-    <!--查询知识点列表-->
-    <select id="findKmtKnowledgeByGradeCourseNameTypeSemester" resultType="com.ssj.bean.kmt.kmt.model.KmtKnowledgeModel">
-        select t1.id know_how_id,
-		       if(t3.is_zt = 1, concat('专题：', t1.alias), t1.alias) know_how_name,
-		       t2.id know_how_details_id,
-		       t2.alias          know_how_details_name,
-		       t4.id how_details_kd_id,
-		       t4.alias know_how_details_kd_name
-		from zyb_know_how_details_sort t1
-                   left join zyb_know_how_details_sort t2 on t1.how_id = t2.how_id  and t2.stat = 2
-                   and t2.grade = #{grade}
-                   and t2.course_name = #{courseName}
-                   and t2.type = #{versionType}
-                   and t2.semester = #{semester}
-                   and t2.lib_id = 'SSJ'
-                   join zyb_know_how_details t3 on t2.how_details_id = t3.id
-        left join zyb_know_how_details_sort t4 on t2.how_details_id = t4.how_details_id and t4.stat = 3
-                   and t4.grade = #{grade}
-                   and t4.course_name = #{courseName}
-                   and t4.type = #{versionType}
-                   and t4.semester = #{semester}
-                   and t4.lib_id = 'SSJ'
-            where t1.stat = 1
-              and t1.grade = #{grade}
-              and t1.course_name = #{courseName}
-              and t1.type = #{versionType}
-              and t1.semester = #{semester}
-              and t1.lib_id = 'SSJ'
-        <if test="searchKey != null and searchKey != ''">
-            and t2.alias REGEXP #{searchKey}
-        </if>
-        <if test="courseName != '数学' and moduleType != null">
-          and t3.is_zt = #{moduleType}
-        </if>
-        order by t3.is_zt, t1.num, t1.create_time, t2.num, t3.num, t4.num
-    </select>
-
-    <!--查询知识点下的考点-->
-    <select id="findDetailsListWithKd" resultType="com.ssj.bean.kmt.kmt.model.KmtKnowledgeModel">
-        select kd.id how_details_kd_id, kd.alias know_how_details_kd_name, detail.id know_how_details_id, detail.alias know_how_details_name,
-        detail.grade, detail.type, detail.semester, detail.course_name
-        from zyb_know_how_details_sort detail
-        left join zyb_know_how_details_sort kd on kd.how_details_id=detail.how_details_id and kd.stat=3
-        and kd.type=detail.type and kd.semester=detail.semester and kd.grade=detail.grade and kd.course_name=detail.course_name
-        where detail.id in
-        <foreach collection="detailIds" open="(" item="id" separator="," close=")">
-            #{id}
-        </foreach>
-        order by detail.num, kd.num
-    </select>
-
-    <select id="findAllModule" resultType="java.util.Map">
-        select
-               <if test="subject == '语文' || subject == '数学'">
-                   two_module real_module,
-               </if>
-               <if test="subject == '英语'">
-                   module real_module,
-               </if>
-               group_concat(how_details_id) how_details_id_str
-        from zyb_know_how_details_sort
-        where stat = 2
-          and grade = #{grade}
-          and semester = #{semester}
-          and course_name = #{subject}
-          and type = #{version}
-        group by real_module
-    </select>
-
-    <select id="findKnowledgeInfoByHowDetailIdAndTypeAndGradeAndSemester" resultType="java.util.Map">
-        select detailSort.how_details_id,
-               howSort.alias how_name,
-               detailSort.alias knowledge_name,
-               if(detailSort.course_name = '英语', detailSort.module, detailSort.two_module) module
-        from zyb_know_how_details_sort detailSort,
-             zyb_know_how_details_sort howSort
-        where detailSort.how_id = howSort.how_id
-              and howSort.type = detailSort.type
-              and howSort.stat = 1
-              and howSort.grade = #{grade}
-              and howSort.semester = #{semester}
-              and detailSort.how_details_id = #{howDetailId}
-              and detailSort.type = #{version}
-              and detailSort.stat = 2
-              and detailSort.grade = #{grade}
-              and detailSort.semester = #{semester}
-              and detailSort.lib_id = 'SSJ'
-        limit 1
-    </select>
-
-    <select id="countKnowledgeWrongAndTotalQuestion" resultType="java.util.Map">
-        select
-            scon_homework_how_details.how_detail_id,
-            ifnull(sum(scon_homework_how_details.detail_count), 0) wrong_count,
-            ifnull(sum(scon_homework_how_details.total_count), 0)  total_count
-        from
-            (select id
-             from scon_homework
-             where vip_id = #{vipId} and subject = #{subject} and grade = #{grade}
-                   <if test="homeworkDate != ''">
-                       and date(create_time) = #{homeworkDate}
-                   </if>
-                   and date(now()) > create_time
-                   and date_format(create_time, '%m-%d')
-                   <if test="semester == 1"> not </if> between '02-15' and '08-01') homework
-            join scon_homework_how_details
-                on scon_homework_how_details.homework_id = homework.id
-                   and scon_homework_how_details.how_detail_id in
-                   <foreach collection="knowledgeIdList" open="(" item="knowledgeId" separator="," close=")">
-                       #{knowledgeId}
-                   </foreach>
-                   and scon_homework_how_details.grade = #{grade}
-                   and scon_homework_how_details.semester = #{semester}
-                   and scon_homework_how_details.knowledge_version = #{version}
-        group by scon_homework_how_details.how_detail_id
-    </select>
-
-    <select id="countKnowledgeRightQuestionWithExercise" resultType="java.util.Map">
-        select questionKnow.how_details_id,
-               count(distinct questionKnow.homework_id, questionKnow.question_id) right_count
-        from (select
-                  question.question_id,
-                  question.homework_id,
-                  kmt_exercise_question_know.how_details_id,
-                  kmt_exercise_question_know.how_detail_sort_id
-              from (select kmt_homework_wrong_question.question_id,
-                           kmt_homework_wrong_question.homework_id
-                    from
-                        (select id
-                         from scon_homework
-                         where vip_id = #{vipId} and subject = #{subject} and grade = #{grade}
-                         <if test="homeworkDate != ''">
-                             and date(create_time) = #{homeworkDate}
-                         </if>
-                         and date(now()) > create_time
-                         and date_format(create_time, '%m-%d')
-                         <if test="semester == 1"> not </if> between '02-15' and '08-01') homework
-                        join kmt_homework_wrong_question
-                            on kmt_homework_wrong_question.homework_id = homework.id and
-                               kmt_homework_wrong_question.type = 2) question
-                  join kmt_exercise_question_know
-                      on question.question_id = kmt_exercise_question_know.question_id
-                         and kmt_exercise_question_know.how_details_id in
-                         <foreach collection="knowledgeIdList" open="(" item="knowledgeId" separator="," close=")">
-                             #{knowledgeId}
-                         </foreach>
-             ) questionKnow
-            join zyb_know_how_details_sort
-                on questionKnow.how_detail_sort_id = zyb_know_how_details_sort.id
-                   and zyb_know_how_details_sort.course_name = #{subject}
-                   and zyb_know_how_details_sort.grade = #{grade}
-                   and zyb_know_how_details_sort.semester = #{semester}
-                   and zyb_know_how_details_sort.type = #{version}
-        group by questionKnow.how_details_id
-    </select>
-
-    <select id="findKnowHowDetailsSortMap" resultType="java.util.Map">
-        select knowHowDetail.id, knowHowDetail.how_details_id, knowHowDetail.how_id, knowHowDetail.type,
-               knowHowDetail.course_name, knowHowDetail.grade, knowHowDetail.grade_num, knowHowDetail.semester,
-               knowHowDetail.num, knowHowDetail.lib_id,
-               date_format(knowHowDetail.create_time, '%Y-%m-%dT%H:%i:%s.000Z')        create_time,
-               ifnull(knowHow.alias, '') unit_name,
-               ifnull(knowHow.num, 0) unit_num,
-               knowHowDetail.how_details_kd_id, knowHowDetail.stat, knowHowDetail.alias,
-               knowHowDetail.before_how_details_kd_id, knowHowDetail.memorize, knowHowDetail.understanding,
-               knowHowDetail.apply, knowHowDetail.two_module, knowHowDetail.module, knowHowDetail.jxmb,
-               knowHowDetail.zdbx, knowHowDetail.ydsl, knowHowDetail.attr_type,
-               0 question_status
-        from zyb_know_how_details_sort knowHowDetail, zyb_know_how_details_sort knowHow
-        where knowHow.how_id = knowHowDetail.how_id
-          and knowHow.grade = knowHowDetail.grade
-          and knowHow.semester = knowHowDetail.semester
-          and knowHow.type = knowHowDetail.type
-          and knowHow.stat = 1
-          and knowHowDetail.stat = 2
-          and knowHowDetail.lib_id = 'SSJ'
-          and knowHowDetail.how_details_id is not null
-        limit #{offset}, #{pageSize}
-    </select>
-
-    <select id="countExerciseQuestionKnow" resultType="java.lang.Integer">
-        select count(*)
-        from (select question_id from kmt_exercise_question_know where how_details_id = #{howDetailsId}) eqk
-                 join kmt_exercise_questions eq
-                      on eqk.question_id = eq.id and eq.book_id is not null and (eq.deal_status in (4, 5) or eq.deal_status > 7)
-                          and (eq.real_exam_type is null or eq.real_exam_type &lt;> '4')
-    </select>
-
-    <select id="findKnowledgeIdAndNameAndModule" resultType="java.util.Map">
-        select how_details_id, alias,
-            <if test="subject == '语文' || subject == '数学'">
-                two_module module
-            </if>
-            <if test="subject == '英语'">
-                module
-            </if>
-        from zyb_know_how_details_sort
-        where stat = 2 and lib_id = 'SSJ' and course_name = #{subject} and grade = #{grade}
-              and semester = #{semester} and type = #{version}
-        limit 1000
-    </select>
-
-</mapper>

target/classes/mybatis/mapper/KmtQualityQuestionsMapper.xml

@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.ssj.service.mapper.KmtQualityQuestionsMapper">
-
-    <!--查询搜索的题目-->
-    <select id="findKmtQuestionsById" resultType="com.ssj.service.kmt.dto.ExerciseQuetionDto">
-        select eq.id question_id, eq.course_name, eq.handle_user_id, eq.auditing_user_id, eq.analysis_user_id, eq.analysis_auditer_id, eq.book_course_id course_id,
-        eq.big_question_index, eq.num small_question_index, eq.question,eq.question_text, eq.option_answer answer,
-        eq.answer_json, eq.deal_status question_status, eq.create_time, eq.remark reason, eq.from_user_id, eq.to_user_id, eq.analysis question_analysis,
-        eq.analysis_json, eq.question_type question_types, eq.difficulty_level difficulty_levels, eq.real_exam_type real_exam_types,
-        eq.training_skill training_skills, parent_id, image question_image, eq.update_type, qqc.begin_year, qqc.end_year
-        from kmt_quality_questions eq
-        left join kmt_quality_question_comment qqc on eq.id=qqc.question_id
-        where (eq.id=#{questionId} or eq.parent_id=#{questionId}) and eq.question_class_type in (0, 2) and eq.book_id is null
-        <choose>
-            <when test="dealType == 1">
-                and eq.handle_user_id = #{userId} and eq.deal_status &lt; 2
-            </when>
-            <when test="dealType == 2">
-                and eq.auditing_user_id = #{userId} and eq.deal_status in (3, 7)
-            </when>
-            <otherwise>
-                and eq.deal_status != 6
-            </otherwise>
-        </choose>
-        order by eq.num
-    </select>
-
-    <!--查询大题-->
-    <select id="findBigQuestionById"  resultType="com.ssj.service.kmt.dto.ExerciseQuetionDto">
-        select eq.id question_id, eq.course_name, eq.handle_user_id, eq.auditing_user_id, eq.analysis_user_id, eq.analysis_auditer_id, eq.book_course_id course_id,
-        eq.big_question_index, eq.small_question_name small_question_index, eq.question,eq.question_text, eq.option_answer answer,
-        eq.answer_json, eq.deal_status question_status, eq.create_time, eq.remark reason, eq.analysis question_analysis,
-        eq.analysis_json, eq.question_type question_types, eq.difficulty_level difficulty_levels, eq.real_exam_type real_exam_types,
-        eq.training_skill training_skills, eq.parent_id, image question_image,eq.update_type, qqc.begin_year, qqc.end_year
-        from kmt_quality_questions eq
-        left join kmt_quality_question_comment qqc on eq.id=qqc.question_id
-        where eq.id = #{id}
-    </select>
-
-    <select id="findData2EsByQuestionList" resultType="java.util.Map">
-        select k.id,
-        k.question_id,
-        k.how_details_id,
-        k.how_details_kd_id,
-        k.how_detail_sort_id,
-        k.how_detail_kd_sort_id,
-        k.version,
-        date_format(k.create_time, '%Y-%m-%dT%H:%i:%s.000Z')        create_time,
-        book_id,
-        unit_id,
-        book_course_id,
-        question,
-        question_type,
-        option_answer,
-        source,
-        big_question_index,
-        date_format(analysis_submit_time, '%Y-%m-%dT%H:%i:%s.000Z') analysis_submit_time,
-        page_index,
-        image,
-        precision_percent,
-        auditing_user_id,
-        handle_user_id,
-        deal_status,
-        remark,
-        analysis_submit_type,
-        answer_image,
-        t.num,
-        small_question_name,
-        question_text,
-        option_answer_text,
-        ifnull(parent_id, '') parent_id,
-        big_name,
-        analysis,
-        question_json,
-        answer_json,
-        real_exam_type,
-        date_format(publish_time, '%Y-%m-%dT%H:%i:%s.000Z')         publish_time,
-        update_type,
-        analysis_user_id,
-        ifnull(difficulty_level, 0) difficulty_level,
-        t.course_name,
-        training_skill,
-        analysis_json,
-        concise_id,
-        analysis_auditer_id,
-        date_format(handler_submit_time, '%Y-%m-%dT%H:%i:%s.000Z')         handler_submit_time,
-        date_format(analysis_handler_submit_time, '%Y-%m-%dT%H:%i:%s.000Z')         analysis_handler_submit_time,
-        question_class_type,
-        ifnull(khds.alias, '') knowledge_name,
-        khds.course_name,
-        khds.semester,
-        khds.grade,
-        date_format(t.repulse_time, '%Y-%m-%dT%H:%i:%s.000Z')        repulse_time,
-        qqc.begin_year,
-        qqc.end_year
-        from (select *
-        from kmt_quality_question_know
-        where question_id in
-        <foreach collection="questionIdList" open="(" item="questionId" separator="," close=")">
-            #{questionId}
-        </foreach>
-        limit 1000) k join kmt_quality_questions t on k.question_id = t.id
-        left join kmt_quality_question_comment qqc on t.id =  qqc.question_id
-        left join zyb_know_how_details_sort khds on k.how_detail_sort_id = khds.id
-    </select>
-
-    <select id="findQuestionByParentId" resultType="com.ssj.bean.kmt.kmt.domain.KmtQualityQuestions">
-        select * from kmt_quality_questions where (id in
-        <foreach collection="parentIds" open="(" item="id" separator="," close=")">
-            #{id}
-        </foreach>or parent_id in
-        <foreach collection="parentIds" open="(" item="id" separator="," close=")">
-            #{id}
-        </foreach>
-        ) and deal_status != 6
-        order by num
-        limit 2000
-    </select>
-
-    <select id="findQualityQuestionKnowByQuestionId" resultType="com.ssj.bean.kmt.kmt.domain.KmtQualityQuestionKnow">
-        select * from kmt_quality_question_know where question_id=#{questionId}
-    </select>
-
-</mapper>

target/classes/mybatis/mapper/KmtQuestionMapper.xml

@@ -1,530 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.ssj.service.mapper.KmtQuestionMapper">
-    <update id="updateEsLoadStatus">
-        update kmt_question_know set es_loaded = #{newEsLoaded}
-        where id in
-            <foreach collection="kmtQuestionKnowIdList" open="(" item="kmtQuestionKnowId" separator="," close=")">
-                #{kmtQuestionKnowId}
-            </foreach>
-    </update>
-
-    <select id="findTrainRecommendQuestion" resultType="java.util.Map">
-        (select kmt_question.id, kmt_question.parent_id, kmt_question.question, kmt_question.easy difficulty
-         from kmt_question,
-              kmt_question_know
-         where kmt_question.id = kmt_question_know.question_id
-           and kmt_question_know.how_details_id in
-           <foreach collection="knowHowDetailIdSet" open="(" item="howDetailsId" separator="," close=")">
-               #{howDetailsId}
-           </foreach>
-           <if test="excludeQuestionIdSet.size() > 0">
-               and kmt_question.id not in
-               <foreach collection="excludeQuestionIdSet" open="(" item="questionId" separator="," close=")">
-                   #{questionId}
-               </foreach>
-           </if>
-           and kmt_question.easy = 1
-           and ((1 > ifnull(length(kmt_question.parent_id), 0)
-             and not exists(select id from kmt_question temp where kmt_question.id = temp.parent_id)) or
-             (ifnull(length(kmt_question.parent_id), 0) > 0))
-         group by kmt_question.id
-         order by rand()
-         <if test="type == 1">
-             limit 2
-         </if>
-         <if test="type == 2">
-             limit 1
-         </if>
-        )
-        union all
-        (select kmt_question.id, kmt_question.parent_id, kmt_question.question, kmt_question.easy difficulty
-         from kmt_question,
-              kmt_question_know
-         where kmt_question.id = kmt_question_know.question_id
-           and kmt_question_know.how_details_id in
-           <foreach collection="knowHowDetailIdSet" open="(" item="howDetailsId" separator="," close=")">
-               #{howDetailsId}
-           </foreach>
-           <if test="excludeQuestionIdSet.size() > 0">
-               and kmt_question.id not in
-               <foreach collection="excludeQuestionIdSet" open="(" item="questionId" separator="," close=")">
-                   #{questionId}
-               </foreach>
-           </if>
-           and kmt_question.easy = 2
-           and ((1 > ifnull(length(kmt_question.parent_id), 0)
-             and not exists(select id from kmt_question temp where kmt_question.id = temp.parent_id)) or
-             (ifnull(length(kmt_question.parent_id), 0) > 0))
-         group by kmt_question.id
-         order by rand()
-         limit 1)
-        <if test="type == 2">
-            union all
-            (select kmt_question.id, kmt_question.parent_id, kmt_question.question, kmt_question.easy difficulty
-             from kmt_question,
-                  kmt_question_know
-             where kmt_question.id = kmt_question_know.question_id
-               and kmt_question_know.how_details_id in
-               <foreach collection="knowHowDetailIdSet" open="(" item="howDetailsId" separator="," close=")">
-                   #{howDetailsId}
-               </foreach>
-               <if test="excludeQuestionIdSet.size() > 0">
-                   and kmt_question.id not in
-                   <foreach collection="excludeQuestionIdSet" open="(" item="questionId" separator="," close=")">
-                       #{questionId}
-                   </foreach>
-               </if>
-               and kmt_question.easy = 3
-               and ((1 > ifnull(length(kmt_question.parent_id), 0)
-                 and not exists(select id from kmt_question temp where kmt_question.id = temp.parent_id)) or
-                 (ifnull(length(kmt_question.parent_id), 0) > 0))
-             group by kmt_question.id
-             order by rand()
-             limit 1)
-        </if>
-    </select>
-
-    <select id="findFullQuestion" resultType="java.util.Map">
-        select kmt_question.id, kmt_question.parent_id, kmt_question.question, kmt_question.option_content, kmt_question.easy difficulty
-        from kmt_question
-        where kmt_question.id = #{parentId}
-           or kmt_question.parent_id = #{parentId}
-        order by kmt_question.num
-    </select>
-
-    <select id="countTrainRecommendQuestionV2" resultType="java.util.Map">
-        <if test="recommendNumMap.easyNum > 0">
-            (select count(distinct kmt_question.id) easy_num, 0 middle_num, 0 difficult_num
-             from kmt_question,
-                  kmt_question_know
-             where kmt_question.id = kmt_question_know.question_id
-               and kmt_question_know.how_details_id in
-               <foreach collection="knowHowDetailIdSet" open="(" item="howDetailsId" separator="," close=")">
-                   #{howDetailsId}
-               </foreach>
-               <if test="excludeQuestionIdSet.size() > 0">
-                   and kmt_question.id not in
-                   <foreach collection="excludeQuestionIdSet" open="(" item="questionId" separator="," close=")">
-                       #{questionId}
-                   </foreach>
-               </if>
-               and kmt_question.easy = 1
-               and kmt_question.state = 1
-               and kmt_question.type = #{recommendNumMap.type}
-               and ((1 > ifnull(length(kmt_question.parent_id), 0)
-                 and not exists(select id from kmt_question temp where kmt_question.id = temp.parent_id)) or
-                 (ifnull(length(kmt_question.parent_id), 0) > 0))
-            )
-        </if>
-        <if test="recommendNumMap.middleNum > 0">
-            <if test="recommendNumMap.easyNum > 0">
-                union all
-            </if>
-            (select 0 easy_num, count(distinct kmt_question.id) middle_num, 0 difficult_num
-             from kmt_question,
-                  kmt_question_know
-             where kmt_question.id = kmt_question_know.question_id
-               and kmt_question_know.how_details_id in
-               <foreach collection="knowHowDetailIdSet" open="(" item="howDetailsId" separator="," close=")">
-                   #{howDetailsId}
-               </foreach>
-               <if test="excludeQuestionIdSet.size() > 0">
-                   and kmt_question.id not in
-                   <foreach collection="excludeQuestionIdSet" open="(" item="questionId" separator="," close=")">
-                       #{questionId}
-                   </foreach>
-               </if>
-               and kmt_question.easy = 2
-               and kmt_question.state = 1
-               and kmt_question.type = #{recommendNumMap.type}
-               and ((1 > ifnull(length(kmt_question.parent_id), 0)
-                 and not exists(select id from kmt_question temp where kmt_question.id = temp.parent_id)) or
-                 (ifnull(length(kmt_question.parent_id), 0) > 0)))
-        </if>
-        <if test="recommendNumMap.difficultNum > 0">
-            <if test="recommendNumMap.easyNum > 0 or recommendNumMap.middleNum > 0">
-                union all
-            </if>
-            (select 0 easy_num, 0 middle_num, count(distinct kmt_question.id) difficult_num
-             from kmt_question,
-                  kmt_question_know
-             where kmt_question.id = kmt_question_know.question_id
-               and kmt_question_know.how_details_id in
-               <foreach collection="knowHowDetailIdSet" open="(" item="howDetailsId" separator="," close=")">
-                   #{howDetailsId}
-               </foreach>
-               <if test="excludeQuestionIdSet.size() > 0">
-                   and kmt_question.id not in
-                   <foreach collection="excludeQuestionIdSet" open="(" item="questionId" separator="," close=")">
-                       #{questionId}
-                   </foreach>
-               </if>
-               and kmt_question.easy = 3
-               and kmt_question.state = 1
-               and kmt_question.type = #{recommendNumMap.type}
-               and ((1 > ifnull(length(kmt_question.parent_id), 0)
-                 and not exists(select id from kmt_question temp where kmt_question.id = temp.parent_id)) or
-                 (ifnull(length(kmt_question.parent_id), 0) > 0)))
-        </if>
-    </select>
-
-    <select id="findTrainRecommendQuestionV2" resultType="java.util.Map">
-        <if test="recommendNumMap.easyLimitOffset > -1 and recommendNumMap.easyNum > 0">
-            (select kmt_question.id, kmt_question.parent_id, kmt_question.question, kmt_question.option_content, kmt_question.easy difficulty, kmt_question.option_type option_type_int
-             from kmt_question,
-                  kmt_question_know
-             where kmt_question.id = kmt_question_know.question_id
-               and kmt_question_know.how_details_id in
-               <foreach collection="knowHowDetailIdSet" open="(" item="howDetailsId" separator="," close=")">
-                   #{howDetailsId}
-               </foreach>
-               <if test="excludeQuestionIdSet.size() > 0">
-                   and kmt_question.id not in
-                   <foreach collection="excludeQuestionIdSet" open="(" item="questionId" separator="," close=")">
-                       #{questionId}
-                   </foreach>
-               </if>
-               and kmt_question.state = 1
-               and kmt_question.easy = 1
-               and kmt_question.type = #{recommendNumMap.type}
-               and ((1 > ifnull(length(kmt_question.parent_id), 0)
-                 and not exists(select id from kmt_question temp where kmt_question.id = temp.parent_id)) or
-                 (ifnull(length(kmt_question.parent_id), 0) > 0))
-             limit #{recommendNumMap.easyLimitOffset}, #{recommendNumMap.easyNum}
-            )
-        </if>
-        <if test="recommendNumMap.middleLimitOffset > -1 and recommendNumMap.middleNum > 0">
-            <if test="recommendNumMap.easyLimitOffset > -1">
-                union all
-            </if>
-            (select kmt_question.id, kmt_question.parent_id, kmt_question.question, kmt_question.option_content, kmt_question.easy difficulty, kmt_question.option_type option_type_int
-             from kmt_question,
-                  kmt_question_know
-             where kmt_question.id = kmt_question_know.question_id
-               and kmt_question_know.how_details_id in
-               <foreach collection="knowHowDetailIdSet" open="(" item="howDetailsId" separator="," close=")">
-                   #{howDetailsId}
-               </foreach>
-               <if test="excludeQuestionIdSet.size() > 0">
-                   and kmt_question.id not in
-                   <foreach collection="excludeQuestionIdSet" open="(" item="questionId" separator="," close=")">
-                       #{questionId}
-                   </foreach>
-               </if>
-               and kmt_question.state = 1
-               and kmt_question.easy = 2
-               and kmt_question.type = #{recommendNumMap.type}
-               and ((1 > ifnull(length(kmt_question.parent_id), 0)
-                 and not exists(select id from kmt_question temp where kmt_question.id = temp.parent_id)) or
-                 (ifnull(length(kmt_question.parent_id), 0) > 0))
-             limit #{recommendNumMap.middleLimitOffset}, #{recommendNumMap.middleNum})
-        </if>
-        <if test="recommendNumMap.difficultLimitOffset > -1 and recommendNumMap.difficultNum > 0">
-            <if test="recommendNumMap.easyLimitOffset > -1 or recommendNumMap.middleLimitOffset > -1">
-                union all
-            </if>
-            (select kmt_question.id, kmt_question.parent_id, kmt_question.question, kmt_question.option_content, kmt_question.easy difficulty, kmt_question.option_type option_type_int
-             from kmt_question,
-                  kmt_question_know
-             where kmt_question.id = kmt_question_know.question_id
-               and kmt_question_know.how_details_id in
-               <foreach collection="knowHowDetailIdSet" open="(" item="howDetailsId" separator="," close=")">
-                   #{howDetailsId}
-               </foreach>
-               <if test="excludeQuestionIdSet.size() > 0">
-                   and kmt_question.id not in
-                   <foreach collection="excludeQuestionIdSet" open="(" item="questionId" separator="," close=")">
-                       #{questionId}
-                   </foreach>
-               </if>
-               and kmt_question.state = 1
-               and kmt_question.easy = 3
-               and kmt_question.type = #{recommendNumMap.type}
-               and ((1 > ifnull(length(kmt_question.parent_id), 0)
-                 and not exists(select id from kmt_question temp where kmt_question.id = temp.parent_id)) or
-                 (ifnull(length(kmt_question.parent_id), 0) > 0))
-             limit #{recommendNumMap.difficultLimitOffset}, #{recommendNumMap.difficultNum})
-        </if>
-    </select>
-
-    <!--查询知识点对应的题目，知识点命中数量越多，排序越靠前-->
-    <select id="findQuestionByHowDetailIds" resultType="com.ssj.bean.conch.conch.dto.KmtQuestionDto">
-        select q.id question_id, q.analysis, q.question, q.option_content, count(qk.how_details_id) num from kmt_question_know qk
-        left join kmt_question q on qk.question_id=q.id where qk.how_details_id in
-        <foreach collection="howDetailIds" open="(" item="id" separator="," close=")">
-            #{id}
-        </foreach>
-        and q.type=1
-        group by q.id, q.analysis, q.question, q.option_content
-        order by num desc limit #{count}
-    </select>
-
-    <!--查询题目列表-->
-    <select id="findQuestionByIds" resultType="com.ssj.bean.conch.conch.dto.KmtQuestionDto">
-        select q.id question_id, q.analysis, q.question, q.option_content from kmt_question q where id in
-        <foreach collection="list" open="(" item="id" separator="," close=")">
-            #{id}
-        </foreach>
-    </select>
-
-    <select id="findWrongQuestionKnowModuleList" resultType="java.lang.String">
-        select distinct
-            <if test="subject == '语文' || subject == '数学'">
-                t1.two_module
-            </if>
-            <if test="subject == '英语'">
-                t1.module
-            </if>
-        from
-            scon_homework k1 join
-            scon_homework_how_details s1 on k1.subject = #{subject} and s1.is_wrong_ques_delete = 0 and s1.detail_count > 0
-                and s1.homework_id = k1.id
-            join zyb_know_how_details_sort t1 on t1.stat = 2 and t1.how_details_id = s1.how_detail_id
-        where t1.type = s1.knowledge_version
-            and s1.is_wrong_ques_delete = 0
-            and s1.detail_count > 0
-            <if test="type == 2">
-                and s1.wrong_question_id is not null
-            </if>
-            and k1.vip_id = #{vipId}
-            and k1.subject = #{subject}
-            <if test="beginDateTimeStr != ''">
-                and k1.create_time > #{beginDateTimeStr}
-            </if>
-            <if test="endDateTimeStr != ''">
-                and #{endDateTimeStr} > k1.create_time
-            </if>
-    </select>
-
-    <select id="findWrongQuestionKnowledgePage" resultType="com.ssj.service.conch.parents.v2.dto.WrongBookKnowledgeDTO2">
-        select group_concat(s1.how_detail_id) know_how_detail_id_str,
-                t1.alias knowledge_alias,
-                count(distinct e1.id) wrong_question_sum,
-                group_concat(t1.type) knowledge_version_str,
-                1 questionStatus
-        from zyb_know_how_details_sort t1
-            join scon_homework_how_details s1 on t1.stat = 2 and t1.how_details_id = s1.how_detail_id
-            join scon_homework_picture e1 on s1.homework_picture_id = e1.id and e1.subject = #{subject}
-        where s1.is_wrong_ques_delete = 0
-            and s1.detail_count > 0
-            and t1.type = s1.knowledge_version
-            <if test="subject == '语文' || subject == '数学'">
-                and t1.two_module = #{module}
-            </if>
-            <if test="subject == '英语'">
-                and t1.module = #{module}
-            </if>
-            and e1.vip_id = #{vipId}
-            <if test="beginDateTimeStr != ''">
-                and e1.create_time > #{beginDateTimeStr}
-            </if>
-            <if test="endDateTimeStr != ''">
-                and #{endDateTimeStr} > e1.create_time
-            </if>
-            and e1.subject = #{subject}
-            group by knowledge_alias
-    </select>
-
-    <select id="findWrongBookQuestionPage" resultType="com.ssj.service.conch.parents.v2.dto.WrongBookQuestionDTO">
-        select temp.homework_id,
-               temp.create_time,
-               group_concat(temp.homework_picture_id) homework_picture_id_str,
-               group_concat(temp.picture_url)         picture_url_str
-        from (
-                 <foreach collection="req.knowHowDetailList" item="knowHowDetail" separator=" union all ">
-                     (select scon_homework_picture.id                homework_picture_id,
-                             scon_homework_picture.homework_id,
-                             date(scon_homework_picture.create_time) create_time,
-                             if(length(scon_homework_picture.corrected_picture_url) > 0,
-                                scon_homework_picture.corrected_picture_url,
-                                scon_homework_picture.file_key)      picture_url
-                      from scon_homework_picture,
-                           scon_homework_how_details
-                      where scon_homework_picture.id = scon_homework_how_details.homework_picture_id
-                        <if test="!includeDeleted">
-                            and scon_homework_how_details.is_wrong_ques_delete = 0
-                        </if>
-                        and scon_homework_how_details.detail_count > 0
-                        <if test="req.type == 2">
-                            and scon_homework_how_details.wrong_question_id is not null
-                        </if>
-                        and scon_homework_picture.vip_id = #{req.vipId}
-                        <if test="beginDateTimeStr != ''">
-                            and scon_homework_picture.create_time > #{beginDateTimeStr}
-                        </if>
-                        <if test="endDateTimeStr != ''">
-                            and #{endDateTimeStr} > scon_homework_picture.create_time
-                        </if>
-                        and scon_homework_how_details.how_detail_id = #{knowHowDetail.knowHowDetailId}
-                        and scon_homework_how_details.knowledge_version = #{knowHowDetail.knowledgeVersion}
-                      group by create_time, scon_homework_how_details.homework_picture_id)
-                 </foreach>
-             ) temp
-        group by create_time, homework_id
-        order by create_time desc, homework_id
-    </select>
-
-    <select id="findWrongQuestionKnowModuleListV2" resultType="java.util.Map">
-        select
-            <if test="subject == '语文' || subject == '数学'">
-                zyb_know_how_details_sort.two_module real_module,
-            </if>
-            <if test="subject == '英语'">
-                zyb_know_how_details_sort.module real_module,
-            </if>
-            group_concat(how_details_id) how_details_id_str,
-            group_concat(type) version_str
-        from zyb_know_how_details_sort,
-            scon_homework_how_details,
-            scon_homework
-        where zyb_know_how_details_sort.stat = 2
-            and zyb_know_how_details_sort.how_details_id = scon_homework_how_details.how_detail_id
-            and zyb_know_how_details_sort.type = scon_homework_how_details.knowledge_version
-            and scon_homework_how_details.is_wrong_ques_delete = 0
-            and scon_homework_how_details.detail_count > 0
-            and scon_homework_how_details.homework_id = scon_homework.id
-            and scon_homework.vip_id = #{vipId}
-            and scon_homework.subject = #{subject}
-            <if test="beginDateTimeStr != ''">
-                and scon_homework.create_time > #{beginDateTimeStr}
-            </if>
-            <if test="endDateTimeStr != ''">
-                and #{endDateTimeStr} > scon_homework.create_time
-            </if>
-        group by real_module
-    </select>
-
-    <select id="findByHowDetailKdId" resultType="java.util.Map">
-        select kmt_question.id,
-               kmt_question.parent_id,
-               kmt_question.question,
-               kmt_question.option_content,
-               kmt_question.easy difficulty,
-               kmt_question.option_type
-        from kmt_question,
-             kmt_question_know
-        where kmt_question.id = kmt_question_know.question_id
-          and kmt_question_know.how_details_kd_id in
-          <foreach collection="wrongQuestionHowDetailKdIdList" open="(" item="wrongQuestionHowDetailKdId" separator="," close=")">
-              #{wrongQuestionHowDetailKdId}
-          </foreach>
-          <if test="existQuestionIdSet.size() > 0">
-              and kmt_question_know.question_id not in
-              <foreach collection="existQuestionIdSet" open="(" item="existQuestionId" separator="," close=")">
-                  #{existQuestionId}
-              </foreach>
-          </if>
-        group by how_details_kd_id
-    </select>
-
-    <select id="findWrongQuestionKnowModuleListV3New" resultType="java.lang.String">
-        select distinct
-            <if test="subject == '语文' || subject == '数学'">
-                scon_knowledge_wrong_question_count.two_module
-            </if>
-            <if test="subject == '英语'">
-                scon_knowledge_wrong_question_count.module
-            </if>
-        from scon_knowledge_wrong_question_count
-        where mastered = 0
-            and vip_id = #{vipId}
-            and subject = #{subject}
-            <if test="type == 2">
-                and question_status > 0
-            </if>
-            <if test="beginDateTimeStr != ''">
-                and homework_time > #{beginDateTimeStr}
-            </if>
-            <if test="endDateTimeStr != ''">
-                and #{endDateTimeStr} > homework_time
-            </if>
-    </select>
-
-    <select id="findWrongQuestionKnowledgePageV4New"
-            resultType="com.ssj.service.conch.parents.v2.dto.WrongBookKnowledgeDTO2">
-        select knowledge_name knowledge_alias,
-            sum(wrong_count) wrong_question_sum,
-            group_concat(how_detail_id) know_how_detail_id_str,
-            group_concat(knowledge_version)         knowledge_version_str,
-            group_concat(question_status) question_status_str
-        from scon_knowledge_wrong_question_count
-        where mastered = 0
-            and vip_id = #{vipId}
-            and subject = #{subject}
-            <if test="type == 2">
-                and question_status > 0
-            </if>
-            <if test="subject == '语文' || subject == '数学'">
-                and two_module = #{module}
-            </if>
-            <if test="subject == '英语'">
-                and module = #{module}
-            </if>
-            <if test="beginDateTimeStr != ''">
-                and homework_time > #{beginDateTimeStr}
-            </if>
-            <if test="endDateTimeStr != ''">
-                and #{endDateTimeStr} > homework_time
-            </if>
-        group by knowledge_name
-    </select>
-
-    <select id="findAll2Es" resultType="java.util.Map">
-        select questionKnow.*,
-               kmt_question.course_name,
-               ifnull(parent_id, '') parent_id,
-               question,
-               option_content,
-               option_answer,
-               option_type,
-               type,
-               easy,
-               explain_text,
-               analysis,
-               thinking,
-               suggest,
-               date_format(update_time, '%Y-%m-%dT%H:%i:%s.000Z') update_time,
-               state,
-               source,
-               checkuser,
-               skill,
-               kmt_question.remarks,
-               min_option_type,
-               ifnull(kmt_question.num, 0) num,
-               tag,
-               adduser,
-               adduser_id,
-               source_name,
-               is_copy
-        from (select id,
-                     question_id,
-                     how_details_id,
-                     how_id,
-                     course_name,
-                     how_details_kd_id,
-                     tags,
-                     date_format(create_time, '%Y-%m-%dT%H:%i:%s.000Z') create_time,
-                     date_format(last_update_time, '%Y-%m-%dT%H:%i:%s.000Z') last_update_time,
-                     remarks
-              from kmt_question_know
-              where es_loaded = 0
-              limit #{pageSize}) questionKnow
-                 join kmt_question on questionKnow.question_id = kmt_question.id
-    </select>
-
-    <!-- 查询kmt老师详情 -->
-    <select id="findKmtTeacherDetails" resultType="com.ssj.service.kmt.exercisesys.dto.KmtTeacherDetailDto">
-        select detail.id detail_id, detail.alias detail_name, detail.grade, detail.semester, detail.course_name, detail.type version_type,
-               etd.total_count, etd.un_finish_count, etd.question_total_count, etd.question_unfinish_count, etd.rollback_question_count
-        from kmt_exercise_teacher_datalist etd left join zyb_know_how_details_sort detail
-        on etd.business_id=detail.id and detail.stat=2
-        where 1=1
-            and etd.teacher_id=#{userId}
-            and etd.type = #{type}
-        <if test="detailName != null and detailName != ''">
-            and detail.alias regexp #{detailName}
-        </if>
-        order by etd.un_finish_count desc, etd.id
-    </select>
-</mapper>

target/classes/mybatis/mapper/LearningGrowthReportMapper.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.ssj.service.mapper.LearningGrowthReportMapper">
-    <select id="findWeeklyReport4UpdateKnowledgeSituation"
-            resultType="com.ssj.bean.sys.homework.domain.StudentWeeklyReport">
-        select * from scon_student_weekly_report
-    </select>
-
-    <select id="findWeeklyReportByVipIdAndSubjectAndBeginDate"
-            resultType="com.ssj.bean.sys.homework.domain.StudentWeeklyReport">
-        select * from scon_student_weekly_report where vip_id = #{vipId} and subject = #{subject} and begin_date = #{beginDate}
-    </select>
-
-    <select id="findWeeklyReportByVipIdAndBeginDate"
-            resultType="com.ssj.bean.sys.homework.domain.StudentWeeklyReport">
-        select * from scon_student_weekly_report where vip_id = #{vipId} and begin_date = #{beginDate}
-    </select>
-</mapper>

target/classes/mybatis/mapper/LibManagerAuditMapper.xml

@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.ssj.service.mapper.LibManagerAuditMapper">
-    <select id="findPageByType" resultType="com.ssj.service.sys.curator.dto.CuratorAuditDTO">
-        select tb_lib_manager_audit.id, tb_lib_manager_audit.name      curator_name,
-               tb_lib_manager_audit.telephone,
-               tb_lib_join.league_name        lib_name,
-               tb_lib_manager_audit.last_update_time applyTime
-        from tb_lib_manager_audit,
-             tb_lib_join
-        where tb_lib_manager_audit.lib_id = tb_lib_join.id
-          and tb_lib_manager_audit.type = #{type}
-          and tb_lib_manager_audit.status = 3
-          <if test="name neq ''">
-              and tb_lib_manager_audit.name like '%${name}%'
-          </if>
-    </select>
-
-    <select id="findPageByName" resultType="com.ssj.bean.weixin.libmy.domain.TbLibManagerAudit">
-            select  t.*
-            from tb_lib_manager_audit t
-            where t.type = 17
-        <if test="name !=null and name!=''">
-                and t.name regexp #{name}
-            </if>
-        <if test="subject !=null and subject!=''">
-            union  select  t.*
-            from tb_lib_manager_audit t
-            where t.type = 17
-             and t.subject regexp #{subject}
-        </if>
-        <if test="authority !=null and authority!=''">
-            union  select  t.*
-            from tb_lib_manager_audit t
-            where t.type = 17
-            and t.authority regexp concat('[',#{authority},']')
-        </if>
-        and t.status = 3
-        </select>
-
-</mapper>

target/classes/mybatis/mapper/LibManagerMapper.xml

@@ -1,253 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.ssj.service.mapper.LibManagerMapper">
-    <select id="findOrgMyInfo" resultType="com.ssj.service.weixin.library.dto.SelfCorrectTeacherInfoDTO">
-        select tb_lib_manager.name,
-               tb_lib_manager.t_photo  photo,
-               tb_lib_manager.lib_id,
-               tb_lib_join.league_name org_name,
-               tb_lib_manager.telephone
-        from tb_lib_manager,
-             tb_lib_join
-        where tb_lib_manager.lib_id = tb_lib_join.id
-          and tb_lib_manager.state = 1
-          and tb_lib_manager.user_id = #{teacherId}
-          and tb_lib_manager.type = #{type}
-        limit 1
-    </select>
-
-    <select id="findOrgMyInfoV1" resultType="com.ssj.service.weixin.library.dto.SelfCorrectTeacherInfoDTO">
-        select tb_lib_manager.name,
-               tb_lib_manager.t_photo  photo,
-               tb_lib_manager.lib_id,
-               tb_lib_join.league_name org_name,
-               tb_lib_manager.telephone
-        from tb_lib_manager,
-             tb_lib_join
-        where tb_lib_manager.lib_id = tb_lib_join.id
-          and tb_lib_manager.state = 1
-          and tb_lib_manager.user_id = #{teacherId}
-          and tb_lib_manager.type = #{type}
-    </select>
-
-    <select id="findSubjectMyInfo" resultType="com.ssj.service.weixin.library.dto.SubjectMyInfoDto">
-        select tb_lib_manager.name,
-               tb_lib_manager.t_photo  photo,
-               tb_lib_manager.course_name courseName,
-               tb_lib_join.league_name leagueName,
-               tb_lib_manager.telephone
-        from tb_lib_manager,
-             tb_lib_join
-        where tb_lib_manager.lib_id = tb_lib_join.id
-          and tb_lib_manager.state = 1
-          and tb_lib_manager.user_id = #{teacherId}
-          and tb_lib_manager.type = #{type}
-    </select>
-
-    <select id="findSchoolmasterInfo" resultType="com.ssj.service.conch.curator.dto.SchoolmasterInfoDTO">
-        select schoolmaster.t_photo                                                    photo,
-               schoolmaster.lib_id,
-               tb_lib_join.league_name                                                 orgName,
-               schoolmaster.telephone                                                  phone,
-               schoolmaster.name     schoolName,
-               (select count(distinct tb_lib_vip.id)
-                from tb_lib_vip
-                where tb_lib_vip.lib_id = schoolmaster.lib_id and tb_lib_vip.stat = 1) studentNum,
-               (select count(distinct tb_lib_manager.user_id)
-                from tb_lib_manager
-                where tb_lib_manager.lib_id = schoolmaster.lib_id
-                  and tb_lib_manager.type in (2, 10, 15)
-                  and tb_lib_manager.state = 1)                                        teacherNum,
-               tb_lib_join.lib_service,
-               tb_lib_join.platform_service
-        from tb_lib_manager schoolmaster,
-             tb_lib_join
-        where schoolmaster.lib_id = tb_lib_join.id
-          and schoolmaster.user_id = #{schoolmasterUserId}
-          and schoolmaster.type = 4
-          and schoolmaster.state = 1
-    </select>
-
-    <select id="findExerciseTeacherList" resultType="com.ssj.service.kmt.exercisesys.dto.ExerciseTeacherDTO">
-        select lm.*,
-               sum(if((lm.teacherId = eb.handle_user_id and eb.had_handle = 0)
-                          or
-                      (lm.teacherId = eb.auditing_user_id and (eb.had_handle = 0 or eb.had_auditing = 0))
-                          or
-                      (lm.teacherId = eb.analysis_user_id and eb.analysis_handled = 0)
-                          or
-                      (lm.teacherId = eb.analysis_auditer_id and (eb.analysis_handled = 0 or eb.analysis_audited = 0)), 1, 0)
-                   )      unFinishCount,
-               sum(if(eb.id is null, 0, 1))   totalCount
-        from (select user_id teacherId, t_photo image, name, course_name subject, authority, is_banned, is_cancelled,
-                     is_formal
-              from tb_lib_manager
-              where state = 1
-                and type = 17
-                <if test="req.subject != null and req.subject != ''">
-                    and course_name regexp #{req.subject}
-                </if>
-                <choose>
-                    <when test="req.type != null and req.type != ''">
-                        and authority regexp #{req.type}
-                    </when>
-                    <otherwise>
-                        and authority regexp '[12348]'
-                    </otherwise>
-                </choose>
-                and #{req.maxCreateTime} > create_time) lm
-                 left join
-             kmt_exercise_book eb
-             on (lm.teacherId = eb.handle_user_id or
-                 lm.teacherId = eb.auditing_user_id or
-                 lm.teacherId = eb.analysis_user_id or
-                 lm.teacherId = eb.analysis_auditer_id)
-        <where>
-            <if test="req.teacherName != null and req.teacherName != ''">
-                lm.name regexp #{req.teacherName}
-            </if>
-        </where>
-        group by lm.teacherId, lm.is_banned, lm.is_cancelled
-        order by lm.is_banned, lm.is_cancelled, unFinishCount desc
-    </select>
-
-    <!-- 查询kmt老师列表 -->
-    <select id="findKmtTeacherList" resultType="com.ssj.service.kmt.exercisesys.dto.ExerciseTeacherDTO">
-        select m.user_id teacher_id, m.t_photo image, m.name, m.is_banned, m.is_cancelled, m.is_formal, m.authority, etd.total_count, etd.un_finish_count,m.course_name subject,
-               etd.question_total_count, etd.question_unfinish_count from tb_lib_manager m
-            left join  kmt_exercise_teacher_datalist etd on m.user_id=etd.teacher_id and etd.type=#{type}
-        where m.state=1
-        <if test="subject != null and subject != ''">
-            and m.course_name regexp #{subject}
-        </if>
-        <choose>
-            <when test="authority != null and authority != '' and authority != 0">
-                and m.authority regexp #{authority}
-            </when>
-            <otherwise>
-                and m.authority regexp '[56]'
-            </otherwise>
-        </choose>
-        <if test="teacherName != null and teacherName != ''">
-            and m.name regexp #{teacherName}
-        </if>
-        and m.type = 17
-        order by m.is_banned, m.is_cancelled, etd.question_unfinish_count desc, etd.id
-    </select>
-
-    <select id="findExerciseTeacherDetails"
-            resultType="com.ssj.service.kmt.exercisesys.dto.ExerciseTeacherDetailDTO">
-        select book_id, exercise_book_id, book_name, grade, semester, course_name, version, book_type, book_status,
-               unfinished_unit_count, total_unit_count, accuracy
-        from kmt_exercise_book_count
-        where user_id = #{req.teacherId}
-          and #{req.maxCreateTime} > create_time
-          <if test="req.bookName != null and req.bookName != ''">
-                and book_name like concat('%',#{req.bookName},'%')
-          </if>
-          and book_status > 0
-        order by book_status
-    </select>
-
-    <select id="findTeacherStatusDetail"
-            resultType="com.ssj.service.kmt.exercisesys.dto.TeacherInfoStatusDetailDTO">
-        select user_id teacherId,
-               t_photo image,
-               name,
-               school,
-               sex,
-               create_time,
-               major,
-               telephone,
-               authority,
-               is_banned,
-               is_cancelled,
-               is_formal,
-               course_name subject
-        from tb_lib_manager
-        where user_id = #{teacherId}
-          and state = 1
-          and type = 17
-          order by create_time desc
-        limit 1
-    </select>
-
-    <select id="findTbLibManagerByUserIdsAndType" resultType="com.ssj.bean.weixin.libmy.domain.TbLibManager">
-        select * from tb_lib_manager where type in
-        <foreach collection="types" open="(" item="type" separator="," close=")">
-            #{type}
-        </foreach>
-        and user_id in
-        <foreach collection="userIds" open="(" item="userId" separator="," close=")">
-            #{userId}
-        </foreach>
-    </select>
-
-    <select id="findExerciseTeacherByName" resultType="String">
-        select user_id from tb_lib_manager
-        where state=1
-        and type=17
-        and is_cancelled=0
-        and name = #{name}
-        union
-        select user_id from tb_lib_manager_audit
-        where type=17
-        and status=3
-        and name = #{name}
-        limit 1
-    </select>
-
-    <select id="findManagerByNameAndType" resultType="com.ssj.bean.weixin.libmy.domain.TbLibManager">
-        select * from tb_lib_manager where name regexp #{name} and type=#{type} and state=1
-    </select>
-    
-    <select id="findRandManagerByTypeAndSubject" resultType="com.ssj.bean.weixin.libmy.domain.TbLibManager">
-        select * from tb_lib_manager m where type=17 and authority regexp '6' and state=1
-        <if test="subject != null and subject != ''">
-            and course_name regexp #{subject}
-        </if>
-        order by rand() limit 1;
-    </select>
-
-    <select id="findCheckTeacherList"
-            resultType="com.ssj.service.kmt.exercisesys.dto.FindCheckTeacherListDto">
-        select user_id teacherId,
-               name teacherName,
-               is_banned,
-               is_cancelled,
-               is_formal,
-               course_name subject
-        from tb_lib_manager
-        where type = 17
-        and state = 1
-        and authority regexp #{authorityType}
-        and is_cancelled = 0
-        and is_banned = 0
-        <if test="subjects != null and subjects.size()>0" >
-            <foreach collection="subjects" item="subject" index="index" open="" close=" " separator="">
-                and course_name regexp #{subject}
-            </foreach>
-        </if>
-        <if test="teacherName != null and teacherName != ''">
-            and name regexp #{teacherName}
-        </if>
-    </select>
-
-    <select id="findCheckTeacherDetailsList" resultType="java.util.Map">
-        select t.id, t.book_id bookId, t.book_name bookName, t.grade grade, t.semester semester, t.course_name subject,
-         t.version_name version, book_type bookType, t.answer_corrected_status bookStatus,t.check_time checkTime
-         from kmt_exercise_book t
-         where t.answer_correcter_id = #{teacherId}
-         and t.create_time &lt;=#{maxCreateTime}
-         order by t.answer_corrected_status,t.check_time desc
-    </select>
-
-    <select id="findCheckTeacherDetails" resultType="java.util.Map">
-     select
-      sum(case when t.answer_corrected_status=0 then 1 else 0 end) uncheckCount,
-      sum(case when t.answer_corrected_status=1 then 1 else 0 end) checkCount
-      from kmt_exercise_book t
-      where t.answer_correcter_id = #{teacherId}
-      and t.create_time &lt;=#{maxCreateTime}
-   </select>
-</mapper>

target/classes/mybatis/mapper/LibVipMapper.xml

@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.ssj.service.mapper.LibVipMapper">
-    <select id="findManageStudentList" resultType="com.ssj.service.weixin.library.dto.StudentDTO">
-        select tb_lib_vip.id         vipId,
-               tb_lib_vip.child_name studentName,
-               tb_lib_vip.img_url,
-               service.service_sort,
-               service.end_time,
-               service.correct_type,
-               service.type
-        from tb_lib_vip
-                 join (select tb_lib_vip_service.vip_id,
-                              ifnull(tb_lib_vip_service.service_sort, 0) service_sort,
-                              tb_lib_vip_service.end_time,
-                              tb_lib_vip_service.correct_type,
-                              tb_lib_vip_service.type
-                       from (select vip_id
-                             from (select class_id
-                                   from tb_class_teacher
-                                   where lib_id = #{libId}
-                                     and teacher_id = #{teacherId}
-                                     and status = 1) classTeacher
-                                      join tb_class_student
-                                           on classTeacher.class_id = tb_class_student.class_id and
-                                              tb_class_student.status = 1) classStudent
-                                join tb_lib_vip_service
-                                     on classStudent.vip_id = tb_lib_vip_service.vip_id and
-                                        tb_lib_vip_service.stat = 1 and
-                                        now() between start_time and end_time) service
-                      on service.vip_id = tb_lib_vip.id and tb_lib_vip.lib_id = #{libId}
-    </select>
-
-    <select id="findGradeAndSchoolById" resultType="com.ssj.bean.weixin.libmy.domain.LibVip">
-        SELECT v.school,v.grade from  tb_lib_vip v  where v.id=#{vipId}
-    </select>
-
-    <select id="findGradeAndSchoolAndSubjectByHomeworkId" resultType="com.ssj.bean.weixin.libmy.domain.LibVip">
-        SELECT v.school,v.grade, h.subject course_name from  tb_lib_vip v left join scon_homework h on v.id=h.vip_id where h.id=#{homeworkId}
-    </select>
-
-    <select id="findSignInStudentList" resultType="com.ssj.service.conch.teacher.library.dto.StudentDto">
-        select t.id vipId,
-                t.child_name studentName,
-                t.school,
-                t.grade,
-                t.img_url imgUrl
-        from tb_lib_vip t
-        where t.lib_id = #{libId} and t.user_id is not null
-        <!--and t.stat='1'-->
-        and t.id not in
-            (select vip_id
-            from tb_lib_subscribe
-            where lib_id = #{libId}
-            and flow_stat = '3'
-            and stat = '1'
-            and to_days(ryke_time) = to_days(now())
-            )
-        <!--当前有服务且不在节假日中间-->
-        and exists(
-            select 1
-            from (select s.*
-                from (select *
-                from tb_lib_vip_service
-                where stat = 1
-                and species in ('S003', 'S999')
-                and to_days(start_time) &lt;= to_days(now())
-                and to_days(end_time) >= to_days(now())
-                order by service_sort) s
-                group by s.vip_id) s1
-            where s1.vip_id = t.id
-            and (s1.lib_id is null
-                or not exists(
-                    select 1
-                    from tb_vacation_limit s2
-                    where s2.set_state = 2
-                    and to_days(s2.start_date) &lt;= to_days(now())
-                    and to_days(s2.end_date) >= to_days(now())
-                    and s1.lib_id = s2.lib_id
-                )
-            )
-        )
-        <if test="studentName != null and studentName != '' ">
-            and t.child_name regexp #{studentName}
-        </if>
-    </select>
-
-</mapper>

target/classes/mybatis/mapper/LibraryTeacherMapper.xml

@@ -1,305 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.ssj.mapper.libraryteacher.LibraryTeacherMapper">
-    <resultMap id="FeedbackDTOResultMap" type="com.ssj.service.conch.teacher.library.dto.FeedbackDTO">
-        <id column="push_id" property="pushId"/>
-        <result column="suggest" property="suggest"/>
-        <result column="push_time" property="pushTime"/>
-        <collection property="homeworkPictureList" ofType="String">
-            <constructor>
-                <arg column="file_key"/>
-            </constructor>
-        </collection>
-    </resultMap>
-
-    <sql id="tbLibVip">
-        t1.id,
-        t1.child_name childName,
-        t1.img_url imgUrl
-    </sql>
-
-    <select id="findVipList" resultType="com.ssj.bean.mybatis.LibVipMBDto" parameterType="java.util.Map">
-        select
-        <include refid="tbLibVip"/>
-        ,t2.id pushId,t2.type,t2.push_time pushTime
-        from tb_lib_vip t1
-        join zyb_student_push t2 on t1.id = t2.vip_id and to_days(t2.push_time) = to_days( #{map.strdate})
-        where
-        <!--这里兼容注销逻辑-->
-
-
-        t2.teacher_id = #{map.teacherId}
-        <!--小孩的馆必须和签到的馆是一个馆才能显示 add by Mount 20200422 16:00-->
-        and t1.lib_id = t2.lib_id
-        and to_days(t2.push_time) = to_days( #{map.strdate})
-        and t1.user_id is not null
-        <if test="map.type != null and map.type != '' ">
-            and t2.type = #{map.type}
-        </if>
-        order by t2.push_time,t1.id
-    </select>
-
-    <select id="findTodayHomeworkByVipId" resultType="com.ssj.bean.mybatis.HomeworkPictureMBDto" parameterType="String">
-      		 select
-             t.course_name subject,
-             t.type workType,
-
-        	sum(case when e.is_delete = 0  then 1 else 0 end)   homeworkNum,
-				( sum(case when e.is_delete = 0 and e.is_feedback = 1  then 1 else 0 end ) +
-				sum(case when e.is_delete = 0 and e.is_feedback = 0 and e.is_mark in(1,3) then 1 else 0 end ) )    feedbackNum
-       from
-	( SELECT  a.id  ,a.course_name ,  a.type from  scon_no_homework_record a where  a.vip_id =#{vipId}
-	 and to_days(a.create_time) = to_days( #{strdate} ) ) t
-       left join  scon_homework_picture e on e.homework_record_id = t.id and e.is_delete=0
-        GROUP BY  t.course_name
-    </select>
-
-    <select id="findTodayBadHomeworkByVipId" resultType="com.ssj.bean.mybatis.HomeworkPictureMBDto"
-            parameterType="String">
-      select t.isMark,t.fileKey,t.picNum,t.remindTime,t.subject
-        from (select t.is_mark isMark,
-                     t.file_key fileKey,
-                     count(t.id)        picNum,
-                     min(t.create_time) remindTime,
-                     t.subject
-              from scon_homework_picture t
-              where t.is_mark in (1, 3)
-                and to_days(t.create_time) = to_days(now())
-                and t.vip_id = #{vipId}
-              group by t.vip_id, t.is_mark, t.subject) t
-        order by t.remindTime
-    </select>
-
-    <select id="countHomeworkDataByClass" resultType="java.util.Map">
-        select count(distinct kmt_homework_wrong_question.id) totalCount,
-        sum(if(kmt_homework_wrong_question.type = 1, 1, 0)) wrongCount
-        from tb_class_student,
-        scon_homework,
-        kmt_homework_wrong_question
-        where tb_class_student.vip_id = scon_homework.vip_id
-        and scon_homework.id = kmt_homework_wrong_question.homework_id
-        and tb_class_student.status = 1
-        and scon_homework.subject in
-        <foreach collection="subjectList" open="(" item="subject" separator="," close=")">
-            #{subject}
-        </foreach>
-        and tb_class_student.class_id = #{classId}
-        and scon_homework.create_time > #{beginDateTimeStr}
-        and #{endDateTimeStr} > scon_homework.create_time
-    </select>
-
-    <select id="countSubmittedStudentNum" resultType="java.lang.Integer">
-        select count(distinct scon_homework_picture.vip_id)
-        from (select vip_id
-        from tb_class_student
-        where class_id = #{classId}
-        and status = 1) student
-        join scon_homework_picture on student.vip_id = scon_homework_picture.vip_id and
-        scon_homework_picture.create_time between #{beginDateTimeStr} and #{endDateTimeStr} and
-        scon_homework_picture.subject in
-        <foreach collection="subjectList" open="(" item="subject" separator="," close=")">
-            #{subject}
-        </foreach>
-        <if test="corrected">
-            and scon_homework_picture.is_feedback = 1
-            and scon_homework_picture.is_mark in (0, 2)
-        </if>
-    </select>
-
-    <select id="findHomeworkIdYesterdayByClass" resultType="java.lang.String">
-        select distinct scon_homework_picture.homework_id
-        from tb_class_student,
-        scon_homework_picture
-        where tb_class_student.class_id = #{classId}
-        and tb_class_student.status = 1
-        and tb_class_student.vip_id = scon_homework_picture.vip_id
-        and scon_homework_picture.create_time > #{beginDateTimeStr}
-        and #{endDateTimeStr} > scon_homework_picture.create_time
-        and scon_homework_picture.subject in
-        <foreach collection="subjectList" open="(" item="subject" separator="," close=")">
-            #{subject}
-        </foreach>
-        and scon_homework_picture.is_feedback = 1
-        and scon_homework_picture.is_mark in (0, 2)
-    </select>
-
-    <select id="findTypicalWrongQuestionList"
-            resultType="com.ssj.service.conch.teacher.library.dto.TypicalWrongQuestionDTO">
-        select kmt_homework_wrong_question.question_id,
-        kmt_exercise_book_course.book_name,
-        kmt_exercise_book_course.unit,
-        kmt_exercise_book_course.period,
-        kmt_exercise_questions.big_question_index bigIndex,
-        kmt_exercise_questions.small_question_name smallIndex,
-        count(kmt_homework_wrong_question.homework_id) studentCount
-        from kmt_homework_wrong_question,
-        kmt_exercise_questions,
-        kmt_exercise_book_course
-        where kmt_homework_wrong_question.homework_id in
-        <foreach collection="homeworkIdList" open="(" item="homeworkId" separator="," close=")">
-            #{homeworkId}
-        </foreach>
-        and kmt_homework_wrong_question.type = 1
-        and kmt_homework_wrong_question.question_id = kmt_exercise_questions.id
-        and kmt_exercise_questions.book_course_id = kmt_exercise_book_course.id
-        group by kmt_homework_wrong_question.question_id
-    </select>
-
-    <select id="countHomeworkDataByGrade" resultType="java.util.Map">
-        select sum(IF(type = 2, 1, 0)) rightCount, count(DISTINCT homework_id) totalCount
-        from kmt_homework_wrong_question, scon_homework
-        where kmt_homework_wrong_question.homework_id = scon_homework.id
-          and kmt_homework_wrong_question.question_id = #{questionId}
-          and scon_homework.grade = #{grade}
-          and scon_homework.create_time > #{beginDateTimeStr}
-          and #{endDateTimeStr} > scon_homework.create_time
-    </select>
-
-    <select id="findDependentKnowledge" resultType="com.ssj.service.conch.teacher.library.dto.KnowledgeDTO">
-        select zyb_know_how_details_sort.alias name
-        from kmt_exercise_question_know, zyb_know_how_details_sort
-        where kmt_exercise_question_know.how_details_id = zyb_know_how_details_sort.how_details_id
-          and zyb_know_how_details_sort.stat = 2
-          and kmt_exercise_question_know.question_id = #{questionId}
-        group by kmt_exercise_question_know.how_details_id
-    </select>
-
-    <select id="findSubmittedStudentList" resultType="com.ssj.service.conch.teacher.library.dto.StudentDTOV2">
-        select tb_lib_vip.img_url photo,
-        tb_lib_vip.child_name name,
-        picture.vip_id,
-        time
-        from (select scon_homework_picture.vip_id, max(scon_homework_picture.create_time) time
-        from (select vip_id
-        from tb_class_student
-        where class_id = #{classId}
-        and status = 1) student
-        join scon_homework_picture on student.vip_id = scon_homework_picture.vip_id and
-        scon_homework_picture.create_time between #{beginDateTimeStr} and #{endDateTimeStr} and
-        scon_homework_picture.subject in
-        <foreach collection="subjectList" open="(" item="subject" separator="," close=")">
-            #{subject}
-        </foreach>
-        group by scon_homework_picture.vip_id
-        order by time desc) picture
-        join tb_lib_vip on picture.vip_id = tb_lib_vip.id
-    </select>
-
-    <select id="findWrongQuestionDetail" resultType="com.ssj.service.conch.teacher.library.dto.WrongQuestionDetailDTO">
-        select ifnull(classStudentPicture.corrected_picture_url, classStudentPicture.file_key) homeworkPictureUrl,
-               tb_lib_vip.img_url                                                              studentPhoto,
-               tb_lib_vip.child_name                                                           studentName
-        from (select picture.*
-              from (select scon_homework_picture.corrected_picture_url,
-                           scon_homework_picture.file_key,
-                           scon_homework_picture.vip_id
-                    from (select homework_picture_id
-                          from kmt_homework_wrong_question
-                          where question_id = #{questionId}) wrongQuestion
-                             join scon_homework_picture on wrongQuestion.homework_picture_id = scon_homework_picture.id and
-                                                           scon_homework_picture.create_time between #{beginDateTimeStr} and #{endDateTimeStr}) picture
-                       join tb_class_student on picture.vip_id = tb_class_student.vip_id and tb_class_student.status = 1 and
-                                                tb_class_student.class_id = #{classId}) classStudentPicture
-                 join tb_lib_vip on classStudentPicture.vip_id = tb_lib_vip.id
-    </select>
-
-    <select id="findClassList" resultType="com.ssj.service.conch.teacher.v2.dto.ClassDto">
-        select tb_class.id                                  classId,
-               tb_class.grade                               grade,
-               tb_class.class_name                          className
-         from  tb_class_teacher left join
-               tb_class on tb_class_teacher.class_id=tb_class.id
-         where  tb_class_teacher.status=1
-         and   tb_class.status in(1,2)
-         and   tb_class_teacher.teacher_id=#{teacherId}
-         order by tb_class.create_time
-    </select>
-
-    <select id="findNewClassList" resultType="com.ssj.service.conch.teacher.v2.dto.NewClassDto">
-        select ct.class_id, c.class_name, lj.league_name
-        from tb_class_teacher ct
-                 join tb_lib_manager lm
-                      on ct.teacher_id = lm.user_id and lm.type = 10 and ct.lib_id = lm.lib_id and lm.state = 1
-                 join tb_class c on ct.class_id = c.id and c.status in (1, 2)
-                 join tb_lib_join lj on ct.lib_id = lj.id
-        where ct.teacher_id = #{teacherId}
-          and ct.status = 1
-        order by c.create_time
-    </select>
-
-    <select id="findStudentList" resultType="com.ssj.service.conch.teacher.v2.dto.ClassStudentDto">
-        select  t2.img_url     photo,
-                t2.child_name   name,
-                t2.school       school,
-                t2.grade        grade,
-                t2.id       vipId
-         from   tb_class_student t1  join
-                tb_lib_vip       t2  on t1.vip_id=t2.id  and   t2.stat=1
-         where  t1.vip_id=t2.id
-          and   t1.status=1
-          and   t1.class_id = #{classId}
-
-
-    </select>
-
-    <select id="countAllByClassId" resultType="java.lang.Integer">
-        select count(distinct vip_id) from tb_class_student where class_id = #{classId} and status = 1
-    </select>
-
-    <select id="fingClassTeacherList" resultType="com.ssj.bean.mybatis.ManagerMBDto" parameterType="java.util.Map">
-        select t.user_id userId,
-        t.course_name courseName,
-        t.name,
-        t.t_photo tPhoto,
-        t.telephone,
-        sum(t.type) typeSum
-        from tb_lib_manager t
-        where t.type in (2, 10, 15)
-        and t.state = 1
-        <!--在本班的老师-->
-        <if test="map.classId != null and map.classId != '' ">
-            and exists(select 1 from tb_class_teacher where t.user_id=teacher_id and status=1 and
-            class_id=#{map.classId})
-        </if>
-        <!--不在此班级的其他老师-->
-        <if test="map.notThisClassId != null and map.notThisClassId != '' ">
-            and t.user_id not in (select teacher_id from tb_class_teacher where class_id = #{map.notThisClassId} and
-            status = 1)
-        </if>
-        <if test="map.libId != null and map.libId != '' ">
-            and t.lib_id=#{map.libId}
-        </if>
-        group by t.user_id
-        order by t.name
-        <if test="map.nolimit != null and map.nolimit != '' ">
-            limit 1000
-        </if>
-    </select>
-
-    <select id="findFeedbackHistory" resultMap="FeedbackDTOResultMap">
-        select push.*, scon_homework_picture.file_key
-        from (select id        push_id,
-                     vip_id,
-                     suggest,
-                     push_time push_time
-              from zyb_student_push
-              where vip_id = #{vipId}
-                and #{endDate} > push_time
-                and type > 0
-              order by push_time desc
-              limit #{offset}, #{pageSize}) push
-                 left join scon_homework_picture
-                           on push.vip_id = scon_homework_picture.vip_id
-                               and to_days(push.push_time) = to_days(scon_homework_picture.create_time)
-                               and scon_homework_picture.is_delete = 0
-        order by push.push_time desc, field(scon_homework_picture.subject, '语文', '数学', '英语')
-    </select>
-
-    <select id="countFeedbackHistory" resultType="java.lang.Integer">
-        select count(*)
-        from zyb_student_push
-        where vip_id = #{vipId}
-          and #{endDate} > push_time
-              and type > 0
-    </select>
-</mapper>

target/classes/mybatis/mapper/LoadDataMapper.xml

@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.ssj.mapper.load.data.LoadDataMapper">
-    <resultMap id="FeedbackDTOResultMap" type="com.ssj.service.conch.teacher.library.dto.FeedbackDTO">
-        <id column="push_id" property="pushId"/>
-        <result column="suggest" property="suggest"/>
-        <result column="push_time" property="pushTime"/>
-        <result column="vip_id" property="vipId"/>
-        <collection property="homeworkPictureList" ofType="String">
-            <constructor>
-                <arg column="file_key"/>
-            </constructor>
-        </collection>
-    </resultMap>
-
-    <select id="findFeedbackHistory" resultMap="FeedbackDTOResultMap">
-        select push.*, scon_homework_picture.file_key
-        from (select id        push_id,
-        vip_id,
-        suggest,
-        push_time push_time
-        from zyb_student_push
-        where
-        push_time >= #{beginDate} and    #{endDate} >  push_time
-             and type > 0
-        ) push
-        left join scon_homework_picture
-        on push.vip_id = scon_homework_picture.vip_id
-        and to_days(push.push_time) = to_days(scon_homework_picture.create_time)
-        and scon_homework_picture.is_delete = 0
-        order by push.push_time desc, field(scon_homework_picture.subject, '语文', '数学', '英语')
-    </select>
-
-
-    <select id="findWeeklyReportBeginDateAndEndDate"
-            resultType="com.ssj.bean.sys.homework.domain.StudentWeeklyReport">
-        select * from scon_student_weekly_report where  create_time >= #{beginDate} and    #{endDate} >  create_time
-    </select>
-
-
-    <select id="findMonthHomeworkCount" resultType="com.ssj.bean.sys.homework.domain.HomeworkCount">
-        select *
-        from scon_homework_count
-        where  create_time >= #{beginDate} and    #{endDate} >  create_time
-    </select>
-
-    <select id="findWeeklyReportHistory"
-            resultType="com.ssj.service.conch.parents.v2.dto.StudentWeeklyReportDTO">
-        select vip_id,
-               group_concat(subject)              subject_str,
-               group_concat(accuracy_rate)        accuracy_rate_str,
-               sum(total_knowledge_num)           total_knowledge_num,
-               sum(master_well_knowledge_num)     master_well_knowledge_num,
-               sum(master_infirmly_knowledge_num) master_infirmly_knowledge_num,
-               sum(not_mastered_knowledge_num)    not_mastered_knowledge_num,
-               begin_date begin_time,
-               end_date end_time
-        from scon_student_weekly_report
-        where  create_time >= #{beginDate} and    #{endDate} >  create_time
-        group by vip_id, begin_date
-        order by begin_date desc
-    </select>
-
-    <select id="findMonthlyReportHistory" resultType="com.ssj.service.conch.parents.v2.dto.MonthlyReportDTO">
-        select accuracy_rate learning_score,
-               homework_month,
-               transcended_student_proportion,
-               increased_score
-        from scon_homework_count
-        where data_type = 2
-          and create_time >= #{beginDate}
-          and #{endDate} >  create_time
-        order by homework_month desc
-    </select>
-
-
-</mapper>

target/classes/mybatis/mapper/OpenTestMapper.xml

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.ssj.service.mapper.OpenTestMapper">
-
-
-    <select id="countResult" resultType="com.ssj.bean.mybatis.OpenTestMBDto" parameterType="java.util.Map">
-        select count(1)                                            total,
-        sum(case when accuracy_rate &lt; #{map.accuracyRate} then 1 else 0 end) accuracyLower,
-        sum(case when `time` > #{map.time} then 1 else 0 end)          timeLower
-        from tb_test_result
-        where grade = #{map.grade}
-        and subject = #{map.subject}
-        and version = #{map.version}
-    </select>
-
-    <select id="findRankingResult" resultType="com.ssj.bean.mybatis.OpenTestMBDto" parameterType="java.util.Map">
-        SELECT @rownum := @rownum + 1 AS rankingNo,
-    	t.score,
-    	(select name from tb_test_user where user_id = t.user_id limit 1) name
-        FROM
-    	( SELECT @rownum := 0 ) r,
-    	tb_test_result t
-    	where t.grade = #{map.grade}
-        and t.subject = #{map.subject}
-        and t.is_delete = 0
-        <if test="map.version != null and map.version != '' ">
-            and t.version = #{map.version}
-        </if>
-        <if test="map.unit != null and map.unit != '' ">
-            and t.unit = #{map.unit}
-        </if>
-        <if test="map.type != null and map.type != '' ">
-            and t.type = #{map.type}
-        </if>
-		order by t.score desc,t.create_time
-    </select>
-
-</mapper>

target/classes/mybatis/mapper/ProblemMapper.xml

@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.ssj.mapper.problem.ProblemMapper">
-    <!--查询老师的难题列表，只查三天-->
-    <select id="findProblemListByTeacherId" resultType="com.ssj.bean.sys.problem.dto.ProblemPictureListDto">
-        select pp.id problem_picture_id, pp.subject, vip.child_name, vip.img_url child_img, pp.create_time, pp.manual_edit_type type,
-        pp.file_key problem_picture_path, psp.task_status, psp.deal_flag,pp.is_feedback isFeedback from  scon_problem_picture  pp
-        left join  tb_lib_vip vip on vip.id=pp.vip_id
-        left join tb_class_student cs on vip.id=cs.vip_id and cs.status = 1
-        left join scon_problem_similar_predeal psp on pp.id=psp.problem_picture_id
-        where cs.class_id = #{classId}
-        <if test="subjects != null">
-            and pp.subject in
-            <foreach collection="subjects" open="(" item="subject" separator="," close=")">
-                #{subject}
-            </foreach>
-        </if>
-        <if test="libId != null and libId != ''">
-            and vip.lib_id=#{libId}
-                </if>
-        and pp.create_time > #{beginTime} and pp.is_delete=0
-        and vip.user_id is not null
-        order by pp.create_time desc
-    </select>
-
-    <!--查询学生某科难题-->
-    <select id="findProblemListByVipIdAndSubject" resultType="com.ssj.bean.sys.problem.dto.ProblemPictureListDto">
-        select pp.id problem_picture_id, pp.subject, pp.create_time, pp.file_key problem_picture_path,
-        pp.manual_edit_type type, pp.teacher_message teacherComment,
-            psp.task_status, psp.deal_flag,is_feedback isFeedback
-        from scon_problem_picture pp
-        left join scon_problem_similar_predeal psp on pp.id=psp.problem_picture_id
-        where pp.vip_id=#{vipId}
-        <if test="subjects != null">
-            and pp.subject in
-            <foreach collection="subjects" open="(" item="subject" separator="," close=")">
-                #{subject}
-            </foreach>
-        </if>
-        and pp.is_delete = 0
-        order by pp.create_time desc
-    </select>
-
-    <!--查询学生某科所有难题-->
-    <select id="findAllProblemListByVipIdAndSubject" resultType="com.ssj.bean.sys.problem.dto.ProblemPictureListDto">
-        select pp.id problem_picture_id, pp.subject, pp.create_time, pp.file_key problem_picture_path,
-        pp.manual_edit_type type, psp.task_status, psp.deal_flag,pp.is_feedback isFeedback from scon_problem_picture pp
-        left join scon_problem_similar_predeal psp on pp.id=psp.problem_picture_id
-        where pp.vip_id=#{vipId}
-        <if test="subject != null and subject !='' ">
-            and pp.subject=#{subject}
-        </if>
-        and pp.is_delete = 0
-        order by pp.create_time desc
-    </select>
-
-    <select id="findOrgTeacherIdByVipIdAndSubject" resultType="java.lang.String">
-        select distinct tb_lib_manager.user_id
-        from (select tb_class_teacher.teacher_id
-              from (select class_id
-                    from tb_class_student
-                    where vip_id = #{vipId} and status = 1) classStudent
-                  join tb_class_teacher
-                      on classStudent.class_id = tb_class_teacher.class_id and tb_class_teacher.status = 1 and tb_class_teacher.lib_id=#{libId}) classTeacher
-            join tb_lib_manager
-                on classTeacher.teacher_id = tb_lib_manager.user_id and tb_lib_manager.type = 10 and tb_lib_manager.state = 1 and
-                   tb_lib_manager.course_name regexp #{subject} and tb_lib_manager.lib_id regexp #{libId}
-    </select>
-</mapper>

target/classes/mybatis/mapper/RecordQuestionMapper.xml

@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.ssj.service.mapper.RecordQuestionMapper">
-    <update id="updateQuestionNum">
-        update tb_test_question
-        set question_num = question_num - #{step}
-        where type = #{openTestQuestion.type}
-          and grade = #{openTestQuestion.grade}
-          and subject = #{openTestQuestion.subject}
-          and version = #{openTestQuestion.version}
-          and unit = #{openTestQuestion.unit}
-          and question_num > #{openTestQuestion.questionNum}
-          and update_version > -1
-    </update>
-
-    <select id="findZtKnowledgeList" resultType="com.ssj.bean.mybatis.KnowledgeMBDto" parameterType="java.util.Map">
-        select distinct (t1.alias) name,t1.two_module module
-        from zyb_know_how_details_sort t1
-        where t1.course_name = '语文'
-        and exists(
-            select 1 from zyb_know_how_details t2 where t1.how_id = t2.how_id and t2.is_zt = 1
-        )
-        and t1.stat=2
-        and t1.grade = #{map.grade}
-        and t1.semester = #{map.semester}
-        and t1.type = 2
-        order by t1.two_module,t1.alias
-    </select>
-
-    <select id="findKnowledgeList" resultType="com.ssj.bean.mybatis.KnowledgeMBDto" parameterType="java.util.Map">
-        select distinct t.alias name
-        from zyb_know_how_details_sort t
-        where t.stat=2
-        <if test="map.subject != null and map.subject != '' ">
-            and t.course_name = #{map.subject}
-        </if>
-        <if test="map.version != null and map.version != '' ">
-            and t.type = #{map.version}
-        </if>
-        <if test="map.semester != null and map.semester != '' ">
-            and t.semester = #{map.semester}
-        </if>
-        <if test="map.howIds.size() > 0">
-            and t.how_id in
-            <foreach collection="map.howIds" index="i" item="howId" open="(" close=")" separator=",">
-                #{howId}
-            </foreach>
-        </if>
-        order by t.num
-    </select>
-</mapper>

target/classes/mybatis/mapper/SSJPeiyouBookMapper.xml

@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.ssj.service.mapper.SSJPeiyouBookMapper" >
-
-    <select id="findUnitBySelective" resultType="com.ssj.service.conch.parents.dto.GetPeiyouBookUnitDto">
-        select id unitId,
-               unit unitName
-        from ssj_peiyou_book
-        where 1=1
-        <if test="grade != null and grade!=''">
-            and grade = #{grade}
-        </if>
-        <if test="courseName != null and courseName!=''">
-            and course_name = #{courseName}
-        </if>
-        <if test="bookName != null and bookName!=''">
-            and book_name = #{bookName}
-        </if>
-        GROUP BY unit
-    </select>
-
-    <select id="findSecondUnitBySelective" resultType="com.ssj.service.conch.parents.dto.GetSecondUnitInfoDto">
-        select id secondUnitId,
-               second_unit secondUnitName
-        from ssj_peiyou_book
-        where 1=1
-        <if test="grade != null and grade!=''">
-            and grade = #{grade}
-        </if>
-        <if test="courseName != null and courseName!=''">
-            and course_name = #{courseName}
-        </if>
-        <if test="bookName != null and bookName!=''">
-            and book_name = #{bookName}
-        </if>
-        <if test="unit != null and unit!=''">
-            and unit = #{unit}
-        </if>
-        GROUP BY second_unit
-    </select>
-
-</mapper>

target/classes/mybatis/mapper/SysMapper.xml

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.ssj.mapper.sys.SysMapper">
-    <select id="findCodeExchangeListByPage" parameterType="java.util.Map" resultType="com.ssj.bean.sys.codeexchange.CodeExchange">
-        select t.id,
-            t.code,
-            t.is_valid isValid,
-            t.user_id userId,
-            t.user_name userName,
-            t.module,
-            t.type,
-            t.months,
-            t.days,
-            t.start_time startTime,
-            t.end_time endTime,
-            t.is_lock isLock,
-            t.create_time createTime
-        from tb_code_exchange t
-        where 1=1
-        <if test="map.code != null and map.code != '' ">
-            and t.code regexp #{map.code}
-        </if>
-        <if test="map.user_name != null and map.user_name != '' ">
-            and t.user_name regexp #{map.user_name}
-        </if>
-        <if test="map.module != null and map.module != '' ">
-            and t.module = #{map.module}
-        </if>
-    </select>
-</mapper>

target/classes/mybatis/mapper/ZybStudentWorkMapper.xml

@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.ssj.service.mapper.ZybStudentWorkMapper">
-    <update id="updateStudentPushType">
-        update zyb_student_push sp
-        set sp.type = 4
-        where sp.type = 0
-          and exists(select 1
-                     from scon_homework_picture hp
-                     where to_days(hp.create_time) = to_days(sp.push_time)
-                       and hp.vip_id = sp.vip_id
-                       and hp.is_delete = 0)
-    </update>
-
-    <select id="findLearningDate" resultType="java.lang.String">
-        select date(create_time)
-        from scon_homework
-        where vip_id = #{vipId}
-          and work_type in (1,2,4)
-          and create_time between #{beginDateTimeStr} and #{endDateTimeStr}
-    </select>
-
-    <select id="countHomeworkDaysAndUsedTime" resultType="java.util.Map">
-        select subject course_name,
-               count(*) coursecount,
-               sum(ifnull(used_time, 0)) used_time
-        from scon_homework
-        where work_type in (1,2,4)
-          and vip_id = #{vipId}
-          and create_time between #{beginTime} and #{endTime}
-        group by subject
-    </select>
-</mapper>

target/classes/mybatis/mybatis-config.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE configuration PUBLIC "-//mybatis.org//DTD Config 3.0//EN" "http://mybatis.org/dtd/mybatis-3-config.dtd">
-<configuration>
-	<settings>
-		<setting name="logImpl" value="STDOUT_LOGGING" />
-
-	</settings>
-	<typeAliases>
-		<typeAlias alias="Integer" type="java.lang.Integer" />
-		<typeAlias alias="Long" type="java.lang.Long" />
-		<typeAlias alias="String" type="java.lang.String" />
-		<typeAlias alias="HashMap" type="java.util.HashMap" />
-		<typeAlias alias="LinkedHashMap" type="java.util.LinkedHashMap" />
-		<typeAlias alias="ArrayList" type="java.util.ArrayList" />
-		<typeAlias alias="LinkedList" type="java.util.LinkedList" />
-	</typeAliases>
-</configuration>

target/classes/static/js/awardRotate.js

@@ -1,303 +0,0 @@
-(function($) {
-var supportedCSS,styles=document.getElementsByTagName("head")[0].style,toCheck="transformProperty WebkitTransform OTransform msTransform MozTransform".split(" ");
-for (var a=0;a<toCheck.length;a++) if (styles[toCheck[a]] !== undefined) supportedCSS = toCheck[a];
-// Bad eval to preven google closure to remove it from code o_O
-// After compresion replace it back to var IE = 'v' == '\v'
-var IE = eval('"v"=="\v"');
-
-jQuery.fn.extend({
-    rotate:function(parameters)
-    {
-        if (this.length===0||typeof parameters=="undefined") return;
-            if (typeof parameters=="number") parameters={angle:parameters};
-        var returned=[];
-        for (var i=0,i0=this.length;i<i0;i++)
-            {
-                var element=this.get(i);	
-                if (!element.Wilq32 || !element.Wilq32.PhotoEffect) {
-
-                    var paramClone = $.extend(true, {}, parameters); 
-                    var newRotObject = new Wilq32.PhotoEffect(element,paramClone)._rootObj;
-
-                    returned.push($(newRotObject));
-                }
-                else {
-                    element.Wilq32.PhotoEffect._handleRotation(parameters);
-                }
-            }
-            return returned;
-    },
-    getRotateAngle: function(){
-        var ret = [];
-        for (var i=0,i0=this.length;i<i0;i++)
-            {
-                var element=this.get(i);	
-                if (element.Wilq32 && element.Wilq32.PhotoEffect) {
-                    ret[i] = element.Wilq32.PhotoEffect._angle;
-                }
-            }
-            return ret;
-    },
-    stopRotate: function(){
-        for (var i=0,i0=this.length;i<i0;i++)
-            {
-                var element=this.get(i);	
-                if (element.Wilq32 && element.Wilq32.PhotoEffect) {
-                    clearTimeout(element.Wilq32.PhotoEffect._timer);
-                }
-            }
-    }
-});
-
-// Library agnostic interface
-
-Wilq32=window.Wilq32||{};
-Wilq32.PhotoEffect=(function(){
-
-	if (supportedCSS) {
-		return function(img,parameters){
-			img.Wilq32 = {
-				PhotoEffect: this
-			};
-            
-            this._img = this._rootObj = this._eventObj = img;
-            this._handleRotation(parameters);
-		}
-	} else {
-		return function(img,parameters) {
-			// Make sure that class and id are also copied - just in case you would like to refeer to an newly created object
-            this._img = img;
-
-			this._rootObj=document.createElement('span');
-			this._rootObj.style.display="inline-block";
-			this._rootObj.Wilq32 = 
-				{
-					PhotoEffect: this
-				};
-			img.parentNode.insertBefore(this._rootObj,img);
-			
-			if (img.complete) {
-				this._Loader(parameters);
-			} else {
-				var self=this;
-				// TODO: Remove jQuery dependency
-				jQuery(this._img).bind("load", function()
-				{
-					self._Loader(parameters);
-				});
-			}
-		}
-	}
-})();
-
-Wilq32.PhotoEffect.prototype={
-    _setupParameters : function (parameters){
-		this._parameters = this._parameters || {};
-        if (typeof this._angle !== "number") this._angle = 0 ;
-        if (typeof parameters.angle==="number") this._angle = parameters.angle;
-        this._parameters.animateTo = (typeof parameters.animateTo==="number") ? (parameters.animateTo) : (this._angle); 
-
-        this._parameters.step = parameters.step || this._parameters.step || null;
-		this._parameters.easing = parameters.easing || this._parameters.easing || function (x, t, b, c, d) { return -c * ((t=t/d-1)*t*t*t - 1) + b; }
-		this._parameters.duration = parameters.duration || this._parameters.duration || 1000;
-        this._parameters.callback = parameters.callback || this._parameters.callback || function(){};
-        if (parameters.bind && parameters.bind != this._parameters.bind) this._BindEvents(parameters.bind); 
-	},
-	_handleRotation : function(parameters){
-          this._setupParameters(parameters);
-          if (this._angle==this._parameters.animateTo) {
-              this._rotate(this._angle);
-          }
-          else { 
-              this._animateStart();          
-          }
-	},
-
-	_BindEvents:function(events){
-		if (events && this._eventObj) 
-		{
-            // Unbinding previous Events
-            if (this._parameters.bind){
-                var oldEvents = this._parameters.bind;
-                for (var a in oldEvents) if (oldEvents.hasOwnProperty(a)) 
-                        // TODO: Remove jQuery dependency
-                        jQuery(this._eventObj).unbind(a,oldEvents[a]);
-            }
-
-            this._parameters.bind = events;
-			for (var a in events) if (events.hasOwnProperty(a)) 
-				// TODO: Remove jQuery dependency
-					jQuery(this._eventObj).bind(a,events[a]);
-		}
-	},
-
-	_Loader:(function()
-	{
-		if (IE)
-		return function(parameters)
-		{
-			var width=this._img.width;
-			var height=this._img.height;
-			this._img.parentNode.removeChild(this._img);
-							
-			this._vimage = this.createVMLNode('image');
-			this._vimage.src=this._img.src;
-			this._vimage.style.height=height+"px";
-			this._vimage.style.width=width+"px";
-			this._vimage.style.position="absolute"; // FIXES IE PROBLEM - its only rendered if its on absolute position!
-			this._vimage.style.top = "0px";
-			this._vimage.style.left = "0px";
-
-			/* Group minifying a small 1px precision problem when rotating object */
-			this._container =  this.createVMLNode('group');
-			this._container.style.width=width;
-			this._container.style.height=height;
-			this._container.style.position="absolute";
-			this._container.setAttribute('coordsize',width-1+','+(height-1)); // This -1, -1 trying to fix ugly problem with small displacement on IE
-			this._container.appendChild(this._vimage);
-			
-			this._rootObj.appendChild(this._container);
-			this._rootObj.style.position="relative"; // FIXES IE PROBLEM
-			this._rootObj.style.width=width+"px";
-			this._rootObj.style.height=height+"px";
-			this._rootObj.setAttribute('id',this._img.getAttribute('id'));
-			this._rootObj.className=this._img.className;			
-		    this._eventObj = this._rootObj;	
-		    this._handleRotation(parameters);	
-		}
-		else
-		return function (parameters)
-		{
-			this._rootObj.setAttribute('id',this._img.getAttribute('id'));
-			this._rootObj.className=this._img.className;
-			
-			this._width=this._img.width;
-			this._height=this._img.height;
-			this._widthHalf=this._width/2; // used for optimisation
-			this._heightHalf=this._height/2;// used for optimisation
-			
-			var _widthMax=Math.sqrt((this._height)*(this._height) + (this._width) * (this._width));
-
-			this._widthAdd = _widthMax - this._width;
-			this._heightAdd = _widthMax - this._height;	// widthMax because maxWidth=maxHeight
-			this._widthAddHalf=this._widthAdd/2; // used for optimisation
-			this._heightAddHalf=this._heightAdd/2;// used for optimisation
-			
-			this._img.parentNode.removeChild(this._img);	
-			
-			this._aspectW = ((parseInt(this._img.style.width,10)) || this._width)/this._img.width;
-			this._aspectH = ((parseInt(this._img.style.height,10)) || this._height)/this._img.height;
-			
-			this._canvas=document.createElement('canvas');
-			this._canvas.setAttribute('width',this._width);
-			this._canvas.style.position="relative";
-			this._canvas.style.left = -this._widthAddHalf + "px";
-			this._canvas.style.top = -this._heightAddHalf + "px";
-			this._canvas.Wilq32 = this._rootObj.Wilq32;
-			
-			this._rootObj.appendChild(this._canvas);
-			this._rootObj.style.width=this._width+"px";
-			this._rootObj.style.height=this._height+"px";
-            this._eventObj = this._canvas;
-			
-			this._cnv=this._canvas.getContext('2d');
-            this._handleRotation(parameters);
-		}
-	})(),
-
-	_animateStart:function()
-	{	
-		if (this._timer) {
-			clearTimeout(this._timer);
-		}
-		this._animateStartTime = +new Date;
-		this._animateStartAngle = this._angle;
-		this._animate();
-	},
-    _animate:function()
-    {
-         var actualTime = +new Date;
-         var checkEnd = actualTime - this._animateStartTime > this._parameters.duration;
-
-         // TODO: Bug for animatedGif for static rotation ? (to test)
-         if (checkEnd && !this._parameters.animatedGif) 
-         {
-             clearTimeout(this._timer);
-         }
-         else 
-         {
-             if (this._canvas||this._vimage||this._img) {
-                 var angle = this._parameters.easing(0, actualTime - this._animateStartTime, this._animateStartAngle, this._parameters.animateTo - this._animateStartAngle, this._parameters.duration);
-                 this._rotate((~~(angle*10))/10);
-             }
-             if (this._parameters.step) {
-                this._parameters.step(this._angle);
-             }
-             var self = this;
-             this._timer = setTimeout(function()
-                     {
-                     self._animate.call(self);
-                     }, 10);
-         }
-
-         // To fix Bug that prevents using recursive function in callback I moved this function to back
-         if (this._parameters.callback && checkEnd){
-             this._angle = this._parameters.animateTo;
-             this._rotate(this._angle);
-             this._parameters.callback.call(this._rootObj);
-         }
-     },
-
-	_rotate : (function()
-	{
-		var rad = Math.PI/180;
-		if (IE)
-		return function(angle)
-		{
-            this._angle = angle;
-			this._container.style.rotation=(angle%360)+"deg";
-		}
-		else if (supportedCSS)
-		return function(angle){
-            this._angle = angle;
-			this._img.style[supportedCSS]="rotate("+(angle%360)+"deg)";
-		}
-		else 
-		return function(angle)
-		{
-            this._angle = angle;
-			angle=(angle%360)* rad;
-			// clear canvas	
-			this._canvas.width = this._width+this._widthAdd;
-			this._canvas.height = this._height+this._heightAdd;
-						
-			// REMEMBER: all drawings are read from backwards.. so first function is translate, then rotate, then translate, translate..
-			this._cnv.translate(this._widthAddHalf,this._heightAddHalf);	// at least center image on screen
-			this._cnv.translate(this._widthHalf,this._heightHalf);			// we move image back to its orginal 
-			this._cnv.rotate(angle);										// rotate image
-			this._cnv.translate(-this._widthHalf,-this._heightHalf);		// move image to its center, so we can rotate around its center
-			this._cnv.scale(this._aspectW,this._aspectH); // SCALE - if needed ;)
-			this._cnv.drawImage(this._img, 0, 0);							// First - we draw image
-		}
-
-	})()
-}
-
-if (IE)
-{
-Wilq32.PhotoEffect.prototype.createVMLNode=(function(){
-document.createStyleSheet().addRule(".rvml", "behavior:url(#default#VML)");
-		try {
-			!document.namespaces.rvml && document.namespaces.add("rvml", "urn:schemas-microsoft-com:vml");
-			return function (tagName) {
-				return document.createElement('<rvml:' + tagName + ' class="rvml">');
-			};
-		} catch (e) {
-			return function (tagName) {
-				return document.createElement('<' + tagName + ' xmlns="urn:schemas-microsoft.com:vml" class="rvml">');
-			};
-		}		
-})();
-}
-
-})(jQuery);

target/classes/static/js/city/Popt.js

@@ -1,233 +0,0 @@
-Array.prototype.unique = function () {//去数组重复
-    return this.sort().join(",,").replace(/(,|^)([^,]+)(,,\2)+(,|$)/g, "$1$2$4").replace(/,,+/g, ",").replace(/,$/, "").split(",");
-}
-var Iput = {
-    confg: {
-        hand: "0", //0对像位置1鼠标位置divID滚动位置
-        idIframe: "PoPx", //默认可不用改
-        idBox: "PoPy", //默认可不用改
-        content: "", //传过来的内容
-        ok: null, //弹出框之后执行的函数
-        id: null, //不能为空一般传this对像而不是对像ID
-        event: window.event, //这个必写一般为e就可以了
-        top: 0, //顶部偏移位置
-        left: 0, //左部偏移位置
-        bodyHeight: 0, //在被position:absolute元素下得到HTML真实高度
-        bodyWidth: 0,
-        width: 0,
-        soll: null,
-        pop: null //指定ID点击时不关闭
-    },
-    get: function (obj) { return document.getElementById(obj); },
-    lft: function (e) {
-        var l = 0;
-        while (e) { l += e.offsetLeft; e = e.offsetParent; }
-        return l
-    },
-    ltp: function (e) {
-        var t = 0;
-        while (e) { t += e.offsetTop; e = e.offsetParent; }
-        return t
-    },
-    clear: function () {
-        Iput.confg.hand = "0"; Iput.confg.ok = null; Iput.confg.top = 0; Iput.confg.left = 0; Iput.confg.bodyHeight = 0; Iput.confg.bodyWidth = 0; Iput.confg.width = 0; Iput.confg.pop = null;
-    },
-    stopBubble: function (e) {
-        if (e && e.stopPropagation) {
-            e.stopPropagation();    //w3c
-        } else {
-            window.event.cancelBubble = true; //IE
-        }
-    },
-    pop: function () {
-        var $a = document.getElementsByTagName("body").item(0);
-        var $c = document.createElement("iframe");
-        var $b = document.createElement("div");
-        $c.setAttribute('id', Iput.confg.idIframe);
-        $c.setAttribute("src", "about:blank");
-        $c.style.zindex = '100';
-        $c.frameBorder = "0";
-        $c.style.width = "0px";
-        $c.style.height = "0px";
-        $c.style.position = 'absolute';
-        $b.setAttribute('id', Iput.confg.idBox);
-        $b.setAttribute('align', 'left');
-        $b.style.position = 'absolute';
-        $b.style.background = 'transparent';
-        $b.style.zIndex = '20000';
-        if ($a) {
-            if (Iput.get(Iput.confg.idIframe)) {
-                Iput.colse();
-            }
-            $a.appendChild($c);
-            if ($c) {
-                $c.ownerDocument.body.appendChild($b);
-            }
-            Iput.get(Iput.confg.idBox).innerHTML = Iput.confg.content;
-            Iput.drice(Iput.confg.event);
-        }
-
-        if (!document.all) {
-            window.document.addEventListener("click", Iput.hide, false);
-        }
-        else {
-            window.document.attachEvent("onclick", Iput.hide);
-        }
-    },
-    drice: function (e) {
-        var bodyHith = Iput.confg.bodyHeight == 0 ? document.body.scrollHeight : Iput.confg.bodyHeight;
-        var bodywidth = Iput.confg.bodyWidth == 0 ? document.body.scrollWidth : Iput.confg.bodyWidth;
-        if (!e) e = window.event;
-        var top = 0, left = 0;
-        var a = Iput.get(Iput.confg.idBox);
-        var b = Iput.get(Iput.confg.idIframe);
-        var c = Iput.confg.id.offsetHeight;
-        var d = Iput.confg.id.offsetWidth;
-        var w = 0;
-        var st = 0;
-        var sl = 0;
-        if (Iput.confg.soll != null) {
-            st = document.getElementById(Iput.confg.soll).scrollTop;
-            sl = document.getElementById(Iput.confg.soll).scrollLeft;
-        }
-        if (Iput.get(Iput.confg.idIframe)) {
-            if (Iput.confg.hand == "1") {
-                top = Iput.confg.top + document.body.scrollTop + document.documentElement.scrollTop + e.clientY;
-                left = Iput.confg.left + e.clientX + document.body.scrollLeft + document.documentElement.scrollLeft;
-                if (a.offsetHeight + top > bodyHith) { top = top - a.offsetHeight + Iput.get(Iput.confg.idBox).firstChild.offsetHeight; }
-                if (a.offsetWidth + left > bodywidth) { left = left - a.offsetWidth + Iput.get(Iput.confg.idBox).firstChild.offsetWidth; }
-                a.style.top = top - st + "px";
-                b.style.top = top - st + "px";
-                a.style.left = left - sl + "px";
-                b.style.left = left - sl + "px";
-            }
-            else if (Iput.confg.hand == "0") {
-                w = Iput.confg.id.offsetWidth + "px";
-                a.style.width = w;
-                b.style.width = w;
-                height = c;
-                top = Iput.confg.top + Iput.ltp(Iput.confg.id);
-                left = Iput.confg.left + Iput.lft(Iput.confg.id);
-                if (a.firstChild.offsetHeight + top + c > bodyHith) { top = top - a.firstChild.offsetHeight - c; }
-                if (a.firstChild.offsetWidth + left > bodywidth) { left = left - a.firstChild.offsetWidth + d; }
-                b.style.top = top - st + "px";
-                a.style.top = top - st + height + "px";
-                b.style.left = left - sl + "px";
-                a.style.left = left - sl + "px";
-            }
-            else {
-                height = c;
-                top = Iput.confg.top - Iput.get(Iput.confg.hand).scrollTop + Iput.ltp(Iput.confg.id);
-                left = Iput.confg.left - Iput.get(Iput.confg.hand).scrollLeft + Iput.lft(Iput.confg.id);
-
-                if (a.offsetHeight + top > bodyHith) { top = top - a.offsetHeight - c; }
-                if (a.offsetWidth + left > bodywidth) { left = left - a.offsetWidth - d; }
-
-                b.style.top = top - st + height + "px";
-                a.style.top = top - st + height + "px";
-                b.style.left = left - sl + "px";
-                a.style.left = left - sl + "px";
-            }
-        }
-    },
-    show: function () {
-        var config = arguments[0]; var that = Iput.confg;
-        Iput.clear();
-        for (var i in that) { if (config[i] != undefined) { that[i] = config[i]; } };
-        Iput.pop();
-        if (Iput.confg.ok != null) {
-            Iput.action(Iput.confg.ok());
-        }
-    },
-    colse: function () {
-        if (Iput.get(Iput.confg.idIframe)) {
-            document.body.removeChild(Iput.get(Iput.confg.idBox));
-            document.body.removeChild(Iput.get(Iput.confg.idIframe));
-        }
-        if (Iput.get(Iput.confg.pop)) {
-            Iput.get(Iput.confg.pop).style.display = "none";
-        }
-    },
-    $colse: function () { Iput.colse(); },
-    hide: function (e) {//点击任何处关闭层
-        e = window.event || e;
-        var srcElement = e.srcElement || e.target;
-        if (Iput.confg.event == undefined) {//输入时用,般在没传入Iput.confg.event请况下使用
-            Iput.colse();
-        }
-        else {
-            var a = Iput.confg.event.srcElement || Iput.confg.event.target;
-            var b = Iput.get(Iput.confg.pop);
-            if (a != srcElement) { Iput.colse(); }
-            if (b != null) {
-                if (b != srcElement && a != srcElement) { Iput.colse(); }
-            }
-        }
-        if (Iput.get(Iput.confg.idIframe)) {
-            Iput.get(Iput.confg.idIframe).onclick = function (e) { Iput.stopBubble(e); };
-            Iput.get(Iput.confg.idBox).onclick = function (e) { Iput.stopBubble(e); };
-        }
-        if (Iput.get(Iput.confg.pop)) {
-            Iput.get(Iput.confg.pop).onclick = function (e) { Iput.stopBubble(e); };
-        }
-
-    },
-    action: function (obj) {
-        eval(obj);
-    },
-    cookie: {
-        Set: function (name, val) {
-            var Days = 30;                          //此 cookie 将被保存 30 天
-            var exp = new Date();                  //new Date("December 31, 9998");
-            exp.setTime(exp.getTime() + Days * 24 * 60 * 60 * 1000);
-            document.cookie = name + "=" + escape(val) + ";expires=" + exp.toGMTString() + "; path=/";
-        },
-        Get: function (name) {
-            var start = document.cookie.indexOf(name);
-            var end = document.cookie.indexOf(";", start);
-            return start == -1 ? null : unescape(document.cookie.substring(start + name.length + 1, (end > start ? end : document.cookie.length)));
-        },
-        Del: function (name) {
-            var exp = new Date();
-            exp.setTime(exp.getTime() - 1);
-            var cval = this.GetCookie(name);
-            if (cval != null) document.cookie = name + "=" + cval + ";expires=" + exp.toGMTString();
-        }
-    },
-    ischeck: function (bol) {
-        var objs = form1.getElementsByTagName("input");
-        if (bol) {
-            for (var i = 0; i < objs.length; i++) { if (objs[i].type.toLowerCase() == "checkbox") { objs[i].checked = true; } }
-        }
-        else {
-            for (var i = 0; i < objs.length; i++) { if (objs[i].type.toLowerCase() == "checkbox") { objs[i].checked = false; } }
-        }
-    },
-    contains: function (star, end, isIgnoreCase) {
-        if (isIgnoreCase) {
-            star = star.toLowerCase();
-            end = end.toLowerCase();
-        }
-        var startChar = end.substring(0, 1);
-        var strLen = end.length;
-        for (var j = 0; j < star.length - strLen + 1; j++) {
-            if (star.charAt(j) == startChar)//如果匹配起始字符,开始查找
-            {
-                if (star.substring(j, j + strLen) == end)//如果从j开始的字符与str匹配，那ok
-                {
-                    return true;
-                }
-            }
-        }
-        return false;
-    },
-    gData: function (name, value) {
-        var top = window.top, cache = top['_CACHE'] || {};
-        top['_CACHE'] = cache;
-        return value ? cache[name] = value : cache[name];
-    },
-    rData: function (name) {
-        var cache = window.top['_CACHE'];
-        if (cache && cache[name]) delete cache[name];
-    }
-}

target/classes/static/js/city/citySet.js

@@ -1,130 +0,0 @@
-function SelCity(obj, e) {
-    var ths = obj;
-    var dal = '<div class="_citys"><span title="关闭" id="cColse" >×</span><div id="_citysheng" class="_citys0">请选择省份</div><div id="_citys0" class="_citys1"></div><div style="display:none" id="_citys1" class="_citys1"></div><div style="display:none" id="_citys2" class="_citys1"></div></div>';
-    Iput.show({
-        id: ths,
-        event: e,
-        content: dal,
-        width: "470"
-    });
-    $("#cColse").click(function() {
-        Iput.colse()
-    });
-    var tb_province = [];
-    var b = province;
-    for (var i = 0,
-    len = b.length; i < len; i++) {
-        tb_province.push('<a data-id="' + b[i]['id'] + '" data-name="' + b[i]['name'] + '" title="' + b[i]['name'] + '">' + b[i]['name'] + '</a>')
-    }
-    $("#_citys0").append(tb_province.join(""));
-    $("#_citys0 a").click(function() {
-        var g = getCity($(this));
-        $("#_citys1 a").remove();
-        $("#_citys1").append(g);
-        $("._citys1").hide();
-        $("._citys1:eq(1)").show();
-        $("#_citys0 a,#_citys1 a,#_citys2 a").removeClass("AreaS");
-        $(this).addClass("AreaS");
-        var lev = $(this).data("name");
-        ths.value = $(this).data("name");
-        if (document.getElementById("hcity") == null) {
-            var hcitys = $('<input>', {
-                type: 'hidden',
-                name: "hcity",
-                "data-id": $(this).data("id"),
-                id: "hcity",
-                val: lev
-            });
-            $(ths).after(hcitys)
-        } else {
-            $("#hcity").val(lev);
-            $("#hcity").attr("data-id", $(this).data("id"))
-        }
-        $("#_citys1 a").click(function() {
-            $("#_citys1 a,#_citys2 a").removeClass("AreaS");
-            $(this).addClass("AreaS");
-            var lev = $(this).data("name");
-            if (document.getElementById("hproper") == null) {
-                var hcitys = $('<input>', {
-                    type: 'hidden',
-                    name: "hproper",
-                    "data-id": $(this).data("id"),
-                    id: "hproper",
-                    val: lev
-                });
-                $(ths).after(hcitys)
-            } else {
-                $("#hproper").attr("data-id", $(this).data("id"));
-                $("#hproper").val(lev)
-            }
-            var bc = $("#hcity").val();
-            ths.value = bc + "/" + $(this).data("name");
-            var ar = getArea($(this));
-            $("#_citys2 a").remove();
-            if (ar == '') Iput.colse();
-            $("#_citys2").append(ar);
-            $("._citys1").hide();
-            $("._citys1:eq(2)").show();
-            $("#_citys2 a").click(function() {
-                $("#_citys2 a").removeClass("AreaS");
-                $(this).addClass("AreaS");
-                var lev = $(this).data("name");
-                if (document.getElementById("harea") == null) {
-                    var hcitys = $('<input>', {
-                        type: 'hidden',
-                        name: "harea",
-                        "data-id": $(this).data("id"),
-                        id: "harea",
-                        val: lev
-                    });
-                    $(ths).after(hcitys)
-                } else {
-                    $("#harea").val(lev);
-                    $("#harea").attr("data-id", $(this).data("id"))
-                }
-                var bc = $("#hcity").val();
-                var bp = $("#hproper").val();
-                ths.value = bc + "/" + bp + "/" + $(this).data("name");
-                Iput.colse()
-            })
-        })
-    })
-}
-function getCity(obj) {
-    var c = obj.data('id');
-    var e = province;
-    var f = [];
-    var g = '';
-    for (var i = 0; i < e.length; i++) {
-        if (e[i]['id'] == parseInt(c)) {
-            f = e[i]['son'];
-            break
-        }
-    }
-    for (var j = 0; j < f.length; j++) {
-        g += '<a data-id="' + f[j]['id'] + '" data-name="' + f[j]['name'] + '" title="' + f[j]['name'] + '">' + f[j]['name'] + '</a>'
-    }
-    $("#_citysheng").html('请选择城市');
-    return g
-}
-function getArea(obj) {
-    var c = obj.data('id');
-    var e = province;
-    var f = [];
-    var g = '';
-    for (var i = 0; i < e.length; i++) {
-        for (var j = 0; j < e[i]['son'].length; j++) {
-            if (e[i]['son'][j]['id'] == parseInt(c) && e[i]['son'][j]['sec']) {
-                f = e[i]['son'][j]['sec'];
-                break
-            }
-        }
-    }
-    if (f.length) {
-        for (var k = 0; k < f.length; k++) {
-            g += '<a data-id="' + f[k]['id'] + '" data-name="' + f[k]['name'] + '" title="' + f[k]['name'] + '">' + f[k]['name'] + '</a>'
-        }
-    }
-    $("#_citysheng").html('请选择区县');
-    return g
-}

target/classes/static/js/city/citySetMe.js

@@ -1,140 +0,0 @@
-function SelCity(obj, e) {
-    var ths = obj;
-    var dal = '<div class="_citys"><span title="关闭" id="cColse" >×</span><div id="_citysheng" class="_citys0">请选择省份</div><div id="_citys0" class="_citys1"></div><div style="display:none" id="_citys1" class="_citys1"></div><div style="display:none" id="_citys2" class="_citys1"></div></div>';
-    Iput.show({
-        id: ths,
-        event: e,
-        content: dal,
-        width: "470"
-    });
-    $("#cColse").click(function() {
-        Iput.colse()
-    });
-    var tb_province = [];
-    var b = province;
-    for (var i = 0,
-    len = b.length; i < len; i++) {
-        tb_province.push('<a data-id="' + b[i]['id'] + '" data-name="' + b[i]['name'] + '" title="' + b[i]['name'] + '">' + b[i]['name'] + '</a>')
-    }
-    $("#_citys0").append(tb_province.join(""));
-    $("#_citys0 a").click(function() {
-        var g = getCity($(this));
-        $("#_citys1 a").remove();
-        $("#_citys1").append(g);
-        $("._citys1").hide();
-        $("._citys1:eq(1)").show();
-        $("#_citys0 a,#_citys1 a,#_citys2 a").removeClass("AreaS");
-        $(this).addClass("AreaS");
-        var lev = $(this).data("name");
-       // ths.value = $(this).data("name");
-        var pre = $(this).data("name");
-        if( $(this).data("name")=="北京市"||$(this).data("name")=="天津市"||$(this).data("name")=="重庆市"||$(this).data("name")=="上海市"||$(this).data("name")=="台湾省"||$(this).data("name")=="香港特别行政区"||$(this).data("name")=="澳门特别行政区"){
-        	ths.value = $(this).data("name");
-        }
-        $("#area").val("");
-        if (document.getElementById("hcity") == null) {
-            var hcitys = $('<input>', {
-                type: 'hidden',
-                name: "hcity",
-                "data-id": $(this).data("id"),
-                id: "hcity",
-                val: lev
-            });
-            $(ths).after(hcitys)
-        } else {
-            $("#hcity").val(lev);
-            $("#hcity").attr("data-id", $(this).data("id"))
-        }
-        $("#_citys1 a").click(function() {
-            $("#_citys1 a,#_citys2 a").removeClass("AreaS");
-            $(this).addClass("AreaS");
-            var lev = $(this).data("name");
-            if (document.getElementById("hproper") == null) {
-                var hcitys = $('<input>', {
-                    type: 'hidden',
-                    name: "hproper",
-                    "data-id": $(this).data("id"),
-                    id: "hproper",
-                    val: lev
-                });
-                $(ths).after(hcitys)
-            } else {
-                $("#hproper").attr("data-id", $(this).data("id"));
-                $("#hproper").val(lev)
-            }
-            var bc = $("#hcity").val();
-            if( pre=="北京市"||pre=="天津市"||pre=="重庆市"||pre=="上海市"||pre=="台湾省"||pre=="香港特别行政区"||pre=="澳门特别行政区"){
-            	 $("#area").val($(this).data("name"));
-            }else{
-            	ths.value = $(this).data("name");
-            }
-            
-            var ar = getArea($(this));
-            $("#_citys2 a").remove();
-            if (ar == '') Iput.colse();
-            $("#_citys2").append(ar);
-            $("._citys1").hide();
-            $("._citys1:eq(2)").show();
-            $("#_citys2 a").click(function() {
-                $("#_citys2 a").removeClass("AreaS");
-                $(this).addClass("AreaS");
-                var lev = $(this).data("name");
-                if (document.getElementById("harea") == null) {
-                    var hcitys = $('<input>', {
-                        type: 'hidden',
-                        name: "harea",
-                        "data-id": $(this).data("id"),
-                        id: "harea",
-                        val: lev
-                    });
-                    $(ths).after(hcitys)
-                } else {
-                    $("#harea").val(lev);
-                    $("#harea").attr("data-id", $(this).data("id"))
-                }
-                var bc = $("#hcity").val();
-                var bp = $("#hproper").val();
-                $("#area").val($(this).data("name"));
-                Iput.colse()
-            })
-        })
-    })
-}
-function getCity(obj) {
-    var c = obj.data('id');
-    var e = province;
-    var f = [];
-    var g = '';
-    for (var i = 0; i < e.length; i++) {
-        if (e[i]['id'] == parseInt(c)) {
-            f = e[i]['son'];
-            break
-        }
-    }
-    for (var j = 0; j < f.length; j++) {
-        g += '<a data-id="' + f[j]['id'] + '" data-name="' + f[j]['name'] + '" title="' + f[j]['name'] + '">' + f[j]['name'] + '</a>'
-    }
-    $("#_citysheng").html('请选择城市');
-    return g
-}
-function getArea(obj) {
-    var c = obj.data('id');
-    var e = province;
-    var f = [];
-    var g = '';
-    for (var i = 0; i < e.length; i++) {
-        for (var j = 0; j < e[i]['son'].length; j++) {
-            if (e[i]['son'][j]['id'] == parseInt(c) && e[i]['son'][j]['sec']) {
-                f = e[i]['son'][j]['sec'];
-                break
-            }
-        }
-    }
-    if (f.length) {
-        for (var k = 0; k < f.length; k++) {
-            g += '<a data-id="' + f[k]['id'] + '" data-name="' + f[k]['name'] + '" title="' + f[k]['name'] + '">' + f[k]['name'] + '</a>'
-        }
-    }
-    $("#_citysheng").html('请选择区县');
-    return g
-}

target/classes/static/js/city/citySetMe_V.js

@@ -1,184 +0,0 @@
-function SelCity(obj, e) {
-	$("#hcity").remove();
-	$("#hproper").remove();
-	$("#harea").remove();
-    var ths = obj;
-    var dal = '<div class="_citys"><span title="关闭" id="cColse" >×</span><div id="_citysheng" class="_citys0">请选择省份</div><div id="_citys0" class="_citys1"></div><div style="display:none" id="_citys1" class="_citys1"></div><div style="display:none" id="_citys2" class="_citys1"></div></div>';
-    Iput.show({
-        id: ths,
-        event: e,
-        content: dal,
-        width: "470"
-    });
-    $("#cColse").click(function() {
-        Iput.colse()
-    });
-    var tb_province = [];
-    var b = province;
-    for (var i = 0,
-    len = b.length; i < len; i++) {
-        tb_province.push('<a data-id="' + b[i]['id'] + '" data-name="' + b[i]['name'] + '" title="' + b[i]['name'] + '">' + b[i]['name'] + '</a>')
-    }
-    $("#_citys0").append(tb_province.join(""));
-    $("#_citys0 a").click(function() {
-        var g = getCity($(this));
-        $("#_citys1 a").remove();
-        $("#_citys1").append(g);
-        $("._citys1").hide();
-        $("._citys1:eq(1)").show();
-        $("#_citys0 a,#_citys1 a,#_citys2 a").removeClass("AreaS");
-        $(this).addClass("AreaS");
-        var lev = $(this).data("name");
-       // ths.value = $(this).data("name");
-        var pre = $(this).data("name");
-        if( $(this).data("name")=="北京市"||$(this).data("name")=="天津市"||$(this).data("name")=="重庆市"||$(this).data("name")=="上海市"||$(this).data("name")=="台湾省"||$(this).data("name")=="香港特别行政区"||$(this).data("name")=="澳门特别行政区"){
-        	
-        }
-        $("#area").val("");
-        if (document.getElementById("hcity") == null) {
-            var hcitys = $('<input>', {
-                type: 'hidden',
-                name: "hcity",
-                "data-id": $(this).data("id"),
-                id: "hcity",
-                val: lev
-            });
-            $(ths).after(hcitys)
-        } else {
-            $("#hcity").val(lev);
-            $("#hcity").attr("data-id", $(this).data("id"))
-        }
-        $("#_citys1 a").click(function() {
-            $("#_citys1 a,#_citys2 a").removeClass("AreaS");
-            $(this).addClass("AreaS");
-            var lev = $(this).data("name");
-            if (document.getElementById("hproper") == null) {
-                var hcitys = $('<input>', {
-                    type: 'hidden',
-                    name: "hproper",
-                    "data-id": $(this).data("id"),
-                    id: "hproper",
-                    val: lev
-                });
-                $(ths).after(hcitys)
-            } else {
-                $("#hproper").attr("data-id", $(this).data("id"));
-                $("#hproper").val(lev)
-            }
-            var bc = $("#hcity").val();
-            if( pre=="北京市"||pre=="天津市"||pre=="重庆市"||pre=="上海市"||pre=="台湾省"||pre=="香港特别行政区"||pre=="澳门特别行政区"){
-            	 $("#area").val($(this).data("name"));
-            }else{
-            	
-            }
-            
-            var ar = getArea($(this));
-            $("#_citys2 a").remove();
-            if (ar == '') Iput.colse();
-            $("#_citys2").append(ar);
-            $("._citys1").hide();
-            $("._citys1:eq(2)").show();
-            $("#_citys2 a").click(function() {
-                $("#_citys2 a").removeClass("AreaS");
-                $(this).addClass("AreaS");
-                var lev = $(this).data("name");
-                if (document.getElementById("harea") == null) {
-                    var hcitys = $('<input>', {
-                        type: 'hidden',
-                        name: "harea",
-                        "data-id": $(this).data("id"),
-                        id: "harea",
-                        val: lev
-                    });
-                    $(ths).after(hcitys)
-                } else {
-                    $("#harea").val(lev);
-                    $("#harea").attr("data-id", $(this).data("id"))
-                }
-                var bc = $("#hcity").val();
-                var bp = $("#hproper").val();
-                $("#area").val($(this).data("name"));
-                Iput.colse()
-                
-                
-                var value="";
-            	if($("#hcity").val()!=undefined){
-            		value=$("#hcity").val();
-            	}
-            	if($("#hproper").val()!=undefined){
-            		value=value+$("#hproper").val();
-            	}
-            	if($("#harea").val()!=undefined){
-            		value=value+$("#harea").val();
-            	}
-            	ths.value = value;  
-                
-            })
-            
-            var value="";
-        	if($("#hcity").val()!=undefined){
-        		value=$("#hcity").val();
-        	}
-        	if($("#hproper").val()!=undefined){
-        		value=value+$("#hproper").val();
-        	}
-        	if($("#harea").val()!=undefined){
-        		value=value+$("#harea").val();
-        	}
-        	ths.value = value;
-            
-        })
-        
-        var value="";
-    	if($("#hcity").val()!=undefined){
-    		value=$("#hcity").val();
-    	}
-    	if($("#hproper").val()!=undefined){
-    		value=value+$("#hproper").val();
-    	}
-    	if($("#harea").val()!=undefined){
-    		value=value+$("#harea").val();
-    	}
-    	ths.value = value;
-        
-    })
-
-}
-function getCity(obj) {
-    var c = obj.data('id');
-    var e = province;
-    var f = [];
-    var g = '';
-    for (var i = 0; i < e.length; i++) {
-        if (e[i]['id'] == parseInt(c)) {
-            f = e[i]['son'];
-            break
-        }
-    }
-    for (var j = 0; j < f.length; j++) {
-        g += '<a data-id="' + f[j]['id'] + '" data-name="' + f[j]['name'] + '" title="' + f[j]['name'] + '">' + f[j]['name'] + '</a>'
-    }
-    $("#_citysheng").html('请选择城市');
-    return g
-}
-function getArea(obj) {
-    var c = obj.data('id');
-    var e = province;
-    var f = [];
-    var g = '';
-    for (var i = 0; i < e.length; i++) {
-        for (var j = 0; j < e[i]['son'].length; j++) {
-            if (e[i]['son'][j]['id'] == parseInt(c) && e[i]['son'][j]['sec']) {
-                f = e[i]['son'][j]['sec'];
-                break
-            }
-        }
-    }
-    if (f.length) {
-        for (var k = 0; k < f.length; k++) {
-            g += '<a data-id="' + f[k]['id'] + '" data-name="' + f[k]['name'] + '" title="' + f[k]['name'] + '">' + f[k]['name'] + '</a>'
-        }
-    }
-    $("#_citysheng").html('请选择区县');
-    return g
-}

target/classes/static/js/common.js

@@ -1,84 +0,0 @@
-
-function mediaPlay(id,src,btn,w,h,classN){
-        $(id).jPlayer({
-            ready: function () {
-                $(this).jPlayer("setMedia", {
-                    m4v: src
-                });
-            },
-            swfPath: "jplayer",
-            supplied: "m4v",
-            cssSelectorAncestor: btn,
-            size: {
-                width: w,
-                height: h,
-                cssClass: classN
-            },
-            useStateClassSkin: true,
-            autoBlur: false,
-            smoothPlayBar: true,
-            keyEnabled: true,
-            remainingDuration: true,
-            toggleDuration: true
-        });
-   };
-   
-    function jplayerp(id,src,btn){
-        $(id).jPlayer({
-            ready: function (event) {
-                $(this).jPlayer("setMedia", {
-                    title: "Bubble",
-                    mp3: src
-                });
-            },
-            swfPath: "jplayer",
-            supplied: "mp3, oga",
-            cssSelectorAncestor: btn,
-            wmode: "window",
-            useStateClassSkin: true,
-            autoBlur: false,
-            smoothPlayBar: true,
-            keyEnabled: true,
-            remainingDuration: true,
-            toggleDuration: true
-        });
-    };
-    
-    $(function(){
-        $(".jp-play").click(function(){
-            var prCl = $(this).parents(".audioDiv").find(".soundBox");
-            $(".soundBox").addClass("soundBoxUn");
-            prCl.removeClass("soundBoxUn");
-            $(".soundBoxUn .jp-stop").click();
-        });
-    });
-
-//图片按比例放大缩小
-function DrawImage(ImgD, FitWidth, FitHeight) {
-    var image = new Image();
-    image.src = ImgD.src;
-    if (image.width > 0 && image.height > 0) 
-    {
-        if (image.width / image.height >= FitWidth / FitHeight){
-			if (image.width > FitWidth) {
-				//ImgD.width = FitWidth;
-				ImgD.height = FitHeight;
-				var ml = ((image.width * FitHeight) / image.height - FitWidth)/2;
-				ImgD.style.marginLeft = -ml + "px";
-			}else{
-				//ImgD.width = FitWidth;
-				ImgD.height = FitHeight;
-			}
-		}else {
-			if (image.height > FitHeight) {
-				//ImgD.height = FitHeight;
-				ImgD.width = FitWidth;
-			}else {
-				ImgD.width = FitWidth;
-				//ImgD.height = FitHeight;
-			}
-		}
-	}
-}
-
-

target/classes/static/js/common_math.js

@@ -1,543 +0,0 @@
-/**
- * Created by lizhenya on 2018/5/19.
- */
-
-function openCart() {
-    var t = $(window).width();
-    0 == $(".shopping_all").length ? t > 768 ? $("#shop_cart").animate({
-        right: 35
-    }, 300) : $("#shop_cart").animate({
-        right: 0
-    }, 300) : t > 980 ? $("#shop_cart").animate({
-        right: 35
-    }, 300) : $("#shop_cart").animate({
-        right: 0
-    }, 300),
-    $(".compare_btn").hasClass("open") && closeCompare(),
-        $(".shop_cart").addClass("bg")
-}
-function openBar() {
-    toolbar.hasClass("open") || (toolbar.addClass("open"),
-        $("#shop_cart .lazyload").removeClass("hidden").find("img").trigger("appear"),
-        $(".global_toolbar").removeClass("default"),
-        $(".toolbar_btn").css({
-            top: "50%",
-            marginTop: -$(".toolbar_btn").height() / 2
-        })),
-        $(".global_toolbar").removeClass("opacity"),
-        $(".toolbar_btn").removeClass("default")
-}
-function closeBar() {
-    $(".toolbar_btn a").removeClass("current"),
-        toolbar.removeClass("open"),
-        $(".toolbar_btn").removeClass("default")
-}
-function openCartMeiu() {
-    var t = $(window).width();
-    $(".bar_cart").hasClass("current") || $(".bar_cart").addClass("current").siblings("a").removeClass("current"),
-        $(".global_toolbar").hasClass("open") ? closeBar() : openBar(),
-        t > 768 ? $(".bar_cart").hasClass("current") || $(".bar_cart").trigger("click") : openBar()
-}
-
-function isChecked() {
-    $("#shop_cart .go_btn").removeClass("disable"),
-        $("#shop_cart .go_btn").attr("href", $("#shop_cart .go_btn").attr("data-url"));
-    for (var t = "", e = document.getElementsByName("checkbox_c_Name"), i = 0; i < e.length; i++) {
-        var r = $(e[i]).attr("data-url");
-        if (1 == e[i].checked) {
-            if ("undefined" != r) {
-                var n = r.split("|")
-                    , o = $(e[i]).siblings(".amount_btn").find("input").val();
-                t += "" != t ? "|" + n[1] + "," + o + "," + n[0] + ",1" : n[1] + "," + o + "," + n[0] + ",1"
-            }
-        } else if ("undefined" != r) {
-            var n = r.split("|")
-                , o = $(e[i]).siblings(".amount_btn").find("input").val();
-            t += "" != t ? "|" + n[1] + "," + o + "," + n[0] + ",0" : n[1] + "," + o + "," + n[0] + ",0"
-        }
-    }
-    var s = $("#vHidelink").val() + encodeURIComponent($("#vHideToken").val());
-    s = (s = (s = s.replace("en-GB", "uk")).replace("ru-RU", "ru")).replace("test120.huawei.com/zh", "test120.huawei.com/zh/EBG/Home").replace("test120.huawei.com/cn", "test120.huawei.com/zh/EBG/Home");
-    var a = {
-        type: 23,
-        vgUserId: $("#hidevUserName").val(),
-        UpdateString: t
-    };
-    $.ajax({
-        url: s,
-        type: "POST",
-        data: a,
-        success: function(t) {},
-        error: function(t) {}
-    }),
-        CheckedAll()
-}
-
-function BindFCPwdHref() {
-    var t = $("#aForgotPassword").attr("href")
-        , e = $("#aChangePassword").attr("href");
-    try {
-        var i = GetQueryString("redirect");
-        if (IsEmpty(i)) {
-            var r = getLanguages()
-                , n = "http://" + window.location.host + "/" + r;
-            $("#aForgotPassword").attr("href", t + n),
-                $("#aChangePassword").attr("href", e + n)
-        } else {
-            var o = decodeURI(i);
-            o = o.replace("+", " ").replace("+", " ").replace("+", " ").replace("+", " ").replace("+", " ").replace("+", " ").replace("+", " ").replace("+", " "),
-                $("#aForgotPassword").attr("href", t + o),
-                $("#aChangePassword").attr("href", e + o)
-        }
-    } catch (s) {}
-}
-
-var toolbar = $(".global_toolbar");
-$(function() {
-    $("#wap_cartbtn_display").addClass("none");
-    var t = $(window).height();
-    $(window).width();
-    setTimeout(function() {
-        //BindDataTableAll()
-    }, 5e3),
-        $("body").click(function(t) {
-            toolbar.hasClass("open") && closeBar()
-        }),
-        toolbar.click(function(t) {
-            t.stopPropagation()
-        }),
-        $(".go_compare").click(function(t) {
-            t.stopPropagation(),
-                gpXlItemId = $("#hideItemId").val(),
-                $(".m-pic_details.show").length > 3 ? $("#popup_full").fadeIn(300) : (LoadCompareAll(),
-                    joinCompareOne(this),
-                    $(".m-pic_details.show").length < 2 ? $(".m-compared .m-con .m-list .m-btn .m-db").removeClass("off") : $(".m-compared .m-con .m-list .m-btn .m-db").addClass("off"),
-                    $(".m-compared .m-con .m-list .m-btn .m-del").removeClass("delete"))
-        }),
-        $("#popup_full .solid_btn").click(function() {
-            $("#popup_full").fadeOut(300)
-        }),
-        $("#compare_column").find(".m-db").click(function() {
-            if ($(this).hasClass("off")) {
-                var t = $("#hideCompareList").val()
-                    , e = $("#hideItemId").val()
-                    , i = $(this).attr("data-url")
-                    , r = "";
-                r = (r = (r = (r = "?" == /\?/.exec(i) ? i + "&hideCompareList=" + t + e + "|" : i + "?hideCompareList=" + t + e + "|").replace("en-GB", "uk")).replace("ru-RU", "ru")).replace("test120.huawei.com/zh", "test120.huawei.com/zh/EBG/Home").replace("test120.huawei.com/cn", "test120.huawei.com/zh/EBG/Home"),
-                    window.open(r)
-            }
-        }),
-        $(".select_all").click(function() {
-            $("input.checkbox_c").prop("checked", $(this).prop("checked")),
-                countAll()
-        }),
-        $(".select_all").bind("click", isChecked);
-    $(window).width();
-    $("#shop_cart h4 a").click(function() {
-        closeCart(),
-            closeCompare()
-    }),
-        $("#shop_cart").find(".go_btn").click(function() {
-            if ($(this).hasClass("disable"))
-                return !1;
-            AllUpdateOrderShoppingCar()
-        }),
-        $(window).resize(function() {
-            autoShopcartH()
-        }),
-        $(".compare_table tr:odd").addClass("gray_bg"),
-        $(".compare_table tr td:last-child").addClass("last");
-    var e;
-    e = /MSIE /i.test(navigator.userAgent) ? 565 : 625,
-        $("#choose_products li").click(function() {
-            $(this).addClass("current").siblings("li").removeClass("current"),
-                $(this).find("dl").each(function() {
-                    $(this).find("dd span:even").each(function() {
-                        var t = 0
-                            , e = $(this).outerHeight(!0)
-                            , i = $(this).next("span").outerHeight(!0);
-                        t = e >= i ? e : i,
-                            $(this).height(t),
-                            $(this).next("span").height(t)
-                    })
-                });
-            var t = 0
-                , i = 60
-                , r = $("#productBox").height();
-            $(this).find("dl").each(function() {
-                i += $(this).outerHeight(!0)
-            }),
-                i > e && i > r ? $(".choose_products").height(i) : $(".choose_products").height("auto");
-            var n = $(document).scrollTop()
-                , o = $("#choose_products").offset().top - $("#nav-cont.fix .nav-list").height()
-                , s = $("#choose_products ul").offset().top;
-            if (n >= o) {
-                var a = (n = $(document).scrollTop()) - s + $("#nav-cont.fix .nav-list").height();
-                $(this).find(".item_layer").css({
-                    top: a
-                });
-                var c = (t = a > 0 ? a : 0) + $("#pc_sidebar h3").height();
-                if (i + c < e) {
-                    var h = $("#pc_sidebar").height() - c;
-                    $(this).find(".item_layer").css({
-                        "min-height": h
-                    })
-                } else
-                    $(this).find(".item_layer").css({
-                        height: i
-                    }),
-                        $(".choose_products").height(i + t + 50)
-            } else
-                $(this).find(".item_layer").css({
-                    top: -50
-                }),
-                    $(this).find(".item_layer").css({
-                        "min-height": e
-                    })
-        }),
-        $(".item_layer dd span a").click(function(t) {
-            t.stopPropagation(),
-                $("#choosen_tips").show(),
-                $(".product_series .picbox font").hide(),
-                $(this).parents(".item_layer").parent("li").removeClass("current"),
-                $(".choose_products").height("auto")
-        }),
-        $(".r_item dd a").click(function() {
-            $("#choosen_tips").show(),
-                $(".product_series .picbox font").hide(),
-                $(this).parents(".fixed_sidebar").hide()
-        });
-    var i = t - $(".fixed_sidebar h1").outerHeight(!0);
-    $(".l_sidebar,.r_item").height(i),
-        $(".l_sidebar li").click(function() {
-            $(this).addClass("current").siblings("li").removeClass("current");
-            var t = $(this).index();
-            $(".item_wrap").eq(t).removeClass("none").siblings(".item_wrap").addClass("none")
-        }),
-        $(".wap_pro_sidebar").click(function() {
-            $(".fixed_sidebar").fadeIn()
-        }),
-        $(".fixed_sidebar h1 a").click(function() {
-            $(this).parents(".fixed_sidebar").fadeOut()
-        }),
-        $("body").click(function() {
-            $("#pc_sidebar li").removeClass("current")
-        }),
-        $("#pc_sidebar,.item_layer").click(function(t) {
-            t.stopPropagation()
-        }),
-        $(".toolbar_btn a:not('.bar_forum')").bind("click", function(t) {
-            t.stopPropagation();
-            var e = $(this).attr("data-id")
-                , i = $("." + e);
-            $(this).hasClass("current") ? $(this).removeClass("current") : $(this).addClass("current").siblings("a").removeClass("current"),
-                i.hasClass("open") ? closeBar() : openBar()
-        }),
-        $(".wap_cartbtn").bind("click", function(t) {
-            t.stopPropagation(),
-                autoShopcartH(),
-            $(this).hasClass("disable") || ($(".global_toolbar").hasClass("open") ? closeBar() : openBar())
-        }),
-        $(".js_column h4 a").click(function() {
-            closeBar()
-        })
-});
-var gpXlItemId = ""
-    , winH = $(window).height()
-    , compared_h = 0;
-$(window).load(function() {
-    $(".js-m-compared .js-m-list").each(function() {
-        var t = $(this).outerHeight();
-        compared_h > t || (compared_h = t)
-    }),
-        $(".js-m-compared .js-m-list").outerHeight(compared_h),
-        $(".js-m-compared").css("bottom", -compared_h - 200),
-        $(".arrow-off").on("click", function() {
-            var t = $(this);
-            t.hasClass("active") ? (t.css("background", "url(/Assets/EBG/img/arrow-top.jpg) no-repeat center center"),
-                t.removeClass("active"),
-                $(".js-m-compared").removeClass("active").animate({
-                    bottom: -compared_h
-                })) : (t.css("background", "url(/Assets/EBG/img/arrow-bottom.jpg) no-repeat center center"),
-                t.addClass("active"),
-                $(".js-m-compared").addClass("active").animate({
-                    bottom: 0
-                }))
-        }),
-        $(".m-btn a.m-del").on("click", function() {
-            gpXlItemId = "",
-                $("#hideCompareNow").val("");
-            for (var t = $("#hideCompareList").val().split("|"), e = 0; e < t.length - 1; e++) {
-                var i = $(".m-bomb_box-block a[data-id='" + t[e] + "']")
-                    , r = i.attr("data-name");
-                i.html(r),
-                    i.removeClass("disable")
-            }
-            $("#hideCompareList").val(""),
-                $(".js-m-pic_details").css("display", "none").removeClass("show"),
-                $(".js-m-list-ul").css("display", "block"),
-                $(".m-pic_details.show").length < 2 ? $(".m-compared .m-con .m-list .m-btn .m-db").removeClass("off") : $(".m-compared .m-con .m-list .m-btn .m-db").addClass("off"),
-                $(".m-compared .m-con .m-list .m-btn .m-del").addClass("delete")
-        }),
-        $("#shoppingCart").on("click", function() {
-            var t = (new Date).getTime();
-            hwaTrackEventClick($("#gLanguageCurrent").val() + "购物车按钮", "购物车按钮", "购物车按钮", "购物车按钮", t)
-        })
-}),
-    $(function() {
-        BindFCPwdHref(),
-            $(".close_popup").off().click(function() {
-                $(this).parents(".popup_login").off().fadeOut(300),
-                    partnerRefresh = !1,
-                $(window).width() < 750 && $("html,body").removeClass("position-fix").scrollTop($(".popup_login").attr("top"))
-            }),
-        "placeholder"in document.createElement("input") || $(".login_form input[placeholder]").each(function() {
-            var t = $(this)
-                , e = t.attr("placeholder");
-            if ("password" != t.attr("type"))
-                "" === t.val() && (t.val(e).addClass("placeholder"),
-                    t.css("color", "#aaa")),
-                    t.focus(function() {
-                        t.val() === e && (t.val("").removeClass("placeholder"),
-                            t.css("color", "#333"))
-                    }).blur(function() {
-                        "" === t.val() ? (t.val(e).addClass("placeholder"),
-                            t.css("color", "#aaa")) : t.val() == e ? t.css("color", "#aaa") : t.css("color", "#333")
-                    }).closest("form").submit(function() {
-                        t.val() === e && t.val("")
-                    });
-            else {
-                if (e) {
-                    var i = t.attr("id");
-                    if (!i) {
-                        var r = new Date;
-                        i = "lbl_placeholder" + r.getSeconds() + r.getMilliseconds(),
-                            t.attr("id", i)
-                    }
-                }
-                var n = $("<label>", {
-                    html: t.val() ? "" : e,
-                    "for": i,
-                    css: {
-                        position: "absolute",
-                        cursor: "text",
-                        color: "#aaaaaa",
-                        fontSize: t.css("fontSize"),
-                        fontFamily: t.css("fontFamily")
-                    }
-                }).insertAfter(t)
-                    , o = function() {
-                    n.css({
-                        left: "60px",
-                        top: "10px"
-                    })
-                };
-                o(),
-                    t.on("focus blur input keyup propertychange resetplaceholder", function() {
-                        t.val() ? n.html(null) : (o(),
-                            n.html(e))
-                    })
-            }
-        }),
-            $("#btnLoginpopup").unbind("click").click(function() {
-                if (IsEmpty($("#userNamepopup").val()))
-                    $(".tips_error").html($("#userNamepopupErrMsg").val());
-                else if (IsEmpty($("#pwdpopup").val()))
-                    $(".tips_error").html($("#passwordpopupErrMsg").val());
-                else {
-                    $(".tips_error").empty();
-                    var t = $("#userNamepopup").val()
-                        , e = $("#pwdpopup").val()
-                        , i = new JSEncrypt;
-                    i.setPublicKey("MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCyCe6E+MNQHc0XM9M5kpe7a5DzjVbZ/hLXTMLyrqphdRhnQ5EUqyMC80c5LS2MN4SXzC4IIrMxvEbYNKgql7HxSvjYuqAAI/cw0kMm9Gy2ekYsn4UfwXlqgHC+155pnn5damCbm8iXxS/TpeIoKw4W+TVpboYXPey82Be3hWSBHQIDAQAB"),
-                        e = i.encrypt(e);
-                    var r = $("#HidPostLoginUrl").val()
-                        , n = {
-                        userName: t,
-                        pwd: e,
-                        languages: $("#gLanguageCurrent").val(),
-                        fromsite: location.host,
-                        authMethod: "password"
-                    };
-                    try {
-                        $.ajax({
-                            url: r,
-                            data: n,
-                            type: "POST",
-                            dataType: "jsonp",
-                            data: n,
-                            cache: !1,
-                            async: !1,
-                            jsonp: "jsonpCallback"
-                        })
-                    } catch (o) {
-                        return !1
-                    }
-                }
-            }),
-            $(document).on("keydown", ".login_form", function(t) {
-                if (13 == t.keyCode)
-                    return $("#btnLoginpopup").trigger("click"),
-                        !1
-            })
-    });
-var partnerRefresh = !1;
-$("#pwdpopup").keydown(function(t) {
-    t.keyCode,
-        $(".tips_error").html("")
-});
-var popupcountdown = 300
-    , timerNew = null;
-$("#btn_popup_login").unbind("click").click(function() {
-    $(".popup_login").css("display", "block"),
-    $("#userNamepopup").attr("placeholder") != $("#userNamepopup").val() && $("#userNamepopup").val(""),
-        $("#pwdpopup").val("")
-});
-var JSEncryptExports = {};
-
-//数量加减
-(function($) {
-        $.fn.spinner = function(opts) {
-            return this.each(function() {
-                var defaults = {
-                    value: 1,
-                    min: 1
-                }
-                var options = $.extend(defaults, opts)
-                var keyCodes = {
-                    up: 38,
-                    down: 40
-                }
-                var container = $('<div></div>')
-                container.addClass('spinner')
-                var textField = $(this).addClass('value').attr('maxlength', '2').val(options.value).bind('keyup paste change', function(e) {
-                    var field = $(this)
-                    if (e.keyCode == keyCodes.up)
-                        changeValue(1)
-                    else if (e.keyCode == keyCodes.down)
-                        changeValue(-1)
-                    else if (getValue(field) != container.data('lastValidValue'))
-                        validateAndTrigger(field)
-                })
-                textField.wrap(container)
-
-                var increaseButton = $('<button class="increase">+</button>').click(function() {
-                    changeValue(1)
-                })
-                var decreaseButton = $('<button class="decrease">-</button>').click(function() {
-                    changeValue(-1)
-                })
-
-                validate(textField)
-                container.data('lastValidValue', options.value)
-                textField.before(decreaseButton)
-                textField.after(increaseButton)
-
-                function changeValue(delta) {
-                    textField.val(getValue() + delta)
-                    validateAndTrigger(textField)
-                }
-
-                function validateAndTrigger(field) {
-                    clearTimeout(container.data('timeout'))
-                    var value = validate(field)
-                    if (!isInvalid(value)) {
-                        textField.trigger('update', [field, value])
-                    }
-                }
-
-                function validate(field) {
-                    var value = getValue()
-                    if (value <= options.min)
-                        decreaseButton.attr('disabled', 'disabled')
-                    else
-                        decreaseButton.removeAttr('disabled')
-                    field.toggleClass('invalid', isInvalid(value)).toggleClass('passive', value === 0)
-
-                    if (isInvalid(value)) {
-                        var timeout = setTimeout(function() {
-                            textField.val(container.data('lastValidValue'))
-                            validate(field)
-                        }, 500)
-                        container.data('timeout', timeout)
-                    } else {
-                        container.data('lastValidValue', value)
-                    }
-                    return value
-                }
-
-                function isInvalid(value) {
-                    return isNaN(+value) || value < options.min;
-                }
-
-                function getValue(field) {
-                    field = field || textField;
-                    return parseInt(field.val() || 0, 10)
-                }
-            })
-        }
-        ;
-        $('.spinnerExample').spinner({});
-
-    }
-)(jQuery)
-
-function openContact() {
-    "ar-sa" == $("#gLanguageCurrent").val() ? ($(".contact_btn").addClass("open"),
-        $(".contact_btn b").show(),
-        $(".contact_layer").animate({
-            left: 35
-        }, 330)) : ($(".contact_layer").css({
-        "margin-top": $(".contact_btn").css("margin-top")
-    }),
-        $(".contact_layer").animate({
-            right: 35
-        }, 300),
-        $(".contact_btn").addClass("open"),
-        $(".contact_btn b").show(),
-        closeCompare(),
-        closeCart())
-}
-function closeContact() {
-    "ar-sa" == $("#gLanguageCurrent").val() ? ($(".contact_btn").removeClass("open"),
-        $(".contact_btn b").hide(),
-        $(".contact_layer").animate({
-            left: -250
-        })) : ($(".contact_layer").animate({
-        right: -250
-    }, 300),
-        $(".contact_btn").removeClass("open"),
-        $(".contact_btn b").hide())
-}
-function closeCompare() {
-    var e = $("#compare_column");
-    winW > 768 ? e.animate({
-        right: -335
-    }, 300) : e.animate({
-        right: "-100%"
-    }, 300),
-        $(".compare_btn b").hide(),
-        $(".compare_btn").removeClass("open")
-}
-function closeCart() {
-    0 == $(".shopping_all").length ? winW > 768 ? $("#shopping_cart").animate({
-        right: -335
-    }, 300) : $("#shopping_cart").animate({
-        right: "-100%"
-    }, 300) : winW > 980 ? $("#shopping_cart").animate({
-        right: -335
-    }, 300) : $("#shopping_cart").animate({
-        right: "-100%"
-    }, 300),
-        $(".shopping_cart").removeClass("bg"),
-        $(".shopping_btn b").hide(),
-        $(".shopping_btn").removeClass("open")
-}
-
-var winW = $(window).width()
-    , hwa_DisablHwa = "" != document.domain || "1" == $("#hidDisableHwa").val() || navigator.userAgent.match(/AppleWebKit.*Mobile.*/) || navigator.userAgent.indexOf("iPad") > -1;
-!hwa_DisablHwa && checkDomain(),
-
-    $(function() {
-       // get_FeedBack_Url()
-    })

target/classes/static/js/config.js

@@ -1,53 +0,0 @@
-$(window).load(function(){
-	initStyles1();
-});
-
-function initStyles1() {
-	// 设置环状统计报表
-	var viewWidth = $('.work-circlebg').width();  //屏幕宽度
-	var diameter = viewWidth     ;  // 图标宽度
-	var high = diameter;            // 图标高度
-	var radius1 = high/2;               // 外环半径
-	var radius2 = radius1-3;           // 内环半径
-	var cx = diameter/2;                // x轴坐标
-	var cy = high*0.50;                 // y轴坐标
-	var percentnum = $('.flow_text1 span').text();
-	dial(percentnum,diameter,high,cx,cy,radius1,radius2,"flow_chartCvs1","gradient");  // 第一个数值即为百分比数值
-}
-function dial(percent,width,height,cx,cy,r1,r2,eleId,colorFlag){
-	var paper = Raphael(document.getElementById(eleId),width,height);
-	var a = 225 - percent * 270 / 100, a0 = 225;
-	var dial_0 = paper.path(doughnut_path(cx,cy,r1,r2,-45,225)).attr({"fill":"#FFF","stroke":"none"}),
-		dial_1 = paper.path(doughnut_path(cx,cy,r1,r2,225,225)).attr({"fill":"#fff","stroke":"none"});
-	if (colorFlag=="gradient") {
-		dial_0.attr(
-			{
-				"fill":"#c6ea91"
-			}
-		)
-		dial_1.attr(
-			{
-				gradient: '#FE7E56',
-				'stroke-linejoin': 'round',
-				rotation: -90
-			}
-		);
-	};
-	drawTemp();
-	function drawTemp(){
-		if(a0>a){
-			a0--;
-			dial_0.attr({"path":doughnut_path(cx,cy,r1,r2,-45,a0)});
-			dial_1.attr({"path":doughnut_path(cx,cy,r1,r2,a0-1,225)});
-			setTimeout(drawTemp,1);
-		}
-	}
-	function doughnut_path(cx,cy,r1,r2,startAngle,endAngle){
-		var rad = Math.PI / 180;
-		var x1 = cx + r1 * Math.cos(-startAngle * rad), y1 = cy + r1 * Math.sin(-startAngle * rad),
-			x2 =  cx + r2 * Math.cos(-startAngle * rad), y2 = cy + r2 * Math.sin(-startAngle * rad),
-			x3 =  cx + r2 * Math.cos(-endAngle * rad), y3 = cy + r2 * Math.sin(-endAngle * rad),
-			x4 =  cx + r1 * Math.cos(-endAngle * rad), y4 = cy + r1 * Math.sin(-endAngle * rad);    //四点坐标
-		return ["M",x2,y2,"A",r2,r2, 0, +(endAngle - startAngle > 180),0,x3,y3,"L",x4,y4,"A",r1,r1,0,+( endAngle - startAngle > 180),1,x1,y1,"z"];
-	}
-}

target/classes/static/js/error.js

@@ -1,86 +0,0 @@
-function v(id) {
-	return document.getElementById(id);
-}
-// 显示
-function showErrorMsg(id) {
-	var t = v(id);
-	t.style.width = document.body.clientWidth + "px";
-	t.style.height = document.body.clientHeight + "px";
-	window.onresize = function() {
-		t.style.width = document.body.clientWidth + "px";
-		t.style.height = document.body.clientHeight + "px";
-	}
-	v(id).style.display = "";
-}
-// 关闭
-function closeWin(id) {
-	v(id).style.display = "none";
-}
-
-//复制
-function copy(id) {
-	v(id).select();
-	var msg=v(id).value;
-	window.clipboardData.setData('text', msg); 
-	alert('错误信息已成功复制到剪切板！');
-}
-//保存
-function save(id) {
-	var msg=v(id).value;
-	var fso = new ActiveXObject("Scripting.FileSystemObject");  
-	var tf = fso.createtextfile("c:\\系统异常信息.txt",true);
-	// 填写数据，并增加换行符  
-	tf.WriteLine("系统异常信息：") ;  
-	tf.WriteLine("----------------------------------------------") ;  
-	// 增加2个空行  
-	tf.WriteBlankLines(2) ;  
-	// 填写一行，不带换行符  
-	tf.Write (msg);  
-	// 关闭文件  
-	tf.Close();  
-	
-	alert('文件路径：C:\\系统异常信息.txt');
-}
-
-//返回
-function toBack(){
-	window.history.go(-1);	
-}
-//显示管理员信息
-function showAdminInfo(){
-	showErrorMsg('adminInfo');
-}
-
-// -------------------------------------------------------------------------------
-function moveEvent(e, id) {
-	var isIE = (document.all) ? true : false;
-	// navigator.userAgent.toLowerCase().indexOf("msie") != -1;
-	// var event=window.event||event;
-	drag = true;
-	xx = isIE ? event.x : e.pageX;
-	yy = isIE ? event.y : e.pageY;
-	L = v(id).offsetLeft;
-	T = v(id).offsetTop;
-
-	document.onmousemove = function(e) {
-		if (drag) {
-			x = isIE ? event.x : e.pageX;
-			if (x < 0)
-				x = 0;
-			y = isIE ? event.y : e.pageY;
-			if (y < 0)
-				y = 0;
-			v(id).style.left = L - xx + x;
-			v(id).style.top = T - yy + y;
-		}
-	};
-
-	document.onmouseup = function() {
-		drag = false;
-	};
-};
-// -------------------------------------------------------------------------------
-window.onscroll = function() {
-	v("back_div").style.width = document.body.scrollWidth + "px";
-	v("back_div").style.height = document.body.scrollHeight + "px";
-};

target/classes/static/js/example.js

@@ -1,294 +0,0 @@
-$(function () {
-
-    var router = new Router({
-        container: '#container',
-        enterTimeout: 250,
-        leaveTimeout: 250
-    });
-
-    // grid
-    var home = {
-        url: '/',
-        className: 'home',
-        render: function () {
-            return $('#tpl_home').html();
-        }
-    };
-
-    // button
-    var button = {
-        url: '/button',
-        className: 'button',
-        render: function () {
-            return $('#tpl_button').html();
-        }
-    };
-
-    // cell
-    var cell = {
-        url: '/cell',
-        className: 'cell',
-        render: function () {
-            return $('#tpl_cell').html();
-        },
-        bind: function (){
-            $('.container').on('click', '#showTooltips', function (){
-                $('.js_tooltips').show();
-                setTimeout(function (){
-                    $('.js_tooltips').hide();
-                }, 3000);
-            });
-        }
-    };
-
-    // toast
-    var toast = {
-        url: '/toast',
-        className: 'toast',
-        render: function () {
-            return $('#tpl_toast').html();
-        },
-        bind: function () {
-            $('#container').on('click', '#showToast', function () {
-                $('#toast').show();
-                setTimeout(function () {
-                    $('#toast').hide();
-                }, 2000);
-            }).on('click', '#showLoadingToast', function () {
-                $('#loadingToast').show();
-                setTimeout(function () {
-                    $('#loadingToast').hide();
-                }, 2000);
-            });
-        }
-    };
-
-    // dialog
-    var dialog = {
-        url: '/dialog',
-        className: 'dialog',
-        render: function () {
-            return $('#tpl_dialog').html();
-        },
-        bind: function () {
-            $('#container').on('click', '#showDialog1', function () {
-                $('#dialog1').show().on('click', '.weui_btn_dialog', function () {
-                    $('#dialog1').off('click').hide();
-                });
-            }).on('click', '#showDialog2', function () {
-                $('#dialog2').show().on('click', '.weui_btn_dialog', function () {
-                    $('#dialog2').off('click').hide();
-                });
-            });
-
-        }
-    };
-
-    // progress
-    var progress = {
-        url: '/progress',
-        className: 'progress',
-        render: function () {
-            return $('#tpl_progress').html();
-        },
-        bind: function () {
-            $('#container').on('click', '#btnStartProgress', function () {
-                if ($(this).hasClass('weui_btn_disabled')) {
-                    return;
-                }
-
-                $(this).addClass('weui_btn_disabled');
-
-                var progress = 0;
-                var $progress = $('.js_progress');
-
-                function next() {
-                    $progress.css({width: progress + '%'});
-                    progress = ++progress % 100;
-                    setTimeout(next, 30);
-                }
-
-                next();
-            });
-        }
-    };
-
-    // msg
-    var msg = {
-        url: '/msg',
-        className: 'msg',
-        render: function () {
-            return $('#tpl_msg').html();
-        }
-    };
-
-    // article
-    var article = {
-        url: '/article',
-        className: 'article',
-        render: function () {
-            return $('#tpl_article').html();
-        }
-    };
-
-    // actionsheet
-    var actionsheet = {
-        url: '/actionsheet',
-        className: 'actionsheet',
-        render: function () {
-            return $('#tpl_actionsheet').html();
-        },
-        bind: function () {
-            $('#container').on('click', '#showActionSheet', function () {
-                var mask = $('#mask');
-                var weuiActionsheet = $('#weui_actionsheet');
-                weuiActionsheet.addClass('weui_actionsheet_toggle');
-                mask.show()
-                    .focus()//加focus是为了触发一次页面的重排(reflow or layout thrashing),使mask的transition动画得以正常触发
-                    .addClass('weui_fade_toggle').one('click', function () {
-                    hideActionSheet(weuiActionsheet, mask);
-                });
-                $('#actionsheet_cancel').one('click', function () {
-                    hideActionSheet(weuiActionsheet, mask);
-                });
-                mask.unbind('transitionend').unbind('webkitTransitionEnd');
-
-                function hideActionSheet(weuiActionsheet, mask) {
-                    weuiActionsheet.removeClass('weui_actionsheet_toggle');
-                    mask.removeClass('weui_fade_toggle');
-                    mask.on('transitionend', function () {
-                        mask.hide();
-                    }).on('webkitTransitionEnd', function () {
-                        mask.hide();
-                    })
-                }
-            });
-        }
-    };
-
-    // icons
-    var icons = {
-        url: '/icons',
-        className: 'icons',
-        render: function () {
-            return $('#tpl_icons').html();
-        }
-    };
-
-    // panel
-    var panel = {
-        url: '/panel',
-        className: 'panel',
-        render: function () {
-            return $('#tpl_panel').html();
-        }
-    };
-
-    // tab
-    var tab = {
-        url: '/tab',
-        className: 'tab',
-        render: function () {
-            return $('#tpl_tab').html();
-        }
-    };
-
-    // navbar
-    var navbar = {
-        url: '/navbar',
-        className: 'navbar',
-        render: function () {
-            return $('#tpl_navbar').html();
-        },
-        bind: function () {
-            $('#container').on('click', '.weui_navbar_item', function () {
-                $(this).addClass('weui_bar_item_on').siblings('.weui_bar_item_on').removeClass('weui_bar_item_on');
-            });
-        }
-    };
-
-    // tabbar
-    var tabbar = {
-        url: '/tabbar',
-        className: 'tabbar',
-        render: function () {
-            return $('#tpl_tabbar').html();
-        },
-        bind: function () {
-            $('#container').on('click', '.weui_tabbar_item', function () {
-                $(this).addClass('weui_bar_item_on').siblings('.weui_bar_item_on').removeClass('weui_bar_item_on');
-            });
-        }
-    };
-
-    // searchbar
-    var searchbar = {
-        url: '/searchbar',
-        className: 'searchbar',
-        render: function () {
-            return $('#tpl_searchbar').html();
-        },
-        bind: function () {
-            $('#container').on('focus', '#search_input', function () {
-                var $weuiSearchBar = $('#search_bar');
-                $weuiSearchBar.addClass('weui_search_focusing');
-            }).on('blur', '#search_input', function () {
-                var $weuiSearchBar = $('#search_bar');
-                $weuiSearchBar.removeClass('weui_search_focusing');
-                if ($(this).val()) {
-                    $('#search_text').hide();
-                } else {
-                    $('#search_text').show();
-                }
-            }).on('input', '#search_input', function () {
-                var $searchShow = $("#search_show");
-                if ($(this).val()) {
-                    $searchShow.show();
-                } else {
-                    $searchShow.hide();
-                }
-            }).on('touchend', '#search_cancel', function () {
-                $("#search_show").hide();
-                $('#search_input').val('');
-            }).on('touchend', '#search_clear', function () {
-                $("#search_show").hide();
-                $('#search_input').val('');
-            });
-        }
-    };
-
-    router.push(home)
-        .push(button)
-        .push(cell)
-        .push(toast)
-        .push(dialog)
-        .push(progress)
-        .push(msg)
-        .push(article)
-        .push(actionsheet)
-        .push(icons)
-        .push(panel)
-        .push(tab)
-        .push(navbar)
-        .push(tabbar)
-        .push(searchbar)
-        .setDefault('/')
-        .init();
-
-
-    // .container 设置了 overflow 属性, 导致 Android 手机下输入框获取焦点时, 输入法挡住输入框的 bug
-    // 相关 issue: https://github.com/weui/weui/issues/15
-    // 解决方法:
-    // 0. .container 去掉 overflow 属性, 但此 demo 下会引发别的问题
-    // 1. 参考 http://stackoverflow.com/questions/23757345/android-does-not-correctly-scroll-on-input-focus-if-not-body-element
-    //    Android 手机下, input 或 textarea 元素聚焦时, 主动滚一把
-    if (/Android/gi.test(navigator.userAgent)) {
-        window.addEventListener('resize', function () {
-            if (document.activeElement.tagName == 'INPUT' || document.activeElement.tagName == 'TEXTAREA') {
-                window.setTimeout(function () {
-                    document.activeElement.scrollIntoViewIfNeeded();
-                }, 0);
-            }
-        })
-    }
-});

target/classes/static/js/fn.js

@@ -1,14 +0,0 @@
-// JavaScript Document
-(function (doc, win) {
-  var docEl = doc.documentElement,
-	resizeEvt = 'orientationchange' in window ? 'orientationchange' : 'resize',
-	recalc = function () {
-	  var clientWidth = docEl.clientWidth;
-	  if (!clientWidth) return;
-	  docEl.style.fontSize = 100 * (clientWidth / 750) + 'px';
-	};
-
-  if (!doc.addEventListener) return;
-  win.addEventListener(resizeEvt, recalc, false);
-  doc.addEventListener('DOMContentLoaded', recalc, false);
-})(document, window);

target/classes/static/js/jquery.cookie.js

@@ -1,117 +0,0 @@
-/*!
- * jQuery Cookie Plugin v1.4.1
- * https://github.com/carhartl/jquery-cookie
- *
- * Copyright 2006, 2014 Klaus Hartl
- * Released under the MIT license
- */
-(function (factory) {
-	if (typeof define === 'function' && define.amd) {
-		// AMD
-		define(['jquery'], factory);
-	} else if (typeof exports === 'object') {
-		// CommonJS
-		factory(require('jquery'));
-	} else {
-		// Browser globals
-		factory(jQuery);
-	}
-}(function ($) {
-
-	var pluses = /\+/g;
-
-	function encode(s) {
-		return config.raw ? s : encodeURIComponent(s);
-	}
-
-	function decode(s) {
-		return config.raw ? s : decodeURIComponent(s);
-	}
-
-	function stringifyCookieValue(value) {
-		return encode(config.json ? JSON.stringify(value) : String(value));
-	}
-
-	function parseCookieValue(s) {
-		if (s.indexOf('"') === 0) {
-			// This is a quoted cookie as according to RFC2068, unescape...
-			s = s.slice(1, -1).replace(/\\"/g, '"').replace(/\\\\/g, '\\');
-		}
-
-		try {
-			// Replace server-side written pluses with spaces.
-			// If we can't decode the cookie, ignore it, it's unusable.
-			// If we can't parse the cookie, ignore it, it's unusable.
-			s = decodeURIComponent(s.replace(pluses, ' '));
-			return config.json ? JSON.parse(s) : s;
-		} catch(e) {}
-	}
-
-	function read(s, converter) {
-		var value = config.raw ? s : parseCookieValue(s);
-		return $.isFunction(converter) ? converter(value) : value;
-	}
-
-	var config = $.cookie = function (key, value, options) {
-
-		// Write
-
-		if (arguments.length > 1 && !$.isFunction(value)) {
-			options = $.extend({}, config.defaults, options);
-
-			if (typeof options.expires === 'number') {
-				var days = options.expires, t = options.expires = new Date();
-				t.setTime(+t + days * 864e+5);
-			}
-
-			return (document.cookie = [
-				encode(key), '=', stringifyCookieValue(value),
-				options.expires ? '; expires=' + options.expires.toUTCString() : '', // use expires attribute, max-age is not supported by IE
-				options.path    ? '; path=' + options.path : '',
-				options.domain  ? '; domain=' + options.domain : '',
-				options.secure  ? '; secure' : ''
-			].join(''));
-		}
-
-		// Read
-
-		var result = key ? undefined : {};
-
-		// To prevent the for loop in the first place assign an empty array
-		// in case there are no cookies at all. Also prevents odd result when
-		// calling $.cookie().
-		var cookies = document.cookie ? document.cookie.split('; ') : [];
-
-		for (var i = 0, l = cookies.length; i < l; i++) {
-			var parts = cookies[i].split('=');
-			var name = decode(parts.shift());
-			var cookie = parts.join('=');
-
-			if (key && key === name) {
-				// If second argument (value) is a function it's a converter...
-				result = read(cookie, value);
-				break;
-			}
-
-			// Prevent storing a cookie that we couldn't decode.
-			if (!key && (cookie = read(cookie)) !== undefined) {
-				result[name] = cookie;
-			}
-		}
-
-		return result;
-	};
-
-	config.defaults = {};
-
-	$.removeCookie = function (key, options) {
-		if ($.cookie(key) === undefined) {
-			return false;
-		}
-
-		// Must not alter options, thus extending a fresh object...
-		$.cookie(key, '', $.extend({}, options, { expires: -1 }));
-		return !$.cookie(key);
-	};
-
-}));