成果数据接口

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/AppUserDetail.java

@@ -86,4 +86,11 @@ public class AppUserDetail {
 	@ApiModelProperty(value = "1-新人用户；2-未激活；3-激活")
 	@Column(name = "state")
 	private  Integer state;
+
+    @Column(name = "adminStrators")
+    private  String admin_Strators;
+
+
+
+
 }

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/AppUserLogin.java

@@ -51,4 +51,8 @@ public class AppUserLogin {
 	 */
 	@Column(name = "gtdata_pass")
 	private String gtdataPass;
+
+
+//	@Column(name="administrators")
+//	private String administrators;
 }

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/vo/AppUserVo.java

@@ -103,4 +103,6 @@ public class AppUserVo {
 	private String password;
 
 	private String gtdataPass;
+
+	private String adminStrators;
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/service/AppPermissionService.java

@@ -392,6 +392,8 @@ public class AppPermissionService {
         log.info("-----------autoLogin----code==="+code+"----activityCode===="+activityCode);
         JSONObject data = new JSONObject();
         AppUserVo userVo = appUserDetailBiz.getUserInfoById(userid);
+      //  AppUserDetail appUserDetail = appUserDetailBiz.selectById(userVo.getId());
+        System.out.println(userVo);
         if (userVo != null) {
             data.put("nickname", nickname);
             data.put("headerurl", headimgurl);
@@ -407,6 +409,7 @@ public class AppPermissionService {
             data.put("imUserId", userVo.getImUserid());
             data.put("code", userVo.getCode());
             data.put("positionId", userVo.getPositionId());
+            data.put("administrators",userVo.getAdminStrators());
             //更新登录时间 和 ip
             String clientIp = getIp();
             appUserLoginBiz.updateLoginInfo(userid, clientIp);

ace-modules/ace-admin/src/main/resources/mapper/AppUserDetailMapper.xml

@@ -36,12 +36,13 @@
         <result column="jobTitle" property="jobTitle"/>
         <result column="memberName" property="memberName"/>
         <result column="gtdata_pass" property="gtdataPass"/>
+        <result column="admin_Strators" property="adminStrators"/>
     </resultMap>
 
 
     <!--  获取用户信息 -->
     <select id="getUserInfo" resultMap="AppUserVoMap">
-    select l.im_userid,l.username,l.wx_openid,l.unionid,l.openid,l.status,l.id_number,l.certification_status,l.gtdata_pass,d.*  from app_user_login l
+    select l.im_userid,l.username,l.wx_openid,l.unionid,l.openid,l.status,l.id_number,l.certification_status,l.gtdata_pass,d.*, d.admin_Strators as adminStrators  from app_user_login l
     left join  app_user_detail d
     on d.userid = l.id
      where d.userid = #{userId}  limit 1

rs-website/rs-website-api/src/main/java/com/upyuns/platform/rs/website/dto/GainDataDTO.java

+package com.upyuns.platform.rs.website.dto;
+
+import com.github.wxiaoqi.security.common.vo.PageParam;
+import lombok.Data;
+
+@Data
+public class GainDataDTO extends PageParam {
+
+    private String menuId;
+
+
+
+}

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/controller/web/GainDataController.java

 package com.upyuns.platform.rs.website.controller.web;
 
+import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.upyuns.platform.rs.website.biz.GainDataBiz;
+import com.upyuns.platform.rs.website.dto.GainDataDTO;
 import com.upyuns.platform.rs.website.entity.GainData;
+import io.swagger.annotations.ApiModelProperty;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
+import tk.mybatis.mapper.entity.Example;
+
+import java.util.List;
 
 @RestController
-@RequestMapping("gainData")
+@RequestMapping("gainData/web")
 public class GainDataController extends BaseController<GainDataBiz,GainData> {
 
 
+    @ApiModelProperty("列表")
+    @IgnoreUserToken
+    @RequestMapping(value = "/app/unauth/mapAll",method = RequestMethod.GET)
+    public ObjectRestResponse<List<GainData>> getPageList(GainDataDTO dto) {
+        Example example = new Example(GainData.class);
+        Example.Criteria criteria = example.createCriteria();
+        criteria.andEqualTo("isDel", 0);
+//        if (StringUtils.isNotBlank(dto.getName())){
+//            criteria.andLike("name","%"+dto.getName()+"%");
+//        }
+//        String menuId = dto.getMenuId().toString();
+        if (StringUtils.isNotBlank(dto.getMenuId())){
+            criteria.andEqualTo("menuId",dto.getMenuId());
+        }
+        PageDataVO pageDataVO = PageDataVO.pageInfo(dto.getPage(), dto.getLimit(), ()->baseBiz.selectByExample(example));
+        return ObjectRestResponse.succ(pageDataVO);
+    }
+
+
+
 
 }
\ No newline at end of file