活动管理和订单管理、学子公司院校管理

common/src/main/java/com/winsun/bean/SalesOrder.java

+package com.winsun.bean;
+
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotations.TableName;
+
+import lombok.Data;
+
+@Data
+@TableName("hhr_sales_order")
+public class SalesOrder {
+	
+	/**
+	 * 主键
+	 */
+	private int id;
+	
+	/**
+	 * 订单号码
+	 */
+	private String orderPhone;
+	
+	/**
+	 * 用户id
+	 */
+	private String userId;
+	
+	/**
+	 * 创建时间
+	 */
+	private Date createTime;
+	
+	/**
+	 * 审核状态 1：未审核  2：系统审核不通过  3：充值审核通过  4、 充值审核不通过
+	 */
+	private String status;
+	
+	/**
+	 * 审核备注
+	 */
+	private String remark;
+	
+	/**
+	 * 销售县分
+	 */
+	private String salesSubst;
+	
+	/**
+	 * 销售学校
+	 */
+	private String salesSchool;
+
+	
+	/**
+	 * 审核时间
+	 */
+	private Date auditTime ;
+	
+	/**
+	 * 佣金状态
+	 */
+	private String bonusStatus;
+	
+	/**
+	 * 订单类型 
+	 */
+	private String orderType;
+	
+	/**
+	 * 订单编码
+	 */
+	private String orderNum;
+	
+	/**
+	 * 升级套餐
+	 */
+	private String upgradeCombo;
+	
+	/**
+	 * 原套餐
+	 */
+	private String oldCombo;
+	
+	/**
+	 * 删除标价 0:未删除 1：已删除
+	 */
+	private String delFlag;
+	
+	/**
+	 * 号码激活时间
+	 */
+	private Date activateTime;
+	
+	/**
+	 * 网点编码
+	 */
+	private String networkCode;
+	
+	/**
+	 * 网点名称
+	 */
+	private String networkName;
+	
+	/**
+	 * 总激励
+	 */
+	private double allBonus;
+	
+	/**
+	 * 未发放激励
+	 */
+	private double nonSendBonus;
+	
+	/**
+	 * 已发放激励
+	 */
+	private double sendBonus;
+	
+	/**
+	 * 最近充值金额
+	 */
+	private double recentlyAmount;
+	
+	/**
+	 * 最近充值激励
+	 */
+	private double recentlyBonus;
+	
+	/**
+	 * 累计充值金额
+	 */
+	private double monthAmount;
+	
+	/**
+	 * 累计充值激励
+	 */
+	private double monthBonus;
+	
+	/**
+	 * 本金激励
+	 */
+	private double capitalBonus;
+	
+}

common/src/main/java/com/winsun/bean/SysUser.java

@@ -9,6 +9,8 @@ import lombok.Data;
 import java.io.Serializable;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.Date;
 
 
