微信

src/main/java/com/jeeplus/modules/sys/web/OfficeController.java

@@ -249,11 +249,11 @@ public class OfficeController extends BaseController {
             t.setIsSon(c.getIsSon());
             officeService.save(t);
             //微信端
-            Integer wxOfficeIdByParentIdService = officeService.findWxOfficeIdByParentIdService(office.getId());
-            String accessToken = AccessTokenUtil.getAccessToken(WeChatParamsUtil.corpId, WeChatParamsUtil.contactsSecret);
-            Integer wxOfficeIdByIdSerice= officeService.findWxOfficeIdByIdSerice(office.getId());
-            WxDepartment wxDepartment = new WxDepartment(wxOfficeIdByIdSerice,office.getName(),wxOfficeIdByParentIdService);
-            AddressDepartment.updateDepartment(accessToken,wxDepartment);
+//            Integer wxOfficeIdByParentIdService = officeService.findWxOfficeIdByParentIdService(office.getId());
+//            String accessToken = AccessTokenUtil.getAccessToken(WeChatParamsUtil.corpId, WeChatParamsUtil.contactsSecret);
+//            Integer wxOfficeIdByIdSerice= officeService.findWxOfficeIdByIdSerice(office.getId());
+//            WxDepartment wxDepartment = new WxDepartment(wxOfficeIdByIdSerice,office.getName(),wxOfficeIdByParentIdService);
+//            AddressDepartment.updateDepartment(accessToken,wxDepartment);
             addMessage(redirectAttributes, "修改成功");
             String id = "0".equals(office.getParentId()) ? "" : office.getParentId();
             return "redirect:" + adminPath + "/sys/office/list";
@@ -262,10 +262,10 @@ public class OfficeController extends BaseController {
             office.setIsSon(c.getIsSon());
             office.setWxOfficeId(wxOfficeIdService);
             officeService.save(office);//保存
-            Integer wxOfficeIdByParentIdService = officeService.findWxOfficeIdByParentIdService(office.getId());
-            String accessToken = AccessTokenUtil.getAccessToken(WeChatParamsUtil.corpId, WeChatParamsUtil.contactsSecret);
-            WxDepartment wxDepartment = new WxDepartment(new Integer(wxOfficeIdService),office.getName(),wxOfficeIdByParentIdService);
-            AddressDepartment.createDepartment(accessToken,wxDepartment);
+//            Integer wxOfficeIdByParentIdService = officeService.findWxOfficeIdByParentIdService(office.getId());
+//            String accessToken = AccessTokenUtil.getAccessToken(WeChatParamsUtil.corpId, WeChatParamsUtil.contactsSecret);
+//            WxDepartment wxDepartment = new WxDepartment(new Integer(wxOfficeIdService),office.getName(),wxOfficeIdByParentIdService);
+//            AddressDepartment.createDepartment(accessToken,wxDepartment);
         }
         String str = "0";
         //如果是添加分公司，则分配相应部门和岗位
@@ -353,9 +353,9 @@ public class OfficeController extends BaseController {
             return "redirect:" + Global.getAdminPath() + "/sys/office/?repage";
         }
         officeService.logicDelete(office);
-        String accessToken = AccessTokenUtil.getAccessToken(WeChatParamsUtil.corpId, WeChatParamsUtil.contactsSecret);
-        Integer wxOfficeIdByIdSerice= officeService.findWxOfficeIdByIdSerice(office.getId());
-        AddressDepartment.deleteDepartment(accessToken,String.valueOf(wxOfficeIdByIdSerice));
+//        String accessToken = AccessTokenUtil.getAccessToken(WeChatParamsUtil.corpId, WeChatParamsUtil.contactsSecret);
+//        Integer wxOfficeIdByIdSerice= officeService.findWxOfficeIdByIdSerice(office.getId());
+//        AddressDepartment.deleteDepartment(accessToken,String.valueOf(wxOfficeIdByIdSerice));
         if(UserUtils.getSelectCompany().getId().equals(office.getId())){
             systemService.removeSession(UserUtils.getUser());
             return "modules/sys/sysLogin";

src/main/java/com/jeeplus/modules/wexinpackage/access/util/access/AddressBookUtil.java

@@ -4,6 +4,7 @@ import com.google.gson.Gson;
 import com.jeeplus.modules.wexinpackage.access.entity.WeChatUser;
 import com.jeeplus.modules.workstaff.entity.WorkStaffBasicInfo;
 import net.sf.json.JSONObject;
+import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

src/main/java/com/jeeplus/modules/wexinpackage/access/web/WeChatCallbackController.java

@@ -37,7 +37,7 @@ public class WeChatCallbackController extends BaseController {
         if ("GET".equals(method)){
             doGet(request,response);
         }else {
-            doPost(request,response);
+//            doPost(request,response);
         }
     }
     private void doGet(HttpServletRequest request, HttpServletResponse response){
@@ -69,7 +69,7 @@ public class WeChatCallbackController extends BaseController {
         String sReqMsgSig = request.getParameter("msg_signature");
         String sReqTimeStamp = request.getParameter("timestamp");
         String sReqNonce = request.getParameter("nonce");
-//        try {
+        try {
             BufferedReader reader = request.getReader();
             char[] buf = new char[512];
             int len = 0;
@@ -85,11 +85,11 @@ public class WeChatCallbackController extends BaseController {
             String sMsg = wxcpt.DecryptMsg(sReqMsgSig, sReqTimeStamp, sReqNonce, content);
             weChatCallbackService.getMapOperation(sMsg,request);
             // 循环所有子元素
-//        } catch (Exception e) {
-//            // TODO
-//            // 解密失败，失败原因请查看异常
-//            e.printStackTrace();
-//        }
+        } catch (Exception e) {
+            // TODO
+            // 解密失败，失败原因请查看异常
+            e.printStackTrace();
+        }
     }
 
 //    public void getSaveUser(List children,HttpServletRequest request){

src/main/java/com/jeeplus/modules/wexintheorder/dao/TheLeadershipDao.java

@@ -9,7 +9,7 @@ import java.util.List;
 
 @MyBatisDao
 public interface TheLeadershipDao extends CrudDao<TheLeadership> {
-    public User findUser(String wechatId);
+    public User findUser(String name);
 
     //增加
     Integer insertLeaderShip(TheLeadership theLeadership);

src/main/java/com/jeeplus/modules/wexintheorder/service/TheLeadershipService.java

@@ -35,8 +35,8 @@ public class TheLeadershipService extends CrudService<TheLeadershipDao, TheLeade
        User
     */
     //查找用户关联信息
-    public User findUser(String weChatId){
-        return theLeadershipDao.findUser(weChatId);
+    public User findUser(String name){
+        return theLeadershipDao.findUser(name);
     }
     //获取部门name
     public String findOffice(String id){

src/main/java/com/jeeplus/modules/wexintheorder/web/TheOrderController.java

@@ -3,11 +3,16 @@ package com.jeeplus.modules.wexintheorder.web;
 import com.jeeplus.common.json.AjaxJson;
 import com.jeeplus.common.web.BaseController;
 import com.jeeplus.modules.sys.entity.User;
+import com.jeeplus.modules.wexinpackage.access.entity.WeChatUser;
+import com.jeeplus.modules.wexinpackage.access.util.access.AccessTokenUtil;
+import com.jeeplus.modules.wexinpackage.access.util.access.AddressBookUtil;
+import com.jeeplus.modules.wexinpackage.access.util.access.WeChatParamsUtil;
 import com.jeeplus.modules.wexintheorder.Utils.OrderUtils;
 import com.jeeplus.modules.wexintheorder.entity.TheLeadership;
 import com.jeeplus.modules.wexintheorder.entity.TheOrder;
 import com.jeeplus.modules.wexintheorder.service.TheLeadershipService;
 import com.jeeplus.modules.wexintheorder.service.TheOrderService;
+import net.sf.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -33,8 +38,10 @@ public class TheOrderController extends BaseController {
     public String getOrderForm(Model model){
         DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
         String userId = "XuShuai";
+        WeChatUser weChatUser = new WeChatUser();
+        weChatUser.setName("张三");
         //回显
-        TheOrder userOrderEcho = getUserOrderEcho(userId);
+        TheOrder userOrderEcho = getUserOrderEcho("张三");
         //验证今天是否预定过餐
         //获取工作日 -- 第二天
         String addOrMinusDayString = OrderUtils.getAddOrMinusDayString(1, dateFormat);
@@ -56,7 +63,11 @@ public class TheOrderController extends BaseController {
                 DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
                 String userId = OrderUtils.findUserId(code);//获取useerid
                 //回显
-                TheOrder userOrderEcho = getUserOrderEcho(userId);
+                //获取acton
+                String accessToken = AccessTokenUtil.getAccessToken(WeChatParamsUtil.corpId, WeChatParamsUtil.contactsSecret);
+                String user = AddressBookUtil.getUser(accessToken, userId);
+                String name = getMaps(user);
+                TheOrder userOrderEcho = getUserOrderEcho(name);
                 //验证今天是否预定过餐
                 //获取工作日 -- 第二天
                 String addOrMinusDayString = OrderUtils.getAddOrMinusDayString(1, dateFormat);
@@ -77,10 +88,10 @@ public class TheOrderController extends BaseController {
     }
 
     //获取部门以及分管领导信息--回显FROM
-    public TheOrder getUserOrderEcho(String weChatUserId){
+    public TheOrder getUserOrderEcho(String name){
         TheOrder theOrder = new TheOrder();
         //查询用户
-        User user = theLeadershipService.findUser(weChatUserId);
+        User user = theLeadershipService.findUser(name);
         String userId = user.getId();//获取用户id
         //获取用户user
         //添加回显对象
@@ -220,4 +231,15 @@ public class TheOrderController extends BaseController {
             theOrder.setSpecific("");
         }
     }
+
+    public String getMaps(String sMsg){
+        String name = "";
+        JSONObject jsonObject = JSONObject.fromObject(sMsg);
+        try {
+            name = jsonObject.getString("name");
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        return name;
+    }
 }

src/main/java/com/jeeplus/modules/workstaff/web/WorkStaffBasicInfoController.java

@@ -261,24 +261,24 @@ public class WorkStaffBasicInfoController extends BaseController {
 			WorkStaffBasicInfo t = workStaffBasicInfoService.get(workStaffBasicInfo.getId());//从数据库取出记录的值
 			MyBeanUtils.copyBeanNotNull2Bean(workStaffBasicInfo, t);//将编辑表单中的非NULL值覆盖数据库记录中的值
 			workStaffBasicInfoService.save(t,request);//保存
-			String officeId = workStaffBasicInfo.getOffice().getId();
-			Integer weChatId = 1;
-			if (null!=officeId){
-				weChatId = weChatCallbackService.findWeChatId(officeId);
-			}
-			String accessToken = AccessTokenUtil. getAccessToken(WeChatParamsUtil.corpId, WeChatParamsUtil.contactsSecret);
-			WeChatUser weChatUser = AddressBookUtil.replaceUser(workStaffBasicInfo,weChatId);
-			AddressBookUtil.updateUser(accessToken,weChatUser);
+//			String officeId = workStaffBasicInfo.getOffice().getId();
+//			Integer weChatId = 1;
+//			if (null!=officeId){
+//				weChatId = weChatCallbackService.findWeChatId(officeId);
+//			}
+//			String accessToken = AccessTokenUtil. getAccessToken(WeChatParamsUtil.corpId, WeChatParamsUtil.contactsSecret);
+//			WeChatUser weChatUser = AddressBookUtil.replaceUser(workStaffBasicInfo,weChatId);
+//			AddressBookUtil.updateUser(accessToken,weChatUser);
 		}else{//新增表单保存
 			workStaffBasicInfoService.save(workStaffBasicInfo,request);//保存
-			String officeId = workStaffBasicInfo.getOffice().getId();
-			Integer weChatId = 1;
-			if (null!=officeId){
-				weChatId = weChatCallbackService.findWeChatId(officeId);
-			}
-			String accessToken = AccessTokenUtil. getAccessToken(WeChatParamsUtil.corpId, WeChatParamsUtil.contactsSecret);
-			WeChatUser weChatUser = AddressBookUtil.replaceUser(workStaffBasicInfo,weChatId);
-			AddressBookUtil.createUser(accessToken,weChatUser);
+//			String officeId = workStaffBasicInfo.getOffice().getId();
+//			Integer weChatId = 1;
+//			if (null!=officeId){
+//				weChatId = weChatCallbackService.findWeChatId(officeId);
+//			}
+//			String accessToken = AccessTokenUtil. getAccessToken(WeChatParamsUtil.corpId, WeChatParamsUtil.contactsSecret);
+//			WeChatUser weChatUser = AddressBookUtil.replaceUser(workStaffBasicInfo,weChatId);
+//			AddressBookUtil.createUser(accessToken,weChatUser);
 		}
 		addMessage(redirectAttributes, "保存员工信息成功");
         if (StringUtils.isNotBlank(workStaffBasicInfo.getHome()) && "home".equals(workStaffBasicInfo.getHome())){
@@ -338,7 +338,7 @@ public class WorkStaffBasicInfoController extends BaseController {
 	@RequestMapping(value = "delete")
 	public String delete(WorkStaffBasicInfo workStaffBasicInfo, RedirectAttributes redirectAttributes) {
 		workStaffBasicInfoService.delete(workStaffBasicInfo);
-		AddressBookUtil.deleteUser(AccessTokenUtil.getAccessToken(WeChatParamsUtil.corpId,WeChatParamsUtil.contactsSecret),workStaffBasicInfo.getNo());
+//		AddressBookUtil.deleteUser(AccessTokenUtil.getAccessToken(WeChatParamsUtil.corpId,WeChatParamsUtil.contactsSecret),workStaffBasicInfo.getNo());
 		addMessage(redirectAttributes, "删除员工信息成功");
 		return "redirect:"+Global.getAdminPath()+"/workstaff/workStaffBasicInfo/?repage";
 	}

src/main/resources/mappings/modules/wexintheorder/TheLeadershipDao.xml

@@ -103,18 +103,20 @@
 	</update>
 
 
-
-	<!-- 根据id查找部门分管领导信息 -->
 	<select id="findUser" resultType="com.jeeplus.modules.sys.entity.User">
-		SELECT
-		<include refid="userColumns"/>
-		FROM sys_user a
-		LEFT JOIN sys_user_office uo ON uo.user_id = a.id AND uo.company_id = #{companyId} AND uo.status = '3' AND uo.del_flag = '0'
-		LEFT JOIN sys_office s ON s.id = uo.company_id
-		LEFT JOIN sys_office o ON o.id = uo.office_id
-		LEFT JOIN sys_office bo ON bo.id = o.branch_office
-		WHERE a.we_chat_id = #{wechatId}
+		SELECT a.id from sys_user a WHERE a.name = #{name}
 	</select>
+	<!-- 根据id查找部门分管领导信息 -->
+	<!--<select id="findUser" resultType="com.jeeplus.modules.sys.entity.User">-->
+		<!--SELECT-->
+		<!--<include refid="userColumns"/>-->
+		<!--FROM sys_user a-->
+		<!--LEFT JOIN sys_user_office uo ON uo.user_id = a.id AND uo.company_id = #{companyId} AND uo.status = '3' AND uo.del_flag = '0'-->
+		<!--LEFT JOIN sys_office s ON s.id = uo.company_id-->
+		<!--LEFT JOIN sys_office o ON o.id = uo.office_id-->
+		<!--LEFT JOIN sys_office bo ON bo.id = o.branch_office-->
+		<!--WHERE a.name = #{name}-->
+	<!--</select>-->
 
 	<select id="findOffice" resultType="java.lang.String">
 		select o.name from sys_office o where id = #{id}