修改配置文件

enterprise-service-manager/src/main/java/com/mortals/xhx/base/login/web/LoginController.java

 package com.mortals.xhx.base.login.web;
 
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.mortals.framework.ap.CookieService;
+import com.mortals.framework.ap.GlobalSysInfo;
+import com.mortals.framework.ap.SysConstains;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.model.PageInfo;
 import com.mortals.framework.service.IAuthTokenService;
 import com.mortals.framework.service.ICacheService;
 import com.mortals.framework.service.IUser;
+import com.mortals.framework.util.AESUtil;
+import com.mortals.framework.util.DateUtils;
+import com.mortals.framework.util.HttpUtil;
+import com.mortals.framework.util.StringUtils;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.menu.model.MenuEntity;
 import com.mortals.xhx.base.system.menu.service.MenuService;
 import com.mortals.xhx.base.system.resource.service.ResourceService;
 import com.mortals.xhx.base.system.user.model.UserEntity;
 import com.mortals.xhx.base.system.user.service.UserService;
+import com.mortals.xhx.base.system.valid.service.ValidCodeService;
 import com.mortals.xhx.common.code.YesNoEnum;
 import com.mortals.xhx.common.key.RedisKey;
 import com.mortals.xhx.common.pdu.user.LoginPdu;
@@ -45,38 +54,86 @@ import static com.mortals.xhx.common.key.ErrorCode.ERROR_TOKEN_EXPIRED_CONTENT;
 @RequestMapping("login")
 public class LoginController extends BaseCRUDJsonBodyMappingController<UserService, UserEntity, Long> implements InitializingBean {
 
+    @Autowired
+    private UserService userService;
+    @Autowired
+    private ValidCodeService validCodeService;
     @Autowired
     private ResourceService resourceService;
     @Autowired
     private MenuService menuService;
+
     @Autowired
     private ICacheService cacheService;
     @Autowired
     private IAuthTokenService authTokenService;
-    @Autowired
-    private IUserFeign userFeign;
-
-    @Autowired
-    private ISiteFeign siteFeign;
-
 
     @RequestMapping("login")
     public String login(@RequestBody LoginForm loginForm) throws Exception {
 
+        JSONObject ret = new JSONObject();
         String loginName = loginForm.getLoginName();
         String password = loginForm.getPassword();
-        LoginPdu loginPdu = new LoginPdu();
-        loginPdu.setLoginName(loginName);
-        loginPdu.setPassword(password);
-        loginPdu.setSecurityCode("admin");
-        String resp = userFeign.portalLogin(loginPdu);
-        return resp;
+
+        String ip = super.getRequestIP(request);
+        if (StringUtils.isEmpty(loginName) || StringUtils.isEmpty(password)) {
+            ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
+            ret.put(KEY_RESULT_MSG, "未获取到用户信息，请重新登录");
+            return ret.toJSONString();
+        }
+        UserEntity userEntity = null;
+        try {
+            loginForm.validate();
+
+            userEntity = userService.doLogin(loginName, password, ip);
+            userEntity.setLastLoginAddress(ip);
+
+            recordSysLog(request, userEntity, "用户登录系统成功!");
+
+
+            List<MenuEntity> treeMenuList = menuService.findTreeMenu(userEntity);
+
+            // 返回拥有的菜单数据
+            Set<String> urls = resourceService.findUrlSetByUserId(userEntity.getId());
+            log.info("userId:{},urls:{}", userEntity.getId(), JSON.toJSONString(urls));
+            String currUserName = userEntity.getRealName();
+            if (currUserName == null || currUserName.trim().length() == 0) {
+                currUserName = "管理员";
+            }
+            JSONObject data = new JSONObject();
+            data.put("currUserName", currUserName);
+            data.put("id", userEntity.getId());
+            data.put("userType", userEntity.getUserType());
+            userEntity.setLoginTime(System.currentTimeMillis());
+            userEntity.setToken(IdUtil.fastSimpleUUID());
+            userEntity.setExpireTime(DateUtils.addCurrDate(7).getTime());
+
+            String token = authTokenService.createToken(userEntity);
+            data.put("token", token);
+            data.put("menuList", treeMenuList);
+
+            ret.put(KEY_RESULT_DATA, data);
+            ret.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
+            ret.put(KEY_RESULT_MSG, "用户登录系统成功!");
+            ret.put("resources", urls);
+            return ret.toJSONString();
+        } catch (Exception e) {
+            log.error("login error ", e);
+            if (userEntity == null) {
+                userEntity = new UserEntity();
+                userEntity.setLoginName(loginName);
+            }
+            ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
+            ret.put(KEY_RESULT_MSG, super.convertException(e));
+            return ret.toJSONString();
+        }
     }
 
     @RequestMapping("logout")
     public void logout(HttpServletRequest request, HttpServletResponse response) throws Exception {
         recordSysLog(request, "退出登录");
         super.removeCurrUser(request);
+        this.deleteBlackCookie(request, response);
     }
 
     @RequestMapping("index")
@@ -109,14 +166,84 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
         ret.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
         ret.put(KEY_RESULT_MSG, "用户登录系统成功!");
         ret.put("resources", urls);
+        return ret.toJSONString();
+    }
+
 
 
+    private String generateMenuUrlCode(Set<String> urls) {
+        try {
+            String securityKey = GlobalSysInfo.getPropertyValue(SysConstains.PROP_COOKIE_SECURITY_KEY);
+            StringBuilder sb = new StringBuilder();
+            if (urls != null && urls.size() > 0) {
+                for (String url : urls) {
+                    int index = url.hashCode() & (Integer.MAX_VALUE - 1);
+                    sb.append(index).append(",");
+                }
+            }
+            String menuUrl = sb.toString();
+            return AESUtil.encrypt(menuUrl, securityKey);
+        } catch (Throwable e) {
+            log.error("编码异常", e);
+            return null;
+
+        }
+    }
+
+    @RequestMapping("validcode")
+    public String validCode(HttpServletRequest request, HttpServletResponse response, LoginForm loginForm) {
+        JSONObject ret = new JSONObject();
+        String loginName = loginForm.getLoginName();
+        String password = loginForm.getPassword();
+        if (StringUtils.isEmpty(loginName) || StringUtils.isEmpty(password)) {
+            ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
+            ret.put(KEY_RESULT_MSG, "登录名或密码为空");
+        }
+        UserEntity user = null;
+        try {
+            user = userService.doCheckUser(loginName, password);
+            if (user == null) {
+                ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
+                ret.put(KEY_RESULT_MSG, "用户名或密码不正确");
+            } else if (StringUtils.isEmpty(user.getMobile())) {
+                ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
+                ret.put(KEY_RESULT_MSG, "用户无正确的手机号");
+            } else {
+                String mobile = StringUtils.trim(user.getMobile());
+                String sessionId = request.getSession().getId();
+                String ip = super.getRequestIP(request);
+                boolean result = validCodeService.createSmsValidCode(sessionId, ip, mobile);
+                if (result) {
+                    ret.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
+                } else {
+                    ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
+                    ret.put(KEY_RESULT_MSG, "验证码发送失败，请稍后在试！");
+                }
+            }
+        } catch (Exception e) {
+            ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
+            ret.put(KEY_RESULT_MSG, "验证码发送失败：" + super.convertException(e));
+        } finally {
+            if (user == null) {
+                user = new UserEntity();
+                user.setLoginName(loginName);
+            }
+            recordSysLog(request, user, "用户获取短信验证码");
+        }
         return ret.toJSONString();
     }
 
