Forráskód Böngészése

企业列表权限控制

ZhangWenQiang 4 éve
szülő
commit
4178ef687f

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 558 - 550
happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlgcompany/controller/HlgCompanyController.java


+ 4 - 3
happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlgcompany/service/IHlgCompanyService.java

@@ -8,19 +8,20 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.hlgcompany.entity.HlgCompanySubcontractor;
 import org.jeecg.modules.hlgcompany.entity.HlgCompanyUploadContract;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**
  * @Description: hlg_company
  * @Author: jeecg-boot
- * @Date:   2020-02-17
+ * @Date: 2020-02-17
  * @Version: V1.0
  */
 public interface IHlgCompanyService extends IService<HlgCompany> {
 
     void saveCompany(HlgCompany hlgCompany);
 
-    Page<HlgCompany> pageList(Integer pageNo, Integer pageSize, HlgCompany hlgCompany);
+    Page<HlgCompany> pageList(Integer pageNo, Integer pageSize, HlgCompany hlgCompany, HttpServletRequest req);
 
     void lockCompany(HlgCompany hlgCompany);
 
@@ -38,7 +39,7 @@ public interface IHlgCompanyService extends IService<HlgCompany> {
 
     Result<HlgCompany> updateCompanyPay(HlgCompany hlgCompany);
 
-    Boolean getIsExistenceDateByCompanyCode(String companyCode,Integer pageNo,Integer pageSize);
+    Boolean getIsExistenceDateByCompanyCode(String companyCode, Integer pageNo, Integer pageSize);
 
     String saveCompanySubcontractor(HlgCompanySubcontractor hlgCompanySubcontractor);
 

+ 39 - 25
happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlgcompany/service/impl/HlgCompanyServiceImpl.java

@@ -37,6 +37,7 @@ import org.jeecg.modules.system.entity.SysUser;
 import org.jeecg.modules.system.service.ISysDepartService;
 import org.jeecg.modules.system.service.ISysUserService;
 import org.jeecg.modules.system.service.impl.SysDepartServiceImpl;
+import org.jeecg.modules.util.RoleDataUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -44,6 +45,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
 import java.util.*;
 
@@ -73,14 +75,20 @@ public class HlgCompanyServiceImpl extends ServiceImpl<HlgCompanyMapper, HlgComp
 
     /**
      * 去慧盈查询企业列表
+     *
      * @param pageNo
      * @param pageSize
      * @param hlgCompany
      * @return
      */
     @Override
-    public Page<HlgCompany> pageList(Integer pageNo, Integer pageSize, HlgCompany hlgCompany) {
+    public Page<HlgCompany> pageList(Integer pageNo, Integer pageSize, HlgCompany hlgCompany, HttpServletRequest request) {
         Page<HlgCompany> page = new Page<HlgCompany>();
+        //获取请求路由路径
+        String routeUrl = request.getServletPath();
+        //获取当前登录用户
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        List<String> companyCodeList = RoleDataUtils.findCompanyCodeList(sysUser.getUsername(), routeUrl, sysUser.getOrgCode());
         //慧盈查询用户列表
         String accessToken = OauthTokenUtils.getDayAccessToken();
         String requestUrl = OauthApi.companyList;
@@ -93,6 +101,7 @@ public class HlgCompanyServiceImpl extends ServiceImpl<HlgCompanyMapper, HlgComp
         parameters.put("cityCode", hlgCompany.getCityCode());
         parameters.put("countryCode", hlgCompany.getCountryCode());
         parameters.put("companySubcontractorStatus", hlgCompany.getCompanySubcontractorStatus());
+        parameters.put("companyCodeList", companyCodeList);
         //数据加密
         String biz_content = CryptTool.encode(JSONObject.toJSONString(parameters));
         JSONObject jsonObject = OauthTokenUtils.doRequest(requestUrl, HttpsContants.POST, biz_content, accessToken);
@@ -101,11 +110,11 @@ public class HlgCompanyServiceImpl extends ServiceImpl<HlgCompanyMapper, HlgComp
             if (jsonObject.getBoolean(HttpsContants.SUCCESS_FLAG)) {
                 log.info("企业列表===={}", jsonObject);
                 JSONObject jsonObject1 = jsonObject.getJSONObject("result");
-                List<Map<String, Object>> list = ( List<Map<String, Object>>) jsonObject1.get("records");
+                List<Map<String, Object>> list = (List<Map<String, Object>>) jsonObject1.get("records");
                 log.info("企业列表==={}", list);
-                List<HlgCompany> list1=new ArrayList();
-                for (int i = 0; i <list.size() ; i++) {
-                    HlgCompany hlgCompany1=baseMapper.getByCompanyCode((String)list.get(i).get("companyCode"));
+                List<HlgCompany> list1 = new ArrayList();
+                for (int i = 0; i < list.size(); i++) {
+                    HlgCompany hlgCompany1 = baseMapper.getByCompanyCode((String) list.get(i).get("companyCode"));
                     hlgCompany1.setCompanySubcontractorStatus((Integer) list.get(i).get("companySubcontractorStatus"));
                     list1.add(hlgCompany1);
                 }
@@ -482,11 +491,12 @@ public class HlgCompanyServiceImpl extends ServiceImpl<HlgCompanyMapper, HlgComp
 
     /**
      * 从慧盈获取是否存在业务数据(即是否存在企业服务商)
+     *
      * @param companyCode
      * @return
      */
     @Override
-    public Boolean getIsExistenceDateByCompanyCode(String companyCode,Integer pageNo,Integer pageSize) {
+    public Boolean getIsExistenceDateByCompanyCode(String companyCode, Integer pageNo, Integer pageSize) {
         String accessToken = OauthTokenUtils.getDayAccessToken();
         String requestUrl = OauthApi.companySubcontractorList;
         Map<String, Object> parameters = new HashMap<>();
@@ -501,9 +511,9 @@ public class HlgCompanyServiceImpl extends ServiceImpl<HlgCompanyMapper, HlgComp
         if (jsonObject != null) {
             if (jsonObject.getBoolean("success")) {
                 log.info("企业-获取服务商列表===={}", jsonObject);
-               JSONObject jsonObject1=jsonObject.getJSONObject("result");
-               List<Object>  list= (List<Object>) jsonObject1.get("records");
-               return list.size()>0;
+                JSONObject jsonObject1 = jsonObject.getJSONObject("result");
+                List<Object> list = (List<Object>) jsonObject1.get("records");
+                return list.size() > 0;
             } else {
                 //抛出异常
                 throw new JeecgBootException("未查询到该companyCode的企业数据");
@@ -515,12 +525,13 @@ public class HlgCompanyServiceImpl extends ServiceImpl<HlgCompanyMapper, HlgComp
 
     /**
      * 服务商新增
+     *
      * @param hlgCompanySubcontractor
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
     public String saveCompanySubcontractor(HlgCompanySubcontractor hlgCompanySubcontractor) {
-        HlgCompany hlgCompany=getById(hlgCompanySubcontractor.getCompanyId());
+        HlgCompany hlgCompany = getById(hlgCompanySubcontractor.getCompanyId());
         String accessToken = OauthTokenUtils.getDayAccessToken();
         String requestUrl = OauthApi.companySubcontractorAdd;
         Map<String, Object> parameters = new HashMap<>();
@@ -541,10 +552,10 @@ public class HlgCompanyServiceImpl extends ServiceImpl<HlgCompanyMapper, HlgComp
         if (jsonObject != null) {
             if (jsonObject.getBoolean("success")) {
                 log.info("企业-服务商新增===={}", jsonObject);
-                String msg=jsonObject.getString("message");
+                String msg = jsonObject.getString("message");
                 return msg;
             } else {
-                String msg=jsonObject.getString("message");
+                String msg = jsonObject.getString("message");
                 //抛出异常
                 throw new JeecgBootException(msg);
             }
@@ -555,12 +566,13 @@ public class HlgCompanyServiceImpl extends ServiceImpl<HlgCompanyMapper, HlgComp
 
     /**
      * 企业服务商编辑
+     *
      * @param hlgCompanySubcontractor
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
     public String companySubcontractoredit(HlgCompanySubcontractor hlgCompanySubcontractor) {
-        HlgCompany hlgCompany=getById(hlgCompanySubcontractor.getCompanyId());
+        HlgCompany hlgCompany = getById(hlgCompanySubcontractor.getCompanyId());
         String accessToken = OauthTokenUtils.getDayAccessToken();
         String requestUrl = OauthApi.companySubcontractoredit;
         Map<String, Object> parameters = new HashMap<>();
@@ -579,10 +591,10 @@ public class HlgCompanyServiceImpl extends ServiceImpl<HlgCompanyMapper, HlgComp
         if (jsonObject != null) {
             if (jsonObject.getBoolean("success")) {
                 log.info("企业-服务商编辑===={}", jsonObject);
-                String msg=jsonObject.getString("message");
+                String msg = jsonObject.getString("message");
                 return msg;
             } else {
-                String msg=jsonObject.getString("message");
+                String msg = jsonObject.getString("message");
                 //抛出异常
                 throw new JeecgBootException(msg);
             }
@@ -593,13 +605,14 @@ public class HlgCompanyServiceImpl extends ServiceImpl<HlgCompanyMapper, HlgComp
 
     /**
      * 企业服务商停用启用
+     *
      * @param hlgCompanySubcontractor
      * @return
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
     public String companySubcontractorLock(HlgCompanySubcontractor hlgCompanySubcontractor) {
-        HlgCompany hlgCompany=getById(hlgCompanySubcontractor.getCompanyId());
+        HlgCompany hlgCompany = getById(hlgCompanySubcontractor.getCompanyId());
         String accessToken = OauthTokenUtils.getDayAccessToken();
         String requestUrl = OauthApi.companySubcontractorLock;
         Map<String, Object> parameters = new HashMap<>();
@@ -617,10 +630,10 @@ public class HlgCompanyServiceImpl extends ServiceImpl<HlgCompanyMapper, HlgComp
         if (jsonObject != null) {
             if (jsonObject.getBoolean("success")) {
                 log.info("企业服务商停用启用===={}", jsonObject);
-                String msg=jsonObject.getString("message");
+                String msg = jsonObject.getString("message");
                 return msg;
             } else {
-                String msg=jsonObject.getString("message");
+                String msg = jsonObject.getString("message");
                 //抛出异常
                 throw new JeecgBootException(msg);
             }
@@ -630,16 +643,16 @@ public class HlgCompanyServiceImpl extends ServiceImpl<HlgCompanyMapper, HlgComp
     }
 
 
-
     /**
      * 企业服务商删除
+     *
      * @param hlgCompanySubcontractor
      * @return
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
     public String companySubcontractorDelete(HlgCompanySubcontractor hlgCompanySubcontractor) {
-        HlgCompany hlgCompany=getById(hlgCompanySubcontractor.getCompanyId());
+        HlgCompany hlgCompany = getById(hlgCompanySubcontractor.getCompanyId());
         String accessToken = OauthTokenUtils.getDayAccessToken();
         String requestUrl = OauthApi.companySubcontractorDelete;
         Map<String, Object> parameters = new HashMap<>();
@@ -656,10 +669,10 @@ public class HlgCompanyServiceImpl extends ServiceImpl<HlgCompanyMapper, HlgComp
         if (jsonObject != null) {
             if (jsonObject.getBoolean("success")) {
                 log.info("企业服务商删除===={}", jsonObject);
-                String msg=jsonObject.getString("message");
+                String msg = jsonObject.getString("message");
                 return msg;
             } else {
-                String msg=jsonObject.getString("message");
+                String msg = jsonObject.getString("message");
                 //抛出异常
                 throw new JeecgBootException(msg);
             }
@@ -670,13 +683,14 @@ public class HlgCompanyServiceImpl extends ServiceImpl<HlgCompanyMapper, HlgComp
 
     /**
      * 企业服务商上传合同
+     *
      * @param hlgCompanyUploadContract
      * @return
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
     public String companyUploadContract(HlgCompanyUploadContract hlgCompanyUploadContract) {
-        HlgCompany hlgCompany=getById(hlgCompanyUploadContract.getCompanyId());
+        HlgCompany hlgCompany = getById(hlgCompanyUploadContract.getCompanyId());
         String accessToken = OauthTokenUtils.getDayAccessToken();
         String requestUrl = OauthApi.uploadContract;
         Map<String, Object> parameters = new HashMap<>();
@@ -699,10 +713,10 @@ public class HlgCompanyServiceImpl extends ServiceImpl<HlgCompanyMapper, HlgComp
         if (jsonObject != null) {
             if (jsonObject.getBoolean("success")) {
                 log.info("企业-服务商合同上传===={}", jsonObject);
-                String msg=jsonObject.getString("message");
+                String msg = jsonObject.getString("message");
                 return msg;
             } else {
-                String msg=jsonObject.getString("message");
+                String msg = jsonObject.getString("message");
                 //抛出异常
                 throw new JeecgBootException(msg);
             }