+import org.apache.commons.io.filefilter.FalseFileFilter;
+
 @TableName("sys_user")
 @TableName("sys_user")
 @Data
 @Data
 public class SysUser implements Serializable {
 public class SysUser implements Serializable {
@@ -132,4 +134,7 @@ public class SysUser implements Serializable {
     private String deptidBelong;
     private String deptidBelong;
 
 
     private String oldPassward;
     private String oldPassward;
+    
+    @TableField(exist = false)
+    private String schoolName;
 }
 }

common/src/main/java/com/winsun/bean/activity/HhrActivity.java

+package com.winsun.bean.activity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+
+import lombok.Data;
+
+@SuppressWarnings("serial")
+@TableName("hhr_activity")
+@Data
+public class HhrActivity implements Serializable{
+
+    /**
+     * 主键
+     */
+	@TableId(type = IdType.AUTO)
+    private String id;
+
+    /**
+     * 活动标题
+     */
+    private String title;
+
+    /**
+     * 活动详情
+     */
+    private String desc;
+
+    /**
+     * 活动积分
+     */
+    private int integral;
+
+    /**
+     * 活动封面图片
+     */
+    private String imageUrl;
+
+    /**
+     * 活动类型
+     */
+    private String activityType;
+
+    /**
+     * 活动小类
+     */
+    private String subclass;
+
+    /**
+     * 学生证照片
+     */
+    private String range;
+    
+    /**
+     * 状态
+     */
+    private String status;
+
+    /**
+     * 排序号
+     */
+    private int sort;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+    
+    /**
+     * 创建人
+     */
+    private String creator;
+    
+    /**
+     * 修改时间
+     */
+    private Date updateTime;
+
+    /**
+     * 删除标记
+     */
+    private int delFlag;
+}

common/src/main/java/com/winsun/bean/activity/HhrActivityRecord.java

+package com.winsun.bean.activity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+
+import lombok.Data;
+
+@SuppressWarnings("serial")
+@TableName("hhr_activity_record")
+@Data
+public class HhrActivityRecord implements Serializable{
+
+    /**
+     * 主键
+     */
+	@TableId(type = IdType.AUTO)
+    private String id;
+
+    /**
+     * 活动ID
+     */
+    private String activityId;
+
+    /**
+     * 活动积分
+     */
+    private int recordIntegral;
+    
+    /**
+     * 活动记录审核状态
+     */
+    private String status;
+    
+
+    /**
+     * 审核意见
+     */
+    private String remark;
+
+    /**
+     * 活动记录参与图片
+     */
+    private String imageUrl;
+
+
+    /**
+     * 活动留言
+     */
+    private String message;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+    
+    /**
+     * 创建人id
+     */
+    private String createId;
+    
+    /**
+     * 创建人
+     */
+    private String creator;
+    
+    /**
+     * 修改时间
+     */
+    private Date updateTime;
+
+}

common/src/main/java/com/winsun/mapper/PartnerMapper.java

@@ -33,7 +33,5 @@ public interface PartnerMapper extends BaseMapper<Partner> {
     @Insert(" replace into hhr_user_school(user_id,school_id) VALUES(#{userId},#{schoolId})")
     @Insert(" replace into hhr_user_school(user_id,school_id) VALUES(#{userId},#{schoolId})")
     int saveSchoolRef(@Param("userId") String userId,@Param("schoolId") String schoolId);
     int saveSchoolRef(@Param("userId") String userId,@Param("schoolId") String schoolId);
     
     
-    @Select(" select * from hhr_user_school")
-    List<Map<String, Object>> getSchoolRef();
     
     
 }
 }

common/src/main/java/com/winsun/mapper/SalesOrderMapper.java

+package com.winsun.mapper;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
+import org.springframework.stereotype.Component;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.winsun.bean.SalesOrder;
+
+@Mapper
+@Component
+public interface SalesOrderMapper extends BaseMapper<SalesOrder> {
+	
+	@Select(" select * from hhr_phone_school ")
+	List<Map<String, Object>> getPhoneSchool();
+	
+    @Insert(" replace into hhr_phone_school(order_phone,school) VALUES(#{orderPhone},#{school})")
+    int updatePhoneSchool(@Param("orderPhone") String orderPhone,@Param("school") String school);
+    
+    @Update(" update hhr_sales_order set status = #{status}, remark = #{remark} where order_phone = #{orderPhone} and del_flag = 0"
+    		+ " and order_type = 1 and send_bonus = 0 ")
+    int updateRepealOrder(@Param("status") String status,@Param("remark") String remark,@Param("orderPhone") String orderPhone);
+    
+    @Select(" select * from hhr_phone_school where order_phone = #{orderPhone} ")
+    List<Map<String, Object>> getPhoneSchoolByPhone(@Param("orderPhone") String orderPhone);
+    
+    @Delete("delete from hhr_phone_school where order_phone = #{orderPhone} ")
+    int deletePhoneSchool(@Param("orderPhone") String orderPhone);
+    
+}

