后台管理增加网点编码和网点名称字段

fc38b1c6 · 彭祥礼 · 868f60c0 · fc38b1c6 · fc38b1c6 · fc38b1c6
Commit fc38b1c6 authored Apr 07, 2020 by 彭祥礼
11 changed files
--- a/common/src/main/java/com/winsun/bean/NetworkInfo.java
+++ b/common/src/main/java/com/winsun/bean/NetworkInfo.java
+package com.winsun.bean;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+import lombok.Data;
+import java.io.Serializable;
+/**
+ * 网点信息类
+ */
+@Data
+@TableName("hhr_network_info")
+public class NetworkInfo implements Serializable {
+    private static final long serialVersionUID = 5797224009939724683L;
+    /**
+     * 主键id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private String id;
+    /**
+     * 局向，区名
+     */
+    private String areaName;
+    /**
+     * 学校名
+     */
+    private String schoolName;
+    /**
+     * 网点编码
+     */
+    private String networkCode;
+    /**
+     * 网点名称
+     */
+    private String networkName;
+}
--- a/common/src/main/java/com/winsun/bean/Order.java
+++ b/common/src/main/java/com/winsun/bean/Order.java
 package com.winsun.bean;
-import java.io.Serializable;
-import java.util.Date;
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableName;
 import lombok.Data;
+import java.io.Serializable;
+import java.util.Date;
 /**
 * 订单
 *
@@ -15,7 +14,8 @@ import lombok.Data;
 @Data
 @TableName("hhr_order")
 public class Order implements Serializable{
+	private static final long serialVersionUID = 1052451021982452911L;
 	/**
 	 * 主键
 	 */

