rankin-api-web/src/main/java/cn/rankin/apiweb/controller/LoginController.java

@@ -41,19 +41,16 @@ public class LoginController
         String merchant = request.getHeader("merchant");
         String userAgent = request.getHeader("User-Agent");
 
+
         String ip = HttpUtil.getClientIp(request);
         loginInfoDTO.setIp(ip);
         loginInfoDTO.setTerminal(terminal);
         loginInfoDTO.setMerchant(merchant);
 
-       String mac = MacAddressHelper.getMacInLinux(ip);
-
+        log.info("login request header : ip={},terminal={},merchant={},user-agent={}", ip, terminal, merchant,userAgent);
         //填充设备信息
         fillDeviceInfo(userAgent, loginInfoDTO);
 
-        log.info("login request header : ip={},terminal={},merchant={},mac={},user-agent={}", ip, terminal, merchant, mac,userAgent);
-
-
         return userService.login(loginInfoDTO);
     }
 
@@ -62,8 +59,13 @@ public class LoginController
     {
         String deviceCode = deviceLoginDTO.getDeviceCode();
         String merchant = request.getHeader("merchant");
-        log.info("refresh request header : deviceCode={}, merchant={}", deviceCode, merchant);
-        return userService.refresh(deviceCode, merchant, Boolean.TRUE);
+        String userAgent = request.getHeader("User-Agent");
+        log.info("refresh request header : deviceCode={}, merchant={},userAgent={}", deviceCode, merchant,userAgent);
+
+        //填充设备信息
+        fillDeviceInfo(userAgent, deviceLoginDTO);
+
+        return userService.refresh(deviceCode, merchant, Boolean.TRUE,deviceLoginDTO);
     }
 
     @RequestMapping(method = RequestMethod.DELETE)
@@ -78,6 +80,79 @@ public class LoginController
      * @param userAgentStr the string of user agent
      * @param loginInfoDTO the login info
      */
+    private void fillDeviceInfo(String userAgentStr, DeviceLoginDTO loginInfoDTO)
+    {
+        if (userAgentStr == "" || userAgentStr == null)
+        {
+            return;
+        }
+        if (loginInfoDTO == null)
+        {
+            return;
+        }
+
+        UserAgent userAgent = UserAgent.parseUserAgentString(userAgentStr);
+
+        //获取浏览器对象
+        Browser browser = userAgent.getBrowser();
+
+        //获取操作系统对象
+        OperatingSystem operatingSystem = userAgent.getOperatingSystem();
+
+        //操作系统名称
+        String osName = operatingSystem.getName();
+        loginInfoDTO.setDeviceName(osName);
+
+        //获取厂商
+        String osMfrs = operatingSystem.getManufacturer().toString();
+        loginInfoDTO.setDeviceMfrs(osMfrs);
+
+        //获取设备类型
+        String deviceType = operatingSystem.getDeviceType().toString();
+        loginInfoDTO.setDeviceType(deviceType);
+
+        //获取设备型号
+        //获取设备型号
+        if ("MOBILE".equals(deviceType))
+        {
+            String split[] = userAgentStr.split("Build/");
+
+            if(split!=null || split.length > 0)
+            {
+                String splitType[] =  split[0].split(";");
+                if(splitType!=null && splitType.length>0)
+                {
+                    loginInfoDTO.setDeviceModel(splitType[splitType.length-1]);
+                }
+
+            }
+
+        }
+        else if ("TABLET".equals(deviceType))
+        {
+            String split[] = userAgentStr.split("Build/");
+
+            if(split!=null || split.length > 0)
+            {
+                String splitType[] =  split[0].split(";");
+                if(splitType!=null && splitType.length>0)
+                {
+                    loginInfoDTO.setDeviceModel(splitType[splitType.length-1]);
+                }
+
+            }
+        }
+        else
+        {
+            loginInfoDTO.setDeviceModel(osName);
+        }
+    }
+
+    /**
+     * Fill device info
+     * @param userAgentStr the string of user agent
+     * @param loginInfoDTO the login info
+     */
     private void fillDeviceInfo(String userAgentStr, LoginInfoDTO loginInfoDTO)
     {
         if (userAgentStr == "" || userAgentStr == null)
@@ -112,13 +187,31 @@ public class LoginController
         //获取设备型号
         if ("MOBILE".equals(deviceType))
         {
-            Pattern pattern = Pattern.compile(";\\s?(\\S*?\\s?\\S*?)\\s?(Build)?/");
-            Matcher matcher = pattern.matcher(userAgentStr);
-            String model = null;
-            if (matcher.find())
+            String split[] = userAgentStr.split("Build/");
+
+            if(split!=null || split.length > 0)
             {
-                model = matcher.group(1).trim();
-                loginInfoDTO.setDeviceModel(model);
+                String splitType[] =  split[0].split(";");
+                if(splitType!=null && splitType.length>0)
+                {
+                    loginInfoDTO.setDeviceModel(splitType[splitType.length-1]);
+                }
+
+            }
+
+        }
+        else if ("TABLET".equals(deviceType))
+        {
+            String split[] = userAgentStr.split("Build/");
+
+            if(split!=null || split.length > 0)
+            {
+                String splitType[] =  split[0].split(";");
+                if(splitType!=null && splitType.length>0)
+                {
+                    loginInfoDTO.setDeviceModel(splitType[splitType.length-1]);
+                }
+
             }
         }
         else

rankin-api-web/src/main/java/cn/rankin/apiweb/controller/QRcodeController.java

@@ -0,0 +1,123 @@
+package cn.rankin.apiweb.controller;
+
+import cn.rankin.apiweb.assist.resolver.NeedUser;
+import cn.rankin.apiweb.service.user.UserService;
+import cn.rankin.common.utils.api.model.APIResult;
+import cn.rankin.common.utils.util.FastJsonUtils;
+import cn.rankin.data.api.app.vo.DeviceUserVo;
+import cn.rankin.data.api.user.vo.QRCodeVo;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+
+@Slf4j
+@RestController
+@RequestMapping(value = "/qrcode")
+public class QRcodeController {
+
+    @Autowired
+    private UserService userService;
+
+    @RequestMapping(method = RequestMethod.GET)
+    public APIResult<QRCodeVo> qrcode(@NeedUser DeviceUserVo user)
+    {
+        String eid = user.getEid();
+        log.info("qrcode request header : eid={},", eid);
+        return userService.qrcode(eid);
+    }
+
+    @RequestMapping(value = "/last", method = RequestMethod.GET)
+    public APIResult<QRCodeVo> queryLastQRCode(@NeedUser DeviceUserVo user)
+    {
+        String eid = user.getEid();
+        log.info("qrcode request header : eid={},", eid);
+        return userService.queryLastQRCode(eid);
+    }
+
+    @RequestMapping(value = "/callback", method = RequestMethod.POST)
+    public APIResult callback(@RequestParam("data") String data)
+    {
+        log.info("qrcode/callback request json : json={},", data);
+        return userService.qrcodeCallback(data);
+    }
+
+
+    public static String getJson (){
+
+        //二维码信息
+        Map<String,Object> qrcode = new HashMap<>();
+        qrcode.put("user","100166661101001");
+        qrcode.put("time",new Date().getTime());
+
+        //扫码定位信息
+        Map<String,Object> position = new HashMap<>();
+        position.put("lat","27.10444444");
+        position.put("lng","101.5688746");
+        position.put("precise","位置精确度低");
+        position.put("address","湖南省长沙市五一大道壹号公馆");
+
+        //扫码人老师信息
+        Map<String,Object> teacher_info = new HashMap<>();
+        teacher_info.put("real_name","方老师");
+        teacher_info.put("mobile","17319266010");
+        teacher_info.put("position","校长");
+        teacher_info.put("en_code","10056");
+
+
+        //扫码人校区信息
+        Map<String,Object> campus_info = new HashMap<>();
+        campus_info.put("campus_name","芙蓉校区");
+        campus_info.put("en_code","10056");
+        campus_info.put("lat","27.10444444");
+        campus_info.put("lng","101.5688746");
+
+        //其他附加消息
+        Map<String,Object> attach = new HashMap<>();
+
+
+
+        Map<String,Object> data = new HashMap<>();
+        data.put("qrcode",qrcode);
+        data.put("position",position);
+        data.put("teacher_info",teacher_info);
+        data.put("campus_info",campus_info);
+        data.put("attach",attach);
+
+
+
+        Map<String,Object> result = new HashMap<>();
+        result.put("code","0");
+        result.put("status",true);
+        result.put("msg","扫码成功");
+        result.put("data",data);
+        result.put("user","100166661101001");
+
+
+        String json = FastJsonUtils.toJSONNoFeatures(result);
+        System.out.println(json);
+        return json;
+
+    }
+
+
+    public static void main(String[] args){
+        String json = getJson();
+
+        Map<Object, Object> objectMap = FastJsonUtils.stringToCollect(json);
+
+        Object code = objectMap.get("code");
+        Object status = objectMap.get("status");
+        Object msg = objectMap.get("msg");
+        Object data = objectMap.get("data");
+
+        System.out.println("=============");
+
+    }
+
+}
+

rankin-api-web/src/main/java/cn/rankin/apiweb/intercepter/RequestSignatureInterceptor.java

@@ -44,6 +44,7 @@ public class RequestSignatureInterceptor implements HandlerInterceptor {
 
     static {
         ignorePaths.add("/token");
+        ignorePaths.add("/qrcode/callback");
     }
 
     @Autowired

rankin-api-web/src/main/java/cn/rankin/apiweb/service/user/UserClient.java

@@ -3,11 +3,13 @@ package cn.rankin.apiweb.service.user;
 import cn.rankin.apiweb.code.ApiWebCode;
 import cn.rankin.common.utils.api.model.APIResult;
 import cn.rankin.common.utils.api.page.Page;
+import cn.rankin.data.api.user.dto.QRCodeDTO;
 import cn.rankin.data.api.user.dto.TerminalDeviceDTO;
 import cn.rankin.data.api.user.dto.UserDeviceDTO;
 import cn.rankin.data.api.user.entity.UserRecommend;
 import cn.rankin.data.api.user.entity.UserTag;
 import cn.rankin.data.api.user.entity.UserTagProductRelation;
+import cn.rankin.data.api.user.vo.QRCodeVo;
 import cn.rankin.data.api.user.vo.TerminalDeviceVo;
 import cn.rankin.data.api.user.vo.TerminalUserVo;
 import cn.rankin.data.api.user.vo.WhiteUserVo;
@@ -71,6 +73,19 @@ public interface UserClient
                                                @RequestParam("pageNo") Integer pageNo,
                                                @RequestParam("pageSize") Integer pageSize);
 
+    @RequestMapping(value = "/qrcode", method = RequestMethod.POST)
+    QRCodeVo qrcode(@RequestBody QRCodeDTO dto);
+
+    @RequestMapping(value = "/qrcode/last", method = RequestMethod.GET)
+    QRCodeVo queryLastQRCode(@RequestParam("eid") String eid);
+
+    @RequestMapping(value = "/qrcode/callback", method = RequestMethod.POST)
+    APIResult qrcodeCallback(@RequestParam("data")String data);
+
+    @RequestMapping(value = "/qrcode/status/fail", method = RequestMethod.PUT)
+    void updateQrcodesStatus(@RequestParam("eid") String eid);
+
+
     @Component
     class UserServiceHystrix implements UserClient
     {
@@ -162,6 +177,26 @@ public interface UserClient
             return null;
         }
 
+        @Override
+        public QRCodeVo qrcode(QRCodeDTO dto) {
+            return null;
+        }
+
+        @Override
+        public QRCodeVo queryLastQRCode(String eid) {
+            return null;
+        }
+
+        @Override
+        public APIResult qrcodeCallback(String data) {
+            return null;
+        }
+
+        @Override
+        public void updateQrcodesStatus(String eid) {
+
+        }
+
 
     }
 }

rankin-api-web/src/main/java/cn/rankin/apiweb/service/user/UserService.java

@@ -3,21 +3,27 @@ package cn.rankin.apiweb.service.user;
 import cn.rankin.apiweb.code.ApiWebCode;
 import cn.rankin.apiweb.service.product.ProductClient;
 import cn.rankin.apiweb.utils.SecurityManager;
+import cn.rankin.common.utils.api.model.APICode;
 import cn.rankin.common.utils.api.model.APIResult;
 import cn.rankin.common.utils.api.model.BaseCode;
 import cn.rankin.common.utils.api.page.Page;
 import cn.rankin.common.utils.constant.PlatForm;
 import cn.rankin.common.utils.constant.RedisKey;
 import cn.rankin.common.utils.service.RedisService;
+import cn.rankin.common.utils.util.FastJsonUtils;
+import cn.rankin.common.utils.util.QRCodeUtil;
+import cn.rankin.data.api.app.dto.DeviceLoginDTO;
 import cn.rankin.data.api.app.dto.LoginInfoDTO;
 import cn.rankin.data.api.app.vo.DeviceUserVo;
 import cn.rankin.data.api.app.vo.ItemVo;
 import cn.rankin.data.api.app.vo.UserInfoVo;
+import cn.rankin.data.api.user.dto.QRCodeDTO;
 import cn.rankin.data.api.user.dto.TerminalDeviceDTO;
 import cn.rankin.data.api.user.dto.UserDeviceDTO;
 import cn.rankin.data.api.user.entity.UserRecommend;
 import cn.rankin.data.api.user.entity.UserTag;
 import cn.rankin.data.api.user.entity.UserTagProductRelation;
+import cn.rankin.data.api.user.vo.QRCodeVo;
 import cn.rankin.data.api.user.vo.TerminalDeviceVo;
 import cn.rankin.data.api.user.vo.TerminalUserVo;
 import com.alibaba.fastjson.JSON;
@@ -30,10 +36,7 @@ import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 
 @Service
@@ -79,27 +82,7 @@ public class UserService
             return APIResult.error(ApiWebCode.LOGIN_ERROR);
         }
 
-        //操作用户登录设备信息
-        if (deviceName != null && !"".equals(deviceName.trim()))
-        {
-            String uid = userVo.getId();
-            UserDeviceDTO dto = new UserDeviceDTO();
-            dto.setDeviceCode(deviceCode);
-            dto.setDeviceModel(deviceModel);
-            dto.setDeviceType(deviceType);
-            dto.setDeviceMfrs(deviceMfrs);
-            dto.setDeviceName(deviceName);
 
-            int opRet = userClient.opUserDevice(uid,dto);
-            if (opRet == 0)
-            {
-                log.error("Failed to operated user device with[uid={},deviceCode={},deviceModel={},deviceName={}]", uid, deviceCode, deviceModel, deviceName);
-            }
-            else
-            {
-                log.info("Succeed to operating user device with[uid={},deviceCode={},deviceModel={},deviceName={}]", uid, deviceCode, deviceModel, deviceName);
-            }
-        }
 
         String storePassword = userVo.getPassword();
         if (!SecurityManager.validate(loginPassword, storePassword))
@@ -153,6 +136,32 @@ public class UserService
         UserInfoVo userInfoVo = toUserInfoVo(deviceUserVo, true);
         log.info("user={} login success, userInfo={}", eid, JSON.toJSONString(userInfoVo));
 
+
+        //操作用户登录设备信息
+        if (deviceName != null && !"".equals(deviceName.trim()))
+        {
+            UserDeviceDTO dto = new UserDeviceDTO();
+            dto.setDeviceCode(deviceCode);
+            dto.setDeviceModel(deviceModel);
+            dto.setDeviceType(deviceType);
+            dto.setDeviceMfrs(deviceMfrs);
+            dto.setDeviceName(deviceName);
+            if(deviceModel == "" || deviceModel == null)
+            {
+                dto.setDeviceModel("未知");
+            }
+
+            int opRet = userClient.opUserDevice(userId,dto);
+            if (opRet == 0)
+            {
+                log.error("Failed to operated user device with[uid={},deviceCode={},deviceModel={},deviceName={}]", userId, deviceCode, deviceModel, deviceName);
+            }
+            else
+            {
+                log.info("Succeed to operating user device with[uid={},deviceCode={},deviceModel={},deviceName={}]", userId, deviceCode, deviceModel, deviceName);
+            }
+        }
+
         return APIResult.ok(userInfoVo);
     }
 
@@ -230,7 +239,7 @@ public class UserService
         return toDeviceUserVo(userVo, deviceVo);
     }
 
-    public APIResult<UserInfoVo> refresh(String deviceCode, String merchant, Boolean force)
+    public APIResult<UserInfoVo> refresh(String deviceCode, String merchant, Boolean force, DeviceLoginDTO deviceLoginDTO)
     {
 
         List<TerminalDeviceVo> deviceVoList = userClient.findByDeviceCode(deviceCode);
@@ -301,6 +310,36 @@ public class UserService
         refreshToken(deviceUserVo);
         save(deviceUserVo);
 
+        //获取设备台账
+        String deviceModel = deviceLoginDTO.getDeviceModel();
+        String deviceMfrs = deviceLoginDTO.getDeviceMfrs();
+        String deviceName = deviceLoginDTO.getDeviceName();
+        String deviceType = deviceLoginDTO.getDeviceType();
+        //操作用户登录设备信息
+        if (deviceName != null && !"".equals(deviceName.trim()))
+        {
+            UserDeviceDTO dto = new UserDeviceDTO();
+            dto.setDeviceCode(deviceCode);
+            dto.setDeviceModel(deviceModel);
+            dto.setDeviceType(deviceType);
+            dto.setDeviceMfrs(deviceMfrs);
+            dto.setDeviceName(deviceName);
+            if(deviceModel == "" || deviceModel == null)
+            {
+                dto.setDeviceModel("未知");
+            }
+
+            int opRet = userClient.opUserDevice(uid,dto);
+            if (opRet == 0)
+            {
+                log.error("Failed to operated user device with[uid={},deviceCode={},deviceModel={},deviceName={}]", uid, deviceCode, deviceModel, deviceName);
+            }
+            else
+            {
+                log.info("Succeed to operating user device with[uid={},deviceCode={},deviceModel={},deviceName={}]", uid, deviceCode, deviceModel, deviceName);
+            }
+        }
+
         UserInfoVo userInfoVo = toUserInfoVo(deviceUserVo, true);
         return APIResult.ok(userInfoVo);
     }
@@ -436,4 +475,62 @@ public class UserService
     {
         return userClient.findRelations(userTagId, productIdList, pageNo, pageSize);
     }
+
+    public APIResult<QRCodeVo> qrcode(String eid) {
+        APIResult<TerminalUserVo> apiResult = userClient.loadUserByEid(eid);
+        if(!apiResult.getSuccess()){
+            log.error("load user by eid is fail");
+            return APIResult.error(ApiWebCode.OPERATE_ERROR);
+        }
+        TerminalUserVo vo = apiResult.getData();
+        if(null == vo){
+            log.info("load terminalUser is null");
+            return APIResult.error(ApiWebCode.OPERATE_ERROR);
+        }
+
+        Date time = new Date();
+
+        Map qrcode = new HashMap();
+        qrcode.put("user",eid);
+        qrcode.put("time",time);
+        String json = FastJsonUtils.collectToString(qrcode);
+        String qrCode = null;
+
+        try{
+            qrCode = "data:image/png;base64," +  QRCodeUtil.generateQRCode(json);
+        }catch(Exception e){
+            log.error("generateQRCode exception,message={}",e.getMessage());
+            e.printStackTrace();
+            return APIResult.error(ApiWebCode.SERVER_ERROR);
+        }
+
+        String simple = vo.getMerchantSimple();
+
+
+        //生成新二维码入库前，将所有的待验证的二维码状态置为失败
+        userClient.updateQrcodesStatus(eid);
+
+
+
+        QRCodeDTO dto = new QRCodeDTO();
+        dto.setEid(eid);
+        dto.setSimple(simple);
+        dto.setTime(time);
+        dto.setQrcode(qrCode);
+        QRCodeVo qrcodeVo = userClient.qrcode(dto);
+
+        return APIResult.ok(qrcodeVo);
+    }
+
+    public APIResult<QRCodeVo> queryLastQRCode(String eid) {
+        QRCodeVo vo = userClient.queryLastQRCode(eid);
+        if(null == vo ){
+            return APIResult.error(APICode.OPERATE_ERROR);
+        }
+        return APIResult.ok(vo);
+    }
+
+    public APIResult qrcodeCallback(String data) {
+        return userClient.qrcodeCallback(data);
+    }
 }