+    protected void deleteBlackCookie(HttpServletRequest request, HttpServletResponse response) {
+        try {
+            CookieService.deleteCookieForAuth(request, response);
+        } catch (Throwable e) {
+        }
+    }
+
+
 
     @Override
     public void afterPropertiesSet() throws Exception {
-        log.info("初始化加载登录。。。");
+        log.info("初始化加载单机版登录。。。");
     }
 }

enterprise-service-manager/src/test/java/com/mortals/httpclient/access/AccessController.http

-###登录
-POST {{baseUrl}}/login/login
-Content-Type: application/json
-
-{
-"loginName":"admin",
-"password":"admin",
-"securityCode":"8888"
-}
-
-> {%
-client.global.set("SmsSet_id", JSON.parse(response.body).data.id);
-client.global.set("authToken", JSON.parse(response.body).data.token);
-%}
-
-###区域接入列表
-POST {{baseUrl}}/access/interlist
-Content-Type: application/json
-
-{
-    "orderCols": {"sort": "desc"},
-    "page":1,
-    "size":10
-}
-
-
-###区域接入更新与保存
-POST {{baseUrl}}/access/save
-Authorization: {{authToken}}
-Content-Type: application/json
-
-{
-        "areaName":"puTtsP",
-        "areaCode":"yI3Q50",
-        "bigPath":"5EdNCy",
-        "tag":"Nu6DiD",
-        "sort":0,
-         "accessSystemList":[{
-           "systemName":"7oX31m",
-           "systemCode":"aooVxK",
-           "enabled":0,
-           "accessTime":"1719504000000",
-           "sort":0,
-           "remark":"yIVksS"}],
-           "remark":"IWuGf0"}
-
-> {%
-client.global.set("Access_id", JSON.parse(response.body).data.id);
-%}
-
-###区域接入查看
-GET {{baseUrl}}/access/info?id={{Access_id}}
-Accept: application/json
-
-###区域接入编辑
-GET {{baseUrl}}/access/edit?id={{Access_id}}
-Accept: application/json
-
-
-###区域接入删除
-GET {{baseUrl}}/access/delete?id={{Access_id}}
-Authorization: {{authToken}}
-Accept: application/json
-
-
-
-

