gaojian/oasystem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

通知公告接口修改

Browse Source
This commit is contained in:
itgaojian163 2022-10-08 18:02:30 +08:00
parent d81bbb6c8c
commit d9548a4184
7 changed files with 74 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
baselib/src/main/java/com/tenlionsoft/baselib/constant/PathConfig.java
View File

@ -306,4 +306,5 @@ public class PathConfig {
public static final String PATH_MODULE_OA_FRAGMENT_OA_FLOW_APPLY = "/oamodule/fragment/oaFlowCenter";//发起流程 public static final String PATH_MODULE_OA_FRAGMENT_OA_FLOW_APPLY = "/oamodule/fragment/oaFlowCenter";//发起流程
public static final String PATH_MODULE_OA_FRAGMENT_OA_FLOW_MINE_TODO = "/oamodule/fragment/mineUpcoming";//我的待办、已办 public static final String PATH_MODULE_OA_FRAGMENT_OA_FLOW_MINE_TODO = "/oamodule/fragment/mineUpcoming";//我的待办、已办
public static final String PATH_MODULE_OA_FRAGMENT_OA_FLOW_MINE_READ = "/oamodule/fragment/mineRead";//我的待阅、已阅 public static final String PATH_MODULE_OA_FRAGMENT_OA_FLOW_MINE_READ = "/oamodule/fragment/mineRead";//我的待阅、已阅
public static final String NOTICE_CONFIG_ID ="bce4ab73-45dc-41a1-ac9d-305e83300e49";
} }

4
baselib/src/main/java/com/tenlionsoft/baselib/core/retrofit_net/BaseUrlApi.java
View File

