Преглед на файлове

添加通讯录默认功能点

zhangqiankun преди 3 години
родител
ревизия
6b4d1cfa24

+ 3 - 0
saas-account/src/main/java/com/persagy/account/config/ApplicationProperties.java

@@ -21,6 +21,9 @@ public class ApplicationProperties {
 	@Value("${saas.system.default-menu-id}")
 	private String defaultMenuId;
 	
+	@Value("${saas.system.default-fun-id}")
+	private String defaultFunId;
+	
 	@Value("${saas.system.default-product-icon}")
 	private String productIcon;
 	

+ 19 - 0
saas-account/src/main/java/com/persagy/account/controller/SaasLoginController.java

@@ -212,6 +212,25 @@ public class SaasLoginController {
      * @throws UnsupportedEncodingException
      */
     @ApiOperation(value = "退出登录")
+    @RequestMapping(value = "saas/logout", method = RequestMethod.POST)
+    public ResponseResult saasLogout(@RequestBody @Validated SaasAccountQueryVO queryVO) throws NumberFormatException, UnsupportedEncodingException {
+    	if (StringUtil.isBlank(queryVO.getAccountId())) {
+			return ResponseResultUtil.errorResult(ResponseCode.A0402.getCode(), "账号ID,不可为空");
+		}
+    	// 从redis中清空此账号的sign信息
+    	boolean remove = this.bouncycastleCipher.remove(queryVO.getAccountId());
+    	return remove ? ResponseResultUtil.successResult("退出成功") : ResponseResultUtil.errorResult("退出失败");
+    }
+    
+    /**
+     * 退出登录,清空token,因为网关以确保token值必须于此账号,这里直接清空
+     * 
+     * @param queryVO
+     * @return
+     * @throws NumberFormatException
+     * @throws UnsupportedEncodingException
+     */
+    @ApiOperation(value = "退出登录")
     @RequestMapping(value = "account/logout", method = RequestMethod.POST)
     public ResponseResult accountLogout(@RequestBody @Validated SaasAccountQueryVO queryVO) throws NumberFormatException, UnsupportedEncodingException {
     	if (StringUtil.isBlank(queryVO.getAccountId())) {

+ 3 - 0
saas-account/src/main/java/com/persagy/account/pojo/dto/SaasProject.java

@@ -83,6 +83,9 @@ public class SaasProject extends BaseEntity<SaasProject> {
 	@TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
 	private String latitude;		//项目纬度
 	
+	@TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
+	private String manageZone;		//集团管理分区字段,只做展示用
+	
 	@TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.NOT_EMPTY)
 	private Date createTime; 	// 创建时间
 

+ 3 - 0
saas-account/src/main/java/com/persagy/account/pojo/vo/project/SaasProjectCreateVO.java

@@ -81,6 +81,9 @@ public class SaasProjectCreateVO extends BaseGroupModel {
 	@ApiModelProperty(value = "项目纬度", example = "123456789")
 	private String latitude;		//项目纬度
 	
+	@ApiModelProperty(value = "集团管理分区", example = "123456789")
+	private String manageZone;		//集团管理分区字段
+	
 	@ApiModelProperty(value = "备注信息", example = "测试项目")
 	private String remark; // 备注
 	

+ 1 - 0
saas-account/src/main/java/com/persagy/account/service/impl/SaasRoleServiceImpl.java

@@ -86,6 +86,7 @@ public class SaasRoleServiceImpl extends SuperServiceImpl<SaasRoleMapper, SaasRo
 		saasRoleMenu.setGroupCode(groupCode);
 		saasRoleMenu.setRoleId(saasRole.getId());
 		saasRoleMenu.setMenuId(properties.getDefaultMenuId());
+		saasRoleMenu.setFunctionId(properties.getDefaultFunId());
 		result = this.saasRoleMenuMapper.insert(saasRoleMenu);
 		return SqlHelper.retBool(result);
 	}

+ 2 - 1
saas-account/src/main/resources/mapper/SaasProjectMapper.xml

@@ -21,6 +21,7 @@
 			typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler" />
 		<result column="LONGITUDE" property="longitude" jdbcType="VARCHAR" />
 		<result column="LATITUDE" property="latitude" jdbcType="VARCHAR" />
+		<result column="MANAGE_ZONE" property="manageZone" jdbcType="VARCHAR" />
 		<result column="CREATE_TIME" property="createTime" jdbcType="DATE" />
 		<result column="UPDATE_TIME" property="updateTime" jdbcType="DATE" />
 		<result column="UPDATE_USER" property="updateUser" jdbcType="VARCHAR" />
@@ -31,7 +32,7 @@
 	</resultMap>
 	
 	<sql id="Base_Sql_Column">
-		ID, GROUP_CODE, PROJECT_ID, AREA_ID, PROJECT_LOCAL_ID, PROJECT_NAME, PROVINCE_CODE, CITY_CODE, ZONE_CODE, LONGITUDE, LATITUDE, 
+		ID, GROUP_CODE, PROJECT_ID, AREA_ID, PROJECT_LOCAL_ID, PROJECT_NAME, PROVINCE_CODE, CITY_CODE, ZONE_CODE, LONGITUDE, LATITUDE, MANAGE_ZONE, 
 		LOCATION, OPEN_TIME, PROJECT_FUN, PROJECT_WEATHER, PROJECT_IMAGE, CREATE_TIME, UPDATE_TIME, UPDATE_USER, REMARK, VALID
 	</sql>