enterprise-service-manager/src/test/java/com/mortals/httpclient/access/AccessStatLogController.http

-###登录
-POST {{baseUrl}}/login/login
-Content-Type: application/json
-
-{
-"loginName":"admin",
-"password":"admin",
-"securityCode":"8888"
-}
-
-> {%
-client.global.set("SmsSet_id", JSON.parse(response.body).data.id);
-client.global.set("authToken", JSON.parse(response.body).data.token);
-%}
-
-###统计日志列表
-POST {{baseUrl}}/access/stat/log/list
-Content-Type: application/json
-
-{
-    "page":1,
-    "size":10
-}
-
-
-###统计日志更新与保存
-POST {{baseUrl}}/access/stat/log/save
-Authorization: {{authToken}}
-Content-Type: application/json
-
-{
-        "accessId":"6QOXxd",
-        "siteId":589,
-        "siteCode":"hnPF0D",
-        "siteName":"USMODh",
-        "statStartTime":"1721923200000",
-        "statEndTime":"1721923200000",
-        "duration":0,
-        "type":"全部",
-        "remark":"qYJVAJ",
-}
-
-> {%
-client.global.set("AccessStatLog_id", JSON.parse(response.body).data.id);
-%}
-
-###统计日志查看
-GET {{baseUrl}}/access/stat/log/info?id=1
-
-###统计日志编辑
-GET {{baseUrl}}/access/stat/log/edit?id=1
-Accept: application/json
-
-
-###统计日志删除
-GET {{baseUrl}}/access/stat/log/delete?id=1
-Authorization: {{authToken}}
-Accept: application/json
-
-
-
-

enterprise-service-manager/src/test/java/com/mortals/httpclient/access/AccessSystemController.http

-###登录
-POST {{baseUrl}}/login/login
-Content-Type: application/json
-
-{
-"loginName":"admin",
-"password":"admin",
-"securityCode":"8888"
-}
-
-> {%
-client.global.set("SmsSet_id", JSON.parse(response.body).data.id);
-client.global.set("authToken", JSON.parse(response.body).data.token);
-%}
-
-###区域接入系统列表
-POST {{baseUrl}}/access/system/list
-Content-Type: application/json
-
-{
-    "page":1,
-    "size":10
-}
-
-
-###区域接入系统更新与保存
-POST {{baseUrl}}/access/system/save
-Authorization: {{authToken}}
-Content-Type: application/json
-
-{
-        "accessId":20,
-        "systemName":"7oX31m",
-        "systemCode":"aooVxK",
-        "enabled":0,
-        "accessTime":"1719504000000",
-        "sort":0,
-        "remark":"yIVksS",
-}
-
-> {%
-client.global.set("AccessSystem_id", JSON.parse(response.body).data.id);
-%}
-
-###区域接入系统查看
-GET {{baseUrl}}/access/system/info?id={{AccessSystem_id}}
-Accept: application/json
-
-###区域接入系统编辑
-GET {{baseUrl}}/access/system/edit?id={{AccessSystem_id}}
-Accept: application/json
-
-
-###区域接入系统删除
-GET {{baseUrl}}/access/system/delete?id={{AccessSystem_id}}
-Authorization: {{authToken}}
-Accept: application/json
-
-
-
-

