Accept Merge Request #99: (qa -> main)

pom.xml

@@ -102,6 +102,11 @@
             <artifactId>jimureport-nosql-starter</artifactId>
             <version>${jeccg.jimureport.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.jeecgframework.jimureport</groupId>
+            <artifactId>jimubi-spring-boot-starter</artifactId>
+            <version>${jeccg.jimureport.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>

src/main/java/com/link/report/WangxiaoluLinkModuleReportApplication.java

@@ -16,8 +16,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 @EnableCustomConfig
 @Slf4j
 @EnableRyFeignClients
-@MapperScan(value = {"org.jeecg.modules.jmreport.dao","com.link.report.domain.mapper"})
-@SpringBootApplication(scanBasePackages = {"org.jeecg.modules.jmreport", "com.link.report"})
+@MapperScan(value = {"com.link.report.domain.mapper"})
+@SpringBootApplication(scanBasePackages = { "com.link.report","org.jeecg","org.jeecg.modules.drag.dao"})
 public class WangxiaoluLinkModuleReportApplication {
 
     public static void main(String[] args) {

src/main/java/com/link/report/service/impl/JimuReportTokenServiceImpl.java

 package com.link.report.service.impl;
 
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.sfa.common.core.utils.ServletUtils;
 import com.sfa.common.security.service.TokenService;
 import com.sfa.common.security.utils.SecurityUtils;
@@ -58,6 +59,13 @@ public class JimuReportTokenServiceImpl implements JmReportTokenServiceI {
     public String[] getRoles(String s) {
         LoginUser loginUser = tokenService.getLoginUser(s);
         Set<String> roles = loginUser.getRoles();
+        // it可以设计任何报表
+        if (!ObjectUtil.isAllNotEmpty( loginUser.getSysUser(),loginUser.getSysUser().getDept()
+                ,loginUser.getSysUser().getDept().getDeptName()) &&
+                // 信息中心可以编辑所有报表
+                  loginUser.getSysUser().getDept().getDeptName().contains("信息技术中心")) {
+            roles.add("admin");
+        }
         return roles.toArray(new String[0]);
     }
 
@@ -104,10 +112,11 @@ public class JimuReportTokenServiceImpl implements JmReportTokenServiceI {
         //具备admin或者管理员权限才可访问所有报表
         if (SecurityUtils.isAdmin(loginUser.getUserid())
                 || loginUser.getRoles().contains("it")
-                || loginUser.getRoles().contains("manger")) {
-            return "";
+                // 信息中心可以编辑所有报表
+                || loginUser.getSysUser().getDept().getDeptName().contains("信息技术中心")) {
+            return "1";
         }
-        return loginUser.getUsername();
+        return loginUser.getSysUser().getDept().getDeptName();
     }
 
     @Override

src/main/java/com/link/report/service/impl/OnlDragExternalServiceImpl.java

+package com.link.report.service.impl;
+
+import org.jeecg.modules.drag.service.IOnlDragExternalService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class OnlDragExternalServiceImpl implements IOnlDragExternalService {
+
+//    @Autowired
+//    @Lazy
+//    private BaseCommonService baseCommonService;
+//
+//    @Autowired
+//    @Lazy
+//    private ISysBaseAPI sysBaseApi;
+//    /**
+//     *  根据多个字典code查询多个字典项
+//     * @param codeList
+//     * @return key = dictCode ； value=对应的字典项
+//     */
+//    @Override
+//    public Map<String, List<DragDictModel>> getManyDictItems(List<String> codeList, List<JSONObject> tableDictList) {
+//        Map<String, List<DragDictModel>> manyDragDictItems  = new HashMap<>();
+//        if(!CollectionUtils.isEmpty(codeList)){
+//            Map<String, List<DictModel>> dictItemsMap = sysBaseApi.getManyDictItems(codeList);
+//            dictItemsMap.forEach((k,v)->{
+//                List<DragDictModel> dictItems  = new ArrayList<>();
+//                v.forEach(dictItem->{
+//                    DragDictModel dictModel = new DragDictModel();
+//                    BeanUtils.copyProperties(dictItem,dictModel);
+//                    dictItems.add(dictModel);
+//                });
+//                manyDragDictItems.put(k,dictItems);
+//            });
+//        }
+//
+//        if(!CollectionUtils.isEmpty(tableDictList)){
+//            tableDictList.forEach(item->{
+//                List<DragDictModel> dictItems  = new ArrayList<>();
+//                JSONObject object = JSONObject.parseObject(item.toString());
+//                String dictField = object.getString("dictField");
+//                String dictTable = object.getString("dictTable");
+//                String dictText = object.getString("dictText");
+//                String fieldName = object.getString("fieldName");
+//                List<DictModel> dictItemsList = sysBaseApi.queryTableDictItemsByCode(dictTable,dictText,dictField);
+//                dictItemsList.forEach(dictItem->{
+//                    DragDictModel dictModel = new DragDictModel();
+//                    BeanUtils.copyProperties(dictItem,dictModel);
+//                    dictItems.add(dictModel);
+//                });
+//                manyDragDictItems.put(fieldName,dictItems);
+//            });
+//        }
+//        return manyDragDictItems;
+//    }
+//
+//    /**
+//     *
+//     * @param dictCode
+//     * @return
+//     */
+//    @Override
+//    public List<DragDictModel> getDictItems(String dictCode) {
+//        List<DragDictModel> dictItems  = new ArrayList<>();
+//        if(oConvertUtils.isNotEmpty(dictCode)){
+//            List<DictModel> dictItemsList = sysBaseApi.getDictItems(dictCode);
+//            dictItemsList.forEach(dictItem->{
+//                DragDictModel dictModel = new DragDictModel();
+//                BeanUtils.copyProperties(dictItem,dictModel);
+//                dictItems.add(dictModel);
+//            });
+//        }
+//        return dictItems;
+//    }
+//
+//    /**
+//     * 添加日志
+//     * @param dragLogDTO
+//     */
+//    @Override
+//    public void addLog(DragLogDTO dragLogDTO) {
+//        if(oConvertUtils.isNotEmpty(dragLogDTO)){
+//            LogDTO dto = new LogDTO();
+//            BeanUtils.copyProperties(dragLogDTO,dto);
+//            baseCommonService.addLog(dto);
+//        }
+//    }
+//
+//    /**
+//     * 保存日志
+//     * @param logMsg
+//     * @param logType
+//     * @param operateType
+//     */
+//    @Override
+//    public void addLog(String logMsg, int logType, int operateType) {
+//        baseCommonService.addLog(logMsg,logType,operateType);
+//    }
+}