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

backend/build.war/src/main/java/com/beecode/inz/war/SecurityConfig.java

@@ -348,7 +348,7 @@ public class SecurityConfig  {
 			
 			http.addFilterAfter(new INZTenantAuthenticationFilter(), UsernamePasswordAuthenticationFilter.class);
 			
-			http.logout().logoutUrl("/logout")
+			http.logout().logoutUrl("/sand/logout")
 			.addLogoutHandler(logoutHandler).invalidateHttpSession(true)
 			.permitAll();
 		}

backend/inz.authentication/src/main/java/com/beecode/inz/authentication/handler/RESTWarehouseUserAuthenticationSuccessHandler.java

@@ -70,6 +70,7 @@ public class RESTWarehouseUserAuthenticationSuccessHandler extends SimpleUrlAuth
 				returnJson.put(AuthcConstants.MESSAGE, "success");
 				returnJson.put(AuthcConstants.TOKEN, attr.getSessionId());
 				returnJson.put(AuthcConstants.TENANT, tenant);
+				response.setCharacterEncoding("UTF-8");
 				response.getWriter().append(returnJson.toString());
 			}
 		} catch (IOException e) {

backend/inz.basis/src/main/java/com/beecode/inz/basis/context/sand/SandUserContextConstants.java

@@ -5,6 +5,6 @@ public interface SandUserContextConstants {
 	/**
 	 * 当前用户
 	 */
-	public String CURRENT_WAREHOUSE_USER = "currentSandUser";
+	public String CURRENT_USER = "currentSandUser";
 	
 }

backend/inz.basis/src/main/java/com/beecode/inz/basis/context/sand/SandUserContextRepository.java

@@ -34,7 +34,7 @@ public class SandUserContextRepository {
 	@Autowired
 	private ObjectMapper objectMapper;
 	
-	public static final String WAREHOUSE_USER_CONTEXT_KEY = "WAREHOUSE_USER_CONTEXT";
+	public static final String SAND_USER_CONTEXT_KEY = "SAND_USER_CONTEXT";
 
 	protected final Log logger = LogFactory.getLog(this.getClass());
 	
@@ -74,7 +74,7 @@ public class SandUserContextRepository {
 		if (session == null) {
 			return false;
 		}
-		return session.getAttribute(WAREHOUSE_USER_CONTEXT_KEY) != null;
+		return session.getAttribute(SAND_USER_CONTEXT_KEY) != null;
 	}
 	
 	protected SandUserContext generateNewContext(HttpSession httpSession) {
@@ -91,7 +91,7 @@ public class SandUserContextRepository {
 		}
 		SandUser SandUser = null;
 		
-		String SandUserJsonObj = (String)httpSession.getAttribute(SandUserContextConstants.CURRENT_WAREHOUSE_USER);
+		String SandUserJsonObj = (String)httpSession.getAttribute(SandUserContextConstants.CURRENT_USER);
 		if (StringUtils.isEmpty(SandUserJsonObj)) {
 			try {
 				Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
@@ -106,7 +106,7 @@ public class SandUserContextRepository {
 				if(null == SandUser) {
 					throw new RuntimeException("not found SandUser#" + userName);
 				}
-				httpSession.setAttribute(SandUserContextConstants.CURRENT_WAREHOUSE_USER, objectMapper.writeValueAsString(SandUser));
+				httpSession.setAttribute(SandUserContextConstants.CURRENT_USER, objectMapper.writeValueAsString(SandUser));
 				
 			} catch (JsonProcessingException e) {
 				e.printStackTrace();
@@ -116,7 +116,7 @@ public class SandUserContextRepository {
 				SandUser = objectMapper.readValue(SandUserJsonObj, SandUser.class);
 			}catch(Exception e) {
 				e.printStackTrace();
-				httpSession.removeAttribute(SandUserContextConstants.CURRENT_WAREHOUSE_USER);
+				httpSession.removeAttribute(SandUserContextConstants.CURRENT_USER);
 			}
 		}
 		
@@ -180,7 +180,7 @@ public class SandUserContextRepository {
 					// session
 					// SEC-1735 remove if the contextBeforeExecution was not
 					// anonymous
-					httpSession.removeAttribute(WAREHOUSE_USER_CONTEXT_KEY);
+					httpSession.removeAttribute(SAND_USER_CONTEXT_KEY);
 				}
 				return;
 			}
@@ -196,7 +196,7 @@ public class SandUserContextRepository {
 				// We may have a new session, so check also whether the context
 				// attribute
 				// is set SEC-1561
-				if (contextChanged(context) || httpSession.getAttribute(WAREHOUSE_USER_CONTEXT_KEY) == null) {
+				if (contextChanged(context) || httpSession.getAttribute(SAND_USER_CONTEXT_KEY) == null) {
 					// httpSession.setAttribute(customerContextKey, context);
 
 					if (logger.isDebugEnabled()) {

backend/inz.basis/src/main/java/com/beecode/inz/basis/web/InzBasisFunctionTreeController.java

@@ -15,7 +15,7 @@ public class InzBasisFunctionTreeController {
 	@Autowired
 	private InzBasisFunctionTreeService inzBasisFunctionTreeService;
 
-	@RequestMapping(value = "/basis/functionTree/company", method = RequestMethod.GET)
+	@RequestMapping(value = "/sand/basis/functionTree", method = RequestMethod.GET)
 	public Object getFunctionTreeCompany() {
 
 		String functreeName = "com.beecode.inz.portal.functiontree.CompanyFunctionTree";

backend/inz.basis/src/main/java/com/beecode/inz/basis/web/SandUserController.java

@@ -3,9 +3,11 @@ package com.beecode.inz.basis.web;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.beecode.bcp.core.context.AminoContextHolder;
@@ -16,8 +18,6 @@ import com.beecode.inz.basis.pojo.SandUser;
 import com.beecode.inz.basis.pojo.WarehouseUser;
 import com.beecode.inz.basis.service.SandUserService;
 import com.beecode.inz.basis.team.pojo.ResponseObj;
-import com.beecode.inz.basis.util.JsonUtil;
-import com.beecode.xlib.utils.StringUtil;
 
 /**
  * 采砂用户
@@ -66,4 +66,13 @@ public class SandUserController {
 		return ResponseObj.success("操作成功",null);
 	}
 	
+	/**
+	 * 验证状态
+	 * @return
+	 * @throws Exception
+	 */
+	@RequestMapping(value ="/login/status",method = RequestMethod.GET)
+	public String loginState(){
+		return Integer.toString(HttpStatus.OK.value());
+	}
 }

backend/inz.basis/src/main/java/com/beecode/inz/basis/web/WarehouseUserController.java

@@ -42,7 +42,7 @@ public class WarehouseUserController {
 	 * @param obj
 	 * @return
 	 */
-	@PostMapping("/warehouse/user")
+	@PostMapping("/warehouseuser")
 	public Object create(@RequestBody String body) {
 		if(StringUtil.isEmpty(body)) {
 			return ResponseObj.error("参数不能为空");
@@ -151,7 +151,7 @@ public class WarehouseUserController {
 	 * @return
 	 * @throws Exception
 	 */
-	@RequestMapping(value ="/warehouse/login/status",method = RequestMethod.GET)
+	@RequestMapping(value ="/warehouse/user/login/status",method = RequestMethod.GET)
 	public String loginState(){
 		return Integer.toString(HttpStatus.OK.value());
 	}

backend/inz.basis/src/main/resources/com/beecode/inz/portal/functiontree/DefaultFunctionTree.jmx

@@ -1095,7 +1095,7 @@
 						<m:id>bb45f3c7-3866-4e5a-abe7-a292851a44af</m:id>
 						<m:name>warehouse_list</m:name>
 						<m:title>场站管理</m:title>
-						<m:index>5000</m:index>
+						<m:index>1000</m:index>
 						<m:license></m:license>
 						<m:privilege></m:privilege>
 						<m:role></m:role>
@@ -1105,6 +1105,20 @@
 						</m:function-definition>
 						<m:icon>iconfont iconchangzhan1x</m:icon>
 					</m:function-node>
+					<m:function-node>
+						<m:id>5ff510c1-16dd-458d-b5cf-977a0d5b6417</m:id>
+						<m:name>sandstone_type</m:name>
+						<m:title>砂石种类</m:title>
+						<m:index>2000</m:index>
+						<m:license></m:license>
+						<m:privilege></m:privilege>
+						<m:role></m:role>
+						<m:function-definition>
+							<m:view>function-sandstone-type-list</m:view>
+							<m:view-config></m:view-config>
+						</m:function-definition>
+						<m:icon>iconfont iconchangzhan1x</m:icon>
+					</m:function-node>
                     <m:function-node>
 						<m:id>92cb9c48-0adc-4291-b109-90f9fbfec311</m:id>
 						<m:name>company_customer_list</m:name>

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

@@ -24,10 +24,10 @@ public class DinasTypeDaoImpl extends AbstractBaseDao implements DinasTypeDao, D
     @Autowired
     private HibernateTemplate template;
 
-    private String insertOrUpdateDinasTypeStationHql=" inz_kunlun01.xyst_dinas_biz_station_dinas_type " +
+    private String insertOrUpdateDinasTypeStationHql=" xyst_dinas_biz_station_dinas_type " +
             "set station_id = :stationId , dinas_type_id =:dinasTypeId ";
 
-    private String deleteOrSelectDinasTypeStationHql=" from inz_kunlun01.xyst_dinas_biz_station_dinas_type " +
+    private String deleteOrSelectDinasTypeStationHql=" from xyst_dinas_biz_station_dinas_type " +
             "where station_id= :stationId and dinas_type_id=:dinasTypeId";
 
     /**

backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Position$sequence.jmx

 <?xml version="1.0" encoding="UTF-8"?>
 <metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
 	<specification>1.0</specification>
-<<<<<<< HEAD
-	<id>7f76e0b6-30c6-4365-b7a8-ed44b83ac742</id>
-=======
-	<id>2a96eab1-c316-400c-8dfe-73277f5a618e</id>
->>>>>>> e1eeb4e1cecf0ac7f3c02d6be14a7a3c953e6551
+	<id>a5be25d5-3ed4-41d7-93e3-fc35d4b56ace</id>
 	<name>com.xyst.dinas.biz.bill.Position$sequence</name>
 	<title>岗位$sequence</title>
 	<description>岗位</description>

backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Position$serial.jmx

 <?xml version="1.0" encoding="UTF-8"?>
 <metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial">
 	<specification>1.0</specification>
-<<<<<<< HEAD
-	<id>4ab0c98c-a865-4cc5-aa98-65062df17a7e</id>
-=======
-	<id>15a90012-30db-4266-b2dc-f05cac8f5865</id>
->>>>>>> e1eeb4e1cecf0ac7f3c02d6be14a7a3c953e6551
+	<id>805f11cf-2f52-4530-bd82-4dc8c2e9cb23</id>
 	<name>com.xyst.dinas.biz.bill.Position$serial</name>
 	<title>岗位$serial</title>
 	<description>岗位</description>

backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Position.jmx

 <?xml version="1.0" encoding="UTF-8"?>
 <metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
 	<specification>1.0</specification>
-<<<<<<< HEAD
-	<id>33903504-3e8e-48a9-bdc3-05c7197f842c</id>
-=======
-	<id>be913aae-6093-474c-b008-ba25211f107e</id>
->>>>>>> e1eeb4e1cecf0ac7f3c02d6be14a7a3c953e6551
+	<id>bd507082-d5d9-4b82-ae89-e8190d21efb9</id>
 	<name>com.xyst.dinas.biz.bill.Position</name>
 	<title>岗位</title>
 	<description>岗位</description>

backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/BusinessTripApply$sequence.jmx

 <?xml version="1.0" encoding="UTF-8"?>
 <metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
 	<specification>1.0</specification>
-<<<<<<< HEAD
-	<id>e7136a79-9d58-4402-a53c-af0629a9b9a4</id>
-=======
-	<id>61aee674-615d-4458-8f8d-c05110452d33</id>
->>>>>>> e1eeb4e1cecf0ac7f3c02d6be14a7a3c953e6551
+	<id>5ccfe86d-3a09-4096-942c-12f0cf34b2c9</id>
 	<name>com.xyst.dinas.oa.bill.BusinessTripApply$sequence</name>
 	<title>出差申请$sequence</title>
 	<description>出差申请</description>

backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/BusinessTripApply$serial.jmx

 <?xml version="1.0" encoding="UTF-8"?>
 <metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial">
 	<specification>1.0</specification>
-<<<<<<< HEAD
-	<id>55bb1063-d13c-4862-a854-cb60be8239d5</id>
-=======
-	<id>79839413-2bfb-4318-a1eb-e7814f596d32</id>
->>>>>>> e1eeb4e1cecf0ac7f3c02d6be14a7a3c953e6551
+	<id>fa113b4f-9717-463b-b5c7-c39274105c4d</id>
 	<name>com.xyst.dinas.oa.bill.BusinessTripApply$serial</name>
 	<title>出差申请$serial</title>
 	<description>出差申请</description>

backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/BusinessTripApply.jmx

 <?xml version="1.0" encoding="UTF-8"?>
 <metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
 	<specification>1.0</specification>
-<<<<<<< HEAD
-	<id>ec447a08-5c30-4ecc-a85a-f277f50dbc4e</id>
-=======
-	<id>49c6c36a-38a9-46b4-a84b-899535ce796b</id>
->>>>>>> e1eeb4e1cecf0ac7f3c02d6be14a7a3c953e6551
+	<id>34032bde-f86d-42c5-9e54-815d2df4a38d</id>
 	<name>com.xyst.dinas.oa.bill.BusinessTripApply</name>
 	<title>出差申请</title>
 	<description>出差申请</description>

backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/ProtocolDocument$sequence.jmx

 <?xml version="1.0" encoding="UTF-8"?>
 <metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
 	<specification>1.0</specification>
-<<<<<<< HEAD
-	<id>9409d229-d33b-433d-9e26-2633c863fea4</id>
-=======
-	<id>322b4f87-72ba-4d4e-8455-512d61b449e1</id>
->>>>>>> e1eeb4e1cecf0ac7f3c02d6be14a7a3c953e6551
+	<id>5e0ac321-141b-47c7-9ad6-9f79bd4200a4</id>
 	<name>com.xyst.dinas.oa.bill.ProtocolDocument$sequence</name>
 	<title>拟文$sequence</title>
 	<description>拟文</description>

backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/ProtocolDocument$serial.jmx

 <?xml version="1.0" encoding="UTF-8"?>
 <metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial">
 	<specification>1.0</specification>
-<<<<<<< HEAD
-	<id>defcdd02-7707-4a13-a368-5d5d5080ee23</id>
-=======
-	<id>b050fc3f-9e62-4dee-8e53-a1ab61737dde</id>
->>>>>>> e1eeb4e1cecf0ac7f3c02d6be14a7a3c953e6551
+	<id>3244bf79-7b2b-4be1-80c8-1864ce709939</id>
 	<name>com.xyst.dinas.oa.bill.ProtocolDocument$serial</name>
 	<title>拟文$serial</title>
 	<description>拟文</description>

backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/ProtocolDocument.jmx

 <?xml version="1.0" encoding="UTF-8"?>
 <metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
 	<specification>1.0</specification>
-<<<<<<< HEAD
-	<id>c6741756-a59b-448f-ba12-7573d0916500</id>
-=======
-	<id>4c19c3a8-6955-4f7a-aa97-989e22b20ffe</id>
->>>>>>> e1eeb4e1cecf0ac7f3c02d6be14a7a3c953e6551
+	<id>2ccd3fa2-51cc-4547-8e00-4ffc62150a03</id>
 	<name>com.xyst.dinas.oa.bill.ProtocolDocument</name>
 	<title>拟文</title>
 	<description>拟文</description>

backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/SealBorrow$sequence.jmx

 <?xml version="1.0" encoding="UTF-8"?>
 <metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
 	<specification>1.0</specification>
-<<<<<<< HEAD
-	<id>3a4943d0-5867-4e75-bd3a-4383cdbe177e</id>
-=======
-	<id>5a583754-de0c-4884-a37e-613a82e0db8f</id>
->>>>>>> e1eeb4e1cecf0ac7f3c02d6be14a7a3c953e6551
+	<id>6438c802-9eb6-47e2-a6fb-1ff2876ce099</id>
 	<name>com.xyst.dinas.oa.bill.SealBorrow$sequence</name>
 	<title>证章借出$sequence</title>
 	<description>证章借出</description>

backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/SealBorrow$serial.jmx

 <?xml version="1.0" encoding="UTF-8"?>
 <metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial">
 	<specification>1.0</specification>
-<<<<<<< HEAD
-	<id>a05be48f-04b2-4ce4-8479-6b72b61f60ad</id>
-=======
-	<id>9311fb59-73d8-4241-a570-a962f280034f</id>
->>>>>>> e1eeb4e1cecf0ac7f3c02d6be14a7a3c953e6551
+	<id>b132b075-ae72-409a-a55f-22cd9938fbb4</id>
 	<name>com.xyst.dinas.oa.bill.SealBorrow$serial</name>
 	<title>证章借出$serial</title>
 	<description>证章借出</description>

backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/SealBorrow.jmx

 <?xml version="1.0" encoding="UTF-8"?>
 <metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
 	<specification>1.0</specification>
-<<<<<<< HEAD
-	<id>e37cda04-f87d-4654-9f21-584266c2943d</id>
-=======
-	<id>e705d36c-0ca6-46be-9f89-48389d162e3e</id>
->>>>>>> e1eeb4e1cecf0ac7f3c02d6be14a7a3c953e6551
+	<id>bceccd52-bbcf-4a61-a60e-2c623920899f</id>
 	<name>com.xyst.dinas.oa.bill.SealBorrow</name>
 	<title>证章借出</title>
 	<description>证章借出</description>

backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/UseCarApply$sequence.jmx

 <?xml version="1.0" encoding="UTF-8"?>
 <metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
 	<specification>1.0</specification>
-<<<<<<< HEAD
-	<id>c9f4221c-5f56-43d8-bf3f-823fdee8e35a</id>
-=======
-	<id>cf3798f9-c744-4ee5-afe5-52cf07e246cb</id>
->>>>>>> e1eeb4e1cecf0ac7f3c02d6be14a7a3c953e6551
+	<id>2084c1e0-7086-4188-8d8a-e8b996b30ab9</id>
 	<name>com.xyst.dinas.oa.bill.UseCarApply$sequence</name>
 	<title>用车申请$sequence</title>
 	<description>用车申请</description>

backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/UseCarApply$serial.jmx

 <?xml version="1.0" encoding="UTF-8"?>
 <metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial">
 	<specification>1.0</specification>
-<<<<<<< HEAD
-	<id>13edff2f-bc4d-4041-9d09-2881245d1ccd</id>
-=======
-	<id>8087d2fa-7450-4054-961e-01f5cc35b3c9</id>
->>>>>>> e1eeb4e1cecf0ac7f3c02d6be14a7a3c953e6551
+	<id>e7544710-bc86-47e3-a63f-7375222d9e95</id>
 	<name>com.xyst.dinas.oa.bill.UseCarApply$serial</name>
 	<title>用车申请$serial</title>
 	<description>用车申请</description>

backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/UseCarApply.jmx

 <?xml version="1.0" encoding="UTF-8"?>
 <metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
 	<specification>1.0</specification>
-<<<<<<< HEAD
-	<id>4ede1d03-e4a0-4a64-836c-e6e9f8f203a3</id>
-=======
-	<id>6f73f099-8c03-4ee5-80f3-527c0bd4ed37</id>
->>>>>>> e1eeb4e1cecf0ac7f3c02d6be14a7a3c953e6551
+	<id>f313762f-ef57-4810-a6b6-b3e4f45b22d6</id>
 	<name>com.xyst.dinas.oa.bill.UseCarApply</name>
 	<title>用车申请</title>
 	<description>用车申请</description>