enterprise-service-manager/src/test/java/com/mortals/httpclient/ph/PhQueueController.http

-###登录
-POST {{baseUrl}}/login/login
-Content-Type: application/json
-
-{
-"loginName":"admin",
-"password":"admin",
-"securityCode":"8888"
-}
-
-> {%
-client.global.set("SmsSet_id", JSON.parse(response.body).data.id);
-client.global.set("authToken", JSON.parse(response.body).data.token);
-%}
-
-###排号汇总列表
-POST {{baseUrl}}/ph/queue/interlist
-Content-Type: application/json
-
-{
-    "page":2,
-    "size":10
-}
-
-
-###排号汇总更新与保存
-POST {{baseUrl}}/ph/queue/save
-Content-Type: application/json
-
-{
-        "ordernumber":"123",
-        "style":"未叫号",
-        "business":"医保异地转移",
-        "windowName":"交警窗口",
-        "windowFromnum":"1A11",
-        "flownum":"第xxx号",
-        "formernum":"221",
-        "peopleIdcard":"5101061885411458",
-        "peopleName":"王石",
-        "peopleSex":"男",
-        "peoplePhone":"13808095770",
-        "workmanName":"陈长虹",
-        "workmanNumber":"ZJ001",
-        "taketime":"1716739200000",
-        "calltime":"1716749200000",
-        "endtime":"1716739200000",
-        "waitTime":189,
-        "handleTime":224,
-        "deviceName":"PVq8Ws",
-        "callName":"MHM4hc",
-        "matterName":"RLTHgE",
-        "queueid":"123",
-        "wySignin":"现场取号",
-        "sectionName":"不动产",
-        "hallName":"公安大厅",
-        "deviceType":"排号机",
-        "siteId":1,
-        "siteCode":"511500000000-0001",
-        "siteName":"智慧排队管理服务系统",
-        "extNum":"511500000000-0001-1"
-}
-
-> {%
-client.global.set("PhQueue_id", JSON.parse(response.body).data.id);
-%}
-
-
-
-###排号汇总更新与保存
-POST {{baseUrl}}/ph/queue/batchSave
-Content-Type: application/json
-
-[{
-  "ordernumber":"123",
-  "style":"未叫号",
-  "business":"医保异地转移",
-  "windowName":"交警窗口",
-  "windowFromnum":"1A11",
-  "flownum":"第xxx号",
-  "formernum":"221",
-  "peopleIdcard":"5101061885411458",
-  "peopleName":"王石",
-  "peopleSex":"男",
-  "peoplePhone":"13808095770",
-  "workmanName":"陈长虹",
-  "workmanNumber":"ZJ001",
-  "taketime":"1716739200000",
-  "calltime":"1716749200000",
-  "endtime":"1716739200000",
-  "waitTime":189,
-  "handleTime":224,
-  "deviceName":"PVq8Ws",
-  "callName":"MHM4hc",
-  "matterName":"RLTHgE",
-  "queueid":"123",
-  "wySignin":"现场取号",
-  "sectionName":"不动产",
-  "hallName":"公安大厅",
-  "deviceType":"排号机",
-  "siteId":1,
-  "siteCode":"511500000000-0001",
-  "siteName":"智慧排队管理服务系统",
-  "extNum":"511500000000-0001-2"
-},{
-  "ordernumber":"123",
-  "style":"未叫号",
-  "business":"医保异地转移",
-  "windowName":"交警窗口",
-  "windowFromnum":"1A11",
-  "flownum":"第xxx号",
-  "formernum":"221",
-  "peopleIdcard":"5101061885411458",
-  "peopleName":"王石",
-  "peopleSex":"男",
-  "peoplePhone":"13808095770",
-  "workmanName":"陈长虹",
-  "workmanNumber":"ZJ001",
-  "taketime":"1716739200000",
-  "calltime":"1716749200000",
-  "endtime":"1716739200000",
-  "waitTime":189,
-  "handleTime":224,
-  "deviceName":"PVq8Ws",
-  "callName":"MHM4hc",
-  "matterName":"RLTHgE",
-  "queueid":"123",
-  "wySignin":"现场取号",
-  "sectionName":"不动产",
-  "hallName":"公安大厅",
-  "deviceType":"排号机",
-  "siteId":1,
-  "siteCode":"511500000000-0001",
-  "siteName":"智慧排队管理服务系统",
-  "extNum":"511500000000-0001-3"
-}]
-
-
-###排号汇总查看
-GET {{baseUrl}}/ph/queue/info?id={{PhQueue_id}}
-Accept: application/json
-
-###排号汇总编辑
-GET {{baseUrl}}/ph/queue/edit?id={{PhQueue_id}}
-Accept: application/json
-
-
-###排号汇总删除
-GET {{baseUrl}}/ph/queue/delete?id={{PhQueue_id}}
-Authorization: {{authToken}}
-Accept: application/json
-
-
-
-