rankin-cms-web/pom.xml

@@ -93,6 +93,12 @@
             <artifactId>feign-httpclient</artifactId>
             <version>RELEASE</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi</artifactId>
+            <version>3.17</version>
+        </dependency>
     </dependencies>
 
 	<dependencyManagement>

rankin-cms-web/src/main/java/cn/rankin/cmsweb/controller/stmt/StmtCampusController.java

@@ -0,0 +1,172 @@
+package cn.rankin.cmsweb.controller.stmt;
+
+import cn.rankin.cmsweb.assist.resolver.NeedUser;
+import cn.rankin.cmsweb.entity.UserDetails;
+import cn.rankin.cmsweb.service.stmt.StmtCampusService;
+import cn.rankin.common.utils.api.model.APIResult;
+import cn.rankin.common.utils.api.page.Page;
+import cn.rankin.common.utils.util.BeanUtil;
+import cn.rankin.common.utils.util.ProvinceUtil;
+import cn.rankin.data.api.user.dto.CampusSearchDTO;
+import cn.rankin.data.api.user.vo.CampusVo;
+import org.apache.poi.hssf.usermodel.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.OutputStream;
+import java.util.Date;
+import java.util.List;
+
+@RestController
+@RequestMapping(value = "/stmt/campus")
+public class StmtCampusController
+{
+    @Autowired
+    private StmtCampusService stmtService;
+
+    /**
+     * 查询已开通校区报表
+     *
+     * @param user            the user info
+     * @param campusSearchDTO the campus search
+     * @return
+     */
+    @RequestMapping(value = {"/list", "/"}, method = RequestMethod.GET)
+    public APIResult<Page<CampusVo>> campusList(@NeedUser UserDetails user, CampusSearchDTO campusSearchDTO)
+    {
+        if (!user.isPlatForm())
+        {
+            String merchantId = user.getMerchantId();
+            campusSearchDTO.setMerchantId(merchantId);
+        }
+        APIResult<Page<CampusVo>> pageData = stmtService.search(BeanUtil.convertToMap(campusSearchDTO));
+
+        //设置省份
+        if (pageData != null)
+        {
+            List<CampusVo> list = pageData.getData().getList();
+            if (list != null && list.size() > 0)
+            {
+                for (int i = 0; i < list.size(); i++)
+                {
+                    CampusVo vo = list.get(i);
+                    String provinceCode = vo.getProvinceCode();
+                    String provinceName = ProvinceUtil.get(provinceCode);
+                    vo.setProvinceName(provinceName);
+                }
+            }
+        }
+
+        return pageData;
+    }
+
+    /**
+     * 已开通校区报表导出
+     *
+     * @param user            the user info
+     * @param campusSearchDTO the campus search
+     * @return
+     */
+    @RequestMapping(value = {"/export", "/"}, method = RequestMethod.GET)
+    public String exportCampus(HttpServletResponse res, @NeedUser UserDetails user, CampusSearchDTO campusSearchDTO)
+    {
+        if (!user.isPlatForm())
+        {
+            String merchantId = user.getMerchantId();
+            campusSearchDTO.setMerchantId(merchantId);
+        }
+
+        //不是条件查询就全部下载
+        String code = campusSearchDTO.getCode();
+        String name = campusSearchDTO.getName();
+        if ((code != null && code != "") || (name != null && name != ""))
+        {
+
+        }
+        else
+        {
+            campusSearchDTO.setPageNo(1);
+            campusSearchDTO.setPageSize(100000);
+        }
+
+        APIResult<List<CampusVo>> apiResult = stmtService.query(BeanUtil.convertToMap(campusSearchDTO));
+
+        List<CampusVo> list = apiResult.getData();
+        //创建HSSFWorkbook对象(excel的文档对象)
+        HSSFWorkbook wb = new HSSFWorkbook();
+        //建立新的sheet对象（excel的表单）
+        HSSFSheet sheet = wb.createSheet("已开通校区报表");
+        //设置单元格宽度
+        sheet.setColumnWidth(0, 15 * 256);
+        sheet.setColumnWidth(1, 50 * 256);
+        sheet.setColumnWidth(2, 10 * 256);
+        sheet.setColumnWidth(3, 10 * 256);
+        sheet.setColumnWidth(4, 30 * 256);
+        sheet.setColumnWidth(5, 10 * 256);
+        sheet.setColumnWidth(6, 15 * 256);
+        sheet.setColumnWidth(7, 15 * 256);
+        //在sheet里创建第一行，参数为行索引(excel的行)，可以是0～65535之间的任何一个
+        HSSFRow row1 = sheet.createRow(0);
+        //创建单元格并设置单元格内容
+        row1.createCell(0).setCellValue("校区编号");
+        row1.createCell(1).setCellValue("校区名称");
+        row1.createCell(2).setCellValue("客户类型");
+        row1.createCell(3).setCellValue("所属省");
+        row1.createCell(4).setCellValue("所属市");
+        row1.createCell(5).setCellValue("联系人");
+        row1.createCell(6).setCellValue("联系方式");
+        row1.createCell(7).setCellValue("更新时间");
+
+        //单元格日期格式
+        HSSFCellStyle cellStyle = wb.createCellStyle();
+        HSSFDataFormat format = wb.createDataFormat();
+        cellStyle.setDataFormat(format.getFormat("yyyy/mm/dd"));
+
+        //插入数据
+        if (list != null && list.size() > 0)
+        {
+            for (int i = 0; i < list.size(); i++)
+            {
+
+                CampusVo vo = list.get(i);
+                String provinceCode = vo.getProvinceCode();
+                String provinceName = ProvinceUtil.get(provinceCode);
+                vo.setProvinceName(provinceName);
+
+                HSSFRow row = sheet.createRow(i + 1);
+                row.createCell(0).setCellValue(vo.getCode());
+                row.createCell(1).setCellValue(vo.getName());
+                row.createCell(2).setCellValue(vo.getMerchantName());
+                row.createCell(3).setCellValue(vo.getProvinceName());
+                row.createCell(4).setCellValue(vo.getCityName());
+                row.createCell(5).setCellValue(vo.getContactName());
+                row.createCell(6).setCellValue(vo.getMobile());
+
+
+                HSSFCell cell = row.createCell(7);
+                cell.setCellValue(vo.getGmtModified());
+                cell.setCellStyle(cellStyle);
+            }
+        }
+
+        try
+        {
+            long currentTime = new Date().getTime();
+            //输出Excel文件
+            OutputStream output = res.getOutputStream();
+            res.reset();
+            res.setHeader("Content-disposition", "attachment; filename=lingjiao_campus_" + currentTime + ".xls");
+            res.setContentType("application/msexcel");
+            wb.write(output);
+            output.close();
+        }
+        catch (Exception ex)
+        {
+            ex.printStackTrace();
+        }
+
+        return null;
+    }
+
+}

rankin-cms-web/src/main/java/cn/rankin/cmsweb/controller/stmt/StmtStatsController.java

@@ -0,0 +1,197 @@
+package cn.rankin.cmsweb.controller.stmt;
+
+import cn.rankin.cmsweb.assist.resolver.NeedUser;
+import cn.rankin.cmsweb.entity.UserDetails;
+import cn.rankin.cmsweb.service.stmt.StmtCampusService;
+import cn.rankin.cmsweb.service.user.TerminalUserService;
+import cn.rankin.common.utils.api.model.APIResult;
+import cn.rankin.common.utils.api.page.Page;
+import cn.rankin.common.utils.util.BeanUtil;
+import cn.rankin.data.api.user.dto.CampusSearchDTO;
+import cn.rankin.data.api.user.dto.TerminalUserSearchDTO;
+import cn.rankin.data.api.user.vo.CampusVo;
+import cn.rankin.data.api.user.vo.TerminalUserAuthVo;
+import cn.rankin.data.api.user.vo.TerminalUserVo;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.hssf.usermodel.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.OutputStream;
+import java.util.Date;
+import java.util.List;
+
+
+@Slf4j
+@RestController
+@RequestMapping(value = "/stmt/stats")
+public class StmtStatsController
+{
+    @Autowired
+    private TerminalUserService terminalUserService;
+
+    @Autowired
+    private StmtCampusService stmtService;
+
+    /**
+     * 获取终端明细
+     *
+     * @param user      the user details
+     * @param searchDTO the search Dto
+     * @return
+     */
+    @RequestMapping(value = {"/page", "/"}, method = RequestMethod.GET)
+    public APIResult<Page<TerminalUserVo>> campusList(@NeedUser UserDetails user, TerminalUserSearchDTO searchDTO)
+    {
+        if (!user.isPlatForm())
+        {
+            String merchantId = user.getMerchantId();
+            searchDTO.setMerchantId(merchantId);
+        }
+        APIResult<Page<TerminalUserVo>> page = terminalUserService.search(BeanUtil.convertToMap(searchDTO));
+
+        return page;
+    }
+
+    /**
+     * 下载终端明细
+     *
+     * @param user      the user details
+     * @param searchDTO the search Dto
+     * @return
+     */
+    @RequestMapping(value = {"/export", "/"}, method = RequestMethod.GET)
+    public APIResult<Page<TerminalUserVo>> campusListExport(HttpServletResponse res, @NeedUser UserDetails user, TerminalUserSearchDTO searchDTO) {
+        if (!user.isPlatForm()) {
+            String merchantId = user.getMerchantId();
+            searchDTO.setMerchantId(merchantId);
+        }
+
+        //
+        //下载所有
+        searchDTO.setPageNo(1);
+        searchDTO.setPageSize(10000);
+
+        APIResult<Page<TerminalUserVo>> pageAPIResult = terminalUserService.search(BeanUtil.convertToMap(searchDTO));
+
+        if (!pageAPIResult.getSuccess()) {
+            return null;
+        }
+
+        Page<TerminalUserVo> userTagStmtPage = pageAPIResult.getData();
+
+        if (null != userTagStmtPage) {
+            List<TerminalUserVo> list = userTagStmtPage.getList();
+
+            //创建HSSFWorkbook对象(excel的文档对象)
+            HSSFWorkbook wb = new HSSFWorkbook();
+            //建立新的sheet对象（excel的表单）
+            HSSFSheet sheet = wb.createSheet("总统计表");
+            //设置单元格宽度
+            sheet.setColumnWidth(0, 20 * 256);
+            sheet.setColumnWidth(1, 10 * 256);
+            sheet.setColumnWidth(2, 30 * 256);
+            sheet.setColumnWidth(3, 30 * 256);
+            sheet.setColumnWidth(4, 10 * 256);
+            sheet.setColumnWidth(5, 30 * 256);
+            sheet.setColumnWidth(6, 15 * 256);
+            sheet.setColumnWidth(7, 15 * 256);
+            //在sheet里创建第一行，参数为行索引(excel的行)，可以是0～65535之间的任何一个
+            HSSFRow row1 = sheet.createRow(0);
+            //创建单元格并设置单元格内容
+            row1.createCell(0).setCellValue("校区类型");
+            row1.createCell(1).setCellValue("校区名称");
+            row1.createCell(2).setCellValue("终端编号");
+            row1.createCell(3).setCellValue("终端名称");
+            row1.createCell(4).setCellValue("终端状态");
+
+            //单元格日期格式
+            HSSFCellStyle cellStyle = wb.createCellStyle();
+            HSSFDataFormat format = wb.createDataFormat();
+            cellStyle.setDataFormat(format.getFormat("yyyy/mm/dd"));
+
+            //插入数据
+            if (!CollectionUtils.isEmpty(list)) {
+                for (int i = 0; i < list.size(); i++) {
+                    TerminalUserVo vo = list.get(i);
+
+                    HSSFRow row = sheet.createRow(i + 1);
+                    row.createCell(0).setCellValue(vo.getMerchantName());
+                    row.createCell(1).setCellValue(vo.getCampusName());
+                    row.createCell(2).setCellValue(vo.getCode());
+                    row.createCell(3).setCellValue(vo.getName());
+                    row.createCell(4).setCellValue(vo.getStatus().getName());
+                }
+            }
+
+            try {
+                long currentTime = new Date().getTime();
+                //输出Excel文件
+                OutputStream output = res.getOutputStream();
+                res.reset();
+                res.setHeader("Content-disposition", "attachment; filename=lingjiao_stats_" + currentTime + ".xls");
+                res.setContentType("application/msexcel");
+                wb.write(output);
+                output.close();
+            } catch (Exception ex) {
+
+            }
+
+            return null;
+        }
+        return null;
+    }
+
+
+    /**
+     * 获取校区总数
+     *
+     * @param user            the user details
+     * @param campusSearchDTO the search Dto
+     * @return
+     */
+    @RequestMapping(value = {"/campus/totalsize", "/"}, method = RequestMethod.GET)
+    public APIResult<Page<CampusVo>> getCampusTotalSize(@NeedUser UserDetails user, CampusSearchDTO campusSearchDTO)
+    {
+        if (!user.isPlatForm())
+        {
+            String merchantId = user.getMerchantId();
+            campusSearchDTO.setMerchantId(merchantId);
+        }
+        APIResult<Page<CampusVo>> pageData = stmtService.search(BeanUtil.convertToMap(campusSearchDTO));
+
+        return APIResult.ok(pageData.getData().getTotalSize());
+    }
+
+    /**
+     * 获取终端用户数
+     *
+     * @param user the user details
+     * @param dto  the search Dto
+     * @return
+     */
+    @RequestMapping(value = {"/terminal/user/totalsize", "/"}, method = RequestMethod.GET)
+    public APIResult<Page<TerminalUserAuthVo>> getTerminalTotalSize(@NeedUser UserDetails user, TerminalUserSearchDTO dto)
+    {
+        if (!user.isPlatForm())
+        {
+            String merchantId = user.getMerchantId();
+            dto.setMerchantId(merchantId);
+        }
+
+        APIResult<Page<TerminalUserVo>> pageData =  terminalUserService.search(BeanUtil.convertToMap(dto));
+
+        if (pageData != null)
+        {
+            return APIResult.ok(pageData.getData().getTotalSize());
+        }
+        else
+        {
+            return APIResult.ok(0);
+        }
+    }
+}

rankin-cms-web/src/main/java/cn/rankin/cmsweb/controller/stmt/StmtTerminalUserController.java

