Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/xjrsoft/module/assessment/controller/AssessmentPlanAnswerController.java

@@ -56,15 +56,15 @@ public class AssessmentPlanAnswerController {
         return RT.ok(pageOutput);
     }
 
-    @GetMapping(value = "/result-page")
-    @ApiOperation(value="考核计划答题列表-学生端(分页)")
-    @SaCheckPermission("assessmenttemplateplan:detail")
-    public RT<PageOutput<AssessmentPlanAnswerStudentPageVo>> resultPage(@Valid AssessmentPlanAnswerPageDto dto){
-        dto.setStudentUserId(StpUtil.getLoginIdAsLong());
-        Page<AssessmentPlanAnswerStudentPageVo> page = planService.getStudentPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
-        PageOutput<AssessmentPlanAnswerStudentPageVo> pageOutput = ConventPage.getPageOutput(page, AssessmentPlanAnswerStudentPageVo.class);
-        return RT.ok(pageOutput);
-    }
+//    @GetMapping(value = "/result-page")
+//    @ApiOperation(value="考核计划答题列表-学生端(分页)")
+//    @SaCheckPermission("assessmenttemplateplan:detail")
+//    public RT<PageOutput<AssessmentPlanAnswerStudentPageVo>> resultPage(@Valid AssessmentPlanAnswerPageDto dto){
+//        dto.setStudentUserId(StpUtil.getLoginIdAsLong());
+//        Page<AssessmentPlanAnswerStudentPageVo> page = planService.getStudentPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
+//        PageOutput<AssessmentPlanAnswerStudentPageVo> pageOutput = ConventPage.getPageOutput(page, AssessmentPlanAnswerStudentPageVo.class);
+//        return RT.ok(pageOutput);
+//    }
 
     @GetMapping(value = "/teacher-page")
     @ApiOperation(value="考核计划答题列表-教师端(分页)")
@@ -147,7 +147,7 @@ public class AssessmentPlanAnswerController {
 
     @PostMapping(value="send-msg")
     @ApiOperation(value = "推送微信通知")
-    @SaCheckPermission("assessmenttemplateplan:question-result")
+    @SaCheckPermission("assessmenttemplateplan:send-msg")
     public RT<Boolean> questionResult(@RequestParam AssessmentTemplatePlanSureDto dto){
         Boolean sendMsg = planService.sendMsg(dto);
         return RT.ok(sendMsg);

src/main/java/com/xjrsoft/module/assessment/service/impl/AssessmentTemplatePlanServiceImpl.java

@@ -56,6 +56,7 @@ import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
@@ -446,31 +447,25 @@ public class AssessmentTemplatePlanServiceImpl extends MPJBaseServiceImpl<Assess
                 .eq(AssessmentPlanAnswerStudent::getAssessmentTemplatePlanId , dto.getId())
                 .disableSubLogicDel();
         List<XjrUser> userList = xjrUserMapper.selectJoinList(XjrUser.class, queryWrapper);
-
+        AssessmentTemplatePlan templatePlan = templatePlanMapper.selectById(dto.getId());
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy年MM月dd日 HH:mm:ss");
         for (XjrUser user : userList) {
             WeChatSendMessageDto weChatSendMessageDto = new WeChatSendMessageDto();
             weChatSendMessageDto.setUserId(user.getOpenId());
 
-            weChatSendMessageDto.setTemplateId("qmpXORPM1Cocqn503Qa4OkNNQ0uxlj2-ed9m6uWO-v4");
+            weChatSendMessageDto.setTemplateId("ehYfXni7exZUmt6dJX4Ukbm9ETarFfKLfXVYwNnjKMc");
             weChatSendMessageDto.setUrl(StrUtil.format("{}/pages/student/canteen/evaluate?id={}", commonPropertiesConfig.getDomainApp(), dto.getId()));
             weChatSendMessageDto.setMsgId(dto.getId().toString());
-            JSONObject data = new JSONObject();
 
-//            JSONObject data1 = new JSONObject();
-//            String hValue = news.getFullHead().replace("“", "").replace("”", "").replace("\"", "").replace("\n", "").replace("\r", "").replace("\t", "");
-//            data1.put("value", hValue);
-//            data.put("thing23", data1);
-//
-//            JSONObject data2 = new JSONObject();
-//            data2.put("value", (department == null) ? "重庆铜梁职业教育中心" : department.getName());
-//            data.put("thing18", data2);
-//
-//            JSONObject data3 = new JSONObject();
-//            data3.put("value", LocalDateTimeUtil.format(news.getReleaseTime(), "yyyy-MM-dd HH:mm:ss"));
-//            data.put("time17", data3);
-//            weChatSendMessageDto.setContent(data);
+            JSONObject data = new JSONObject();
+            data.put("thing1.DATA", templatePlan.getName());
+            data.put("time2.DATA", sdf.format(templatePlan.getStartTime()));
+            data.put("time3.DATA", sdf.format(templatePlan.getEndTime()));
+            data.put("thing5.DATA", "test");
+            data.put("thing8.DATA", "test");
+            weChatSendMessageDto.setContent(data);
             weChatService.sendTemplateMessage(weChatSendMessageDto);
         }
-        return null;
+        return true;
     }
 }