enterprise-service-manager/src/test/java/com/mortals/httpclient/ph/PhQueueStatController.http

-###登录
-POST {{baseUrl}}/login/login
-Content-Type: application/json
-
-{
-"loginName":"admin",
-"password":"admin",
-"securityCode":"8888"
-}
-
-> {%
-client.global.set("SmsSet_id", JSON.parse(response.body).data.id);
-client.global.set("authToken", JSON.parse(response.body).data.token);
-%}
-
-###排队叫号汇总统计列表
-POST {{baseUrl}}/ph/queue/stat/interlist
-Content-Type: application/json
-
-{
-  "timeStart": "2024-06-24",
-  "timeEnd": "2024-06-24",
-  "siteId": 1,
-  "businessNotList": [""],
-
-  "groupList": ["year","month","day","business"],
-  "page": 1,
-  "size": 10
-}
-
-###排队叫号汇总统计列表2
-POST {{baseUrl}}/ph/queue/stat/interlist
-Content-Type: application/json
-
-{
-  "timeStart": "2024-06-24",
-  "timeEnd": "2024-06-24",
-  "siteId": 1,
-  "businessList": ["交通违法处理"],
-
-  "sectionNameList": ["市公安局"],
-
-  "groupList": ["year","month","day","business","sectionName"],
-  "page": 1,
-  "size": 10
-}
-
-
-###排队叫号汇总统计列表3
-POST {{baseUrl}}/ph/queue/stat/interlist
-Content-Type: application/json
-
-{
-  "siteId": 1,
-  "month": 6,
-  "year": 2024,
-  "businessList": ["交通违法处理"],
-  "sectionNameList": ["市公安局"],
-
-  "groupList": ["year","month","business","sectionName"],
-  "page": 1,
-  "size": 10
-}
-
-
-###排队叫号汇总统计更新与保存
-POST {{baseUrl}}/ph/queue/stat/save
-Authorization: {{authToken}}
-Content-Type: application/json
-
-{
-        "siteId":0,
-        "siteCode":"k0qhHd",
-        "siteName":"JkrTyE",
-        "business":"oghueH",
-        "sectionName":"TZvj9b",
-        "windowFromnum":"D2bJnu",
-        "pjCount":448,
-        "year":544,
-        "month":191,
-        "day":82,
-}
-
-> {%
-client.global.set("PhQueueStat_id", JSON.parse(response.body).data.id);
-%}
-
-###排队叫号汇总统计查看
-GET {{baseUrl}}/ph/queue/stat/info?id={{PhQueueStat_id}}
-Accept: application/json
-
-###排队叫号汇总统计编辑
-GET {{baseUrl}}/ph/queue/stat/edit?id={{PhQueueStat_id}}
-Accept: application/json
-
-
-###排队叫号汇总统计删除
-GET {{baseUrl}}/ph/queue/stat/delete?id={{PhQueueStat_id}}
-Authorization: {{authToken}}
-Accept: application/json
-
-
-
-

enterprise-service-manager/src/test/java/com/mortals/httpclient/pj/PjEvaluateController.http