@ -7,8 +7,8 @@ package com.tenlionsoft.baselib.core.retrofit_net;
*/ */
public class BaseUrlApi { public class BaseUrlApi {
public static final String IP = "http://192.168.0.120:8080/";/* 测试IP */ // public static final String IP = "http://192.168.0.120:8080/";/* 测试IP */
// public static final String IP = "http://121.36.71.250/";/* 测试IP */ public static final String IP = "http://121.36.71.250/";/* 测试IP */
// public static final String IP = "http://www.wlcbsyzl.cn/";/* 正式IP */ // public static final String IP = "http://www.wlcbsyzl.cn/";/* 正式IP */
public static final String SYS_USERCENTER = "usercenter/"; public static final String SYS_USERCENTER = "usercenter/";
public static final String SYS_POPULATION = "population/";/*人口系统*/ public static final String SYS_POPULATION = "population/";/*人口系统*/

119
oamodule/src/main/java/com/tenlionsoft/oamodule/activity/notify/NoticeListActivity.java
View File

@ -10,6 +10,9 @@ import android.widget.LinearLayout;
import android.widget.ProgressBar; import android.widget.ProgressBar;
import android.widget.TextView; import android.widget.TextView;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.facade.annotation.Route;
import com.alibaba.android.arouter.launcher.ARouter; import com.alibaba.android.arouter.launcher.ARouter;
import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.builder.TimePickerBuilder;
@ -32,8 +35,6 @@ import com.tenlionsoft.oamodule.net.OAApi;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import io.reactivex.rxjava3.annotations.NonNull; import io.reactivex.rxjava3.annotations.NonNull;
@ -100,9 +101,9 @@ public class NoticeListActivity extends BaseActivity {
mRlvContent.setLayoutManager(new LinearLayoutManager(mActivity)); mRlvContent.setLayoutManager(new LinearLayoutManager(mActivity));
mRlvContent.setAdapter(mAdapter); mRlvContent.setAdapter(mAdapter);
mAdapter.addOnItemClickListener(bean -> ARouter.getInstance() mAdapter.addOnItemClickListener(bean -> ARouter.getInstance()
.build(PathConfig.PATH_MODULE_OA_ACTIVITY_NOTICE_DETAIL) .build(PathConfig.PATH_MODULE_OA_ACTIVITY_NOTICE_DETAIL)
.withString("id", bean.getNoticeId()) .withString("id", bean.getNoticeId())
.navigation()); .navigation());
mSrlContent.setOnRefreshListener(v -> doRefresh()); mSrlContent.setOnRefreshListener(v -> doRefresh());
mSrlContent.setOnLoadMoreListener(v -> doLoadMore()); mSrlContent.setOnLoadMoreListener(v -> doLoadMore());
mTvBaseSearchCancel.setOnClickListener(v -> doResetCondition()); mTvBaseSearchCancel.setOnClickListener(v -> doResetCondition());
@ -167,13 +168,13 @@ public class NoticeListActivity extends BaseActivity {
break; break;
} }
}) })
.setTitleText("请选时间") .setTitleText("请选时间")
.setCancelColor(Color.parseColor("#1189FF")) .setCancelColor(Color.parseColor("#1189FF"))
.setSubmitColor(Color.parseColor("#1189FF")) .setSubmitColor(Color.parseColor("#1189FF"))
.isDialog(false) .isDialog(false)
.setType(new boolean[]{true, true, true, false, false, false}) .setType(new boolean[]{true, true, true, false, false, false})
.setTitleColor(Color.parseColor("#1189FF")) .setTitleColor(Color.parseColor("#1189FF"))
.build(); .build();
mTimePickerView.show(); mTimePickerView.show();
} }
@ -234,69 +235,69 @@ public class NoticeListActivity extends BaseActivity {
} }
/** /**
* 我接受的工作 * 通知公告列表
*/ */
private void getNoticeList(int currentPage) { private void getNoticeList(int currentPage) {
mCurrentPage = currentPage; mCurrentPage = currentPage;
String start = mTvStartDate.getText().toString().trim(); String start = mTvStartDate.getText().toString().trim();
String end = mTvEndDate.getText().toString().trim(); String end = mTvEndDate.getText().toString().trim();
RetrofitManager.getInstance() RetrofitManager.getInstance()
.create(OAApi.class) .create(OAApi.class)
.getNoticeList(start, end, mKeywords, mCurrentPage + "", "20") .getNoticeList("2", PathConfig.NOTICE_CONFIG_ID, start, end, mKeywords, mCurrentPage + "", "20")
.compose(RxTransformer.getTransformer()) .compose(RxTransformer.getTransformer())
.subscribe(new Observer<NoticeListBean>() { .subscribe(new Observer<NoticeListBean>() {
@Override @Override
public void onSubscribe(@NonNull Disposable d) { public void onSubscribe(@NonNull Disposable d) {
} }
@Override @Override
public void onNext(@NonNull NoticeListBean listBean) { public void onNext(@NonNull NoticeListBean listBean) {
if (listBean.getRows() != null && listBean.getRows().size() > 0) { if (listBean.getRows() != null && listBean.getRows().size() > 0) {
++mCurrentPage; ++mCurrentPage;
if (currentPage == 1) { if (currentPage == 1) {
mDatas.clear(); mDatas.clear();
mDatas.addAll(listBean.getRows()); mDatas.addAll(listBean.getRows());
} else {
mDatas.addAll(listBean.getRows());
}
refreshPageState(STATE_LOAD_SUCCESS);
mAdapter.notifyDataSetChanged();
mSrlContent.finishRefresh();
if (mDatas.size() >= listBean.getTotal()) {
mSrlContent.finishLoadMore();
mSrlContent.setNoMoreData(true);
} else {
mSrlContent.finishLoadMore();
mSrlContent.setNoMoreData(false);
}
} else { } else {
mDatas.addAll(listBean.getRows()); mSrlContent.finishRefresh();
}
refreshPageState(STATE_LOAD_SUCCESS);
mAdapter.notifyDataSetChanged();
mSrlContent.finishRefresh();
if (mDatas.size() >= listBean.getTotal()) {
mSrlContent.finishLoadMore(); mSrlContent.finishLoadMore();
mSrlContent.setNoMoreData(true); if (currentPage > 1) {
} else { mSrlContent.setNoMoreData(true);
mSrlContent.finishLoadMore(); } else {
mSrlContent.setNoMoreData(false); refreshPageState(STATE_LOAD_EMPTY);
} if (!TextUtils.isEmpty(mKeywords)) {
} else { ToastUtils.show("未查询到相关内容");
mSrlContent.finishRefresh(); }
mSrlContent.finishLoadMore();
if (currentPage > 1) {
mSrlContent.setNoMoreData(true);
} else {
refreshPageState(STATE_LOAD_EMPTY);
if (!TextUtils.isEmpty(mKeywords)) {
ToastUtils.show("未查询到相关内容");
} }
} }
} }
}
@Override @Override
public void onError(@NonNull Throwable e) { public void onError(@NonNull Throwable e) {
mSrlContent.finishLoadMore(); mSrlContent.finishLoadMore();
mSrlContent.finishRefresh(); mSrlContent.finishRefresh();
ExceptionHandler.handleException(e); ExceptionHandler.handleException(e);
refreshPageState(STATE_LOAD_ERROR); refreshPageState(STATE_LOAD_ERROR);
} }
@Override @Override
public void onComplete() { public void onComplete() {
} }
}); });
} }
@Override @Override