common/src/main/java/com/winsun/mapper/SchoolMapper.java

@@ -2,6 +2,9 @@ package com.winsun.mapper;
 
 
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.winsun.bean.School;
 import com.winsun.bean.School;
+
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Insert;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Select;
@@ -30,4 +33,15 @@ public interface SchoolMapper extends BaseMapper<School> {
     @Update("insert into hhr_user_school (school_id,user_id) values (#{schoolId},#{userId})")
     @Update("insert into hhr_user_school (school_id,user_id) values (#{schoolId},#{userId})")
     Integer insertUserSchool(@Param("userId")String usrId ,@Param("schoolId")String schoolId);
     Integer insertUserSchool(@Param("userId")String usrId ,@Param("schoolId")String schoolId);
     
     
+    @Select("select * from `hhr_user_school` ")
+    List<Map<String,Object>> getSchoolRef();
+    
+    @Select("select * from `hhr_supervisor_school` ")
+    List<Map<String,Object>> getSupervisorSchoolRef();
+    
+    @Insert(" replace into hhr_supervisor_school(user_id,school) values(#{userId},#{school})  ")
+    int addSupervisorSchool(@Param("userId") String userId, @Param("school") String school);
+    
+    @Delete(" delete from hhr_supervisor_school where id = #{id}  ")
+    int deleteSupervisorSchool(@Param("id") String id);
 }
 }

common/src/main/java/com/winsun/mapper/ActivityMapper.java → common/src/main/java/com/winsun/mapper/activity/ActivityMapper.java

-package com.winsun.mapper;
+package com.winsun.mapper.activity;
 
 
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Component;
 
 
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.winsun.bean.HhrActivity;
-import com.winsun.bean.HhrUser;
+import com.winsun.bean.activity.HhrActivity;
 
 
 /**
 /**
  * 合伙人用户表的Mapper
  * 合伙人用户表的Mapper

common/src/main/java/com/winsun/mapper/activity/ActivityRecordMapper.java

+package com.winsun.mapper.activity;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Component;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.winsun.bean.activity.HhrActivityRecord;
+
+/**
+ * 合伙人用户表的Mapper
+ */
+@Mapper
+@Component
+public interface ActivityRecordMapper extends BaseMapper<HhrActivityRecord> {
+}

common/src/main/java/com/winsun/utils/ImportExcel.java

 
 
 package com.winsun.utils;
 package com.winsun.utils;
 
 
-import org.apache.commons.lang3.StringUtils;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.ss.usermodel.*;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.web.multipart.MultipartFile;
-
 import java.io.File;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStream;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
 
 