-###登录
-POST {{baseUrl}}/login/login
-Content-Type: application/json
-
-{
-"loginName":"admin",
-"password":"admin",
-"securityCode":"8888"
-}
-
-> {%
-client.global.set("SmsSet_id", JSON.parse(response.body).data.id);
-client.global.set("authToken", JSON.parse(response.body).data.token);
-%}
-
-###评价汇总列表
-POST {{baseUrl}}/pj/evaluate/list
-Content-Type: application/json
-
-{
-    "page":1,
-    "size":10
-}
-
-
-###评价汇总更新与保存
-POST {{baseUrl}}/pj/evaluate/save
-Content-Type: application/json
-
-{
-        "peopleIdcard":"bdQuCS",
-        "peopleName":"张三",
-        "peopleSex":"男",
-        "peoplePhone":"13808095770",
-        "pjOption":"非常满意",
-        "contentTag":"aaa",
-        "picUrl":"/xxx/xxx.jpg",
-        "sectionName":"行政审批局",
-        "hallName":"公安大厅",
-        "pjSource":"导视机",
-        "opinion":"工作人员态度好",
-        "windowName":"社保大厅",
-        "windowFromnum":"D21",
-        "flounum":"uukl09",
-        "pjxt":"自助服务终端",
-        "workmanName":"张三",
-        "workmanNumber":"123",
-        "devicenum":"DC-BC-AE-DF",
-        "evaluatestatus":"等待评价",
-        "evaluatetype":"截图",
-        "photobefor":"/xxx/xxx.jpg",
-        "photoautograph":"/xxx/xxx.jpg",
-        "picture":"/xxx/xxx.jpg",
-        "process":"/xxx/xxx.mp4",
-        "eyevaluate":"标记非恶意差评",
-        "pjType":"窗口评价",
-        "pjTime":1716739200000,
-        "siteId":1,
-        "siteCode":"511500000000-0001",
-        "siteName":"智慧排队管理服务系统",
-        "extNum":"511500000000-0001-41"
-}
-
-> {%
-client.global.set("PjEvaluate_id", JSON.parse(response.body).data.id);
-%}
-
-
-
-###评价汇总批量保存
-POST {{baseUrl}}/pj/evaluate/batchSave
-Content-Type: application/json
-
-[{
-  "peopleIdcard":"bdQuCS",
-  "peopleName":"张三",
-  "peopleSex":"男",
-  "peoplePhone":"13808095770",
-  "pjOption":"非常满意",
-  "contentTag":"aaa",
-  "picUrl":"/xxx/xxx.jpg",
-  "sectionName":"行政审批局",
-  "hallName":"公安大厅",
-  "pjSource":"导视机",
-  "opinion":"工作人员态度好",
-  "windowName":"社保大厅",
-  "windowFromnum":"D21",
-  "flounum":"uukl09",
-  "pjxt":"自助服务终端",
-  "workmanName":"张三",
-  "workmanNumber":"123",
-  "devicenum":"DC-BC-AE-DF",
-  "evaluatestatus":"等待评价",
-  "evaluatetype":"截图",
-  "photobefor":"/xxx/xxx.jpg",
-  "photoautograph":"/xxx/xxx.jpg",
-  "picture":"/xxx/xxx.jpg",
-  "process":"/xxx/xxx.mp4",
-  "eyevaluate":"标记非恶意差评",
-  "pjType":"窗口评价",
-  "pjTime":1716739241000,
-  "siteId":1,
-  "siteCode":"511500000000-0001",
-  "siteName":"智慧排队管理服务系统",
-  "extNum":"511500000000-0001-51"
-},
-  {
-    "peopleIdcard":"bdQuCS",
-    "peopleName":"张三",
-    "peopleSex":"男",
-    "peoplePhone":"13808095770",
-    "pjOption":"非常满意",
-    "contentTag":"aaa",
-    "picUrl":"/xxx/xxx.jpg",
-    "sectionName":"行政审批局",
-    "hallName":"公安大厅",
-    "pjSource":"导视机",
-    "opinion":"工作人员态度好",
-    "windowName":"社保大厅",
-    "windowFromnum":"D21",
-    "flounum":"uukl09",
-    "pjxt":"自助服务终端",
-    "workmanName":"张三",
-    "workmanNumber":"123",
-    "devicenum":"DC-BC-AE-DF",
-    "evaluatestatus":"等待评价",
-    "evaluatetype":"截图",
-    "photobefor":"/xxx/xxx.jpg",
-    "photoautograph":"/xxx/xxx.jpg",
-    "picture":"/xxx/xxx.jpg",
-    "process":"/xxx/xxx.mp4",
-    "eyevaluate":"标记非恶意差评",
-    "pjType":"窗口评价",
-    "pjTime":1716739204000,
-    "siteId":1,
-    "siteCode":"511500000000-0001",
-    "siteName":"智慧排队管理服务系统",
-    "extNum":"511500000000-0001-71"
-  }]
-
-###评价汇总查看
-GET {{baseUrl}}/pj/evaluate/info?id={{PjEvaluate_id}}
-Accept: application/json
-
-###评价汇总编辑
-GET {{baseUrl}}/pj/evaluate/edit?id={{PjEvaluate_id}}
-Accept: application/json
-
-
-###评价汇总删除
-GET {{baseUrl}}/pj/evaluate/delete?id={{PjEvaluate_id}}
-Authorization: {{authToken}}
-Accept: application/json
-
-
-
-

