From 54696ed7a0e2c0c4e07a17a4f3cca3112c12f7aa Mon Sep 17 00:00:00 2001 From: "bo.yang" Date: Thu, 15 Jul 2021 12:02:59 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E4=BF=AE=E6=AD=A3Ecology=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E5=90=8C=E6=AD=A5=EF=BC=8C=E6=80=A7=E5=88=AB=E6=9C=AA?= =?UTF-8?q?=E8=BD=AC=E6=8D=A2=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/system/service/impl/SysUserServiceImpl.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java index c4f7a7d30..93a8c2d01 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java @@ -559,13 +559,21 @@ public class SysUserServiceImpl implements ISysUserService //同步Ecology部门信息 for(EcologyUser ecologyuser:ecologyUserList){ if(ecologyuser.getSubcompanyid1().equals("1") && StringUtils.isNotEmpty(ecologyuser.getLoginid())) { //只取分部ID为“1”的员工 + String sex=ecologyuser.getSex(); + if(sex.equals("男")){ + sex="0"; + }else if(sex.equals("女")){ + sex="1"; + }else{ + sex="2"; + }; user.setUserId(Long.parseLong(ecologyuser.getId())); user.setDeptId(Long.parseLong(ecologyuser.getDepartmentid())); user.setLoginName(ecologyuser.getLoginid()); user.setUserName(ecologyuser.getLastname()); user.setUserType("02"); user.setEmail(ecologyuser.getEmail()); - user.setSex(ecologyuser.getSex()); + user.setSex(sex); user.setPhonenumber(ecologyuser.getMobile()); user.setStatus(ecologyuser.getStatus().equals("5")?"1":"0"); //Ecology为离职状态5，则无效 user.setDelFlag("0"); From c49935cb6ce641fb25ce7f6a202443769f38e676 Mon Sep 17 00:00:00 2001 From: "bo.yang" Date: Thu, 15 Jul 2021 17:06:41 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../GetEcologyInfoTestController.java | 37 ++++++++----------- ruoyi-system/pom.xml | 4 ++ .../service/impl/SysDeptServiceImpl.java | 29 +++++++++++---- .../service/impl/SysUserServiceImpl.java | 14 +++---- 4 files changed, 48 insertions(+), 36 deletions(-) diff --git a/box-test/src/main/java/com/ruoyi/test/conrtroller/GetEcologyInfoTestController.java b/box-test/src/main/java/com/ruoyi/test/conrtroller/GetEcologyInfoTestController.java index 8952c1a9b..faf741d0d 100644 --- a/box-test/src/main/java/com/ruoyi/test/conrtroller/GetEcologyInfoTestController.java +++ b/box-test/src/main/java/com/ruoyi/test/conrtroller/GetEcologyInfoTestController.java @@ -1,37 +1,30 @@ package com.ruoyi.test.conrtroller; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.entity.SysDept; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.http.HttpUtils; -import com.ruoyi.system.domain.EcologyDept; -import com.ruoyi.system.mapper.SysDeptMapper; +import com.ruoyi.system.service.ISysDeptService; import com.ruoyi.system.service.ISysUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - @RestController public class GetEcologyInfoTestController extends BaseController { @Autowired - private SysDeptMapper deptMapper; + private ISysDeptService deptService; @Autowired private ISysUserService userService; @RequestMapping("/anon/getEcologyDept") public String getEcologyDept() throws Exception { String url="http://192.168.2.85:90/api/hrm/resful/getHrmdepartmentWithPage"; - String params="{\"params\":{\"pagesize\":1000}}"; + String params="{\"params\":{\"pagesize\":999999}}"; //return sendPost(url,params); - return deptSync(HttpUtils.sendPostWithRest(url,params)); + int result = deptService.syncEcologyDept(url,params); + if(result==200){ + return "同步成功"; + } + return "同步失败"; } @@ -46,7 +39,7 @@ public class GetEcologyInfoTestController extends BaseController { return "同步失败"; } - /*public Map sendPostWithRest(String url,String params){ + /* *//*public Map sendPostWithRest(String url,String params){ RestTemplate restTemplate=new RestTemplate(); ResponseEntity result=null; int statusCode=0; @@ -65,7 +58,7 @@ public class GetEcologyInfoTestController extends BaseController { } return map; - }*/ + }*//* public SysDept insertEcologyDept(EcologyDept ecologyDept){ SysDept dept=new SysDept(); @@ -123,10 +116,10 @@ public class GetEcologyInfoTestController extends BaseController { //同步Ecology部门信息 for(EcologyDept ecologyDept:depts){ if(ecologyDept.getSubcompanyid1().equals("1")) { //只取分部ID为“1”的部门，排除代理商 - /* String pAncestors=null; + *//* String pAncestors=null; if(ecologyDept.getSupdepid().equals("0")){ //如果Ecology部门为一级部门，则设定ancestors="0,999999" pAncestors="0,999999"; - }*/ + }*//* SysDept dept= insertEcologyDept(ecologyDept); list.add(dept); } @@ -137,7 +130,7 @@ public class GetEcologyInfoTestController extends BaseController { return result; } - /* public String sendPost(String url,String params) throws Exception { + *//* public String sendPost(String url,String params) throws Exception { RestTemplate restTemplate=new RestTemplate(); ResponseEntity result = null; int statusCode = 0; @@ -158,8 +151,8 @@ public class GetEcologyInfoTestController extends BaseController { return result.getStatusCode().toString(); } +*//* + */ - - } diff --git a/ruoyi-system/pom.xml b/ruoyi-system/pom.xml index 77c2764df..7eb8a88eb 100644 --- a/ruoyi-system/pom.xml +++ b/ruoyi-system/pom.xml @@ -22,6 +22,10 @@ com.ruoyi ruoyi-common + + com.google.code.gson + gson + diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java index 87c650e19..6e0d34157 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java @@ -4,6 +4,8 @@ import java.util.*; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; import com.ruoyi.common.utils.http.HttpUtils; import com.ruoyi.system.domain.EcologyDept; import org.apache.commons.lang3.ArrayUtils; @@ -333,17 +335,30 @@ public class SysDeptServiceImpl implements ISysDeptService { return 0; } + //取Ecology返回信息中的部门信息 Map map = (Map) JSON.parse(result); - Map o= (Map) map.get("data"); - JSONArray json = (JSONArray) o.get("dataList"); - List depts = JSONArray.parseArray(json.toJSONString(), EcologyDept.class); - //清空部门表,并插入顶级部门 - SysDept sysDept=deptMapper.selectDeptById(Long.parseLong("999999")); + Map dataMap= (Map) map.get("data"); + //JSONArray json = (JSONArray) o.get("dataList"); + //List depts = JSONArray.parseArray(json.toJSONString(), EcologyDept.class); + List depts= new Gson().fromJson(dataMap.get("dataList").toString(), new TypeToken>(){}.getType()); + + //清空部门表 deptMapper.truncateDept(); - deptMapper.insertDept(sysDept); - List list=new ArrayList<>(); + + //插入顶级部门 + SysDept topDept= new SysDept();//deptMapper.selectDeptById(Long.parseLong("999999")); + topDept.setDeptId(Long.parseLong("999999")); + topDept.setParentId(Long.parseLong("0")); + topDept.setDeptName("BPS"); + topDept.setAncestors("0"); + topDept.setOrderNum("0"); + topDept.setStatus("0"); + topDept.setCreateBy("Admin"); + deptMapper.insertDept(topDept); + //同步Ecology部门信息 + List list=new ArrayList<>(); for(EcologyDept ecologyDept:depts){ if(ecologyDept.getSubcompanyid1().equals("1")) { //只取分部ID为“1”的部门，排除代理商 SysDept dept= insertEcologyDept(ecologyDept); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java index 93a8c2d01..b1484d2f0 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java @@ -2,6 +2,8 @@ package com.ruoyi.system.service.impl; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; import com.ruoyi.common.annotation.DataScope; import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.core.domain.entity.SysRole; @@ -11,10 +13,7 @@ import com.ruoyi.common.exception.BusinessException; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.http.HttpUtils; import com.ruoyi.common.utils.security.Md5Utils; -import com.ruoyi.system.domain.EcologyUser; -import com.ruoyi.system.domain.SysPost; -import com.ruoyi.system.domain.SysUserPost; -import com.ruoyi.system.domain.SysUserRole; +import com.ruoyi.system.domain.*; import com.ruoyi.system.mapper.*; import com.ruoyi.system.service.ISysConfigService; import com.ruoyi.system.service.ISysUserService; @@ -550,9 +549,10 @@ public class SysUserServiceImpl implements ISysUserService } //取Ecology返回信息中的部门信息 Map map = (Map) JSON.parse(result); - Map o= (Map) map.get("data"); - JSONArray json = (JSONArray) o.get("dataList"); - List ecologyUserList = JSONArray.parseArray(json.toJSONString(), EcologyUser.class); + Map dataMap= (Map) map.get("data"); + /*JSONArray json = (JSONArray) dataMap.get("dataList"); + List ecologyUserList = JSONArray.parseArray(json.toJSONString(), EcologyUser.class);*/ + List ecologyUserList= new Gson().fromJson(dataMap.get("dataList").toString(), new TypeToken>(){}.getType()); userMapper.deleteEcologySyncUser(); SysUser user = new SysUser(); From 396dffefac654405a67ff5ba45154fb7668730c1 Mon Sep 17 00:00:00 2001 From: "bo.yang" Date: Thu, 15 Jul 2021 17:37:55 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E5=BF=AB=E9=80=92=EF=BC=9A=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3=E7=82=B9=E5=87=BB=E9=87=8D=E7=BD=AE=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E5=A4=9A=E9=80=89=E4=B8=8B=E6=8B=89=E6=A1=86=E4=B8=8D=E9=87=8D?= =?UTF-8?q?=E7=BD=AE=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/bps/expsubspushresp/expsubspushresp.html | 6 +++--- .../main/resources/templates/bps/subscribe/subscribe.html | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/box-bps/src/main/resources/templates/bps/expsubspushresp/expsubspushresp.html b/box-bps/src/main/resources/templates/bps/expsubspushresp/expsubspushresp.html index 3326a905b..2c752a129 100644 --- a/box-bps/src/main/resources/templates/bps/expsubspushresp/expsubspushresp.html +++ b/box-bps/src/main/resources/templates/bps/expsubspushresp/expsubspushresp.html @@ -13,14 +13,14 @@
  • -
  • - @@ -28,7 +28,7 @@
  • - diff --git a/box-bps/src/main/resources/templates/bps/subscribe/subscribe.html b/box-bps/src/main/resources/templates/bps/subscribe/subscribe.html index be3e4f9c8..1520a1125 100644 --- a/box-bps/src/main/resources/templates/bps/subscribe/subscribe.html +++ b/box-bps/src/main/resources/templates/bps/subscribe/subscribe.html @@ -13,8 +13,8 @@
    • - - @@ -33,7 +33,7 @@
    • - From cb68414e83a2aeaf3a540eac6ad6b19e6c0fcde5 Mon Sep 17 00:00:00 2001 From: "bo.yang" Date: Thu, 15 Jul 2021 17:42:54 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E5=BF=AB=E9=80=92=EF=BC=9A=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3=E7=82=B9=E5=87=BB=E9=87=8D=E7=BD=AE=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E5=A4=9A=E9=80=89=E4=B8=8B=E6=8B=89=E6=A1=86=E4=B8=8D=E9=87=8D?= =?UTF-8?q?=E7=BD=AE=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/bps/expsubspushresp/expsubspushresp.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/box-bps/src/main/resources/templates/bps/expsubspushresp/expsubspushresp.html b/box-bps/src/main/resources/templates/bps/expsubspushresp/expsubspushresp.html index 2c752a129..a3c79046e 100644 --- a/box-bps/src/main/resources/templates/bps/expsubspushresp/expsubspushresp.html +++ b/box-bps/src/main/resources/templates/bps/expsubspushresp/expsubspushresp.html @@ -12,14 +12,14 @@
      • - +
      • - +
      • - +
        • +
      • + + +
      •  搜索  重置 @@ -41,6 +45,9 @@ 删除 --> + + 导入 + 导出 @@ -66,6 +73,8 @@ updateUrl: prefix + "/edit/{id}", removeUrl: prefix + "/remove", exportUrl: prefix + "/export", + importUrl: prefix + "/importData", + importTemplateUrl: prefix + "/importTemplate", modalName: "快递信息", columns: [{ checkbox: false @@ -75,6 +84,10 @@ field: 'message', title: '消息' },*/ + { + field: 'deliveryNum', + title: '出货单号' + }, { field: 'nu', title: '快递单号' @@ -126,10 +139,32 @@ field: 'result', title: '返回结果' },*/ + { field: 'phone', title: '电话号码' - }/*, + }, + { + field: 'singedTime', + title: '签收时间' + }, + { + field: 'collectTime', + title: '揽收时间' + }, + { + field: 'lastUpdateTime', + title: '最后更新时间' + }, + { + field: 'queryTime', + title: '查询时间' + }, + { + field: 'queryUser', + title: '查询人' + } + /* { title: '操作', align: 'center', @@ -144,5 +179,19 @@ $.table.init(options); }); + + \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java index e8cebe16e..d665df5df 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java @@ -1,7 +1,7 @@ package com.ruoyi.system.service.impl; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; import com.ruoyi.common.annotation.DataScope; import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.core.domain.Ztree; @@ -19,7 +19,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.*; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Map; /** * 部门管理 服务实现 @@ -330,13 +333,13 @@ public class SysDeptServiceImpl implements ISysDeptService } //取Ecology返回信息中的部门信息 - /*Map mapTest = (Map) JSON.parse(mapResult.get("result")); + Map map = (Map) JSON.parse(mapResult.get("result")); Map dataMap= (Map) map.get("data"); - JSONArray json = (JSONArray) o.get("dataList"); - List deptList = JSONArray.parseArray(json.toJSONString(), EcologyDept.class);*/ - Map map = new Gson().fromJson(new Gson().toJson(mapResult.get("result")), HashMap.class); + JSONArray json = (JSONArray) dataMap.get("dataList"); + List deptList = JSONArray.parseArray(json.toJSONString(), EcologyDept.class); + /*Map map = new Gson().fromJson(new Gson().toJson(mapResult.get("result")), HashMap.class); Map dataMap= new Gson().fromJson(new Gson().toJson(map.get("data")),HashMap.class); - List deptList= new Gson().fromJson(new Gson().toJson(dataMap.get("dataList")), new TypeToken>(){}.getType()); + List deptList= new Gson().fromJson(new Gson().toJson(dataMap.get("dataList")), new TypeToken>(){}.getType());*/ //清空部门表 deptMapper.truncateDept(); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java index baa2c5769..6b6cdf99e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java @@ -1,5 +1,7 @@ package com.ruoyi.system.service.impl; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.ruoyi.common.annotation.DataScope; @@ -547,14 +549,14 @@ public class SysUserServiceImpl implements ISysUserService } //取Ecology返回信息中的部门信息 - /*Map map = (Map) JSON.parse(mapResult.get("result")); + Map map = (Map) JSON.parse(mapResult.get("result")); Map dataMap= (Map) map.get("data"); JSONArray json = (JSONArray) dataMap.get("dataList"); - List ecologyUserList = JSONArray.parseArray(json.toJSONString(), EcologyUser.class);*/ - Map map = new Gson().fromJson(new Gson().toJson(mapResult.get("result")), HashMap.class); + List ecologyUserList = JSONArray.parseArray(json.toJSONString(), EcologyUser.class); + /*Map map = new Gson().fromJson(new Gson().toJson(mapResult.get("result")), HashMap.class); Map dataMap= new Gson().fromJson(new Gson().toJson(map.get("data")),HashMap.class); List ecologyUserList= new Gson().fromJson(dataMap.get("dataList").toString(), new TypeToken>(){}.getType()); - + */ //删除从Ecology同步过来（用户类型为02）的用户 userMapper.deleteEcologySyncUser();