2
oamodule/src/main/java/com/tenlionsoft/oamodule/fragments/OaMainFragment.java
View File

@ -268,7 +268,7 @@ public class OaMainFragment extends BaseFragment {
private void getNoticeList() { private void getNoticeList() {
RetrofitManager.getInstance() RetrofitManager.getInstance()
.create(OAApi.class) .create(OAApi.class)
.getNoticeList("", "", "", "1", "15") .getNoticeList("2",PathConfig.NOTICE_CONFIG_ID,"", "", "", "1", "15")
.compose(RxTransformer.getTransformer()) .compose(RxTransformer.getTransformer())
.subscribe(new Observer<NoticeListBean>() { .subscribe(new Observer<NoticeListBean>() {
@Override @Override

10
oamodule/src/main/java/com/tenlionsoft/oamodule/net/OAApi.java
View File

@ -674,8 +674,14 @@ public interface OAApi {
* 获取通知公告列表 * 获取通知公告列表
*/ */
@Headers({"base_url_name:oa", "need_token:true", "Content-Type: application/json", "Accept: application/json"}) @Headers({"base_url_name:oa", "need_token:true", "Content-Type: application/json", "Accept: application/json"})
@GET("app/notice/listpage") @GET("app/notice/mylistpage")
Observable<NoticeListBean> getNoticeList(@Query("startTime") String start, @Query("endTime") String end, @Query("keywords") String key, @Query("page") String page, @Query("rows") String rows); Observable<NoticeListBean> getNoticeList(@Query("noticeCheckStatus")String status,
@Query("noticeConfigId") String id,
@Query("startTime") String start,
@Query("endTime") String end,
@Query("keywords") String key,
@Query("page") String page,
@Query("rows") String rows);
/** /**
* 获取通知公告详情 * 获取通知公告详情

2
oamodule/src/main/java/com/tenlionsoft/oamodule/pad/fragments/PadOaMainFragment.java
View File

@ -440,7 +440,7 @@ public class PadOaMainFragment extends BaseFragment {
private void getNoticeList() { private void getNoticeList() {
RetrofitManager.getInstance() RetrofitManager.getInstance()
.create(OAApi.class) .create(OAApi.class)
.getNoticeList("", "", "", "1", "10") .getNoticeList("2",PathConfig.NOTICE_CONFIG_ID,"", "", "", "1", "10")
.compose(RxTransformer.getTransformer()) .compose(RxTransformer.getTransformer())
.subscribe(new Observer<NoticeListBean>() { .subscribe(new Observer<NoticeListBean>() {
@Override @Override

2
oamodule/src/main/java/com/tenlionsoft/oamodule/pad/fragments/home/notice/NoticeListFragment.java
View File

@ -262,7 +262,7 @@ public class NoticeListFragment extends BaseFragment {
String end = mTvEndDate.getText().toString().trim(); String end = mTvEndDate.getText().toString().trim();
RetrofitManager.getInstance() RetrofitManager.getInstance()
.create(OAApi.class) .create(OAApi.class)
.getNoticeList(start, end, mKeywords, mCurrentPage + "", "10") .getNoticeList("2",PathConfig.NOTICE_CONFIG_ID,start, end, mKeywords, mCurrentPage + "", "10")
.compose(RxTransformer.getTransformer()) .compose(RxTransformer.getTransformer())
.subscribe(new Observer<NoticeListBean>() { .subscribe(new Observer<NoticeListBean>() {
@Override @Override