src/main/java/com/xjrsoft/module/system/controller/MenuController.java

@@ -39,16 +39,7 @@ import com.xjrsoft.module.system.service.IMenuButtonService;
 import com.xjrsoft.module.system.service.IMenuColumnService;
 import com.xjrsoft.module.system.service.IMenuFormService;
 import com.xjrsoft.module.system.service.IMenuService;
-import com.xjrsoft.module.system.vo.AuthMenuVo;
-import com.xjrsoft.module.system.vo.MenuButtonVo;
-import com.xjrsoft.module.system.vo.MenuChildTreeVo;
-import com.xjrsoft.module.system.vo.MenuColumnVo;
-import com.xjrsoft.module.system.vo.MenuFormVo;
-import com.xjrsoft.module.system.vo.MenuListVo;
-import com.xjrsoft.module.system.vo.MenuServeVo;
-import com.xjrsoft.module.system.vo.MenuSimpleTreeVo;
-import com.xjrsoft.module.system.vo.MenuTreeVo;
-import com.xjrsoft.module.system.vo.MenuVo;
+import com.xjrsoft.module.system.vo.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
@@ -135,6 +126,14 @@ public class MenuController {
         return RT.ok(list);
     }
 
+    @GetMapping("/allserve")
+    @ApiOperation(value = "获取全部菜单服务")
+    public RT<List<MenuAllServeVo>> menuAllServe(@Valid MenuTreeDto dto) {
+        List<MenuAllServeVo> list = menuService.getAuthAllMenuServe(dto);
+
+        return RT.ok(list);
+    }
+
     @GetMapping("/all-tree")
     @ApiOperation(value = "获取所有菜单（树结构）")
     public R allMenuTree(@Valid MenuTreeDto dto) {

src/main/java/com/xjrsoft/module/system/service/IMenuService.java

@@ -4,6 +4,7 @@ import com.github.yulichang.base.MPJBaseService;
 import com.xjrsoft.module.system.dto.MenuTreeDto;
 import com.xjrsoft.module.system.dto.RoleMenuServeListDto;
 import com.xjrsoft.module.system.entity.Menu;
+import com.xjrsoft.module.system.vo.MenuAllServeVo;
 import com.xjrsoft.module.system.vo.MenuServeVo;
 import com.xjrsoft.module.system.vo.MenuVo;
 
@@ -23,6 +24,8 @@ public interface IMenuService extends MPJBaseService<Menu> {
 
     List<MenuServeVo> getAuthMenuServe(MenuTreeDto dto);
 
+    List<MenuAllServeVo> getAuthAllMenuServe(MenuTreeDto dto);
+
     List<MenuServeVo> getRoleMenuServe(RoleMenuServeListDto dto);
 
     List<Menu> getUserQuick(MenuTreeDto dto);

src/main/java/com/xjrsoft/module/system/service/impl/MenuServiceImpl.java

@@ -23,17 +23,12 @@ import com.xjrsoft.module.system.mapper.AuthorizeMapper;
 import com.xjrsoft.module.system.mapper.MenuMapper;
 import com.xjrsoft.module.system.mapper.XjrMenuQuickMapper;
 import com.xjrsoft.module.system.service.IMenuService;
-import com.xjrsoft.module.system.vo.MenuListVo;
-import com.xjrsoft.module.system.vo.MenuServeVo;
-import com.xjrsoft.module.system.vo.MenuTreeVo;
-import com.xjrsoft.module.system.vo.MenuVo;
+import com.xjrsoft.module.system.vo.*;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -70,6 +65,35 @@ public class MenuServiceImpl extends MPJBaseServiceImpl<MenuMapper, Menu> implem
         return getSubMenu(menuVos);
     }
 
+    /*
+    获取所有菜单 标记 accessibility
+     */
+    @Override
+    public List<MenuAllServeVo> getAuthAllMenuServe(MenuTreeDto dto) {
+        List<Long> roleIdList = new ArrayList<>();
+        roleIdList.add(1L);
+        List<MenuServeVo> roleMenuList = getSubMenu(getAuthMenuByRoleIds(roleIdList, dto));
+
+        List<MenuServeVo> allMenuList = getSubMenu(getAuthMenuList(dto));
+        Map<Long, MenuServeVo> allMenuMap = allMenuList.stream()
+                .collect(Collectors.toMap(MenuServeVo::getId, Function.identity()));
+
+        List<MenuAllServeVo> result = roleMenuList.stream()
+                .map(menu -> convertToMenuAllServeVo(menu, allMenuMap))
+                .collect(Collectors.toList());
+
+        return result;
+    }
+
+    private MenuAllServeVo convertToMenuAllServeVo(MenuServeVo menu, Map<Long, MenuServeVo> allMenuMap) {
+        MenuAllServeVo menuAllServeVo = new MenuAllServeVo();
+        menuAllServeVo.setId(menu.getId());
+        menuAllServeVo.setName(menu.getName());
+        menuAllServeVo.setMenuVoList(menu.getMenuVoList());
+        menuAllServeVo.setAccessibility(allMenuMap.containsKey(menu.getId()) ? 1 : 0);
+        return menuAllServeVo;
+    }
+
     /**
      * 查询角色菜单服务
      */

src/main/java/com/xjrsoft/module/system/vo/MenuAllServeVo.java

@@ -0,0 +1,21 @@
+package com.xjrsoft.module.system.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class MenuAllServeVo {
+    @ApiModelProperty("主键")
+    private Long id;
+
+    @ApiModelProperty("系统名")
+    private String name;
+
+    @ApiModelProperty("菜单")
+    private List<MenuVo> menuVoList;
+
+    @ApiModelProperty("是否具有权限访问 1:能够访问 0:不能访问")
+    private int accessibility;
+}

src/main/java/com/xjrsoft/module/workflow/service/impl/WorkflowExecuteServiceImpl.java

@@ -345,6 +345,9 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
         if (!taskNodeConfigMap.isPresent()) {
             throw new MyException("找不到当前节点的配置信息！");
         }
+        if(taskNodeConfigMap.get().get("styleType") != null){
+            vo.setStyleType(Integer.parseInt(taskNodeConfigMap.get().get("styleType").toString()));
+        }
 
         UserTaskConfig userTaskConfig = Convert.convert(UserTaskConfig.class, taskNodeConfigMap.get());
 

src/main/resources/application-pre.yml

@@ -108,8 +108,8 @@ xjrsoft:
     secret1: z3R17Od4ROW1zPisguiQmTfx0NvcYKmoIu19-82vdtU
     agentid: 1000003
   mpWeChat:
-    appKey: wx628ac080912b2a98
-    appSecret: f05692a5d71a9568d01a461928dd2b8f
+    appKey: wxfeafb4ef984a4282
+    appSecret: bad871713dd2d9c0bbf8f813eebcacbc
   appletWeChat:
     appKey: wx72e974483a9174e4
     appSecret: 3bbe99f6964c9f4fc11a8aa1224ac4b3