+import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.hssf.usermodel.HSSFDateUtil;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.CellType;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.multipart.MultipartFile;
+
 /**
 /**
  * 导入Excel文件（支持“XLS”和“XLSX”格式）
  * 导入Excel文件（支持“XLS”和“XLSX”格式）
  * @author
  * @author
@@ -168,13 +174,20 @@ public class ImportExcel {
 	 */
 	 */
 	public Object getCellValue(Row row, int column){
 	public Object getCellValue(Row row, int column){
 		Object val = "";
 		Object val = "";
+		SimpleDateFormat sFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		
 		try{
 		try{
 			Cell cell = row.getCell(column);
 			Cell cell = row.getCell(column);
 			if (cell != null){
 			if (cell != null){
 				if (cell.getCellType() == CellType.NUMERIC){
 				if (cell.getCellType() == CellType.NUMERIC){
-				val = cell.getNumericCellValue();
-					//		DecimalFormat df = new DecimalFormat("0");
-					//		val = df.format(cell.getNumericCellValue());
+					//val = cell.getNumericCellValue();
+					
+					if(HSSFDateUtil.isCellDateFormatted(cell)) {
+						val = sFormat.format(cell.getDateCellValue());
+					}else {
+						cell.setCellType(CellType.STRING);
+						val = cell.getStringCellValue() + "";
+					}
 				}else if (cell.getCellType() == CellType.STRING){
 				}else if (cell.getCellType() == CellType.STRING){
 					val = cell.getStringCellValue();
 					val = cell.getStringCellValue();
 				}else if (cell.getCellType() == CellType.FORMULA){
 				}else if (cell.getCellType() == CellType.FORMULA){

service-manager/src/main/java/com/winsun/controller/ActivityController.java

@@ -2,34 +2,44 @@ package com.winsun.controller;
 
 
 import java.util.Date;
 import java.util.Date;
 import java.util.List;
 import java.util.List;
+import java.util.Map;
+import java.util.UUID;
 
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
 
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.enums.SqlLike;
 import com.baomidou.mybatisplus.enums.SqlLike;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.baomidou.mybatisplus.plugins.Page;
+import com.google.common.util.concurrent.Service.State;
+import com.itextpdf.text.pdf.PdfStructTreeController.returnType;
 import com.winsun.auth.core.annotion.Permission;
 import com.winsun.auth.core.annotion.Permission;
 import com.winsun.auth.core.base.controller.BaseController;
 import com.winsun.auth.core.base.controller.BaseController;
 import com.winsun.auth.core.common.model.ResponseData;
 import com.winsun.auth.core.common.model.ResponseData;
 import com.winsun.auth.core.shiro.ShiroUser;
 import com.winsun.auth.core.shiro.ShiroUser;
-import com.winsun.bean.HhrActivity;
-import com.winsun.mapper.ActivityMapper;
+import com.winsun.bean.QRCode;
+import com.winsun.bean.activity.HhrActivity;
+import com.winsun.bean.activity.HhrActivityRecord;
+import com.winsun.mapper.activity.ActivityMapper;
+import com.winsun.utils.PicturesUtil;
 
 
 /**
 /**
- * @Author: chancy
- * @Date: 2020/2/12 17:26
+ * @Author: dongyp
+ * @Date: 2020/4/9
  */
  */
 @RestController
 @RestController
 @RequestMapping("/activity")
 @RequestMapping("/activity")
 public class ActivityController extends BaseController {
 public class ActivityController extends BaseController {
 
 
 	private static ActivityMapper activityMapper;
 	private static ActivityMapper activityMapper;
+	private static String PATH_TYPE = "activity";
 
 
 	@Autowired
 	@Autowired
 	public ActivityController(ActivityMapper activityMapper) {
 	public ActivityController(ActivityMapper activityMapper) {
@@ -48,6 +58,7 @@ public class ActivityController extends BaseController {
 		wrapper.like(StringUtils.isNotBlank(title), "title", title, SqlLike.DEFAULT);
 		wrapper.like(StringUtils.isNotBlank(title), "title", title, SqlLike.DEFAULT);
 		wrapper.eq(StringUtils.isNotBlank(activityType), "activity_type", activityType);
 		wrapper.eq(StringUtils.isNotBlank(activityType), "activity_type", activityType);
 		wrapper.eq(StringUtils.isNotBlank(subclass), "subclass", subclass);
 		wrapper.eq(StringUtils.isNotBlank(subclass), "subclass", subclass);
+		wrapper.eq("del_flag", 0);
 		
 		
 		Page<HhrActivity> page = new Page<>(pageIndex, pageSize);
 		Page<HhrActivity> page = new Page<>(pageIndex, pageSize);
 		List<HhrActivity> list = activityMapper.selectPage(page, wrapper);
 		List<HhrActivity> list = activityMapper.selectPage(page, wrapper);
@@ -125,4 +136,56 @@ public class ActivityController extends BaseController {
 		return ResponseData.error("删除失败");
 		return ResponseData.error("删除失败");
 	}
 	}
 	
 	
+	/**
+     * 查询活动列表
+     *
+     * @param pageNo      查询页码 默认首页
+     * @param pageSize    查询每页数量 默认10
+     * @param activityType 查询条件-活动类型
+     * @param subclass   查询条件-活动小类
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping(value = "getActivityList", method = RequestMethod.POST)
+    public ResponseData<Map<String, Object>> getActivityList(Integer pageNo, Integer pageSize, String activityType,  String subclass) {
+
+        Wrapper<HhrActivity> wrapper = new EntityWrapper<HhrActivity>();
+		wrapper.eq(StringUtils.isNotBlank(activityType), "activity_type", activityType);
+		wrapper.eq(StringUtils.isNotBlank(subclass), "subclass", subclass);
+		wrapper.eq("del_flag", 0);
+		
+		Page<HhrActivity> page = new Page<>(pageNo == null ? 1 : pageNo, pageSize == null ? 10 : pageSize);
+		List<HhrActivity> list = activityMapper.selectPage(page, wrapper);
+		page.setRecords(list);
+		resultMap.put("activityList", list);
+
+        return ResponseData.success(resultMap, "查询成功");
+    }
+    
+	/**
+     * 获取活动信息
+     *
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping(value = "getActivityInfo", method = RequestMethod.POST)
+    public ResponseData<Map<String, Object>> getActivityInfo(String id) {
+		HhrActivity activity = activityMapper.selectById(id);
+		Map<String, Object> activityMap = JSON.parseObject(JSON.toJSONString(activity), Map.class);
+
+        return ResponseData.success(activityMap, "查询成功");
+    }
+    
+    @Permission(menuname = "上传图片",value = "uploadImg", method = RequestMethod.POST)
+    public ResponseData<String> uploadImg(@RequestParam("picture") String picture) {
+        ShiroUser user = getShiroUser();
+        Integer userId=user.getId();
+        String path = PicturesUtil.uploadPictures(picture, userId.toString(),PATH_TYPE);
+
+        if(StringUtils.isNoneBlank(path)){
+            return ResponseData.success(path, "上传成功");
+        }
+        return ResponseData.error("上传图片失败！");
+    }
+    
 }
 }

service-manager/src/main/java/com/winsun/controller/PartnerController.java

@@ -21,7 +21,6 @@ import com.winsun.auth.core.annotion.Permission;
 import com.winsun.auth.core.base.controller.BaseController;
 import com.winsun.auth.core.base.controller.BaseController;
 import com.winsun.auth.core.common.model.ResponseData;
 import com.winsun.auth.core.common.model.ResponseData;
 import com.winsun.auth.core.shiro.ShiroUser;
 import com.winsun.auth.core.shiro.ShiroUser;
-import com.winsun.bean.HhrActivity;
 import com.winsun.bean.HhrUser;
 import com.winsun.bean.HhrUser;
 import com.winsun.bean.Partner;
 import com.winsun.bean.Partner;
 import com.winsun.bean.School;
 import com.winsun.bean.School;
@@ -96,7 +95,7 @@ public class PartnerController extends BaseController {
 //		wrapperSchool.like(StringUtils.isNotBlank(name), "name", name, SqlLike.DEFAULT);
 //		wrapperSchool.like(StringUtils.isNotBlank(name), "name", name, SqlLike.DEFAULT);
 		List<School> schoolList = schoolMapper.selectList(wrapperSchool);
 		List<School> schoolList = schoolMapper.selectList(wrapperSchool);
 		
 		
-		Map<String, Object> refMap = MapUtil.listToMap(partnerMapper.getSchoolRef(), "user_id", "school_id");
+		Map<String, Object> refMap = MapUtil.listToMap(schoolMapper.getSchoolRef(), "user_id", "school_id");
 		List<Map<String, Object>> newList = new ArrayList<>();
 		List<Map<String, Object>> newList = new ArrayList<>();
 		
 		
 //		List<Map<String, Object>> sysList = new ArrayList<>();
 //		List<Map<String, Object>> sysList = new ArrayList<>();

service-manager/src/main/java/com/winsun/controller/SchoolManagementController.java

@@ -205,6 +205,7 @@ public class SchoolManagementController extends BaseController {
         wrapper.eq(StringUtils.isNotBlank(status), "status", status);
         wrapper.eq(StringUtils.isNotBlank(status), "status", status);
         Page<Map<String,Object>> page = new Page<>(pageIndex, pageSize);
         Page<Map<String,Object>> page = new Page<>(pageIndex, pageSize);
         List<Map<String, Object>> maps = schoolMapper.selectMapsPage(page, wrapper);
         List<Map<String, Object>> maps = schoolMapper.selectMapsPage(page, wrapper);
+        
         //查询县分列表
         //查询县分列表
         Wrapper<School> wrapperSubName = new EntityWrapper();
         Wrapper<School> wrapperSubName = new EntityWrapper();
         wrapperSubName.setSqlSelect("sub_name as subNameList").groupBy("sub_name");
         wrapperSubName.setSqlSelect("sub_name as subNameList").groupBy("sub_name");

service-manager/src/main/java/com/winsun/controller/WeixinAuthController.java

+package com.winsun.controller;
+
+import java.io.IOException;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@Controller
+public class WeixinAuthController {
+	
+	@RequestMapping("/MP_verify_oYaGTxvtIJXLOkXB.txt")
+	public void auth(HttpServletResponse response) throws IOException {
+		response.getWriter().print("oYaGTxvtIJXLOkXB");
+	}
+	
+}

service-manager/src/main/java/com/winsun/controller/school/SchoolAllocationController.java

+package com.winsun.controller.school;
+
+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.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.baomidou.mybatisplus.enums.SqlLike;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.winsun.auth.core.annotion.Permission;
+import com.winsun.auth.core.base.controller.BaseController;
+import com.winsun.auth.core.common.model.ResponseData;
+import com.winsun.bean.School;
+import com.winsun.bean.SysUser;
+import com.winsun.mapper.PackageMapper;
+import com.winsun.mapper.ProductMapper;
+import com.winsun.mapper.SchoolMapper;
+import com.winsun.mapper.SchoolPackageMapper;
+import com.winsun.mapper.SysUserMapper;
+import com.winsun.utils.MapUtil;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @Author: chancy
+ * @Date: 2020/2/12 17:25 学校管理
+ */
+@Slf4j
+@RestController
+@RequestMapping("/school/schoolAllocation")
+public class SchoolAllocationController extends BaseController {
+
+	private static SchoolMapper schoolMapper;
+    private static SysUserMapper sysUserMapper;
+
+    @Autowired
+    public SchoolAllocationController(SchoolMapper schoolMapper, SysUserMapper sysUserMapper) {
+        SchoolAllocationController.schoolMapper = schoolMapper;
+        SchoolAllocationController.sysUserMapper = sysUserMapper;
+    }
+
+    @Permission(menuname = "添加学校分配信息", value = "addSchoolAllocation", method = RequestMethod.POST)
+    public ResponseData<String> insertSchool(@RequestParam("account") String account,@RequestParam("schoolId") String schoolId) {
+    	Wrapper<SysUser> wrapperUser = new EntityWrapper<SysUser>();
+    	wrapperUser.eq("account", account);
+    	//wrapperUser.eq(column, params);
+    	List<SysUser> userList = sysUserMapper.selectList(wrapperUser);
+    	
+    	
+        if (userList.size() > 0){
+        	schoolMapper.addSupervisorSchool(userList.get(0).getId(), schoolId);
+        	
+            return ResponseData.success("添加成功！");
+        }
+        
+        return ResponseData.error("账号不存在！！");
+    }
+
+    @Permission(menuname = "删除学校分配信息", value = "deleteSchoolAllocation", method = RequestMethod.POST)
+    public ResponseData<String> deleteSchool(@RequestParam("id") String id) {
+
+        int num = schoolMapper.deleteSupervisorSchool(id);
+    	
+        if (num == 1){
+            return ResponseData.success("删除成功！");
+        }
+        return  ResponseData.error("删除失败");
+
+    }
+
+
+    /**
+     *
+     * @param account
+     * @param name
+     * @param substName
+     * @param schoolName
+     * @param pageIndex
+     * @param pageSize
+     * @return
+     */
+    @Permission(menuname = "查询学校分配", value = "findByList", method = RequestMethod.POST)
+    public ResponseData<Page<Map<String,Object>>> listSchool(@RequestParam("account") String account, @RequestParam("name") String name,
+                                                 @RequestParam("substName") String substName, @RequestParam("schoolName") String schoolName,
+                                                 @RequestParam(name = "pageNo", required = false) int pageIndex,
+                                                 @RequestParam(name = "pageSize", required = false) int pageSize) {
+       
+        Wrapper<SysUser> wrapperUser = new EntityWrapper();
+        wrapperUser.like(StringUtils.isNotBlank(name), "name", name, SqlLike.DEFAULT);
+        wrapperUser.eq(StringUtils.isNotBlank(account), "account", account);
+        List<SysUser> userList = sysUserMapper.selectList(wrapperUser);
+        
+        Wrapper<School> wrapperSchool = new EntityWrapper();
+        wrapperSchool.eq(StringUtils.isNotBlank(schoolName), "school_name", schoolName);
+        wrapperSchool.like(StringUtils.isNotBlank(substName), "sub_name", substName, SqlLike.DEFAULT);
+        List<School> schoolList = schoolMapper.selectList(wrapperSchool);
+        
+        Map<String, Object> schoolMap = MapUtil.listToMap(schoolMapper.getSchoolRef(), "user_id", "school_id");
+        List<Map<String, Object>> schoolAllocationList = schoolMapper.getSupervisorSchoolRef();
+        List<Map<String, Object>> dataList = new ArrayList<Map<String,Object>>();
+        
+        for(Map<String, Object> schoolAllocation : schoolAllocationList) {
+        	String theUserId = Integer.toString((Integer)schoolAllocation.get("user_id"));
+        	String theSchoolId = (String)schoolAllocation.get("school");
+        	
+        	for(SysUser sysUser : userList) {
+        		if(sysUser.getId().equals(theUserId)) {
+        			Map<String, Object> map = new HashMap<String, Object>();
+        			map.put("account", sysUser.getAccount());
+        			map.put("name", sysUser.getName());
+        			map.put("schoolId", theSchoolId);
+        			map.put("userId", sysUser.getId());
+        			map.put("id",  schoolAllocation.get("id"));
+        			
+        			dataList.add(map);
+        		}
+        	}
+        }
+        
+        for(Map<String, Object> map : dataList) {
+        	int theSchoolId = Integer.parseInt((String)map.get("schoolId"));
+        	
+        	for(School school : schoolList) {
+        		if(school.getId() == theSchoolId) {
+        			map.put("substName", school.getSubName());
+        			map.put("schoolName", school.getSchoolName());
+        		}
+        	}
+        }
+        
+        Page<Map<String, Object>> page = new Page<>(pageIndex, pageSize);
+        List<Map<String, Object>> newList = new ArrayList<Map<String,Object>>();
+        if(pageIndex*pageSize > dataList.size()) {
+        	newList = dataList.subList((pageIndex-1)*pageSize, dataList.size());
+        }else {
+        	newList = dataList.subList((pageIndex-1)*pageSize, pageIndex*pageSize);
+        }
+        
+        page.setRecords(newList);
+        page.setTotal(dataList.size());
+        return ResponseData.success(page, "查询完毕！");
+    }
+
+  
+
+}