Merge branch 'develop' of gitlab.beecode.cn:kunlun/xyst_dinas/xyst_dinas_backend into develop

backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/dao/StationDao.java

@@ -25,4 +25,6 @@ public interface StationDao extends BaseDao {
 
     void modify(KObject kobject);
 
+	List<KObject> queryStationByRegionalCompany(UUID uuid);
+
 }

backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/internal/dao/StationDaoImpl.java

@@ -14,6 +14,7 @@ import com.xyst.dinas.biz.dao.StationDao;
 import org.hibernate.criterion.DetachedCriteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
+import org.hibernate.query.Query;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.orm.hibernate5.HibernateTemplate;
 
@@ -185,4 +186,13 @@ public class StationDaoImpl  extends AbstractBaseDao implements StationDao, Stat
         return StationConstant.ENTITY;
     }
 
+	@Override
+	public List<KObject> queryStationByRegionalCompany(UUID id) {
+		return template.execute(session -> {
+            Query<KObject> query = session.createQuery("from " + StationConstant.ENTITY + " where regionalCompany.id=:id ", KObject.class);
+            query.setParameter("id", id);
+            return query.getResultList();
+        });
+	}
+
 }

backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/internal/service/StationServiceImpl.java

 package com.xyst.dinas.biz.internal.service;
 
 import com.beecode.bap.attachment.common.Page;
+import com.beecode.bap.staff.BapContext;
 import com.beecode.bcp.type.KObject;
 import com.xyst.dinas.biz.dao.StationDao;
+import com.xyst.dinas.biz.service.DinasOrganizationService;
 import com.xyst.dinas.biz.service.StationService;
 import org.apache.commons.collections.CollectionUtils;
+import org.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
+import java.util.Map;
 import java.util.UUID;
 
 @Transactional(rollbackFor = Exception.class)
@@ -16,6 +20,12 @@ public class StationServiceImpl implements StationService {
 
 	@Autowired
 	private StationDao stationDao;
+	
+	@Autowired
+	public BapContext bapContext;
+	
+	@Autowired
+	public DinasOrganizationService dinasOrganizationService;
 
     @Override
     public Page<KObject> queryByPaging(Page<KObject> page, Integer stationStatus) throws Exception {
@@ -63,6 +73,18 @@ public class StationServiceImpl implements StationService {
     public void deleteById(UUID id) {
         stationDao.deleteById(id);
     }
+	@Override
+	public List<KObject> queryStationByRegionalCompany() {
+		Map<String, String> map = bapContext.getCurrentUserDatas();
+		String currentRegionalCompany = map.get("currentRegionalCompany");
+		
+		JSONObject obj = new JSONObject(currentRegionalCompany);
+		
+		KObject regionalCompany = dinasOrganizationService.load(UUID.fromString(obj.getString("id")));
+		
+		List<KObject> list = stationDao.queryStationByRegionalCompany(regionalCompany.getUuid("id"));
+		return list;
+	}
 
 
 }

backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/service/StationService.java

@@ -23,4 +23,6 @@ public interface StationService {
     void update(KObject kobject);
 
     void deleteById(UUID id);
+
+	List<KObject> queryStationByRegionalCompany();
 }

backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/web/StationController.java

@@ -14,6 +14,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
 import java.util.UUID;
 
 /**
@@ -151,5 +152,16 @@ public class StationController {
         }
         return ResponseObj.success();
     }
+    
+    /**
+     * 根据当前登录人所在区域公司查询场站
+     * @param id
+     * @return
+     */
+    @GetMapping("/queryStationByRegionalCompany")
+    public Object queryStationByRegionalCompany(){
+        List<KObject> kObjects = stationService.queryStationByRegionalCompany();
+        return ResponseObj.success("success", kObjects);
+    }
 
 }
\ No newline at end of file