@@ -0,0 +1,249 @@
+package cn.rankin.cmsweb.controller.stmt;
+
+import cn.rankin.cmsweb.assist.resolver.NeedUser;
+import cn.rankin.cmsweb.entity.UserDetails;
+import cn.rankin.cmsweb.service.product.ProductService;
+import cn.rankin.cmsweb.service.stmt.StmtCampusService;
+import cn.rankin.cmsweb.service.user.CampusService;
+import cn.rankin.cmsweb.service.user.TerminalUserService;
+import cn.rankin.common.utils.api.model.APIResult;
+import cn.rankin.common.utils.api.page.Page;
+import cn.rankin.common.utils.util.BeanUtil;
+import cn.rankin.common.utils.util.DateUtil;
+import cn.rankin.common.utils.util.ListUtil;
+import cn.rankin.data.api.product.vo.ProductVo;
+import cn.rankin.data.api.user.dto.CampusSearchDTO;
+import cn.rankin.data.api.user.dto.TerminalUserSearchDTO;
+import cn.rankin.data.api.user.vo.CampusVo;
+import cn.rankin.data.api.user.vo.TerminalUserAuthVo;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.hssf.usermodel.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.OutputStream;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+@Slf4j
+@RestController
+@RequestMapping(value = "/stmt/terminal/user")
+public class StmtTerminalUserController
+{
+    @Autowired
+    private StmtCampusService StmtService;
+
+    @Autowired
+    private TerminalUserService terminalUserService;
+
+    @Autowired
+    private ProductService productService;
+
+    @Autowired
+    private CampusService campusService;
+
+    /**
+     * 查询已开通校区报表
+     *
+     * @param user      the user info
+     * @param searchDTO the campus search
+     * @return
+     */
+    @RequestMapping(value = {"/page", "/"}, method = RequestMethod.GET)
+    public APIResult<Page<TerminalUserAuthVo>> campusList(@NeedUser UserDetails user, TerminalUserSearchDTO searchDTO)
+    {
+        if (!user.isPlatForm())
+        {
+            String merchantId = user.getMerchantId();
+            searchDTO.setMerchantId(merchantId);
+        }
+        Page<TerminalUserAuthVo> authVoPage = terminalUserService.findAuthList(BeanUtil.convertToMap(searchDTO));
+
+        List<TerminalUserAuthVo> terminalUserAuthVos = authVoPage.getList();
+        setProductInfo(terminalUserAuthVos);
+        setCampusInfo(terminalUserAuthVos);
+
+        return APIResult.ok(authVoPage);
+
+    }
+
+    /**
+     * 查询已开通校区报表
+     *
+     * @param user      the user info
+     * @param searchDTO the campus search
+     * @return
+     */
+    @RequestMapping(value = {"/export", "/"}, method = RequestMethod.GET)
+    public String exportCampus(HttpServletResponse res, @NeedUser UserDetails user, TerminalUserSearchDTO searchDTO)
+    {
+        log.info("fastExpired："+searchDTO.getFastExpired()+"");
+        if (!user.isPlatForm())
+        {
+            String merchantId = user.getMerchantId();
+            searchDTO.setMerchantId(merchantId);
+        }
+
+        //不是条件查询就全部下载
+        String code = searchDTO.getCode();
+        if (code == null || code == "")
+        {
+            searchDTO.setPageNo(1);
+            searchDTO.setPageSize(100000);
+        }
+
+        Page<TerminalUserAuthVo> authVoPage = terminalUserService.findAuthList(BeanUtil.convertToMap(searchDTO));
+
+        List<TerminalUserAuthVo> list = authVoPage.getList();
+        setProductInfo(list);
+        setCampusInfo(list);
+
+        //创建HSSFWorkbook对象(excel的文档对象)
+        HSSFWorkbook wb = new HSSFWorkbook();
+        //建立新的sheet对象（excel的表单）
+        HSSFSheet sheet = wb.createSheet("已开通账户报表");
+        //设置单元格宽度
+        sheet.setColumnWidth(0, 20 * 256);
+        sheet.setColumnWidth(1, 10 * 256);
+        sheet.setColumnWidth(2, 30 * 256);
+        sheet.setColumnWidth(3, 30 * 256);
+        sheet.setColumnWidth(4, 10 * 256);
+        sheet.setColumnWidth(5, 30 * 256);
+        sheet.setColumnWidth(6, 15 * 256);
+        sheet.setColumnWidth(7, 15 * 256);
+        //在sheet里创建第一行，参数为行索引(excel的行)，可以是0～65535之间的任何一个
+        HSSFRow row1 = sheet.createRow(0);
+        //创建单元格并设置单元格内容
+        row1.createCell(0).setCellValue("终端编号");
+        row1.createCell(1).setCellValue("课程包编号");
+        row1.createCell(2).setCellValue("课程包名称");
+        row1.createCell(3).setCellValue("权限有效期");
+        row1.createCell(4).setCellValue("权限有效时长");
+        row1.createCell(5).setCellValue("校区名称");
+        row1.createCell(6).setCellValue("联系人");
+        row1.createCell(7).setCellValue("联系方式");
+
+        //单元格日期格式
+        HSSFCellStyle cellStyle = wb.createCellStyle();
+        HSSFDataFormat format = wb.createDataFormat();
+        cellStyle.setDataFormat(format.getFormat("yyyy/mm/dd"));
+
+        //插入数据
+        if (list != null && list.size() > 0)
+        {
+            for (int i = 0; i < list.size(); i++)
+            {
+
+                TerminalUserAuthVo vo = list.get(i);
+
+                HSSFRow row = sheet.createRow(i + 1);
+                row.createCell(0).setCellValue(vo.getUCode());
+                row.createCell(1).setCellValue(vo.getPCode());
+                row.createCell(2).setCellValue(vo.getPName());
+                String dateStr = "起始时间: " + DateUtil.parseDateStr(vo.getStartTime()) + "\n";
+                dateStr += "到期时间：" + DateUtil.parseDateStr(vo.getEndTime());
+                row.createCell(3).setCellValue(dateStr);
+
+                //判断是否到期
+                Long curTime = new Date().getTime();
+                //获取到期天数
+                String expiredStr = "已到期";
+                long days = (vo.getEndTime() - curTime) / (1000 * 3600 * 24);
+                if (days > 0)
+                {
+                    expiredStr = days + "天到期";
+                }
+
+                row.createCell(4).setCellValue(new HSSFRichTextString(expiredStr));
+                row.createCell(5).setCellValue(vo.getCampusName());
+                row.createCell(6).setCellValue(vo.getCampusContactName());
+                row.createCell(7).setCellValue(vo.getCampusContactWay());
+            }
+        }
+
+        try
+        {
+            long currentTime = new Date().getTime();
+            //输出Excel文件
+            OutputStream output = res.getOutputStream();
+            res.reset();
+            res.setHeader("Content-disposition", "attachment; filename=lingjiao_terminal_user_" + currentTime + ".xls");
+            res.setContentType("application/msexcel");
+            wb.write(output);
+            output.close();
+        }
+        catch (Exception ex)
+        {
+
+        }
+
+        return null;
+    }
+
+    private void setProductInfo(List<TerminalUserAuthVo> terminalUserAuthVos)
+    {
+        if (CollectionUtils.isEmpty(terminalUserAuthVos))
+        {
+            return;
+        }
+
+        List<ProductVo> productVos = productService.productList();
+        if (CollectionUtils.isEmpty(productVos))
+        {
+            return;
+        }
+
+        Map<String, ProductVo> productVoMap = ListUtil.convert(productVos, "pid", ProductVo.class);
+
+        terminalUserAuthVos.forEach(vo ->
+        {
+            ProductVo productVo = productVoMap.get(vo.getPid());
+            if (null != productVo)
+            {
+                vo.setPCode(productVo.getCode());
+                vo.setPName(productVo.getName());
+            }
+            else
+            {
+                log.info("not found product by pid ,pid={}", vo.getPid());
+            }
+        });
+
+    }
+
+    private void setCampusInfo(List<TerminalUserAuthVo> terminalUserAuthVos)
+    {
+        if (CollectionUtils.isEmpty(terminalUserAuthVos))
+        {
+            return;
+        }
+
+        for (TerminalUserAuthVo vo : terminalUserAuthVos)
+        {
+            //时间转换
+            String startTime = DateUtil.parseDateStr(vo.getStartTime());
+            String endTime = DateUtil.parseDateStr(vo.getEndTime());
+            vo.setStartTimeStr(startTime);
+            vo.setEndTimeStr(endTime);
+            String campusId = vo.getCampusId();
+
+            if (campusId != null && campusId.trim() != "")
+            {
+                APIResult<CampusVo> apiResult = campusService.getCampus(campusId);
+                CampusVo campusVo = apiResult.getData();
+                if (campusVo != null)
+                {
+                    vo.setCampusName(campusVo.getName());
+                    vo.setCampusContactName(campusVo.getContactName());
+                    vo.setCampusContactWay(campusVo.getMobile());
+                }
+            }
+        }
+    }
+
+}

rankin-cms-web/src/main/java/cn/rankin/cmsweb/controller/stmt/StmtUserTagController.java

@@ -0,0 +1,152 @@
+package cn.rankin.cmsweb.controller.stmt;
+
+import cn.rankin.cmsweb.assist.resolver.NeedUser;
+import cn.rankin.cmsweb.entity.UserDetails;
+import cn.rankin.cmsweb.service.stmt.StmtUserTagService;
+import cn.rankin.common.utils.api.model.APIResult;
+import cn.rankin.common.utils.api.page.Page;
+import cn.rankin.common.utils.util.BeanUtil;
+import cn.rankin.data.api.cms.StmtSearchDTO;
+import cn.rankin.data.api.cms.vo.UserTagStmt;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.hssf.usermodel.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.OutputStream;
+import java.util.Date;
+import java.util.List;
+
+
+@Slf4j
+@RestController
+@RequestMapping(value = "/stmt/userTagStmt")
+public class StmtUserTagController
+{
+    @Autowired
+    private StmtUserTagService stmtService;
+
+    @RequestMapping(value = "/list", method = RequestMethod.GET)
+    public APIResult<Page<UserTagStmt>> search(@NeedUser UserDetails user, StmtSearchDTO searchDTO) {
+        if (!user.isPlatForm()) {
+            searchDTO.setMerchantId(user.getMerchantId());
+        }
+        return stmtService.UserTagStmtPage(BeanUtil.convertToMap(searchDTO));
+
+    }
+
+    /**
+     * 查询已开通校区报表
+     *
+     * @param user      the user info
+     * @param searchDTO the campus search
+     * @return
+     */
+    @RequestMapping(value = {"/export"}, method = RequestMethod.GET)
+    public String exportCampus(HttpServletResponse res, @NeedUser UserDetails user, StmtSearchDTO searchDTO)
+    {
+        if (!user.isPlatForm())
+        {
+            searchDTO.setMerchantId(user.getMerchantId());
+        }
+
+        //下载所有
+        searchDTO.setPageNo(1);
+        searchDTO.setPageSize(10000);
+
+        APIResult<Page<UserTagStmt>> pageAPIResult = stmtService.UserTagStmtPage(BeanUtil.convertToMap(searchDTO));
+        if(!pageAPIResult.getSuccess()){
+            return null;
+        }
+
+        Page<UserTagStmt> userTagStmtPage = pageAPIResult.getData();
+        if(null != userTagStmtPage){
+            List<UserTagStmt> list = userTagStmtPage.getList();
+
+            //创建HSSFWorkbook对象(excel的文档对象)
+            HSSFWorkbook wb = new HSSFWorkbook();
+            //建立新的sheet对象（excel的表单）
+            HSSFSheet sheet = wb.createSheet("已配置标签终端信息报表");
+            //设置单元格宽度
+            sheet.setColumnWidth(0, 20 * 256);
+            sheet.setColumnWidth(1, 10 * 256);
+            sheet.setColumnWidth(2, 30 * 256);
+            sheet.setColumnWidth(3, 30 * 256);
+            sheet.setColumnWidth(4, 10 * 256);
+            sheet.setColumnWidth(5, 30 * 256);
+            sheet.setColumnWidth(6, 15 * 256);
+            sheet.setColumnWidth(7, 15 * 256);
+            //在sheet里创建第一行，参数为行索引(excel的行)，可以是0～65535之间的任何一个
+            HSSFRow row1 = sheet.createRow(0);
+            //创建单元格并设置单元格内容
+            row1.createCell(0).setCellValue("终端编号");
+            row1.createCell(1).setCellValue("终端名称");
+            row1.createCell(2).setCellValue("校区名称");
+            row1.createCell(3).setCellValue("标签集合");
+            row1.createCell(4).setCellValue("标签数量");
+
+            //单元格日期格式
+            HSSFCellStyle cellStyle = wb.createCellStyle();
+            HSSFDataFormat format = wb.createDataFormat();
+            cellStyle.setDataFormat(format.getFormat("yyyy/mm/dd"));
+
+            //插入数据
+            if (!CollectionUtils.isEmpty(list))
+            {
+                for (int i = 0; i < list.size(); i++)
+                {
+                    UserTagStmt stmt = list.get(i);
+
+                    HSSFRow row = sheet.createRow(i + 1);
+                    row.createCell(0).setCellValue(stmt.getUCode());
+                    row.createCell(1).setCellValue(stmt.getCName());
+                    row.createCell(2).setCellValue(stmt.getCName());
+                    row.createCell(3).setCellValue(stmt.getUserTags().toString());
+                    row.createCell(4).setCellValue(stmt.getUserTagNum());
+                }
+            }
+
+            try
+            {
+                long currentTime = new Date().getTime();
+                //输出Excel文件
+                OutputStream output = res.getOutputStream();
+                res.reset();
+                res.setHeader("Content-disposition", "attachment; filename=lingjiao_user_tag_" + currentTime + ".xls");
+                res.setContentType("application/msexcel");
+                wb.write(output);
+                output.close();
+            }
+            catch (Exception ex)
+            {
+
+            }
+
+
+
+
+
+
+
+
+
+
+
+
+
+        }else{
+            return null;
+        }
+
+
+
+
+        return null;
+    }
+
+
+}

rankin-cms-web/src/main/java/cn/rankin/cmsweb/controller/user/MerchantPermitDeviceController.java

@@ -0,0 +1,51 @@
+package cn.rankin.cmsweb.controller.user;
+
+import cn.rankin.cmsweb.service.user.MerchantPermitDeviceService;
+import cn.rankin.common.utils.api.model.APICode;
+import cn.rankin.common.utils.api.model.APIResult;
+import cn.rankin.common.utils.api.page.Page;
+import cn.rankin.common.utils.util.BeanUtil;
+import cn.rankin.data.api.user.dto.MerchantPermitDeviceDTO;
+import cn.rankin.data.api.user.vo.MerchantPermitDeviceVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+
+@RestController
+@RequestMapping(value = "/merchantPermitDevice")
+public class MerchantPermitDeviceController
+{
+
+    @Autowired
+    private MerchantPermitDeviceService merchantPermitDeviceService;
+
+    @RequestMapping(value = "/list", method = RequestMethod.GET)
+    public APIResult<Page<MerchantPermitDeviceVo>> search(MerchantPermitDeviceDTO searchDTO) {
+        return merchantPermitDeviceService.search(BeanUtil.convertToMap(searchDTO));
+    }
+
+    @RequestMapping(method = RequestMethod.POST)
+    public APIResult<MerchantPermitDeviceVo> create(@RequestBody MerchantPermitDeviceDTO dto){
+        return merchantPermitDeviceService.create(dto);
+    }
+
+    @RequestMapping(method = RequestMethod.PUT)
+    public APIResult<MerchantPermitDeviceVo> update(@Valid @RequestBody MerchantPermitDeviceDTO dto){
+        if (dto.getId() == null) {
+            return APIResult.error(APICode.PARAMETER_ERROR);
+        }
+        return merchantPermitDeviceService.update(dto);
+    }
+
+    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
+    public APIResult<Boolean> delete(@PathVariable String id) {
+        return merchantPermitDeviceService.delete(id);
+    }
+
+    @RequestMapping(value = "/{id}", method = RequestMethod.GET)
+    public APIResult<MerchantPermitDeviceVo> getMerchantPermitDevice(@PathVariable String id) {
+        return merchantPermitDeviceService.getMerchantPermitDevice(id);
+    }
+
+}

rankin-cms-web/src/main/java/cn/rankin/cmsweb/controller/user/UserDeviceController.java

@@ -3,16 +3,14 @@ package cn.rankin.cmsweb.controller.user;
 
 import cn.rankin.cmsweb.service.user.UserDeviceService;
 import cn.rankin.common.utils.api.model.APIResult;
-import cn.rankin.data.api.user.entity.DownloadInfo;
 import cn.rankin.data.api.user.entity.UserDevice;
-import com.alibaba.fastjson.JSON;
+import cn.rankin.data.api.user.vo.DeviceModelVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
-
 /**
  * The controller of user device
  */
@@ -31,5 +29,11 @@ public class UserDeviceController
 
         return APIResult.ok(list);
     }
+
+    @RequestMapping(value = "/model/list", method = RequestMethod.GET)
+    public APIResult<List<DeviceModelVo>> searchDeviceModel(@RequestParam("deviceModel") String deviceModel) {
+        APIResult<List<DeviceModelVo>> apiResult = userDeviceService.searchDeviceModel(deviceModel);
+        return apiResult;
+    }
 }
 

rankin-cms-web/src/main/java/cn/rankin/cmsweb/service/stmt/StmtCampusService.java

@@ -0,0 +1,33 @@
+package cn.rankin.cmsweb.service.stmt;
+
+import cn.rankin.common.utils.api.model.APIResult;
+import cn.rankin.common.utils.api.page.Page;
+import cn.rankin.data.api.user.dto.CampusDTO;
+import cn.rankin.data.api.user.vo.CampusVo;
+import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+@FeignClient(name = "${service.user.name}")
+public interface StmtCampusService
+{
+    /**
+     * 分页查询已开通校区
+     *
+     * @param searchDTO
+     * @return
+     */
+    @RequestMapping(value = "/stmt/campus/page", method = RequestMethod.GET)
+    APIResult<Page<CampusVo>> search(@RequestParam Map<String, Object> searchDTO);
+
+    /**
+     * 按照条件查询所有校区
+     *
+     * @param searchDTO
+     * @return
+     */
+    @RequestMapping(value = "/stmt/campus/list", method = RequestMethod.GET)
+    APIResult<List<CampusVo>> query(@RequestParam Map<String, Object> searchDTO);
+}

rankin-cms-web/src/main/java/cn/rankin/cmsweb/service/stmt/StmtTerminalUserService.java

@@ -0,0 +1,36 @@
+package cn.rankin.cmsweb.service.stmt;
+
+import cn.rankin.common.utils.api.model.APIResult;
+import cn.rankin.common.utils.api.page.Page;
+import cn.rankin.data.api.user.entity.TerminalUser;
+import cn.rankin.data.api.user.vo.CampusVo;
+import cn.rankin.data.api.user.vo.TerminalUserVo;
+import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+import java.util.Map;
+
+@FeignClient(name = "${service.user.name}")
+public interface StmtTerminalUserService
+{
+    /**
+     * 分页查询终端用户
+     *
+     * @param searchDTO
+     * @return
+     */
+    @RequestMapping(value = "/stmt/terminal/user/page", method = RequestMethod.GET)
+    APIResult<Page<TerminalUserVo>> search(@RequestParam Map<String, Object> searchDTO);
+
+    /**
+     * 按照条件查询查询终端用户
+     *
+     * @param searchDTO
+     * @return
+     */
+    @RequestMapping(value = "/stmt/terminal/user/list", method = RequestMethod.GET)
+    APIResult<List<TerminalUserVo>> query(@RequestParam Map<String, Object> searchDTO);
+}

rankin-cms-web/src/main/java/cn/rankin/cmsweb/service/stmt/StmtUserTagService.java

@@ -0,0 +1,23 @@
+package cn.rankin.cmsweb.service.stmt;
+
+import cn.rankin.common.utils.api.model.APIResult;
+import cn.rankin.common.utils.api.page.Page;
+import cn.rankin.data.api.cms.vo.UserTagStmt;
+import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+@FeignClient(value = "${service.user.name}")
+public interface StmtUserTagService {
+
+    /**
+     * 条件查询
+     * 已配置用户标签   终端信息
+     * @param searchDTO
+     * @return
+     */
+    @RequestMapping(value = "/stmt/userTagStmt/list", method = RequestMethod.GET)
+    APIResult<Page<UserTagStmt>> UserTagStmtPage(@RequestParam Map<String,Object> searchDTO);
+
+}

rankin-cms-web/src/main/java/cn/rankin/cmsweb/service/user/MerchantPermitDeviceService.java

@@ -0,0 +1,30 @@
+package cn.rankin.cmsweb.service.user;
+
+import cn.rankin.common.utils.api.model.APIResult;
+import cn.rankin.common.utils.api.page.Page;
+import cn.rankin.data.api.user.dto.MerchantPermitDeviceDTO;
+import cn.rankin.data.api.user.vo.MerchantPermitDeviceVo;
+import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+@FeignClient(name = "${service.user.name}")
+public interface MerchantPermitDeviceService {
+
+    @RequestMapping(value = "/merchantPermitDevice/list", method = RequestMethod.GET)
+    APIResult<Page<MerchantPermitDeviceVo>> search(@RequestParam Map<String, Object> searchDTO);
+
+    @RequestMapping(value = "/merchantPermitDevice", method = RequestMethod.POST)
+    APIResult<MerchantPermitDeviceVo> create(@RequestBody MerchantPermitDeviceDTO dto);
+
+    @RequestMapping(value = "/merchantPermitDevice", method = RequestMethod.PUT)
+    APIResult<MerchantPermitDeviceVo> update(@RequestBody MerchantPermitDeviceDTO dto);
+
+    @RequestMapping(value = "/merchantPermitDevice/{id}", method = RequestMethod.DELETE)
+    APIResult<Boolean> delete(@PathVariable("id") String id);
+
+    @RequestMapping(value = "/merchantPermitDevice/{id}", method = RequestMethod.GET)
+    APIResult<MerchantPermitDeviceVo> getMerchantPermitDevice(@PathVariable("id") String id);
+
+}

rankin-cms-web/src/main/java/cn/rankin/cmsweb/service/user/UserDeviceService.java

@@ -1,19 +1,19 @@
 package cn.rankin.cmsweb.service.user;
 
 import cn.rankin.common.utils.api.model.APIResult;
-import cn.rankin.common.utils.api.page.Page;
-import cn.rankin.data.api.user.dto.CampusDTO;
 import cn.rankin.data.api.user.entity.UserDevice;
-import cn.rankin.data.api.user.vo.CampusVo;
+import cn.rankin.data.api.user.vo.DeviceModelVo;
 import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
-import java.util.Map;
 
 @FeignClient(name = "${service.user.name}")
 public interface UserDeviceService
 {
     @RequestMapping(value = "/userDevice/list/{uid}", method = RequestMethod.GET)
     List<UserDevice> findByCondition(@PathVariable("uid") String uid);
+
+    @RequestMapping(value = "/userDevice/model/list", method = RequestMethod.GET)
+    APIResult<List<DeviceModelVo>> searchDeviceModel(@RequestParam("deviceModel") String deviceModel);
 }

rankin-common-utils/pom.xml

@@ -91,6 +91,16 @@
             <artifactId>commons-lang3</artifactId>
             <version>3.4</version>
         </dependency>
+        <dependency>
+            <groupId>com.google.zxing</groupId>
+            <artifactId>core</artifactId>
+            <version>3.3.3</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.zxing</groupId>
+            <artifactId>javase</artifactId>
+            <version>3.3.3</version>
+        </dependency>
 
     </dependencies>
 

rankin-common-utils/src/main/java/cn/rankin/common/utils/util/DateUtil.java