enterprise-service-manager/src/test/java/com/mortals/httpclient/pj/PjEvaluateStatController.http

-###登录
-POST {{baseUrl}}/login/login
-Content-Type: application/json
-
-{
-"loginName":"admin",
-"password":"admin",
-"securityCode":"8888"
-}
-
-> {%
-client.global.set("SmsSet_id", JSON.parse(response.body).data.id);
-client.global.set("authToken", JSON.parse(response.body).data.token);
-%}
-
-###评价汇总统计列表
-POST {{baseUrl}}/pj/evaluate/stat/interlist
-Content-Type: application/json
-
-{
-  "timeStart": "2024-07-01",
-  "timeEnd": "2024-07-15",
-  "pjOptionNotList": [""],
-  "groupList": ["year","month","day","pjOption"],
-  "page": 1,
-  "size": 10
-}
-
-
-###评价汇总统计更新与保存
-POST {{baseUrl}}/pj/evaluate/stat/save
-Authorization: {{authToken}}
-Content-Type: application/json
-
-{
-        "siteId":0,
-        "siteCode":"Q8lhs4",
-        "siteName":"vxsdQP",
-        "sectionName":"PMhvwe",
-        "pjOption":"eeSBbZ",
-        "windowFromnum":"t4cnTV",
-        "pjCount":657,
-        "year":545,
-        "month":368,
-        "day":323,
-}
-
-> {%
-client.global.set("PjEvaluateStat_id", JSON.parse(response.body).data.id);
-%}
-
-###评价汇总统计查看
-GET {{baseUrl}}/pj/evaluate/stat/info?id={{PjEvaluateStat_id}}
-Accept: application/json
-
-###评价汇总统计编辑
-GET {{baseUrl}}/pj/evaluate/stat/edit?id={{PjEvaluateStat_id}}
-Accept: application/json
-
-
-###评价汇总统计删除
-GET {{baseUrl}}/pj/evaluate/stat/delete?id={{PjEvaluateStat_id}}
-Authorization: {{authToken}}
-Accept: application/json
-
-
-
-

enterprise-service-manager/src/test/java/com/mortals/httpclient/system.http

@@ -5,7 +5,8 @@ Content-Type: application/json
 
 {
   "loginName":"admin",
-  "password":"admin"
+  "password":"xhxADMIN8@a",
+  "securityCode":"admin"
 }
 
 > {%
@@ -52,63 +53,6 @@ Content-Type: application/json
 {"affairCode":"abcd1234ddddd"}
 
 
-###评价
-POST {{baseUrl}}/pj/evaluate/stat/stat
-Content-Type: application/json
-
-{
-  "pjTimeStart": "2024-07-01",
-  "pjTimeEnd": "2024-07-29"
-}
-
-###排队
-POST {{baseUrl}}/ph/queue/stat/stat
-Content-Type: application/json
-
-{
-  "taketimeStart": "2024-07-01",
-  "taketimeEnd": "2024-07-29"
-}
-
-
-###所有
-POST {{baseUrl}}/stat/stat
-Content-Type: application/json
-
-{
-  "createTimeStart": "2024-07-01",
-  "createTimeEnd": "2024-07-29"
-}
-
-###所有
-POST {{baseUrl}}/stat/stat
-Content-Type: application/json
-
-{
-  "createTimeStart": "2024-07-01",
-  "createTimeEnd": "2024-06-61",
-  "accessId": 17
-}
-
-###所有
-POST {{baseUrl}}/access/stat
-Content-Type: application/json
-
-{
-  "accessTimeStart": "2023-01-01",
-  "accessTimeEnd": "2024-08-22"
-}
-
-
-###针对某一接入
-POST {{baseUrl}}/access/stat
-Content-Type: application/json
-
-{
-  "accessTimeStart": "2023-01-01",
-  "accessTimeEnd": "2024-08-22",
-  "id": 17
-}
 
 
 ###针对某一接入