--- a/common/src/main/java/com/winsun/bean/OrderHistory.java
+++ b/common/src/main/java/com/winsun/bean/OrderHistory.java
@@ -16,6 +16,7 @@ import java.util.Date;
 @TableName("hhr_order_history")
 public class OrderHistory implements Serializable {
+    private static final long serialVersionUID = -40129957672095334L;
    /**
     * 订单id
     */

--- a/common/src/main/java/com/winsun/bean/Package.java
+++ b/common/src/main/java/com/winsun/bean/Package.java
@@ -14,6 +14,7 @@ import java.io.Serializable;
 @TableName("hhr_package")
 public class Package implements Serializable {
+    private static final long serialVersionUID = -3214488372758625311L;
    /**
     * 主键
     */

--- a/common/src/main/java/com/winsun/bean/Partner.java
+++ b/common/src/main/java/com/winsun/bean/Partner.java
@@ -15,6 +15,7 @@ import java.io.Serializable;
 @TableName("hhr_user_view")
 public class Partner implements Serializable {
+    private static final long serialVersionUID = -2297946603543248406L;
    /**
     * 主键
     */

--- a/common/src/main/java/com/winsun/bean/School.java
+++ b/common/src/main/java/com/winsun/bean/School.java
@@ -15,6 +15,7 @@ import java.io.Serializable;
 @TableName("hhr_school")
 public class School implements Serializable {
+    private static final long serialVersionUID = 6881513580528426846L;
    /**
     * 主键
     */

--- a/common/src/main/java/com/winsun/bean/Student.java
+++ b/common/src/main/java/com/winsun/bean/Student.java
@@ -5,13 +5,16 @@ import com.baomidou.mybatisplus.annotations.TableName;
 import com.baomidou.mybatisplus.enums.IdType;
 import lombok.Data;
+import java.io.Serializable;
 /**
 * 学生信息
 */
 @Data
 @TableName("hhr_student")
-public class Student {
+public class Student implements Serializable {
+    private static final long serialVersionUID = 3949626453448235989L;
    /**
     *主键
     */

--- a/common/src/main/java/com/winsun/bean/UserSchool.java
+++ b/common/src/main/java/com/winsun/bean/UserSchool.java
@@ -14,6 +14,7 @@ import java.io.Serializable;
 @TableName("hhr_user_school")
 public class UserSchool implements Serializable {
+    private static final long serialVersionUID = 2140472662677454235L;
    /**
     * 主键
     */

--- a/common/src/main/java/com/winsun/mapper/NetworkInfoMapper.java
+++ b/common/src/main/java/com/winsun/mapper/NetworkInfoMapper.java
+package com.winsun.mapper;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.winsun.bean.NetworkInfo;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Component;
+@Mapper
+@Component
+public interface NetworkInfoMapper extends BaseMapper<NetworkInfo> {
+}
--- a/core-service/src/main/java/com/winsun/item/modular/system/controller/GetPhoneCodeController.java
+++ b/core-service/src/main/java/com/winsun/item/modular/system/controller/GetPhoneCodeController.java
@@ -24,8 +24,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 /**
 * 日志管理的控制器
@@ -86,6 +84,7 @@ public class GetPhoneCodeController extends BaseController {
        if (expire>(60*4)){
            return ResponseEntity.newJSON("code", 400, "message", "请勿频繁发送手机验证码操作！");
        }
+        log.info("验证码："+verificationCode);
        stringRedisTemplate.opsForValue().set(code, verificationCode, CODETIME, TimeUnit.MILLISECONDS);
        Map<String, Object> sent=new HashMap<>();
        sent.put("code",400);

--- a/service-manager/src/main/java/com/winsun/controller/SchoolManagementController.java
+++ b/service-manager/src/main/java/com/winsun/controller/SchoolManagementController.java
 package com.winsun.controller;
-import com.alibaba.fastjson.JSON;
 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.auth.core.shiro.ShiroUser;
+import com.winsun.bean.*;
 import com.winsun.bean.Package;
-import com.winsun.bean.Product;
-import com.winsun.bean.School;
-import com.winsun.bean.SchoolPackage;
 import com.winsun.constant.FilePath;
-import com.winsun.mapper.PackageMapper;
+import com.winsun.mapper.*;
-import com.winsun.mapper.ProductMapper;
-import com.winsun.mapper.SchoolMapper;
-import com.winsun.mapper.SchoolPackageMapper;
 import com.winsun.utils.FileUtil;
 import com.winsun.utils.MyBatisPlusUpdateUtils;
 import lombok.extern.slf4j.Slf4j;
@@ -27,7 +22,6 @@ 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.winsun.auth.core.common.model.ResponseData;
 import org.springframework.web.multipart.MultipartFile;
 import java.util.ArrayList;
@@ -53,6 +47,8 @@ public class SchoolManagementController extends BaseController {
    private static ProductMapper productMapper;
+    private static NetworkInfoMapper networkInfoMapper;
    //默认路径
    private static String   DEFAULTPATH="images/schoolPartner/";
@@ -65,6 +61,7 @@ public class SchoolManagementController extends BaseController {
        SchoolManagementController.schoolPackageMapper = schoolPackageMapper;
        SchoolManagementController.packageMapper = packageMapper;
        SchoolManagementController.productMapper = productMapper;
+        SchoolManagementController.networkInfoMapper = networkInfoMapper;
    }
    @Permission(menuname = "添加学校信息", value = "insert", method = RequestMethod.POST)
@@ -198,6 +195,15 @@ public class SchoolManagementController extends BaseController {
        wrapper.eq(StringUtils.isNotBlank(status), "status", status);
        Page<Map<String,Object>> page = new Page<>(pageIndex, pageSize);
        List<Map<String, Object>> maps = schoolMapper.selectMapsPage(page, wrapper);
+        //查询网点编码和网点名称
+        for (Map<String, Object> map : maps) {
+            Wrapper<NetworkInfo> networkWrapper = new EntityWrapper<>();
+            networkWrapper.setSqlSelect(" network_code,network_name ");
+            networkWrapper.addFilter("school_name = '" + map.get("school_name") + "'");
+            Map<String, Object> networkMap = networkInfoMapper.selectMaps(networkWrapper).get(0);
+            map.put("network_code",networkMap.get("network_code"));
+            map.put("network_name",networkMap.get("network_name"));
+        }
        //查询县分列表
        Wrapper<School> wrapperSubName = new EntityWrapper();
        wrapperSubName.setSqlSelect("sub_name as subNameList").groupBy("sub_name");