@@ -209,7 +209,8 @@ public class DateUtil {
 	 * @author xtwin <br/>
 	 * @version 2013-11-27 上午09:59:37 <br/>
 	 */
-	private static SimpleDateFormat getFormat(String pattern) {
+	private static SimpleDateFormat
+	getFormat(String pattern) {
 		SimpleDateFormat sdf = formats.get(pattern);
 		
 		if (null == sdf) {
@@ -247,9 +248,25 @@ public class DateUtil {
 		return strtodate;
 	}
 
+	public static String parseDateStr(Long times)
+	{
+		SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
+		ParsePosition pos = new ParsePosition(0);
+		return formatter.format(new Date(times));
+	}
+
+	/**
+	 * @param startDate
+	 * @param interval
+	 * @return 某日期加间隔分钟数后日期
+	 */
+	public static Date getAfterIntervalMInDate(Date startDate, int interval) {
+		Date calendar = new Date();
+		calendar.setTime((startDate.getTime() + interval * 60 * 1000));
+		return calendar;
+	}
+
 	public static void main(String[] args) {
-		for (int i = 0; i < 20; i++) {
-			System.out.println(DateUtil.getRandomCurrentTimeStamp());
-		}
+		System.out.print(parseDateStr(1543766400000l));
 	}
 }

rankin-common-utils/src/main/java/cn/rankin/common/utils/util/FastJsonUtils.java

@@ -0,0 +1,122 @@
+package cn.rankin.common.utils.util;
+
+import java.util.List;
+import java.util.Map;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.JSONLibDataFormatSerializer;
+import com.alibaba.fastjson.serializer.SerializeConfig;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+
+/**
+ * fastjson工具类
+ * @version:1.0.0
+ */
+public class FastJsonUtils {
+
+    private static final SerializeConfig config;
+
+    static {
+        config = new SerializeConfig();
+        config.put(java.util.Date.class, new JSONLibDataFormatSerializer()); // 使用和json-lib兼容的日期输出格式
+        config.put(java.sql.Date.class, new JSONLibDataFormatSerializer()); // 使用和json-lib兼容的日期输出格式
+    }
+
+    private static final SerializerFeature[] features = {SerializerFeature.WriteMapNullValue, // 输出空置字段
+            SerializerFeature.WriteNullListAsEmpty, // list字段如果为null，输出为[]，而不是null
+            SerializerFeature.WriteNullNumberAsZero, // 数值字段如果为null，输出为0，而不是null
+            SerializerFeature.WriteNullBooleanAsFalse, // Boolean字段如果为null，输出为false，而不是null
+            SerializerFeature.WriteNullStringAsEmpty // 字符类型字段如果为null，输出为""，而不是null
+    };
+
+
+    public static String convertObjectToJSON(Object object) {
+        return JSON.toJSONString(object, config, features);
+    }
+
+    public static String toJSONNoFeatures(Object object) {
+        return JSON.toJSONString(object, config);
+    }
+
+
+
+    public static Object toBean(String text) {
+        return JSON.parse(text);
+    }
+
+    public static <T> T toBean(String text, Class<T> clazz) {
+        return JSON.parseObject(text, clazz);
+    }
+
+    // 转换为数组
+    public static <T> Object[] toArray(String text) {
+        return toArray(text, null);
+    }
+
+    // 转换为数组
+    public static <T> Object[] toArray(String text, Class<T> clazz) {
+        return JSON.parseArray(text, clazz).toArray();
+    }
+
+    // 转换为List
+    public static <T> List<T> toList(String text, Class<T> clazz) {
+        return JSON.parseArray(text, clazz);
+    }
+
+    /**
+     * 将javabean转化为序列化的json字符串
+     * @param keyvalue
+     * @return
+     */
+    /*public static Object beanToJson(KeyValue keyvalue) {
+        String textJson = JSON.toJSONString(keyvalue);
+        Object objectJson  = JSON.parse(textJson);
+        return objectJson;
+    }*/
+
+    /**
+     * 将string转化为序列化的json字符串
+     * @param keyvalue
+     * @return
+     */
+    public static Object textToJson(String text) {
+        Object objectJson  = JSON.parse(text);
+        return objectJson;
+    }
+
+    /**
+     * json字符串转化为map
+     * @param s
+     * @return
+     */
+    public static <K, V> Map<K, V>  stringToCollect(String s) {
+        Map<K, V> m = (Map<K, V>) JSONObject.parseObject(s);
+        return m;
+    }
+
+    /**
+     * 转换JSON字符串为对象
+     * @param jsonData
+     * @param clazz
+     * @return
+     */
+    public static Object convertJsonToObject(String jsonData, Class<?> clazz) {
+        return JSONObject.parseObject(jsonData, clazz);
+    }
+
+    public static Object convertJSONToObject(String content, Class<?> clazz) {
+        return JSONObject.parseObject(content, clazz);
+    }
+
+    /**
+     * 将map转化为string
+     * @param m
+     * @return
+     */
+    public static <K, V> String collectToString(Map<K, V> m) {
+        String s = JSONObject.toJSONString(m);
+        return s;
+    }
+
+}

rankin-common-utils/src/main/java/cn/rankin/common/utils/util/QRCodeUtil.java

@@ -0,0 +1,54 @@
+package cn.rankin.common.utils.util;
+
+import com.google.zxing.BarcodeFormat;
+import com.google.zxing.EncodeHintType;
+import com.google.zxing.MultiFormatWriter;
+import com.google.zxing.WriterException;
+import com.google.zxing.common.BitMatrix;
+import com.google.zxing.client.j2se.MatrixToImageWriter;
+import sun.misc.BASE64Encoder;
+import javax.imageio.ImageIO;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.Map;
+
+public class QRCodeUtil {
+
+    /**
+     * 根据内容，生成指定宽高、指定格式的二维码图片
+     *
+     * @param url   内容
+     * @return 生成的二维码图片路径
+     * @throws Exception
+     */
+    public static String generateQRCode(String url) throws IOException, WriterException {
+        Hashtable<EncodeHintType, Object> hints = new Hashtable<EncodeHintType, Object>();
+        hints.put(EncodeHintType.CHARACTER_SET, "utf-8");
+        hints.put(EncodeHintType.MARGIN, 0);
+        BitMatrix bitMatrix = new MultiFormatWriter().encode(url, BarcodeFormat.QR_CODE, 360, 360, hints);
+        BufferedImage image = MatrixToImageWriter.toBufferedImage(bitMatrix);
+        ByteArrayOutputStream os = new ByteArrayOutputStream();
+        ImageIO.write(image, "png", os);
+        byte b[] = os.toByteArray();
+        String QRCode = new BASE64Encoder().encode(b);
+        return QRCode;
+    }
+
+    public static void main(String[] args) throws Exception {
+
+        Map qrcode = new HashMap();
+        qrcode.put("user","100166661101001");
+        qrcode.put("time",new Date());
+        String json = FastJsonUtils.collectToString(qrcode);
+        String qrCode = QRCodeUtil.generateQRCode(json);
+        System.out.println(qrCode);
+
+
+
+    }
+}
+

rankin-data-api/src/main/java/cn/rankin/data/api/app/dto/DeviceLoginDTO.java

@@ -12,4 +12,16 @@ public class DeviceLoginDTO implements Serializable{
     private String deviceCode;
 
     private String merchant;
+
+    //设备名称
+    private String deviceName;
+
+    //设备型号
+    private String deviceModel;
+
+    //设备厂商
+    private String deviceMfrs;
+
+    //设备类型
+    private String deviceType;
 }

rankin-data-api/src/main/java/cn/rankin/data/api/auth/dto/AuthQueryDTO.java

@@ -21,4 +21,8 @@ public class AuthQueryDTO implements Serializable {
     private Integer pageNo = 1;
 
     private Integer pageSize = 10;
+
+    private Integer fastExpired = 0;
+
+    private String uids;
 }

rankin-data-api/src/main/java/cn/rankin/data/api/cms/StmtSearchDTO.java

@@ -0,0 +1,27 @@
+package cn.rankin.data.api.cms;
+
+import lombok.Data;
+import lombok.ToString;
+
+import java.io.Serializable;
+
+@Data
+@ToString
+public class StmtSearchDTO implements Serializable {
+
+    private String merchantId;
+
+    private String campusId;
+
+    private String name;
+
+    private String uid;
+
+    private String code;
+
+    private String sort;
+
+    private Integer pageNo = 1;
+
+    private Integer pageSize = 10;
+}

rankin-data-api/src/main/java/cn/rankin/data/api/cms/vo/UserTagStmt.java

@@ -0,0 +1,28 @@
+package cn.rankin.data.api.cms.vo;
+
+import lombok.Data;
+import lombok.ToString;
+
+import javax.persistence.Entity;
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+@ToString
+@Entity
+public class UserTagStmt implements Serializable {
+
+    private String cName;
+
+    private String uid;
+
+    private String uName;
+
+    private String uCode;
+
+    private List<String> userTags;
+
+    private int userTagNum;
+
+
+}

rankin-data-api/src/main/java/cn/rankin/data/api/user/dto/MerchantPermitDeviceDTO.java

@@ -0,0 +1,37 @@
+package cn.rankin.data.api.user.dto;
+
+import cn.rankin.common.utils.enums.BaseStatusEnum;
+import lombok.Data;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@ToString
+public class MerchantPermitDeviceDTO implements Serializable {
+
+    private String id;
+
+    private String merchantId;
+
+    private String deviceModel;
+
+    @NotNull
+    private String provinceCode;
+
+    private BaseStatusEnum status;
+
+    private Date gmtCreated;
+
+    private Date gmtModified;
+
+    private Integer pageNo = 1;
+
+    private Integer pageSize = 10;
+
+}
+
+
+

rankin-data-api/src/main/java/cn/rankin/data/api/user/dto/QRCodeDTO.java

@@ -0,0 +1,33 @@
+package cn.rankin.data.api.user.dto;
+
+import lombok.Data;
+import lombok.ToString;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+@Data
+@ToString
+public class QRCodeDTO implements Serializable {
+
+    private String id;
+
+    private String eid;
+
+    private String simple;
+
+    private Date time;
+
+    private String qrcode;
+
+    private int status;
+
+    private Date gmtCreated;
+
+    private Date gmtModified;
+
+}
+
+
+

rankin-data-api/src/main/java/cn/rankin/data/api/user/dto/TerminalUserSearchDTO.java

@@ -2,11 +2,14 @@ package cn.rankin.data.api.user.dto;
 
 import cn.rankin.common.utils.enums.BaseStatusEnum;
 import lombok.Data;
+import lombok.ToString;
 
 import java.io.Serializable;
 
 @Data
-public class TerminalUserSearchDTO implements Serializable {
+@ToString
+public class TerminalUserSearchDTO implements Serializable
+{
 
     private String code;
 
@@ -23,4 +26,6 @@ public class TerminalUserSearchDTO implements Serializable {
     private Integer pageNo = 1;
 
     private Integer pageSize = 10;
+
+    private Integer fastExpired = 0;
 }

rankin-data-api/src/main/java/cn/rankin/data/api/user/dto/UserDeviceSearchDTO.java

@@ -0,0 +1,27 @@
+package cn.rankin.data.api.user.dto;
+
+import lombok.Data;
+import lombok.ToString;
+
+import java.io.Serializable;
+@Data
+@ToString
+public class UserDeviceSearchDTO  implements Serializable
+{
+    private String userId;
+
+    private String deviceCode;
+
+    private String deviceModel;
+
+    private String deviceMfrs;
+
+    private String deviceName;
+
+    private String deviceType;
+
+    private Integer pageNo = 1;
+
+    private Integer pageSize = 10;
+
+}

rankin-data-api/src/main/java/cn/rankin/data/api/user/dto/UserTagSearchDTO.java

@@ -9,6 +9,10 @@ import java.io.Serializable;
 @ToString
 public class UserTagSearchDTO implements Serializable {
 
+    private String merchantId;
+
+    private String campusId;
+
     private String name;
 
     private String uid;

rankin-data-api/src/main/java/cn/rankin/data/api/user/entity/LocationInfo.java

@@ -0,0 +1,88 @@
+package cn.rankin.data.api.user.entity;
+
+import cn.rankin.common.utils.enums.BaseStatusEnum;
+import lombok.Data;
+import lombok.ToString;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
+
+@Data
+@ToString
+@Entity
+@Table(name = "u_location_info")
+@DynamicInsert
+@DynamicUpdate
+public class LocationInfo implements Serializable {
+    @Id
+    @Column(name="id")
+    private String id;
+
+    @Column(name="eid")
+    private String eid;
+
+    @Column(name="simple")
+    private String simple;
+
+    @Column(name="time")
+    private Date time;
+
+    //位置信息
+    @Column(name="lat")
+    private String lat;                 //经纬度
+
+    @Column(name="lng")
+    private String lng;                 //经纬度
+
+    @Column(name="precise")
+    private String precise;             //说明
+
+    @Column(name="address")
+    private String address;             //地址
+
+    //老师信息
+    @Column(name="t_real_name")
+    private String tRealName;
+
+    @Column(name="t_mobile")
+    private String tMobile;
+
+    @Column(name="t_position")
+    private String tPosition;
+
+    @Column(name="t_en_code")
+    private String tEnCode;
+
+    //校区信息
+    @Column(name="campus_name")
+    private String campusName;
+
+    @Column(name="c_en_code")
+    private String cEnCode;
+
+    @Column(name="c_lat")
+    private String cLat;
+
+    @Column(name="c_lng")
+    private String cLng;
+
+    @Enumerated(EnumType.ORDINAL)
+    @Column(name="status")
+    private BaseStatusEnum status;
+
+    @Column(name = "gmt_created", updatable = false, insertable = false, columnDefinition = "timestamp NULL DEFAULT CURRENT_TIMESTAMP")
+    @Temporal(TemporalType.TIMESTAMP)
+    private Date gmtCreated;
+
+    @Column(name = "gmt_modified", updatable = false, insertable = false, columnDefinition = "timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
+    @Temporal(TemporalType.TIMESTAMP)
+    private Date gmtModified;
+
+}
+
+
+

rankin-data-api/src/main/java/cn/rankin/data/api/user/entity/MerchantPermitDevice.java

@@ -0,0 +1,49 @@
+package cn.rankin.data.api.user.entity;
+
+import cn.rankin.common.utils.enums.BaseStatusEnum;
+import lombok.Data;
+import lombok.ToString;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
+
+@Data
+@ToString
+@Entity
+@Table(name = "u_merchant_permit_device")
+@DynamicInsert
+@DynamicUpdate
+public class MerchantPermitDevice implements Serializable {
+    @Id
+    @Column(name="id")
+    private String id;
+
+    @Column(name="merchant_id")
+    private String merchantId;
+
+    //设备型号
+    @Column(name="device_model")
+    private String deviceModel;
+
+    @Column(name = "province_code")
+    private String provinceCode;
+
+    @Enumerated(EnumType.ORDINAL)
+    private BaseStatusEnum status;
+
+    @Column(name = "gmt_created", updatable = false, insertable = false, columnDefinition = "timestamp NULL DEFAULT CURRENT_TIMESTAMP")
+    @Temporal(TemporalType.TIMESTAMP)
+    private Date gmtCreated;
+
+    @Column(name = "gmt_modified", updatable = false, insertable = false, columnDefinition = "timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
+    @Temporal(TemporalType.TIMESTAMP)
+    private Date gmtModified;
+
+}
+
+
+

rankin-data-api/src/main/java/cn/rankin/data/api/user/entity/QRCode.java

@@ -0,0 +1,50 @@
+package cn.rankin.data.api.user.entity;
+
+import lombok.Data;
+import lombok.ToString;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
+
+@Data
+@ToString
+@Entity
+@Table(name = "u_qrcode")
+@DynamicInsert
+@DynamicUpdate
+public class QRCode implements Serializable {
+    @Id
+    @Column(name="id")
+    private String id;
+
+    @Column(name="eid")
+    private String eid;
+
+    @Column(name="simple")
+    private String simple;
+
+    @Column(name="time")
+    private Date time;
+
+    @Column(name="qrcode",columnDefinition="LONGTEXT")
+    private String qrcode;
+
+    @Column(name="status")
+    private int status;
+
+    @Column(name = "gmt_created", updatable = false, insertable = false, columnDefinition = "timestamp NULL DEFAULT CURRENT_TIMESTAMP")
+    @Temporal(TemporalType.TIMESTAMP)
+    private Date gmtCreated;
+
+    @Column(name = "gmt_modified", updatable = false, insertable = false, columnDefinition = "timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
+    @Temporal(TemporalType.TIMESTAMP)
+    private Date gmtModified;
+
+}
+
+
+

rankin-data-api/src/main/java/cn/rankin/data/api/user/vo/CampusVo.java

@@ -17,6 +17,8 @@ public class CampusVo implements Serializable {
 
     private String provinceCode;
 
+    private String provinceName;
+
     private String cityName;
 
     private String zoneName;

rankin-data-api/src/main/java/cn/rankin/data/api/user/vo/DeviceModelVo.java

@@ -0,0 +1,13 @@
+package cn.rankin.data.api.user.vo;
+
+import lombok.Data;
+import lombok.ToString;
+
+import java.io.Serializable;
+
+@Data
+@ToString
+public class DeviceModelVo  implements Serializable
+{
+    private String deviceModel;
+}

rankin-data-api/src/main/java/cn/rankin/data/api/user/vo/MerchantPermitDeviceVo.java

@@ -0,0 +1,31 @@
+package cn.rankin.data.api.user.vo;
+
+import cn.rankin.common.utils.enums.BaseStatusEnum;
+import lombok.Data;
+import lombok.ToString;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@ToString
+public class MerchantPermitDeviceVo implements Serializable {
+
+    private String id;
+
+    private String merchantId;
+
+    private String deviceModel;
+
+    private String provinceCode;
+
+    private BaseStatusEnum status;
+
+    private Date gmtCreated;
+
+    private Date gmtModified;
+
+}
+
+
+

rankin-data-api/src/main/java/cn/rankin/data/api/user/vo/QRCodeVo.java

@@ -0,0 +1,33 @@
+package cn.rankin.data.api.user.vo;
+
+import lombok.Data;
+import lombok.ToString;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+@Data
+@ToString
+public class QRCodeVo implements Serializable {
+
+    private String id;
+
+    private String eid;
+
+    private String simple;
+
+    private Date time;
+
+    private String qrcode;
+
+    private int status;
+
+    private Date gmtCreated;
+
+    private Date gmtModified;
+
+}
+
+
+

rankin-data-api/src/main/java/cn/rankin/data/api/user/vo/TerminalUserAuthVo.java

@@ -41,4 +41,16 @@ public class TerminalUserAuthVo implements Serializable {
     private Long createTime;
 
     private Long updateTime;
+
+    private String campusId;
+
+    private String campusName;
+
+    private String campusContactName;
+
+    private String campusContactWay;
+
+    private String startTimeStr;
+
+    private String endTimeStr;
 }

rankin-product-service/src/main/java/cn/rankin/productservice/repository/CourseSubRelationRepository.java

@@ -13,7 +13,6 @@ public interface CourseSubRelationRepository extends BasicJpaRepository<CourseSu
 
     List<CourseSubRelation> findByCourseId(String courseId);
 
-
     @Query(value = "select r.* from p_course_sub_relation r where r.course_id = :courseId and r.status = 0 order by r.sort limit 1", nativeQuery = true)
     CourseSubRelation findFirstByCourseIdOrderBySort(@Param("courseId") String courseId);
 

rankin-resource-service/src/main/java/cn/rankin/resourceservice/service/ResourceService.java

@@ -126,6 +126,7 @@ public class ResourceService {
     public APIResult<Page<Resource>> findRemotePage(ResourceSearchDTO resourceSearchDTO) {
         APIResult<Page<ResourceRemote>> result = resourceProxy.findPage(new HashMap<String, Object>(){
             {
+                this.put("no", resourceSearchDTO.getCode());
                 this.put("title", resourceSearchDTO.getName());
                 this.put("pageNum", resourceSearchDTO.getPageNo());
                 this.put("pageSize", resourceSearchDTO.getPageSize());

rankin-user-service/src/main/java/cn/rankin/userservice/controller/MerchantPermitDeviceController.java

@@ -0,0 +1,78 @@
+package cn.rankin.userservice.controller;
+
+import cn.rankin.common.utils.api.model.APICode;
+import cn.rankin.common.utils.api.model.APIResult;
+import cn.rankin.common.utils.api.page.Page;
+import cn.rankin.common.utils.enums.BaseOrderEnum;
+import cn.rankin.data.api.user.dto.MerchantPermitDeviceDTO;
+import cn.rankin.data.api.user.dto.MerchantSearchDTO;
+import cn.rankin.data.api.user.dto.UserDeviceDTO;
+import cn.rankin.data.api.user.entity.Merchant;
+import cn.rankin.data.api.user.entity.MerchantPermitDevice;
+import cn.rankin.data.api.user.entity.UserDevice;
+import cn.rankin.data.api.user.vo.MerchantPermitDeviceVo;
+import cn.rankin.userservice.helper.RaStringHelper;
+import cn.rankin.userservice.service.MerchantPermitDeviceService;
+import cn.rankin.userservice.service.UserDeviceService;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.LinkedHashMap;
+import java.util.List;
+
+
+@RestController
+@RequestMapping(value = "/merchantPermitDevice")
+public class MerchantPermitDeviceController
+{
+
+    @Autowired
+    private MerchantPermitDeviceService merchantPermitDeviceService;
+
+    @RequestMapping(value = "/list", method = RequestMethod.GET)
+    public APIResult<Page<MerchantPermitDevice>> search(MerchantPermitDeviceDTO searchDTO) {
+        MerchantPermitDevice simple = new MerchantPermitDevice();
+        String merchantId = searchDTO.getMerchantId();
+        if (StringUtils.isNotBlank(merchantId)) {
+            simple.setMerchantId(merchantId);
+        }
+
+        String provinceCode = searchDTO.getProvinceCode();
+        if (StringUtils.isNotBlank(provinceCode)) {
+            simple.setProvinceCode(provinceCode);
+        }
+
+        // sort
+        LinkedHashMap<String, BaseOrderEnum> sort = new LinkedHashMap<>();
+        sort.put("gmtModified", BaseOrderEnum.DESC);
+
+        return merchantPermitDeviceService.search(simple, searchDTO.getPageNo(), searchDTO.getPageSize(), sort);
+    }
+
+    @RequestMapping(method = RequestMethod.POST)
+    public APIResult<MerchantPermitDevice> create(@Valid @RequestBody MerchantPermitDeviceDTO dto){
+        return merchantPermitDeviceService.create(dto);
+    }
+
+    @RequestMapping(method = RequestMethod.PUT)
+    public APIResult<MerchantPermitDevice> update(@Valid @RequestBody MerchantPermitDeviceDTO dto){
+        if (dto.getId() == null) {
+            return APIResult.error(APICode.PARAMETER_ERROR);
+        }
+        return merchantPermitDeviceService.update(dto);
+    }
+
+    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
+    public APIResult<Boolean> delete(@PathVariable String id) {
+        return merchantPermitDeviceService.delete(id);
+
+    }
+
+    @RequestMapping(value = "/{id}", method = RequestMethod.GET)
+    public APIResult<MerchantPermitDevice> getMerchantPermitDevice(@PathVariable String id) {
+        return merchantPermitDeviceService.getMerchantPermitDevice(id);
+    }
+
+}

rankin-user-service/src/main/java/cn/rankin/userservice/controller/QRCodeController.java

@@ -0,0 +1,134 @@
+package cn.rankin.userservice.controller;
+
+import cn.rankin.common.utils.api.model.APIResult;
+import cn.rankin.common.utils.util.FastJsonUtils;
+import cn.rankin.data.api.user.dto.QRCodeDTO;
+import cn.rankin.data.api.user.entity.LocationInfo;
+import cn.rankin.data.api.user.entity.QRCode;
+import cn.rankin.userservice.service.LocationInfoService;
+import cn.rankin.userservice.service.QRCodeService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Date;
+import java.util.Map;
+
+@Slf4j
+@RestController
+@RequestMapping(value = "/qrcode")
+public class QRCodeController {
+
+    @Autowired
+    private QRCodeService qrcodeService;
+
+    @Autowired
+    private LocationInfoService locationInfoService;
+
+    @RequestMapping(method = RequestMethod.POST)
+    public QRCode add(@RequestBody QRCodeDTO dto) {
+        return qrcodeService.add(dto);
+    }
+
+    @RequestMapping(value = "/last", method = RequestMethod.GET)
+    public QRCode findLastOne(@RequestParam("eid") String eid ){
+        return qrcodeService.findLastOne(eid);
+    }
+
+    @RequestMapping(value = "/status/fail", method = RequestMethod.PUT)
+    public void updateStatusFail(@RequestParam("eid") String eid ){
+        qrcodeService.updateStatusFail(eid);
+    }
+
+    @RequestMapping(value = "/callback", method = RequestMethod.POST)
+    public APIResult callback(@RequestParam("data") String data)
+    {
+
+        try{
+            Map<String, Object> requestMap = FastJsonUtils.stringToCollect(data);
+
+            boolean status = (boolean) requestMap.get("status");
+            Map<String, Object> dataMap = (Map<String, Object>) requestMap.get("data");
+
+
+            Map<String, Object> qrcodeMap = (Map<String, Object>) dataMap.get("qrcode");
+            String eid = (String) qrcodeMap.get("user");
+            long time = (long) qrcodeMap.get("time");
+
+            QRCode qrcode = new QRCode();
+            qrcode.setEid(eid);
+            //qrcode.setTime(new Date(time));
+
+            QRCode entity = qrcodeService.findFirst(qrcode);
+
+            if(null == entity){
+                log.error("qrcode/callback  error ,qrcode is null");
+                return APIResult.ok("扫码失败,未找到二维码信息");
+            }
+
+            if(status){
+                qrcodeCallback(eid, entity.getSimple(), dataMap);
+                entity.setStatus(2);
+                qrcodeService.update(entity);
+                return APIResult.ok("扫码成功");
+            }else{
+                entity.setStatus(1);
+                qrcodeService.update(entity);
+                return APIResult.ok("扫码失败");
+            }
+        }catch(Exception e){
+            return APIResult.ok("扫码失败");
+        }
+    }
+
+    /**
+     * 处理位置信息
+     * @param dataMap
+     */
+    private void qrcodeCallback(String eid,String simple ,Map<String,Object> dataMap) {
+
+        Map<String,Object> position = (Map<String, Object>) dataMap.get("position");
+        String lat = (String) position.get("lat");
+        String lng = (String) position.get("lng");
+        String precise = (String) position.get("precise");
+        String address = (String) position.get("address");
+
+        Map<String,Object> teacher_info = (Map<String, Object>) dataMap.get("teacher_info");
+        String tRealName = (String) teacher_info.get("real_name");
+        String tMobile = (String) teacher_info.get("mobile");
+        String tPosition = (String) teacher_info.get("position");
+        String tEnCode = (String) teacher_info.get("en_code");
+
+
+        Map<String,Object> campus_info = (Map<String, Object>) dataMap.get("campus_info");
+        String campusName = (String) campus_info.get("campus_name");
+        String cEnCode = (String) campus_info.get("en_code");
+        String cLat = (String) campus_info.get("lat");
+        String cLng = (String) campus_info.get("lng");
+        Map<String,Object> attach = (Map<String, Object>) dataMap.get("attach");
+
+
+        LocationInfo locationInfo = new LocationInfo();
+        locationInfo.setEid(eid);
+        locationInfo.setSimple(simple);
+        locationInfo.setAddress(address);
+        locationInfo.setLat(lat);
+        locationInfo.setLng(lng);
+        locationInfo.setPrecise(precise);
+
+
+        locationInfo.setTRealName(tRealName);
+        locationInfo.setTEnCode(tEnCode);
+        locationInfo.setTMobile(tMobile);
+        locationInfo.setTPosition(tPosition);
+
+        locationInfo.setCampusName(campusName);
+        locationInfo.setCEnCode(cEnCode);
+        locationInfo.setCLat(cLat);
+        locationInfo.setCLng(cLng);
+
+        locationInfoService.add(locationInfo);
+
+    }
+
+}

rankin-user-service/src/main/java/cn/rankin/userservice/controller/StmtCampusController.java

@@ -0,0 +1,266 @@
+package cn.rankin.userservice.controller;
+
+import cn.rankin.common.utils.api.model.APIResult;
+import cn.rankin.common.utils.api.page.Page;
+import cn.rankin.common.utils.enums.BaseOrderEnum;
+import cn.rankin.common.utils.util.ProvinceUtil;
+import cn.rankin.data.api.user.dto.CampusDTO;
+import cn.rankin.data.api.user.dto.CampusSearchDTO;
+import cn.rankin.data.api.user.dto.UserDeviceDTO;
+import cn.rankin.data.api.user.entity.Campus;
+import cn.rankin.data.api.user.entity.Merchant;
+import cn.rankin.data.api.user.entity.UserDevice;
+import cn.rankin.userservice.code.UserServiceAPICode;
+import cn.rankin.userservice.helper.RaStringHelper;
+import cn.rankin.userservice.service.CampusService;
+import cn.rankin.userservice.service.MerchantService;
+import cn.rankin.userservice.service.UserDeviceService;
+import cn.rankin.userservice.utils.StudentNo;
+import cn.rankin.userservice.utils.StudentNumberUtil;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.*;
+
+
+@RestController
+@RequestMapping(value = "/stmt/campus")
+public class StmtCampusController
+{
+    @Autowired
+    private MerchantService merchantService;
+
+    @Autowired
+    private CampusService campusService;
+
+    @RequestMapping(value = "/page", method = RequestMethod.GET)
+    public APIResult<Page<Campus>> page(CampusSearchDTO searchDTO)
+    {
+        Campus campus = new Campus();
+
+        String name = searchDTO.getName();
+        if (!StringUtils.isEmpty(name))
+        {
+            campus.setName("%" + name + "%");
+        }
+
+        String code = searchDTO.getCode();
+        if (!StringUtils.isEmpty(code))
+        {
+            campus.setCode("%" + code + "%");
+        }
+
+        String merchantId = searchDTO.getMerchantId();
+        if (!StringUtils.isEmpty(merchantId))
+        {
+            campus.setMerchantId(merchantId);
+        }
+
+        // sort
+        LinkedHashMap<String, BaseOrderEnum> sort = new LinkedHashMap<>();
+        sort.put("gmtModified", BaseOrderEnum.DESC);
+
+        APIResult<Page<Campus>> apiResult = campusService.search(campus, searchDTO.getPageNo(), searchDTO.getPageSize(), sort);
+        if (apiResult.getSuccess() && apiResult.getData() != null)
+        {
+            List<Campus> campusList = apiResult.getData().getList();
+            setMerchantName(campusList);
+
+        }
+
+        return apiResult;
+    }
+
+    @RequestMapping(value = "/list", method = RequestMethod.GET)
+    public APIResult<List<Campus>> search(CampusSearchDTO searchDTO)
+    {
+        Campus campus = new Campus();
+
+        String name = searchDTO.getName();
+        if (!StringUtils.isEmpty(name))
+        {
+            campus.setName("%" + name + "%");
+        }
+
+        String code = searchDTO.getCode();
+        if (!StringUtils.isEmpty(code))
+        {
+            campus.setCode("%" + code + "%");
+        }
+
+        String merchantId = searchDTO.getMerchantId();
+        if (!StringUtils.isEmpty(merchantId))
+        {
+            campus.setMerchantId(merchantId);
+        }
+
+        // sort
+        LinkedHashMap<String, BaseOrderEnum> sort = new LinkedHashMap<>();
+        sort.put("gmtModified", BaseOrderEnum.DESC);
+
+        APIResult<List<Campus>> apiResult =  campusService.find(campus,sort);
+
+        setMerchantName(apiResult.getData());
+
+        return apiResult;
+    }
+
+    @RequestMapping(method = RequestMethod.GET)
+    public APIResult<List<Campus>> findByCondition(CampusSearchDTO searchDTO)
+    {
+        Campus campus = new Campus();
+
+        String name = searchDTO.getName();
+        if (!StringUtils.isEmpty(name))
+        {
+            campus.setName("%" + name + "%");
+        }
+
+        String code = searchDTO.getCode();
+        if (!StringUtils.isEmpty(code))
+        {
+            campus.setCode("%" + code + "%");
+        }
+
+        // sort
+        LinkedHashMap<String, BaseOrderEnum> sort = new LinkedHashMap<>();
+        sort.put("gmtModified", BaseOrderEnum.DESC);
+
+        return campusService.find(campus, sort);
+    }
+
+
+    @Transactional
+    @RequestMapping(method = RequestMethod.POST)
+    public APIResult<Campus> create(@RequestBody @Valid CampusDTO campusDTO)
+    {
+        String merchantId = campusDTO.getMerchantId();
+        if (StringUtils.isEmpty(merchantId))
+        {
+            return APIResult.error(UserServiceAPICode.error("缺少渠道id"));
+        }
+
+        Merchant merchant = merchantService.findOne(merchantId);
+        if (merchant == null)
+        {
+            return APIResult.error(UserServiceAPICode.error("渠道不存在"));
+        }
+
+        String provinceCode = campusDTO.getProvinceCode();
+        if (StringUtils.isEmpty(provinceCode))
+        {
+            return APIResult.error(UserServiceAPICode.PARAMETER_ERROR);
+        }
+
+        provinceCode = converProvinceCode(merchant, provinceCode);
+
+        Integer serialNo = campusService.getSerialNo(merchantId, provinceCode);
+        StudentNo studentNo = StudentNumberUtil.getStudentNo(merchant.getCode(), provinceCode, serialNo);
+        if (studentNo == null)
+        {
+            return APIResult.error(UserServiceAPICode.CAMPUS_NO_ERROR);
+        }
+
+        campusDTO.setProvinceCode(provinceCode);
+        campusDTO.setSerialNo(serialNo);
+        campusDTO.setCode(studentNo.getCampusNo());
+
+        APIResult<Campus> result = campusService.create(campusDTO);
+        if (result.getSuccess())
+        {
+            Campus campus = result.getData();
+            setMerchantName(campus);
+        }
+
+        return result;
+    }
+
+    /**
+     * 判断是否贝尔安亲，湖南校区。
+     * 因湖南校区已达到最大限额，使用湖南新编号
+     *
+     * @param merchant
+     * @param provinceCode
+     * @return
+     */
+    private String converProvinceCode(Merchant merchant, String provinceCode)
+    {
+        if ("6666".equals(merchant.getCode()) && provinceCode.equals(ProvinceUtil.HN_ORIGINAL))
+        {
+            provinceCode = ProvinceUtil.HN;
+        }
+
+        return provinceCode;
+    }
+
+    @RequestMapping(value = "/ids", method = RequestMethod.GET)
+    public APIResult<Map<String, Campus>> findByIds(@RequestParam("id") List<String> campusIds)
+    {
+        Map<String, Campus> campusMap = campusService.getCampusMap(campusIds);
+        return APIResult.ok(campusMap);
+    }
+
+    @RequestMapping(method = RequestMethod.PUT)
+    public APIResult<Campus> update(@RequestBody @Valid CampusDTO campusDTO)
+    {
+        String id = campusDTO.getId();
+        if (StringUtils.isEmpty(id))
+        {
+            return APIResult.error(UserServiceAPICode.PARAMETER_ERROR);
+        }
+
+        APIResult<Campus> result = campusService.update(campusDTO);
+        if (result.getSuccess())
+        {
+            Campus campus = result.getData();
+            setMerchantName(campus);
+        }
+
+        return result;
+    }
+
+    public void setMerchantName(List<Campus> campusList)
+    {
+        if (CollectionUtils.isEmpty(campusList))
+        {
+            return;
+        }
+
+        Set<String> merchantIdSet = new HashSet<>();
+        campusList.forEach(campus -> merchantIdSet.add(campus.getMerchantId()));
+
+        if (merchantIdSet.size() == 0)
+        {
+            return;
+        }
+        List<String> merchantIdList = new ArrayList<>();
+        merchantIdList.addAll(merchantIdSet);
+        Map<String, Merchant> merchantMap = merchantService.getMerchantMap(merchantIdList);
+
+        for (Campus campus : campusList)
+        {
+            String merchantId = campus.getMerchantId();
+            Merchant merchant = merchantMap.get(merchantId);
+            campus.setMerchantName(merchant.getName());
+        }
+    }
+
+    public void setMerchantName(Campus campus)
+    {
+        if (campus == null)
+        {
+            return;
+        }
+
+        Merchant merchant = merchantService.findOne(campus.getMerchantId());
+        if (merchant != null)
+        {
+            campus.setMerchantName(merchant.getName());
+        }
+    }
+
+}

rankin-user-service/src/main/java/cn/rankin/userservice/controller/StmtTerminalUserController.java

@@ -0,0 +1,429 @@
+package cn.rankin.userservice.controller;
+
+import cn.rankin.common.utils.api.model.APIResult;
+import cn.rankin.common.utils.api.page.Page;
+import cn.rankin.common.utils.enums.BaseOrderEnum;
+import cn.rankin.common.utils.enums.BaseStatusEnum;
+import cn.rankin.common.utils.util.HttpUtil;
+import cn.rankin.common.utils.util.ListUtil;
+import cn.rankin.common.utils.util.ProvinceUtil;
+import cn.rankin.data.api.auth.dto.AuthDTO;
+import cn.rankin.data.api.auth.dto.AuthQueryDTO;
+import cn.rankin.data.api.auth.vo.AuthVo;
+import cn.rankin.data.api.user.dto.CampusDTO;
+import cn.rankin.data.api.user.dto.CampusSearchDTO;
+import cn.rankin.data.api.user.dto.TerminalUserDTO;
+import cn.rankin.data.api.user.dto.TerminalUserSearchDTO;
+import cn.rankin.data.api.user.entity.Campus;
+import cn.rankin.data.api.user.entity.Merchant;
+import cn.rankin.data.api.user.entity.TerminalDevice;
+import cn.rankin.data.api.user.entity.TerminalUser;
+import cn.rankin.data.api.user.vo.TerminalUserAuthVo;
+import cn.rankin.userservice.code.UserServiceAPICode;
+import cn.rankin.userservice.dto.RemoteUser;
+import cn.rankin.userservice.proxy.RemoteAuthProxy;
+import cn.rankin.userservice.proxy.RemoteUserProxy;
+import cn.rankin.userservice.service.CampusService;
+import cn.rankin.userservice.service.MerchantService;
+import cn.rankin.userservice.service.TerminalDeviceService;
+import cn.rankin.userservice.service.TerminalUserService;
+import cn.rankin.userservice.utils.Converter;
+import cn.rankin.userservice.utils.StudentNo;
+import cn.rankin.userservice.utils.StudentNumberUtil;
+import com.alibaba.fastjson.JSON;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.transaction.Transactional;
+import javax.validation.Valid;
+import java.util.*;
+
+@Slf4j
+@RestController
+@RequestMapping(value = "/stmt/terminal/user")
+public class StmtTerminalUserController
+{
+    @Autowired
+    private TerminalUserService terminalUserService;
+
+    @Autowired
+    private CampusService campusService;
+
+    @Autowired
+    private MerchantService merchantService;
+
+    @Autowired
+    private RemoteUserProxy remoteUserProxy;
+
+    @Autowired
+    private RemoteAuthProxy remoteAuthProxy;
+
+    @Autowired
+    private TerminalDeviceService terminalDeviceService;
+
+    @RequestMapping(value = "/page", method = RequestMethod.GET)
+    public APIResult<Page<TerminalUser>> search(TerminalUserSearchDTO terminalUserSearchDTO) {
+        log.info("request param = {}",terminalUserSearchDTO.toString());
+        TerminalUser terminalUser = new TerminalUser();
+
+        String code = terminalUserSearchDTO.getCode();
+
+        if (!StringUtils.isEmpty(code)) {
+            terminalUser.setCode("%" + code + "%");
+        }
+        String campusId = terminalUserSearchDTO.getCampusId();
+        if (!StringUtils.isEmpty(campusId)) {
+            terminalUser.setCampusId(campusId);
+        }
+
+        String merchantId = terminalUserSearchDTO.getMerchantId();
+        if (!StringUtils.isEmpty(merchantId)) {
+            terminalUser.setMerchantId(merchantId);
+        }
+
+        BaseStatusEnum status = terminalUserSearchDTO.getStatus();
+        if (status != null) {
+            terminalUser.setStatus(status);
+        }
+
+        LinkedHashMap<String, BaseOrderEnum> sort = new LinkedHashMap<>();
+        sort.put("gmtModified", BaseOrderEnum.DESC);
+
+        APIResult<Page<TerminalUser>> result = terminalUserService.search(terminalUser, terminalUserSearchDTO.getPageNo(), terminalUserSearchDTO.getPageSize(), sort);
+        if (result.getSuccess()) {
+            List<TerminalUser> terminalUserList = result.getData().getList();
+            setUserInfo(terminalUserList);
+            setDeciceInfo(terminalUserList);
+        }
+
+        return result;
+    }
+
+
+    @RequestMapping(method = RequestMethod.GET)
+    public APIResult<List<TerminalUser>> findByCondition(TerminalUserSearchDTO terminalUserSearchDTO) {
+        TerminalUser terminalUser = new TerminalUser();
+
+        String code = terminalUserSearchDTO.getCode();
+        String campusId = terminalUserSearchDTO.getCampusId();
+        if (!StringUtils.isEmpty(code)) {
+            terminalUser.setCode("%" + code + "%");
+        } else if (!StringUtils.isEmpty(campusId)) {
+            terminalUser.setCampusId(campusId);
+        }
+
+        String merchantId = terminalUserSearchDTO.getMerchantId();
+        if (!StringUtils.isEmpty(merchantId)) {
+            terminalUser.setMerchantId(merchantId);
+        }
+
+        LinkedHashMap<String, BaseOrderEnum> sort = new LinkedHashMap<>();
+        sort.put("gmtModified", BaseOrderEnum.DESC);
+
+        List<TerminalUser> terminalUserList = terminalUserService.find(terminalUser, sort);
+        setUserInfo(terminalUserList);
+        return APIResult.ok(terminalUserList);
+    }
+
+    @RequestMapping(value = "/auth", method = RequestMethod.POST)
+    public APIResult updateAuth(@RequestBody AuthDTO dto) {
+        return remoteAuthProxy.saveOrUpdateAuth(dto);
+    }
+
+    @RequestMapping(value = "/auth/list", method = RequestMethod.GET)
+    public Page<TerminalUserAuthVo> findAuthListByCondition(TerminalUserSearchDTO terminalUserSearchDTO) {
+        Page<TerminalUserAuthVo> pageResult = new Page<>();
+        pageResult.setPageNo(terminalUserSearchDTO.getPageNo());
+        pageResult.setPageSize(terminalUserSearchDTO.getPageSize());
+
+        List<TerminalUserAuthVo> terminalUserAuthVos = new ArrayList<>();
+
+        //终端用户鉴权查询条件
+        AuthQueryDTO authQueryDTO = new AuthQueryDTO();
+        authQueryDTO.setPageNo(terminalUserSearchDTO.getPageNo());
+        authQueryDTO.setPageSize(terminalUserSearchDTO.getPageSize());
+
+
+        TerminalUser terminalUser = new TerminalUser();
+        String code = terminalUserSearchDTO.getCode();
+        if (!StringUtils.isEmpty(code)) {
+            log.info("/user/auth/list | request code={}",code);
+            terminalUser.setCode(code);
+        }
+        LinkedHashMap<String, BaseOrderEnum> sort = new LinkedHashMap<>();
+        sort.put("gmtModified", BaseOrderEnum.DESC);
+
+        List<TerminalUser> terminalUserList = terminalUserService.find(terminalUser, sort);
+
+        if(CollectionUtils.isEmpty(terminalUserList)){
+            log.info("terminalUserList is empty!");
+            return pageResult;
+        }else if(terminalUserList.size() == 1){
+            //查询到唯一用户时，设置资源库查询条件 | 其他情况默认查询全部
+            TerminalUser user = terminalUserList.get(0);
+            authQueryDTO.setUid(user.getId());
+        }
+
+        Page<AuthVo> authPage = remoteAuthProxy.findAuthList(authQueryDTO);
+
+        List<AuthVo> authList = authPage.getList();
+        if(CollectionUtils.isEmpty(authList)){
+            log.info("authList is empty!");
+            return pageResult;
+        }
+
+        Map<String, TerminalUser> terminalUserMap = ListUtil.convert(terminalUserList, "id", TerminalUser.class);
+
+        authList.forEach(authVo -> {
+            TerminalUser termianlUser = terminalUserMap.get(authVo.getUid());
+            TerminalUserAuthVo vo = Converter.getTerminalUserAuthVo(termianlUser,authVo);
+            terminalUserAuthVos.add(vo);
+        });
+
+        //设置分页数据
+        pageResult.setTotalSize((int)authPage.getTotalSize());
+        pageResult.setList(terminalUserAuthVos);
+
+        return pageResult;
+    }
+
+
+
+    @Transactional
+    @RequestMapping(method = RequestMethod.POST)
+    public APIResult<TerminalUser> create(HttpServletRequest request, @RequestBody @Valid TerminalUserDTO terminalUserDTO) {
+        String campusId = terminalUserDTO.getCampusId();
+        if (StringUtils.isEmpty(campusId)) {
+            return APIResult.error(UserServiceAPICode.PARAMETER_ERROR);
+        }
+
+        Campus campus = campusService.findOne(campusId);
+        if (campus == null) {
+            return APIResult.error(UserServiceAPICode.NOT_EXISTS);
+        }
+
+        String merchantId = campus.getMerchantId();
+        Merchant merchant = merchantService.findOne(merchantId);
+
+        if (merchant == null) {
+            return APIResult.error(UserServiceAPICode.NOT_EXISTS);
+        }
+
+        // 开始生成学号
+        Integer serialNo = terminalUserService.getSerialNo(campusId);
+        String code = StudentNumberUtil.getStudentNo(campus.getCode(), serialNo);
+
+        // 设置学号
+        terminalUserDTO.setCode(code);
+        terminalUserDTO.setSerialNo(serialNo);
+        terminalUserDTO.setMerchantId(merchantId);
+
+        // 设置名字
+        String name = terminalUserDTO.getName();
+        if (StringUtils.isEmpty(name)) {
+            terminalUserDTO.setName(StudentNumberUtil.toChinese(serialNo, "教室"));
+        }
+
+        // 远程注册
+        String password = terminalUserDTO.getPassword();
+        APIResult<RemoteUser> remoteUserAPIResult = remoteUserProxy.register(code, password, HttpUtil.getClientIp(request), "0");
+        if (!remoteUserAPIResult.getSuccess()) {
+            log.error(JSON.toJSONString(remoteUserAPIResult));
+            return APIResult.error(UserServiceAPICode.REMOTE_USER_REGISTER_ERROR);
+        }else {
+            // 设置资源中心id为本地用户id
+            RemoteUser remoteUser = remoteUserAPIResult.getData();
+            terminalUserDTO.setId(remoteUser.getUid());
+        }
+
+        // 存储数据库
+        APIResult<TerminalUser> result = terminalUserService.create(terminalUserDTO);
+        if (!result.getSuccess()) {
+            return result;
+        }
+
+        TerminalUser terminalUser = result.getData();
+        setUserInfo(terminalUser, campus, merchant);
+
+        return result;
+    }
+
+    @RequestMapping(method = RequestMethod.PUT)
+    public APIResult<TerminalUser> update(HttpServletRequest request, @RequestBody TerminalUserDTO terminalUserDTO) {
+        String id = terminalUserDTO.getId();
+        if (StringUtils.isEmpty(id)) {
+            return APIResult.error(UserServiceAPICode.PARAMETER_ERROR);
+        }
+
+        TerminalUser terminalUser = terminalUserService.find(id);
+        if (terminalUser == null) {
+            return APIResult.error(UserServiceAPICode.NOT_EXISTS);
+        }
+
+        String newPassword = terminalUserDTO.getPassword();
+        if (!StringUtils.isEmpty(newPassword)) {
+            String prePassword = terminalUser.getPassword();
+            if (!prePassword.equals(newPassword)) {
+                APIResult result = remoteUserProxy.changePassword(terminalUser, newPassword, HttpUtil.getClientIp(request), "0");
+                if (!result.getSuccess()) {
+                    return result;
+                }
+            }
+        }
+
+        APIResult<TerminalUser> result = terminalUserService.update(terminalUserDTO);
+        if (result.getSuccess()) {
+            setUserInfo(result.getData());
+        }
+
+        return result;
+    }
+
+    @RequestMapping(value = "/{id}", method = RequestMethod.GET)
+    public APIResult<TerminalUser> getUser(@PathVariable("id") String id) {
+        TerminalUser terminalUser = terminalUserService.find(id);
+        if (terminalUser == null) {
+            return APIResult.error(UserServiceAPICode.NOT_EXISTS);
+        }
+
+        setUserInfo(terminalUser);
+        return APIResult.ok(terminalUser);
+    }
+
+    @RequestMapping(value = "/code/{code}", method = RequestMethod.GET)
+    public APIResult<TerminalUser> loadUser(@PathVariable("code") String code) {
+        TerminalUser terminalUser = terminalUserService.loadUserByCode(code);
+        if (terminalUser == null) {
+            return APIResult.error(UserServiceAPICode.NOT_EXISTS);
+        }
+
+        setUserInfo(terminalUser);
+        return APIResult.ok(terminalUser);
+    }
+
+    @RequestMapping(value = "/campus/ids", method = RequestMethod.GET)
+    public APIResult<List<TerminalUser>> findByCampusIds(@RequestParam("id") List<String> campusIds) {
+        List<TerminalUser> terminalUserList = terminalUserService.findByCampusIds(campusIds);
+        setUserInfo(terminalUserList);
+        return APIResult.ok(terminalUserList);
+    }
+
+    @RequestMapping(value = "/ids", method = RequestMethod.GET)
+    public APIResult<List<TerminalUser>> findByIds(@RequestParam("id") List<String> ids) {
+        List<TerminalUser> terminalUserList = terminalUserService.findByIds(ids);
+        setUserInfo(terminalUserList);
+        return APIResult.ok(terminalUserList);
+    }
+
+    // 禁用终端用户
+    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
+    public APIResult<Boolean> delete(@PathVariable("id") String id) {
+        return terminalUserService.delete(id);
+    }
+
+
+    public static void setUserInfo(TerminalUser terminalUser, Campus campus, Merchant merchant) {
+        if (terminalUser == null) {
+            return;
+        }
+
+        if (campus != null) {
+            terminalUser.setContactName(campus.getContactName());
+            terminalUser.setMobile(campus.getMobile());
+            terminalUser.setCityName(campus.getCityName());
+            terminalUser.setZoneName(campus.getZoneName());
+            terminalUser.setProvinceName(ProvinceUtil.get(campus.getProvinceCode()));
+        }
+
+        if (merchant != null) {
+            terminalUser.setMerchantName(merchant.getName());
+            terminalUser.setMerchantContactMobile(merchant.getMobile());
+            terminalUser.setMerchantContactName(merchant.getContactName());
+        }
+    }
+
+    public void setUserInfo(TerminalUser terminalUser) {
+        if (terminalUser == null) {
+            return;
+        }
+
+        Campus campus = campusService.findOne(terminalUser.getCampusId());
+        if (campus != null) {
+            terminalUser.setContactName(campus.getContactName());
+            terminalUser.setMobile(campus.getMobile());
+            terminalUser.setCityName(campus.getCityName());
+            terminalUser.setZoneName(campus.getZoneName());
+            terminalUser.setProvinceName(ProvinceUtil.get(campus.getProvinceCode()));
+        }
+
+        Merchant merchant = merchantService.findOne(campus.getMerchantId());
+        if (merchant != null) {
+            terminalUser.setMerchantSimple(merchant.getSimple());
+            terminalUser.setMerchantName(merchant.getName());
+            terminalUser.setMerchantContactMobile(merchant.getMobile());
+            terminalUser.setMerchantContactName(merchant.getContactName());
+        }
+    }
+
+    public void setUserInfo(List<TerminalUser> terminalUserList) {
+        if (CollectionUtils.isEmpty(terminalUserList)) {
+            return;
+        }
+
+        List<String> campusIdList = new ArrayList<>();
+        List<String> merchantIdList = new ArrayList<>();
+
+        terminalUserList.forEach(terminalUser -> {
+            campusIdList.add(terminalUser.getCampusId());
+            merchantIdList.add(terminalUser.getMerchantId());
+        });
+
+        Map<String, Campus> campusMap = campusService.getCampusMap(campusIdList);
+        Map<String, Merchant> merchantMap = merchantService.getMerchantMap(merchantIdList);
+
+        for (TerminalUser terminalUser : terminalUserList) {
+            Campus campus = campusMap.get(terminalUser.getCampusId());
+            if (campus != null) {
+                terminalUser.setContactName(campus.getContactName());
+                terminalUser.setMobile(campus.getMobile());
+                terminalUser.setCityName(campus.getCityName());
+                terminalUser.setZoneName(campus.getZoneName());
+                terminalUser.setAddress(campus.getAddress());
+                terminalUser.setProvinceName(ProvinceUtil.get(campus.getProvinceCode()));
+            }
+
+            Merchant merchant = merchantMap.get(terminalUser.getMerchantId());
+            if (merchant != null) {
+                terminalUser.setMerchantName(merchant.getName());
+                terminalUser.setMerchantContactMobile(merchant.getMobile());
+                terminalUser.setMerchantContactName(merchant.getContactName());
+            }
+        }
+    }
+
+    /**
+     * 设置绑定设备信息
+     * @param terminalUserList
+     */
+    private void setDeciceInfo(List<TerminalUser> terminalUserList) {
+        if (CollectionUtils.isEmpty(terminalUserList)) {
+            return;
+        }
+
+        terminalUserList.forEach(terminalUser ->{
+            TerminalDevice terminalDevice = terminalDeviceService.findByUserId(terminalUser.getId());
+            if(null != terminalDevice){
+                //1  已绑定设备
+                terminalUser.setDeviceStatus(1);
+            }else{
+                terminalUser.setDeviceStatus(0);
+            }
+        });
+    }
+
+
+}

rankin-user-service/src/main/java/cn/rankin/userservice/controller/StmtUserTagController.java

@@ -0,0 +1,32 @@
+package cn.rankin.userservice.controller;
+
+import cn.rankin.common.utils.api.model.APIResult;
+import cn.rankin.common.utils.api.page.Page;
+import cn.rankin.data.api.cms.StmtSearchDTO;
+import cn.rankin.data.api.cms.vo.UserTagStmt;
+import cn.rankin.userservice.service.StmtService;
+import lombok.extern.slf4j.Slf4j;
+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.RestController;
+
+
+
+@Slf4j
+@RestController
+@RequestMapping(value = "/stmt/userTagStmt")
+public class StmtUserTagController
+{
+    @Autowired
+    private StmtService stmtService;
+
+    @RequestMapping(value = "/list", method = RequestMethod.GET)
+    public APIResult<Page<UserTagStmt>> UserTagStmtPage(StmtSearchDTO searchDTO) {
+        return stmtService.userTagStmtPage(searchDTO.getCode(),searchDTO.getMerchantId(),searchDTO.getCampusId(),searchDTO.getPageSize(),searchDTO.getPageNo());
+    }
+
+
+
+
+}

rankin-user-service/src/main/java/cn/rankin/userservice/controller/TerminalUserController.java

@@ -45,7 +45,8 @@ import java.util.Map;
 @Slf4j
 @RestController
 @RequestMapping(value = "/user")
-public class TerminalUserController {
+public class TerminalUserController
+{
 
     @Autowired
     private TerminalUserService terminalUserService;
@@ -66,24 +67,31 @@ public class TerminalUserController {
     private TerminalDeviceService terminalDeviceService;
 
     @RequestMapping(value = "/list", method = RequestMethod.GET)
-    public APIResult<Page<TerminalUser>> search(TerminalUserSearchDTO terminalUserSearchDTO) {
+    public APIResult<Page<TerminalUser>> search(TerminalUserSearchDTO terminalUserSearchDTO)
+    {
         TerminalUser terminalUser = new TerminalUser();
 
         String code = terminalUserSearchDTO.getCode();
         String campusId = terminalUserSearchDTO.getCampusId();
-        if (!StringUtils.isEmpty(code)) {
+        if (!StringUtils.isEmpty(code))
+        {
             terminalUser.setCode("%" + code + "%");
-        }else if (!StringUtils.isEmpty(campusId)) {
+        }
+        else if (!StringUtils.isEmpty(campusId))
+        {
             terminalUser.setCampusId(campusId);
         }
 
         String merchantId = terminalUserSearchDTO.getMerchantId();
-        if (!StringUtils.isEmpty(merchantId)) {
+        log.info("merchantId:" + merchantId);
+        if (!StringUtils.isEmpty(merchantId))
+        {
             terminalUser.setMerchantId(merchantId);
         }
 
         BaseStatusEnum status = terminalUserSearchDTO.getStatus();
-        if (status != null) {
+        if (status != null)
+        {
             terminalUser.setStatus(status);
         }
 
@@ -91,7 +99,8 @@ public class TerminalUserController {
         sort.put("gmtModified", BaseOrderEnum.DESC);
 
         APIResult<Page<TerminalUser>> result = terminalUserService.search(terminalUser, terminalUserSearchDTO.getPageNo(), terminalUserSearchDTO.getPageSize(), sort);
-        if (result.getSuccess()) {
+        if (result.getSuccess())
+        {
             List<TerminalUser> terminalUserList = result.getData().getList();
             setUserInfo(terminalUserList);
             setDeciceInfo(terminalUserList);
@@ -102,19 +111,24 @@ public class TerminalUserController {
 
 
     @RequestMapping(method = RequestMethod.GET)
-    public APIResult<List<TerminalUser>> findByCondition(TerminalUserSearchDTO terminalUserSearchDTO) {
+    public APIResult<List<TerminalUser>> findByCondition(TerminalUserSearchDTO terminalUserSearchDTO)
+    {
         TerminalUser terminalUser = new TerminalUser();
 
         String code = terminalUserSearchDTO.getCode();
         String campusId = terminalUserSearchDTO.getCampusId();
-        if (!StringUtils.isEmpty(code)) {
+        if (!StringUtils.isEmpty(code))
+        {
             terminalUser.setCode("%" + code + "%");
-        } else if (!StringUtils.isEmpty(campusId)) {
+        }
+        else if (!StringUtils.isEmpty(campusId))
+        {
             terminalUser.setCampusId(campusId);
         }
 
         String merchantId = terminalUserSearchDTO.getMerchantId();
-        if (!StringUtils.isEmpty(merchantId)) {
+        if (!StringUtils.isEmpty(merchantId))
+        {
             terminalUser.setMerchantId(merchantId);
         }
 
@@ -127,12 +141,14 @@ public class TerminalUserController {
     }
 
     @RequestMapping(value = "/auth", method = RequestMethod.POST)
-    public APIResult updateAuth(@RequestBody AuthDTO dto) {
+    public APIResult updateAuth(@RequestBody AuthDTO dto)
+    {
         return remoteAuthProxy.saveOrUpdateAuth(dto);
     }
 
     @RequestMapping(value = "/auth/list", method = RequestMethod.GET)
-    public Page<TerminalUserAuthVo> findAuthListByCondition(TerminalUserSearchDTO terminalUserSearchDTO) {
+    public Page<TerminalUserAuthVo> findAuthListByCondition(TerminalUserSearchDTO terminalUserSearchDTO)
+    {
         Page<TerminalUserAuthVo> pageResult = new Page<>();
         pageResult.setPageNo(terminalUserSearchDTO.getPageNo());
         pageResult.setPageSize(terminalUserSearchDTO.getPageSize());
@@ -143,72 +159,109 @@ public class TerminalUserController {
         AuthQueryDTO authQueryDTO = new AuthQueryDTO();
         authQueryDTO.setPageNo(terminalUserSearchDTO.getPageNo());
         authQueryDTO.setPageSize(terminalUserSearchDTO.getPageSize());
+        authQueryDTO.setFastExpired(terminalUserSearchDTO.getFastExpired());
 
 
         TerminalUser terminalUser = new TerminalUser();
         String code = terminalUserSearchDTO.getCode();
-        if (!StringUtils.isEmpty(code)) {
-            log.info("/user/auth/list | request code={}",code);
+        if (!StringUtils.isEmpty(code))
+        {
+            log.info("/user/auth/list | request code={}", code);
             terminalUser.setCode(code);
         }
+
+        String merchantId = terminalUserSearchDTO.getMerchantId();
+        if (!StringUtils.isEmpty(merchantId))
+        {
+            log.info("/user/auth/list | request merchantId={}", merchantId);
+            terminalUser.setMerchantId(merchantId);
+        }
+
+        String campusId = terminalUserSearchDTO.getCampusId();
+        if (!StringUtils.isEmpty(campusId))
+        {
+            log.info("/user/auth/list | request campusId={}", campusId);
+            terminalUser.setCampusId(campusId);
+        }
+
         LinkedHashMap<String, BaseOrderEnum> sort = new LinkedHashMap<>();
         sort.put("gmtModified", BaseOrderEnum.DESC);
 
         List<TerminalUser> terminalUserList = terminalUserService.find(terminalUser, sort);
 
-
-
-        if(CollectionUtils.isEmpty(terminalUserList)){
+        if (CollectionUtils.isEmpty(terminalUserList))
+        {
             log.info("terminalUserList is empty!");
             return pageResult;
-        }else if(terminalUserList.size() == 1){
+        }
+        else if (terminalUserList.size() == 1)
+        {
             //查询到唯一用户时，设置资源库查询条件 | 其他情况默认查询全部
             TerminalUser user = terminalUserList.get(0);
             authQueryDTO.setUid(user.getId());
         }
+        else
+        {
+            String uids = "";
+            for (TerminalUser obj : terminalUserList)
+            {
+                uids += obj.getId()+"#";
+            }
+            uids = uids.substring(0,uids.length()-1);
+            authQueryDTO.setUids(uids);
+        }
 
         Page<AuthVo> authPage = remoteAuthProxy.findAuthList(authQueryDTO);
 
         List<AuthVo> authList = authPage.getList();
-        if(CollectionUtils.isEmpty(authList)){
+        if (CollectionUtils.isEmpty(authList))
+        {
             log.info("authList is empty!");
             return pageResult;
         }
 
+
         Map<String, TerminalUser> terminalUserMap = ListUtil.convert(terminalUserList, "id", TerminalUser.class);
 
-        authList.forEach(authVo -> {
+        authList.forEach(authVo ->
+        {
             TerminalUser termianlUser = terminalUserMap.get(authVo.getUid());
-            TerminalUserAuthVo vo = Converter.getTerminalUserAuthVo(termianlUser,authVo);
-            terminalUserAuthVos.add(vo);
+            if (termianlUser != null)
+            {
+                TerminalUserAuthVo vo = Converter.getTerminalUserAuthVo(termianlUser, authVo);
+                terminalUserAuthVos.add(vo);
+            }
         });
 
         //设置分页数据
-        pageResult.setTotalSize((int)authPage.getTotalSize());
+        pageResult.setTotalSize((int) authPage.getTotalSize());
         pageResult.setList(terminalUserAuthVos);
 
         return pageResult;
     }
 
 
-
     @Transactional
     @RequestMapping(method = RequestMethod.POST)
-    public APIResult<TerminalUser> create(HttpServletRequest request, @RequestBody @Valid TerminalUserDTO terminalUserDTO) {
+    public APIResult<TerminalUser> create(HttpServletRequest request, @RequestBody @Valid TerminalUserDTO terminalUserDTO)
+    {
         String campusId = terminalUserDTO.getCampusId();
-        if (StringUtils.isEmpty(campusId)) {
+        if (StringUtils.isEmpty(campusId))
+        {
             return APIResult.error(UserServiceAPICode.PARAMETER_ERROR);
         }
 
         Campus campus = campusService.findOne(campusId);
-        if (campus == null) {
+        if (campus == null)
+        {
             return APIResult.error(UserServiceAPICode.NOT_EXISTS);
         }
 
         String merchantId = campus.getMerchantId();
         Merchant merchant = merchantService.findOne(merchantId);
 
-        if (merchant == null) {
+        if (merchant == null)
+        {
             return APIResult.error(UserServiceAPICode.NOT_EXISTS);
         }
 
@@ -223,17 +276,21 @@ public class TerminalUserController {
 
         // 设置名字
         String name = terminalUserDTO.getName();
-        if (StringUtils.isEmpty(name)) {
+        if (StringUtils.isEmpty(name))
+        {
             terminalUserDTO.setName(StudentNumberUtil.toChinese(serialNo, "教室"));
         }
 
         // 远程注册
         String password = terminalUserDTO.getPassword();
         APIResult<RemoteUser> remoteUserAPIResult = remoteUserProxy.register(code, password, HttpUtil.getClientIp(request), "0");
-        if (!remoteUserAPIResult.getSuccess()) {
+        if (!remoteUserAPIResult.getSuccess())
+        {
             log.error(JSON.toJSONString(remoteUserAPIResult));
             return APIResult.error(UserServiceAPICode.REMOTE_USER_REGISTER_ERROR);
-        }else {
+        }
+        else
+        {
             // 设置资源中心id为本地用户id
             RemoteUser remoteUser = remoteUserAPIResult.getData();
             terminalUserDTO.setId(remoteUser.getUid());
@@ -241,7 +298,8 @@ public class TerminalUserController {
 
         // 存储数据库
         APIResult<TerminalUser> result = terminalUserService.create(terminalUserDTO);
-        if (!result.getSuccess()) {
+        if (!result.getSuccess())
+        {
             return result;
         }
 
@@ -252,30 +310,37 @@ public class TerminalUserController {
     }
 
     @RequestMapping(method = RequestMethod.PUT)
-    public APIResult<TerminalUser> update(HttpServletRequest request, @RequestBody TerminalUserDTO terminalUserDTO) {
+    public APIResult<TerminalUser> update(HttpServletRequest request, @RequestBody TerminalUserDTO terminalUserDTO)
+    {
         String id = terminalUserDTO.getId();
-        if (StringUtils.isEmpty(id)) {
+        if (StringUtils.isEmpty(id))
+        {
             return APIResult.error(UserServiceAPICode.PARAMETER_ERROR);
         }
 
         TerminalUser terminalUser = terminalUserService.find(id);
-        if (terminalUser == null) {
+        if (terminalUser == null)
+        {
             return APIResult.error(UserServiceAPICode.NOT_EXISTS);
         }
 
         String newPassword = terminalUserDTO.getPassword();
-        if (!StringUtils.isEmpty(newPassword)) {
+        if (!StringUtils.isEmpty(newPassword))
+        {
             String prePassword = terminalUser.getPassword();
-            if (!prePassword.equals(newPassword)) {
+            if (!prePassword.equals(newPassword))
+            {
                 APIResult result = remoteUserProxy.changePassword(terminalUser, newPassword, HttpUtil.getClientIp(request), "0");
-                if (!result.getSuccess()) {
+                if (!result.getSuccess())
+                {
                     return result;
                 }
             }
         }
 
         APIResult<TerminalUser> result = terminalUserService.update(terminalUserDTO);
-        if (result.getSuccess()) {
+        if (result.getSuccess())
+        {
             setUserInfo(result.getData());
         }
 
@@ -283,9 +348,11 @@ public class TerminalUserController {
     }
 
     @RequestMapping(value = "/{id}", method = RequestMethod.GET)
-    public APIResult<TerminalUser> getUser(@PathVariable("id") String id) {
+    public APIResult<TerminalUser> getUser(@PathVariable("id") String id)
+    {
         TerminalUser terminalUser = terminalUserService.find(id);
-        if (terminalUser == null) {
+        if (terminalUser == null)
+        {
             return APIResult.error(UserServiceAPICode.NOT_EXISTS);
         }
 
@@ -294,9 +361,11 @@ public class TerminalUserController {
     }
 
     @RequestMapping(value = "/code/{code}", method = RequestMethod.GET)
-    public APIResult<TerminalUser> loadUser(@PathVariable("code") String code) {
+    public APIResult<TerminalUser> loadUser(@PathVariable("code") String code)
+    {
         TerminalUser terminalUser = terminalUserService.loadUserByCode(code);
-        if (terminalUser == null) {
+        if (terminalUser == null)
+        {
             return APIResult.error(UserServiceAPICode.NOT_EXISTS);
         }
 
@@ -305,14 +374,16 @@ public class TerminalUserController {
     }
 
     @RequestMapping(value = "/campus/ids", method = RequestMethod.GET)
-    public APIResult<List<TerminalUser>> findByCampusIds(@RequestParam("id") List<String> campusIds) {
+    public APIResult<List<TerminalUser>> findByCampusIds(@RequestParam("id") List<String> campusIds)
+    {
         List<TerminalUser> terminalUserList = terminalUserService.findByCampusIds(campusIds);
         setUserInfo(terminalUserList);
         return APIResult.ok(terminalUserList);
     }
 
     @RequestMapping(value = "/ids", method = RequestMethod.GET)
-    public APIResult<List<TerminalUser>> findByIds(@RequestParam("id") List<String> ids) {
+    public APIResult<List<TerminalUser>> findByIds(@RequestParam("id") List<String> ids)
+    {
         List<TerminalUser> terminalUserList = terminalUserService.findByIds(ids);
         setUserInfo(terminalUserList);
         return APIResult.ok(terminalUserList);
@@ -320,17 +391,21 @@ public class TerminalUserController {
 
     // 禁用终端用户
     @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
-    public APIResult<Boolean> delete(@PathVariable("id") String id) {
+    public APIResult<Boolean> delete(@PathVariable("id") String id)
+    {
         return terminalUserService.delete(id);
     }
 
 
-    public static void setUserInfo(TerminalUser terminalUser, Campus campus, Merchant merchant) {
-        if (terminalUser == null) {
+    public static void setUserInfo(TerminalUser terminalUser, Campus campus, Merchant merchant)
+    {
+        if (terminalUser == null)
+        {
             return;
         }
 
-        if (campus != null) {
+        if (campus != null)
+        {
             terminalUser.setContactName(campus.getContactName());
             terminalUser.setMobile(campus.getMobile());
             terminalUser.setCityName(campus.getCityName());
@@ -338,20 +413,24 @@ public class TerminalUserController {
             terminalUser.setProvinceName(ProvinceUtil.get(campus.getProvinceCode()));
         }
 
-        if (merchant != null) {
+        if (merchant != null)
+        {
             terminalUser.setMerchantName(merchant.getName());
             terminalUser.setMerchantContactMobile(merchant.getMobile());
             terminalUser.setMerchantContactName(merchant.getContactName());
         }
     }
 
-    public void setUserInfo(TerminalUser terminalUser) {
-        if (terminalUser == null) {
+    public void setUserInfo(TerminalUser terminalUser)
+    {
+        if (terminalUser == null)
+        {
             return;
         }
 
         Campus campus = campusService.findOne(terminalUser.getCampusId());
-        if (campus != null) {
+        if (campus != null)
+        {
             terminalUser.setContactName(campus.getContactName());
             terminalUser.setMobile(campus.getMobile());
             terminalUser.setCityName(campus.getCityName());
@@ -360,7 +439,8 @@ public class TerminalUserController {
         }
 
         Merchant merchant = merchantService.findOne(campus.getMerchantId());
-        if (merchant != null) {
+        if (merchant != null)
+        {
             terminalUser.setMerchantSimple(merchant.getSimple());
             terminalUser.setMerchantName(merchant.getName());
             terminalUser.setMerchantContactMobile(merchant.getMobile());
@@ -368,15 +448,18 @@ public class TerminalUserController {
         }
     }
 
-    public void setUserInfo(List<TerminalUser> terminalUserList) {
-        if (CollectionUtils.isEmpty(terminalUserList)) {
+    public void setUserInfo(List<TerminalUser> terminalUserList)
+    {
+        if (CollectionUtils.isEmpty(terminalUserList))
+        {
             return;
         }
 
         List<String> campusIdList = new ArrayList<>();
         List<String> merchantIdList = new ArrayList<>();
 
-        terminalUserList.forEach(terminalUser -> {
+        terminalUserList.forEach(terminalUser ->
+        {
             campusIdList.add(terminalUser.getCampusId());
             merchantIdList.add(terminalUser.getMerchantId());
         });
@@ -384,9 +467,11 @@ public class TerminalUserController {
         Map<String, Campus> campusMap = campusService.getCampusMap(campusIdList);
         Map<String, Merchant> merchantMap = merchantService.getMerchantMap(merchantIdList);
 
-        for (TerminalUser terminalUser : terminalUserList) {
+        for (TerminalUser terminalUser : terminalUserList)
+        {
             Campus campus = campusMap.get(terminalUser.getCampusId());
-            if (campus != null) {
+            if (campus != null)
+            {
                 terminalUser.setContactName(campus.getContactName());
                 terminalUser.setMobile(campus.getMobile());
                 terminalUser.setCityName(campus.getCityName());
@@ -396,7 +481,8 @@ public class TerminalUserController {
             }
 
             Merchant merchant = merchantMap.get(terminalUser.getMerchantId());
-            if (merchant != null) {
+            if (merchant != null)
+            {
                 terminalUser.setMerchantName(merchant.getName());
                 terminalUser.setMerchantContactMobile(merchant.getMobile());
                 terminalUser.setMerchantContactName(merchant.getContactName());
@@ -406,25 +492,30 @@ public class TerminalUserController {
 
     /**
      * 设置绑定设备信息
+     *
      * @param terminalUserList
      */
-    private void setDeciceInfo(List<TerminalUser> terminalUserList) {
-        if (CollectionUtils.isEmpty(terminalUserList)) {
+    private void setDeciceInfo(List<TerminalUser> terminalUserList)
+    {
+        if (CollectionUtils.isEmpty(terminalUserList))
+        {
             return;
         }
 
-        terminalUserList.forEach(terminalUser ->{
+        terminalUserList.forEach(terminalUser ->
+        {
             TerminalDevice terminalDevice = terminalDeviceService.findByUserId(terminalUser.getId());
-            if(null != terminalDevice){
+            if (null != terminalDevice)
+            {
                 //1  已绑定设备
                 terminalUser.setDeviceStatus(1);
-            }else{
+            }
+            else
+            {
                 terminalUser.setDeviceStatus(0);
             }
         });
     }
 
 
-
-
 }

rankin-user-service/src/main/java/cn/rankin/userservice/controller/UserDeviceController.java

@@ -1,7 +1,9 @@
 package cn.rankin.userservice.controller;
 
+import cn.rankin.common.utils.api.model.APIResult;
 import cn.rankin.data.api.user.dto.UserDeviceDTO;
 import cn.rankin.data.api.user.entity.UserDevice;
+import cn.rankin.data.api.user.vo.DeviceModelVo;
 import cn.rankin.userservice.helper.RaStringHelper;
 import cn.rankin.userservice.service.UserDeviceService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -50,4 +52,10 @@ public class UserDeviceController
         return userDeviceService.findByUserId(uid);
     }
 
+    @RequestMapping(value = "/model/list", method = RequestMethod.GET)
+    public APIResult<List<DeviceModelVo>> searchDeviceModel(@RequestParam("deviceModel") String deviceModel) {
+        APIResult<List<DeviceModelVo>> apiResult = userDeviceService.searchDeviceModel(deviceModel);
+        return apiResult;
+    }
+
 }

rankin-user-service/src/main/java/cn/rankin/userservice/repository/DownloadInfoRepository.java

@@ -11,7 +11,7 @@ import java.util.List;
 
 public interface DownloadInfoRepository extends BasicJpaRepository<DownloadInfo, String> {
 
-    @Query(value = "select info from DownloadInfo info where info.userId = ?1 AND info.mac = ?2 AND info.eventType= ?3 AND info.status = ?4 ORDER BY info.gmtCreated DESC ")
+    @Query(value = "select info from DownloadInfo info where info.userId = ?1 AND info.mac = ?2 AND info.eventType= ?3 AND info.status = ?4 ORDER BY info.gmtModified DESC ")
     List<DownloadInfo> findByUserId(String uid, String mac, EventTypeEnum eventType, BaseStatusEnum status);
 
     @Query(value = "select info from DownloadInfo info where info.userId = ?1 AND info.lessonId = ?2 AND info.mac = ?3 AND info.eventType = ?4  AND info.status = ?5 ORDER BY info.gmtCreated DESC ")

rankin-user-service/src/main/java/cn/rankin/userservice/repository/LocationInfoRepository.java

@@ -0,0 +1,8 @@
+package cn.rankin.userservice.repository;
+
+import cn.rankin.common.utils.jpa.BasicJpaRepository;
+import cn.rankin.data.api.user.entity.LocationInfo;
+
+public interface LocationInfoRepository extends BasicJpaRepository<LocationInfo, String> {
+
+}

rankin-user-service/src/main/java/cn/rankin/userservice/repository/MerchantPermitDeviceRepository.java

@@ -0,0 +1,21 @@
+package cn.rankin.userservice.repository;
+
+import cn.rankin.common.utils.enums.BaseStatusEnum;
+import cn.rankin.common.utils.jpa.BasicJpaRepository;
+import cn.rankin.data.api.user.entity.MerchantPermitDevice;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
+
+
+public interface MerchantPermitDeviceRepository extends BasicJpaRepository<MerchantPermitDevice, String> {
+
+    @Query(value = "select m from MerchantPermitDevice m where m.merchantId = :merchantId AND m.status = :status ")
+    List<MerchantPermitDevice> findByMerchantId(@Param("merchantId")String merchantId, @Param("status") BaseStatusEnum status);
+
+    @Modifying
+    @Query("update MerchantPermitDevice m set m.status = :status where m.id = :id ")
+    Integer updateStatusById(@Param("id") String id, @Param("status") BaseStatusEnum status);
+}

rankin-user-service/src/main/java/cn/rankin/userservice/repository/QRCodeRepository.java

@@ -0,0 +1,16 @@
+package cn.rankin.userservice.repository;
+
+import cn.rankin.common.utils.jpa.BasicJpaRepository;
+import cn.rankin.data.api.user.entity.QRCode;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+
+public interface QRCodeRepository extends BasicJpaRepository<QRCode, String> {
+
+    @Query(value = "select qr.* from u_qrcode qr where qr.eid = ?1 ORDER BY qr.gmt_created DESC limit 1",nativeQuery = true)
+    QRCode findLastOne(String eid);
+
+    @Modifying
+    @Query(value = "update QRCode qr set qr.status = 1 where qr.eid = ?1 and qr.status = 0 ")
+    void updateStatusFail(String eid);
+}

rankin-user-service/src/main/java/cn/rankin/userservice/repository/StmtRepository.java

@@ -0,0 +1,31 @@
+package cn.rankin.userservice.repository;
+
+import cn.rankin.common.utils.jpa.BasicJpaRepository;
+import cn.rankin.data.api.user.entity.UserTag;
+import org.springframework.data.jpa.repository.Query;
+
+import java.util.List;
+
+public interface StmtRepository extends BasicJpaRepository<UserTag, String> {
+
+    /**
+     * 配置用户标签的终端数量
+     * @param merchantId
+     * @param campusId
+     * @return
+     */
+    @Query(value = "SELECT COUNT(1) FROM u_terminal_user tu " +
+            " WHERE tu.id IN ( SELECT tag.uid FROM u_user_tag tag WHERE tag.status = 0 )" +
+            " AND if(?1 !='',tu.code LIKE CONCAT('%',?1,'%'),1=1) " +
+            " AND if(?2 !='',tu.merchant_id=?2,1=1) " +
+            " AND if(?3 !='',tu.campus_id=?3,1=1) ",nativeQuery = true)
+    int userCount(String code, String merchantId, String campusId);
+
+    @Query(value = "SELECT  tu.id  FROM u_terminal_user tu " +
+            " WHERE tu.id IN ( SELECT tag.uid FROM u_user_tag tag WHERE tag.status = 0 ) " +
+            " AND if(?1 !='',tu.code LIKE CONCAT('%',?1,'%'),1=1) " +
+            " AND if(?2 !='',tu.merchant_id=?2,1=1) " +
+            " AND if(?3 !='',tu.campus_id=?3,1=1)  " +
+            " ORDER BY tu.gmt_created DESC LIMIT ?4,?5  ",nativeQuery = true)
+    List<String> uidList(String code, String merchantId, String campusId, long start, Integer pageSize);
+}

rankin-user-service/src/main/java/cn/rankin/userservice/repository/TerminalDeviceRepository.java

@@ -3,6 +3,7 @@ package cn.rankin.userservice.repository;
 import cn.rankin.common.utils.jpa.BasicJpaRepository;
 import cn.rankin.data.api.user.entity.TerminalDevice;
 import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -18,6 +19,7 @@ public interface TerminalDeviceRepository extends BasicJpaRepository<TerminalDev
     TerminalDevice findByDeviceCodeOrUserId(String code, String userId);
 
     @Modifying
+    @Query(value = "delete from TerminalDevice td where td.userId = ?1")
     Integer deleteByUserId(String userId);
 
     @Modifying

rankin-user-service/src/main/java/cn/rankin/userservice/repository/UserDeviceRepository.java

@@ -27,6 +27,13 @@ public interface UserDeviceRepository extends BasicJpaRepository<UserDevice, Str
      * @param userId the id of user
      * @return
      */
-    @Query(value = "select u from  UserDevice  u where u.userId = ?1")
+    @Query(value = "select u from  UserDevice  u where u.userId = ?1 order by u.gmtModified desc")
     List<UserDevice> findByUserId(String userId);
+
+    /**
+     * 查询所有已采集到的设备类型（去除重复）
+     * @return
+     */
+    @Query(value = "select distinct(u.deviceModel) from  UserDevice  u where u.deviceModel LIKE CONCAT('%',?1,'%') order by u.gmtModified desc")
+    List<String> queryDeviceModel(String deviceModel);
 }

rankin-user-service/src/main/java/cn/rankin/userservice/repository/UserTagRepository.java

@@ -30,4 +30,7 @@ public interface UserTagRepository extends BasicJpaRepository<UserTag, String> {
 
     @Query(value = "select t from UserTag t where t.uid = ?1  order by t.sort")
     List<UserTag> findUserTagByUid(String uid);
+
+    @Query(value = "select t from UserTag t where t.uid = ?1 and t.status = ?2 order by t.sort")
+    List<UserTag> findUserTagByUidStatus(String uid,BaseStatusEnum status);
 }

rankin-user-service/src/main/java/cn/rankin/userservice/service/LocationInfoService.java

@@ -0,0 +1,17 @@
+package cn.rankin.userservice.service;
+
+import cn.rankin.data.api.user.entity.LocationInfo;
+import cn.rankin.userservice.repository.LocationInfoRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class LocationInfoService {
+
+    @Autowired
+    private LocationInfoRepository locationInfoRepository;
+
+    public void add(LocationInfo locationInfo) {
+        locationInfoRepository.save(locationInfo);
+    }
+}

rankin-user-service/src/main/java/cn/rankin/userservice/service/MerchantPermitDeviceService.java

@@ -0,0 +1,88 @@
+package cn.rankin.userservice.service;
+
+import cn.rankin.common.utils.api.model.APICode;
+import cn.rankin.common.utils.api.model.APIResult;
+import cn.rankin.common.utils.api.page.Page;
+import cn.rankin.common.utils.enums.BaseOrderEnum;
+import cn.rankin.common.utils.enums.BaseStatusEnum;
+import cn.rankin.common.utils.util.JpaSortUtil;
+import cn.rankin.data.api.user.dto.MerchantPermitDeviceDTO;
+import cn.rankin.data.api.user.entity.MerchantPermitDevice;
+import cn.rankin.userservice.repository.MerchantPermitDeviceRepository;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.transaction.Transactional;
+import java.util.LinkedHashMap;
+import java.util.List;
+
+import static cn.rankin.userservice.utils.DTOConverter.convert;
+
+@Service
+public class MerchantPermitDeviceService
+{
+    @Autowired
+    private MerchantPermitDeviceRepository merchantPermitDeviceRepository;
+
+    public APIResult<MerchantPermitDevice> findByMerchantId(String merchantId){
+        List<MerchantPermitDevice> merchantPermitDevices = merchantPermitDeviceRepository.findByMerchantId(merchantId, BaseStatusEnum.NORMAL);
+        return APIResult.ok(merchantPermitDevices);
+    }
+
+    @Transactional
+    public APIResult<MerchantPermitDevice> create(MerchantPermitDeviceDTO dto) {
+        MerchantPermitDevice entity = convert(dto);
+        MerchantPermitDevice result = merchantPermitDeviceRepository.save(entity);
+
+        if(null == result ){
+            return APIResult.error(APICode.OPERATE_ERROR);
+        }
+
+        return APIResult.ok(result);
+    }
+
+    public APIResult<Page<MerchantPermitDevice>> search(MerchantPermitDevice simple, Integer pageNo, Integer pageSize, LinkedHashMap<String,BaseOrderEnum> sort) {
+        Long count = merchantPermitDeviceRepository.count(simple);
+        Page<MerchantPermitDevice> page = new Page<>(count, pageNo, pageSize);
+
+        if (count == 0) {
+            return APIResult.ok(page);
+        }
+
+        List<MerchantPermitDevice> list = merchantPermitDeviceRepository.find(simple, page.getStart(), page.getPageSize(), JpaSortUtil.sort(sort));
+        page.setList(list);
+
+        return APIResult.ok(page);
+    }
+
+    @Transactional
+    public APIResult<MerchantPermitDevice> update(MerchantPermitDeviceDTO dto) {
+        MerchantPermitDevice entity = convert(dto);
+        MerchantPermitDevice result = merchantPermitDeviceRepository.update(entity);
+
+        if(null == result ){
+            return APIResult.error(APICode.OPERATE_ERROR);
+        }
+
+        return APIResult.ok(result);
+    }
+
+    @Transactional
+    public APIResult<Boolean> delete(String id) {
+        Integer count = merchantPermitDeviceRepository.updateStatusById(id, BaseStatusEnum.DEL);
+
+        if (count == 0) {
+            return APIResult.error(APICode.NOT_EXISTS);
+        }
+        return APIResult.ok(true);
+    }
+
+    public APIResult<MerchantPermitDevice> getMerchantPermitDevice(String id) {
+        if(StringUtils.isBlank(id)){
+            return APIResult.error(APICode.OPERATE_ERROR);
+        }
+        MerchantPermitDevice result = merchantPermitDeviceRepository.find(id);
+        return APIResult.ok(result);
+    }
+}

rankin-user-service/src/main/java/cn/rankin/userservice/service/QRCodeService.java

@@ -0,0 +1,52 @@
+package cn.rankin.userservice.service;
+
+import cn.rankin.common.utils.util.DateUtil;
+import cn.rankin.data.api.user.dto.QRCodeDTO;
+import cn.rankin.data.api.user.entity.QRCode;
+import cn.rankin.userservice.repository.QRCodeRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.transaction.Transactional;
+import java.util.Date;
+
+import static cn.rankin.userservice.utils.DTOConverter.convert;
+
+@Service
+public class QRCodeService {
+
+    @Autowired
+    private QRCodeRepository qrcodeRepository;
+
+    public QRCode add(QRCodeDTO dto) {
+        QRCode qrcode = convert(dto);
+        return qrcodeRepository.save(qrcode);
+    }
+
+    public QRCode findLastOne(String eid) {
+        QRCode qrCode = qrcodeRepository.findLastOne(eid);
+        if(null != qrCode ){
+            Date now = new Date();
+            Date time = DateUtil.getAfterIntervalMInDate(qrCode.getTime(), 1);
+            if(now.getTime() > time.getTime()){
+                qrCode.setStatus(1); //已失效|过期
+                qrcodeRepository.update(qrCode);
+            }
+            return qrCode;
+        }
+        return qrCode;
+    }
+
+    public QRCode findFirst(QRCode simple) {
+        return qrcodeRepository.findFirst(simple);
+    }
+
+    public void update(QRCode qrcode) {
+        qrcodeRepository.update(qrcode);
+    }
+
+    @Transactional
+    public void updateStatusFail(String eid) {
+        qrcodeRepository.updateStatusFail(eid);
+    }
+}

rankin-user-service/src/main/java/cn/rankin/userservice/service/StmtService.java

@@ -0,0 +1,81 @@
+package cn.rankin.userservice.service;
+
+import cn.rankin.common.utils.api.model.APIResult;
+import cn.rankin.common.utils.api.page.Page;
+import cn.rankin.common.utils.enums.BaseOrderEnum;
+import cn.rankin.common.utils.enums.BaseStatusEnum;
+import cn.rankin.common.utils.util.JpaSortUtil;
+import cn.rankin.data.api.cms.vo.UserTagStmt;
+import cn.rankin.data.api.user.dto.UserTagDTO;
+import cn.rankin.data.api.user.entity.Campus;
+import cn.rankin.data.api.user.entity.TerminalUser;
+import cn.rankin.data.api.user.entity.UserTag;
+import cn.rankin.userservice.repository.CampusRepository;
+import cn.rankin.userservice.repository.StmtRepository;
+import cn.rankin.userservice.repository.TerminalUserRepository;
+import cn.rankin.userservice.repository.UserTagRepository;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+
+import java.util.*;
+
+import static cn.rankin.userservice.utils.DTOConverter.convert;
+
+@Slf4j
+@Service
+public class StmtService {
+
+    @Autowired
+    private StmtRepository stmtRepository;
+
+    @Autowired
+    private TerminalUserRepository terminalUserRepository;
+    @Autowired
+    private CampusRepository campusRepository;
+    @Autowired
+    private UserTagRepository userTagRepository;
+
+
+    public APIResult<Page<UserTagStmt>> userTagStmtPage(String code, String merchantId, String campusId, Integer pageSize, Integer pageNo) {
+
+        long count = (long)stmtRepository.userCount(code, merchantId, campusId);
+
+        Page<UserTagStmt> page = new Page(count, pageNo, pageSize);
+        if (count == 0) {
+            return APIResult.ok(page);
+        }
+
+        List<String> uids = stmtRepository.uidList(code, merchantId, campusId, page.getStart() , page.getPageSize());
+
+        List<UserTagStmt> data = new ArrayList<>();
+        uids.forEach(uid -> {
+            TerminalUser terminalUser = terminalUserRepository.find(uid);
+            if(null != terminalUser){
+                UserTagStmt stmt = new UserTagStmt();
+                stmt.setUCode(terminalUser.getCode());
+                stmt.setUid(uid);
+                stmt.setUName(terminalUser.getName());
+                Campus campus = campusRepository.find(terminalUser.getCampusId());
+                if(null != campus){
+                    stmt.setCName(campus.getName());
+                }
+                List<UserTag> userTags = userTagRepository.findUserTagByUidStatus(uid, BaseStatusEnum.NORMAL);
+                if(!CollectionUtils.isEmpty(userTags)){
+                    List<String> tags = new ArrayList<>();
+                    userTags.forEach(userTag -> {
+                        tags.add(userTag.getName());
+                    });
+                    stmt.setUserTags(tags);
+                    stmt.setUserTagNum(tags.size());
+                }
+                data.add(stmt);
+            }
+        });
+
+        page.setList(data);
+        return APIResult.ok(page);
+    }
+}

rankin-user-service/src/main/java/cn/rankin/userservice/service/TerminalDeviceService.java

@@ -5,6 +5,7 @@ import cn.rankin.data.api.user.dto.TerminalDeviceDTO;
 import cn.rankin.data.api.user.entity.TerminalDevice;
 import cn.rankin.userservice.code.UserServiceAPICode;
 import cn.rankin.userservice.repository.TerminalDeviceRepository;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -12,6 +13,7 @@ import org.springframework.stereotype.Service;
 import javax.transaction.Transactional;
 import java.util.List;
 
+@Slf4j
 @Service
 public class TerminalDeviceService {
 
@@ -32,13 +34,17 @@ public class TerminalDeviceService {
         String terminal = terminalDeviceDTO.getTerminal();
 
         TerminalDevice terminalDevice = terminalDeviceRepository.findByUserId(userId);
+
         if (terminalDevice != null) {
             if(!deviceCode.equals(terminalDevice.getDeviceCode())){
                 //存在设备号不一致，账号被其他设备使用中
                 return APIResult.error(UserServiceAPICode.USER_IS_BOUND);
             }else{
                 //根据设备号，merchant,删除设备绑定记录,后面会重新添加绑定关系
-                deleteTerminalDeviceByDeviceCodeMerchant(deviceCode, merchant);
+                //deleteTerminalDeviceByDeviceCodeMerchant(deviceCode, merchant);
+                //根据设备号，merchant,删除设备绑定记录,后面会重新添加绑定关系
+                log.info("uid=,{}",userId);
+                deleteTerminalDeviceByUid(userId);
                 terminalDeviceBindLogService.insert(deviceCode, merchant, userId, brand, ip, modelNo, terminal+"_del");
             }
         }
@@ -58,6 +64,10 @@ public class TerminalDeviceService {
         return APIResult.ok(deviceBind);
     }
 
+    private void deleteTerminalDeviceByUid(String userId) {
+        terminalDeviceRepository.deleteByUserId(userId);
+    }
+
     private void deleteTerminalDeviceByDeviceCodeMerchant(String deviceCode, String merchant) {
         terminalDeviceRepository.deleteByDeviceCodeAndMerchant(deviceCode, merchant);
         terminalDeviceRepository.deleteByDeviceCodeAndMerchant(deviceCode, null);

rankin-user-service/src/main/java/cn/rankin/userservice/service/UserDeviceService.java

@@ -1,15 +1,17 @@
 package cn.rankin.userservice.service;
 
+import cn.rankin.common.utils.api.model.APIResult;
+import cn.rankin.common.utils.api.page.Page;
+import cn.rankin.common.utils.enums.BaseOrderEnum;
+import cn.rankin.common.utils.util.JpaSortUtil;
 import cn.rankin.data.api.user.dto.UserDeviceDTO;
 import cn.rankin.data.api.user.entity.UserDevice;
-import cn.rankin.data.api.user.vo.UserDeviceVo;
-import cn.rankin.userservice.helper.RaStringHelper;
+import cn.rankin.data.api.user.vo.DeviceModelVo;
 import cn.rankin.userservice.repository.UserDeviceRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 @Service
 public class UserDeviceService
@@ -20,7 +22,6 @@ public class UserDeviceService
     /**
      * Find
      *
-     * @param userDeviceVo
      * @return
      */
     public int opUserDevice(UserDeviceDTO uerDeviceDTO)
@@ -80,4 +81,30 @@ public class UserDeviceService
         return list;
     }
 
+    public APIResult<Page<UserDevice>> search(UserDevice simple, Integer pageNo, Integer pageSize, LinkedHashMap<String,BaseOrderEnum> sort) {
+        Long count = userDeviceRepository.count(simple);
+        Page<UserDevice> page = new Page<>(count, pageNo, pageSize);
+        if (count == 0) {
+            return APIResult.ok(page);
+        }
+
+
+        List<UserDevice> result = userDeviceRepository.find(simple, page.getStart(), page.getPageSize(), JpaSortUtil.sort(sort));
+        page.setList(result);
+
+        return APIResult.ok(page);
+
+    }
+
+    public APIResult<List<DeviceModelVo>> searchDeviceModel(String deviceModel) {
+        List<String> models = userDeviceRepository.queryDeviceModel(deviceModel);
+        List<DeviceModelVo> deviceModels = new ArrayList<>();
+        models.forEach(model -> {
+            DeviceModelVo vo = new DeviceModelVo();
+            vo.setDeviceModel(model);
+            deviceModels.add(vo);
+        });
+
+        return APIResult.ok(deviceModels);
+    }
 }

rankin-user-service/src/main/java/cn/rankin/userservice/utils/Converter.java

@@ -26,6 +26,7 @@ public class Converter {
         if(null != termianlUser){
             vo.setUCode(termianlUser.getCode());
             vo.setUName(termianlUser.getName());
+            vo.setCampusId(termianlUser.getCampusId());
         }
 
         return vo;

rankin-user-service/src/main/java/cn/rankin/userservice/utils/DTOConverter.java

@@ -76,4 +76,16 @@ public class DTOConverter {
         BeanUtils.copyProperties(downloadInfoDTO, downloadInfo);
         return downloadInfo;
     }
+
+    public static QRCode convert(QRCodeDTO dto) {
+        QRCode qrcode = new QRCode();
+        BeanUtils.copyProperties(dto, qrcode);
+        return qrcode;
+    }
+
+    public static MerchantPermitDevice convert(MerchantPermitDeviceDTO dto) {
+        MerchantPermitDevice entity = new MerchantPermitDevice();
+        BeanUtils.copyProperties(dto, entity);
+        return entity;
+    }
 }