diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/constant/PathConfig.java b/baselib/src/main/java/com/tenlionsoft/baselib/constant/PathConfig.java
index 7360c6f..106f864 100755
--- a/baselib/src/main/java/com/tenlionsoft/baselib/constant/PathConfig.java
+++ b/baselib/src/main/java/com/tenlionsoft/baselib/constant/PathConfig.java
@@ -66,8 +66,8 @@ public class PathConfig {
public static final String DIC_RELATION = "4c21d91a-d5e1-4cfc-a18a-d63272763cdb";//与户主关系
public static final String DIC_RELATION_YOUNG = "b12834a4-88d3-402c-8685-460dbb397b73";//与户主关系
public static final String DIC_ACCORD = "2156b4da-0be5-46d5-81c5-f1dcf0b30359";//人户是否一致
- public static final String DIC_CARD_TYPE = "76c5044f-805a-4313-b1e8-79e966b97c0d";//证件类型
- // public static final String DIC_CARD_TYPE = "35c6e331-9dd4-425c-be0c-ce570a0a768d";//TODO 证件类型
+// public static final String DIC_CARD_TYPE = "76c5044f-805a-4313-b1e8-79e966b97c0d";//证件类型
+ public static final String DIC_CARD_TYPE = "35c6e331-9dd4-425c-be0c-ce570a0a768d";//TODO 证件类型
public static final String DIC_HOUSE_TYPE = "bd3ceeb7-a523-4532-901d-5ab4046ebae3";//住所类型
public static final String DIC_HEALTH = "6152d370-a809-4e32-8af9-e3c5f606e7f1";//健康状况
public static final String DIC_REAR_TYPE = "40660752-9d0f-47fc-834f-5eb8e2668209";//留守人员类型
@@ -128,7 +128,9 @@ public class PathConfig {
public static final String DIC_FAMILY_STATE = "4bc7e70d-e431-40f1-af55-aee3a3467035";//家庭情况
public static final String DIC_PERSON_TYPE = "eda39bf4-078d-4d12-8fbe-aa0648cb723e";//主要当事人人员类型(编码表-5.57)
-
+ public static final String DIC_SCHOOL_TYPE = "e5624543-4f8e-4550-a8e8-49235f23b287";//学校办学类型
+ public static final String DIC_HARM_LEVEL = "ac006130-7403-40ef-b647-e89bb8cce631";//周边重点人员危害程度
+ public static final String DIC_CASE_NATURE = "28794721-09bb-4f64-920f-4d8eed02fbb3";//案件性质
//=============================主页按钮模块类型===========================
public static final String MODULE_CALL = "call";
public static final String MODULE_PRISON = "prison";
@@ -156,7 +158,7 @@ public class PathConfig {
public static final String USER_TYPE_N = "bc405346-8714-4ded-89ac-9cc4d755f66a";
public static final String USER_TYPE_X = "25affe67-134c-4a32-ba41-64b0cfedc782";
// public static final String APP_VERSION_ID = "f311fd32-cd36-45a1-9652-599d5f2c2d4f";/*正式App下载码*/
- public static final String APP_VERSION_ID = "444a0289-65fc-4cbb-9972-c9569c24f42b";/*测试App下载码*/
+ public static final String APP_VERSION_ID = "96aee0e5-2b4e-4b4a-a13c-9c71052b9ad7";/*测试App下载码*/
public static final String NEWS_ID = "f497904b-7727-4832-891c-604c36ae4167";//文化动态ID
public static final String NEWS_SHOW_ID = "f1d5d313-f728-4dda-9843-1116d97e17b0";//展览展示ID
@@ -430,6 +432,19 @@ public class PathConfig {
public static final String PATH_MODULE_GRID_ACTIVITY_EXPRESS_POI_EDIT = "/modulegrid/activity/expressPoiEdit";//快递点编辑
public static final String PATH_MODULE_GRID_ACTIVITY_EXPRESS_POI_DETAIL = "/modulegrid/activity/expressPoiDetail";//快递点详情
+ public static final String PATH_MODULE_GRID_ACTIVITY_SCHOOL_MANAGE_LIST = "/modulegrid/activity/schoolManageList";//学校管理
+ public static final String PATH_MODULE_GRID_ACTIVITY_SCHOOL_MANAGE_ADD = "/modulegrid/activity/schoolManageAdd";//学校管理添加
+ public static final String PATH_MODULE_GRID_ACTIVITY_SCHOOL_MANAGE_DETAIL = "/modulegrid/activity/schoolManageDetail";//学校管理详情
+
+ public static final String PATH_MODULE_GRID_ACTIVITY_SCHOOL_EMPHASES_PERSON_LIST = "/modulegrid/activity/schoolEmphasesPersonList";//学校周边重点人员列表
+ public static final String PATH_MODULE_GRID_ACTIVITY_SCHOOL_EMPHASES_PERSON_ADD = "/modulegrid/activity/schoolEmphasesPersonAdd";//学校周边重点人员列表
+ public static final String PATH_MODULE_GRID_ACTIVITY_SCHOOL_EMPHASES_PERSON_DETAIL = "/modulegrid/activity/schoolEmphasesPersonDetail";//学校周边重点人员列表
+
+
+ public static final String PATH_MODULE_GRID_ACTIVITY_SCHOOL_CASE_LIST = "/modulegrid/activity/schoolCaseList";//学校案件列表
+ public static final String PATH_MODULE_GRID_ACTIVITY_SCHOOL_CASE_ADD = "/modulegrid/activity/schoolCaseAdd";//学校案件添加
+ public static final String PATH_MODULE_GRID_ACTIVITY_SCHOOL_CASE_DETAIL = "/modulegrid/activity/schoolCaseDetail";//学校案件详情
+
public static final String PATH_MODULE_GRID_ACTIVITY_DIC_SEL = "/modulegrid/activity/dicSel";//字典多选、单选
//巡查巡检
@@ -486,4 +501,5 @@ public class PathConfig {
public static final String PATH_MODULE_SUPERVISION_INCIDENT_CHECK_LIST = "/modulesupervision/activity/incidentDeptList";//事件核查
public static final String PATH_MODULE_SUPERVISION_INCIDENT_CHECK_DETAIL = "/modulesupervision/activity/incidentDeptListDetail";//事件核查详情
+
}
diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/retrofit_net/BaseUrlApi.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/retrofit_net/BaseUrlApi.java
index 2ab52d4..d56fd76 100755
--- a/baselib/src/main/java/com/tenlionsoft/baselib/core/retrofit_net/BaseUrlApi.java
+++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/retrofit_net/BaseUrlApi.java
@@ -10,7 +10,7 @@ import com.tenlionsoft.baselib.constant.PathConfig;
public class BaseUrlApi {
// public static final String IP = "http://192.168.0.109:8080/";/* 正式IP */
- public static final String IP = "http://192.168.0.109:8080/";/* 正式IP */
+ public static final String IP = "http://192.168.0.111:8081/";/* 正式IP */
public static final String SYS_USERCENTER = "usercenter/";
public static final String SYS_POPULATION = "population/";/*人口系统*/
public static final String SYS_CASE = "case/";/*事件部件*/
@@ -18,7 +18,7 @@ public class BaseUrlApi {
public static final String SYS_SECURITY = "systembase/";/*社会治安*/
public static final String TEMP_IP = "http://192.168.0.109:8080/";
- public static final String BASE_MAIN_IP = IP + SYS_POPULATION;
+ public static final String BASE_MAIN_IP = IP + SYS_SECURITY;
public static final String BASE_CASE_IP = IP + SYS_CASE;
public static final String BASE_SECURITY_IP = IP + SYS_SECURITY;
public static final String BASE_HOUSE_IP = IP + SYS_HOUSE;
@@ -26,7 +26,7 @@ public class BaseUrlApi {
public static final String BASE_URL = BASE_MAIN_IP;//基础URL
- public static final String SOCKET_IP = "http://192.168.0.109:8080/websocket";/*SocketIP*/
+ public static final String SOCKET_IP = "http://192.168.0.111:8081/websocket";/*SocketIP*/
//地图页面展示类型
diff --git a/baselib/src/main/res/layout/layout_base_info_detail.xml b/baselib/src/main/res/layout/layout_base_info_detail.xml
index c2807c9..6a080c8 100644
--- a/baselib/src/main/res/layout/layout_base_info_detail.xml
+++ b/baselib/src/main/res/layout/layout_base_info_detail.xml
@@ -19,7 +19,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
- app:defaultItemCount="3"
+ android:paddingBottom="10dp"
+ app:defaultItemCount="5"
app:expandText="点击展开"
app:hideText="点击收起"
app:useDefaultBottom="true">
diff --git a/baselib/src/main/res/values/styles.xml b/baselib/src/main/res/values/styles.xml
index 4e2de1b..232184c 100755
--- a/baselib/src/main/res/values/styles.xml
+++ b/baselib/src/main/res/values/styles.xml
@@ -355,6 +355,7 @@
- wrap_content
- left
- 5dp
+ - @color/black
- 13sp
- 未录入
diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/adapters/SchoolCaseAdapter.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/adapters/SchoolCaseAdapter.java
new file mode 100644
index 0000000..69a18ea
--- /dev/null
+++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/adapters/SchoolCaseAdapter.java
@@ -0,0 +1,59 @@
+package com.tengshisoft.commonmodule.adapters;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.tengshisoft.commonmodule.R;
+import com.tengshisoft.commonmodule.beans.SchoolCaseListBean;
+import com.tengshisoft.commonmodule.beans.SchoolListBean;
+import com.tengshisoft.commonmodule.holders.SchoolCaseHolder;
+import com.tengshisoft.commonmodule.holders.SchoolListHolder;
+import com.tenlionsoft.baselib.core.widget.base.BaseRecyclerAdapter;
+
+import java.util.List;
+
+/**
+ * 作者: adam
+ * 日期: 2021年10月26日10:14:59
+ * 邮箱: itgaojian@163.com
+ * 描述: 学校管理-涉及案件
+ */
+public class SchoolCaseAdapter extends BaseRecyclerAdapter {
+ public SchoolCaseAdapter(Context ctx, List list) {
+ super(ctx, list);
+ }
+
+ @Override
+ public SchoolCaseHolder createHolder(ViewGroup parent, int viewType) {
+ View itemView = LayoutInflater.from(mContext).inflate(R.layout.item_school_case, parent, false);
+ return new SchoolCaseHolder(itemView);
+ }
+
+ @Override
+ public void bindHolder(SchoolCaseHolder holder, int i) {
+ SchoolCaseListBean.RowsBean bean = mData.get(i);
+ holder.mTvName.setText(bean.getCaseName());
+ holder.mTvNumber.setText("是否破案:" + (bean.getIsSolve() == 1 ? "已破案" : "未破案"));
+ holder.mTvTime.setText("发生日期:" + bean.getHappenTime());
+ holder.mTvType.setText(bean.getCaseNatureName());
+ holder.mTvAddress.setText("案发地:" + bean.getHappenLocationName() + bean.getHappenAddress());
+ if (mEditListener != null) {
+ holder.mBtnEdit.setOnClickListener(v -> mEditListener.onEdit(bean, i));
+ holder.mBtnDel.setOnClickListener(v -> mEditListener.onDel(bean, i));
+ }
+ }
+
+ private OnEditListener mEditListener;
+
+ public void addOnEditListener(OnEditListener mListener) {
+ this.mEditListener = mListener;
+ }
+
+ public interface OnEditListener {
+ void onEdit(SchoolCaseListBean.RowsBean bean, int pos);
+
+ void onDel(SchoolCaseListBean.RowsBean bean, int pos);
+ }
+}
diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/adapters/SchoolEmphasesPersonAdapter.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/adapters/SchoolEmphasesPersonAdapter.java
new file mode 100644
index 0000000..14edb1b
--- /dev/null
+++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/adapters/SchoolEmphasesPersonAdapter.java
@@ -0,0 +1,56 @@
+package com.tengshisoft.commonmodule.adapters;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.tengshisoft.commonmodule.R;
+import com.tengshisoft.commonmodule.beans.SchoolEmphasesPersonListBean;
+import com.tengshisoft.commonmodule.beans.SchoolListBean;
+import com.tengshisoft.commonmodule.holders.SchoolEmphasesPersonHolder;
+import com.tengshisoft.commonmodule.holders.SchoolListHolder;
+import com.tenlionsoft.baselib.core.widget.base.BaseRecyclerAdapter;
+
+import java.util.List;
+
+/**
+ * 作者: adam
+ * 日期: 2021年10月26日10:14:59
+ * 邮箱: itgaojian@163.com
+ * 描述: 学校管理 周边重点人员
+ */
+public class SchoolEmphasesPersonAdapter extends BaseRecyclerAdapter {
+ public SchoolEmphasesPersonAdapter(Context ctx, List list) {
+ super(ctx, list);
+ }
+
+ @Override
+ public SchoolEmphasesPersonHolder createHolder(ViewGroup parent, int viewType) {
+ View itemView = LayoutInflater.from(mContext).inflate(R.layout.item_school_emphases_person, parent, false);
+ return new SchoolEmphasesPersonHolder(itemView);
+ }
+
+ @Override
+ public void bindHolder(SchoolEmphasesPersonHolder holder, int i) {
+ SchoolEmphasesPersonListBean.RowsBean bean = mData.get(i);
+ holder.mTvHarm.setText("危害程度:" + bean.getDegreeOfHarmName());
+ holder.mTvAttention.setText("是否重点关注:" + (bean.getIsFollow() == 0 ? "否" : "是"));
+ if (mEditListener != null) {
+ holder.mBtnEdit.setOnClickListener(v -> mEditListener.onEdit(bean, i));
+ holder.mBtnDel.setOnClickListener(v -> mEditListener.onDel(bean, i));
+ }
+ }
+
+ private OnEditListener mEditListener;
+
+ public void addOnEditListener(OnEditListener mListener) {
+ this.mEditListener = mListener;
+ }
+
+ public interface OnEditListener {
+ void onEdit(SchoolEmphasesPersonListBean.RowsBean bean, int pos);
+
+ void onDel(SchoolEmphasesPersonListBean.RowsBean bean, int pos);
+ }
+}
diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/adapters/SchoolListAdapter.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/adapters/SchoolListAdapter.java
new file mode 100644
index 0000000..c6fa78b
--- /dev/null
+++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/adapters/SchoolListAdapter.java
@@ -0,0 +1,61 @@
+package com.tengshisoft.commonmodule.adapters;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.tengshisoft.commonmodule.R;
+import com.tengshisoft.commonmodule.beans.CensusAidsListBean;
+import com.tengshisoft.commonmodule.beans.SchoolListBean;
+import com.tengshisoft.commonmodule.holders.CensusAidsHolder;
+import com.tengshisoft.commonmodule.holders.SchoolListHolder;
+import com.tenlionsoft.baselib.core.widget.base.BaseRecyclerAdapter;
+import com.tenlionsoft.baselib.utils.IDCard;
+
+import java.util.List;
+
+/**
+ * 作者: adam
+ * 日期: 2021年10月26日10:14:59
+ * 邮箱: itgaojian@163.com
+ * 描述: 学校管理
+ */
+public class SchoolListAdapter extends BaseRecyclerAdapter {
+ public SchoolListAdapter(Context ctx, List list) {
+ super(ctx, list);
+ }
+
+ @Override
+ public SchoolListHolder createHolder(ViewGroup parent, int viewType) {
+ View itemView = LayoutInflater.from(mContext).inflate(R.layout.item_school_list, parent, false);
+ return new SchoolListHolder(itemView);
+ }
+
+ @Override
+ public void bindHolder(SchoolListHolder holder, int i) {
+ SchoolListBean.RowsBean bean = mData.get(i);
+ holder.mTvName.setText(bean.getSchoolName());
+ holder.mTvType.setText(bean.getRunningTypeName());
+ holder.mTvNumber.setText("在校人数:" + bean.getStuCount());
+ holder.mTvSchoolMaster.setText("校长:" + bean.getPrincipalName());
+ holder.mTvSchoolMasterPhone.setText("联系电话:" + bean.getPrincipalPhone());
+ holder.mTvAddress.setText(bean.getBelongDeptName() + bean.getSchoolAddress());
+ if (mEditListener != null) {
+ holder.mBtnPerson.setOnClickListener(v -> mEditListener.onShowPerson(bean, i));
+ holder.mBtnCase.setOnClickListener(v -> mEditListener.onShowCase(bean, i));
+ }
+ }
+
+ private OnEditListener mEditListener;
+
+ public void addOnEditListener(OnEditListener mListener) {
+ this.mEditListener = mListener;
+ }
+
+ public interface OnEditListener {
+ void onShowPerson(SchoolListBean.RowsBean bean, int pos);
+
+ void onShowCase(SchoolListBean.RowsBean bean, int pos);
+ }
+}
diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/SaveEmphasesBean.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/SaveEmphasesBean.java
new file mode 100644
index 0000000..7d7d4de
--- /dev/null
+++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/SaveEmphasesBean.java
@@ -0,0 +1,65 @@
+package com.tengshisoft.commonmodule.beans;
+
+/**
+ * 作者: adam
+ * 日期: 2021/10/26 - 3:26 下午
+ * 邮箱: itgaojian@163.com
+ * 描述:
+ */
+public class SaveEmphasesBean {
+
+ private String baseId;
+ private String degreeOfHarm;
+ private String degreeOfHarmCode;
+ private String degreeOfHarmName;
+ private int isFollow;
+ private String schoolId;
+
+ public String getBaseId() {
+ return baseId;
+ }
+
+ public void setBaseId(String baseId) {
+ this.baseId = baseId;
+ }
+
+ public String getDegreeOfHarm() {
+ return degreeOfHarm;
+ }
+
+ public void setDegreeOfHarm(String degreeOfHarm) {
+ this.degreeOfHarm = degreeOfHarm;
+ }
+
+ public String getDegreeOfHarmCode() {
+ return degreeOfHarmCode;
+ }
+
+ public void setDegreeOfHarmCode(String degreeOfHarmCode) {
+ this.degreeOfHarmCode = degreeOfHarmCode;
+ }
+
+ public String getDegreeOfHarmName() {
+ return degreeOfHarmName;
+ }
+
+ public void setDegreeOfHarmName(String degreeOfHarmName) {
+ this.degreeOfHarmName = degreeOfHarmName;
+ }
+
+ public int getIsFollow() {
+ return isFollow;
+ }
+
+ public void setIsFollow(int isFollow) {
+ this.isFollow = isFollow;
+ }
+
+ public String getSchoolId() {
+ return schoolId;
+ }
+
+ public void setSchoolId(String schoolId) {
+ this.schoolId = schoolId;
+ }
+}
diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/SaveSchoolBean.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/SaveSchoolBean.java
new file mode 100644
index 0000000..f5f9cea
--- /dev/null
+++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/SaveSchoolBean.java
@@ -0,0 +1,191 @@
+package com.tengshisoft.commonmodule.beans;
+
+/**
+ * 作者: adam
+ * 日期: 2021/10/26 - 10:03 上午
+ * 邮箱: itgaojian@163.com
+ * 描述: 保存学校
+ */
+public class SaveSchoolBean {
+
+ private String belongDept;
+ private String belongDeptCode;
+ private String belongDeptName;
+ private String defendName;
+ private String defendPhone;
+ private double latitude;
+ private double longitude;
+ private String principalName;
+ private String principalPhone;
+ private String runningType;
+ private String runningTypeCode;
+ private String runningTypeName;
+ private String safeName;
+ private String safePhone;
+ private String schoolAddress;
+ private String schoolName;
+ private int securityCount;
+ private String securityName;
+ private String securityPhone;
+ private int stuCount;
+
+ public String getBelongDept() {
+ return belongDept;
+ }
+
+ public void setBelongDept(String belongDept) {
+ this.belongDept = belongDept;
+ }
+
+ public String getBelongDeptCode() {
+ return belongDeptCode;
+ }
+
+ public void setBelongDeptCode(String belongDeptCode) {
+ this.belongDeptCode = belongDeptCode;
+ }
+
+ public String getBelongDeptName() {
+ return belongDeptName;
+ }
+
+ public void setBelongDeptName(String belongDeptName) {
+ this.belongDeptName = belongDeptName;
+ }
+
+ public String getDefendName() {
+ return defendName;
+ }
+
+ public void setDefendName(String defendName) {
+ this.defendName = defendName;
+ }
+
+ public String getDefendPhone() {
+ return defendPhone;
+ }
+
+ public void setDefendPhone(String defendPhone) {
+ this.defendPhone = defendPhone;
+ }
+
+ public double getLatitude() {
+ return latitude;
+ }
+
+ public void setLatitude(double latitude) {
+ this.latitude = latitude;
+ }
+
+ public double getLongitude() {
+ return longitude;
+ }
+
+ public void setLongitude(double longitude) {
+ this.longitude = longitude;
+ }
+
+ public String getPrincipalName() {
+ return principalName;
+ }
+
+ public void setPrincipalName(String principalName) {
+ this.principalName = principalName;
+ }
+
+ public String getPrincipalPhone() {
+ return principalPhone;
+ }
+
+ public void setPrincipalPhone(String principalPhone) {
+ this.principalPhone = principalPhone;
+ }
+
+ public String getRunningType() {
+ return runningType;
+ }
+
+ public void setRunningType(String runningType) {
+ this.runningType = runningType;
+ }
+
+ public String getRunningTypeCode() {
+ return runningTypeCode;
+ }
+
+ public void setRunningTypeCode(String runningTypeCode) {
+ this.runningTypeCode = runningTypeCode;
+ }
+
+ public String getRunningTypeName() {
+ return runningTypeName;
+ }
+
+ public void setRunningTypeName(String runningTypeName) {
+ this.runningTypeName = runningTypeName;
+ }
+
+ public String getSafeName() {
+ return safeName;
+ }
+
+ public void setSafeName(String safeName) {
+ this.safeName = safeName;
+ }
+
+ public String getSafePhone() {
+ return safePhone;
+ }
+
+ public void setSafePhone(String safePhone) {
+ this.safePhone = safePhone;
+ }
+
+ public String getSchoolAddress() {
+ return schoolAddress;
+ }
+
+ public void setSchoolAddress(String schoolAddress) {
+ this.schoolAddress = schoolAddress;
+ }
+
+ public String getSchoolName() {
+ return schoolName;
+ }
+
+ public void setSchoolName(String schoolName) {
+ this.schoolName = schoolName;
+ }
+
+ public int getSecurityCount() {
+ return securityCount;
+ }
+
+ public void setSecurityCount(int securityCount) {
+ this.securityCount = securityCount;
+ }
+
+ public String getSecurityName() {
+ return securityName;
+ }
+
+ public void setSecurityName(String securityName) {
+ this.securityName = securityName;
+ }
+
+ public String getSecurityPhone() {
+ return securityPhone;
+ }
+
+ public void setSecurityPhone(String securityPhone) {
+ this.securityPhone = securityPhone;
+ }
+
+ public int getStuCount() {
+ return stuCount;
+ }
+
+ public void setStuCount(int stuCount) {
+ this.stuCount = stuCount;
+ }
+}
diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/SaveSchoolCaseBean.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/SaveSchoolCaseBean.java
new file mode 100644
index 0000000..2b2d15f
--- /dev/null
+++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/SaveSchoolCaseBean.java
@@ -0,0 +1,209 @@
+package com.tengshisoft.commonmodule.beans;
+
+/**
+ * 作者: adam
+ * 日期: 2021/10/26 - 4:40 下午
+ * 邮箱: itgaojian@163.com
+ * 描述:
+ */
+public class SaveSchoolCaseBean {
+
+ private int arrestCount;
+ private int atLargeCount;
+ private String caseCode;
+ private String caseName;
+ private String caseNature;
+ private String caseNatureCode;
+ private String caseNatureName;
+ private String caseSituation;
+ private String caseSolve;
+ private int crimeCount;
+ private String happenAddress;
+ private String happenLocation;
+ private String happenLocationCode;
+ private String happenLocationName;
+ private String happenTime;
+ private int isSolve;
+ private String principalCardCode;
+ private String principalCardCodeCode;
+ private String principalCardCodeName;
+ private String principalCardNum;
+ private String principalName;
+ private String schoolId;
+
+ public int getArrestCount() {
+ return arrestCount;
+ }
+
+ public void setArrestCount(int arrestCount) {
+ this.arrestCount = arrestCount;
+ }
+
+ public int getAtLargeCount() {
+ return atLargeCount;
+ }
+
+ public void setAtLargeCount(int atLargeCount) {
+ this.atLargeCount = atLargeCount;
+ }
+
+ public String getCaseCode() {
+ return caseCode;
+ }
+
+ public void setCaseCode(String caseCode) {
+ this.caseCode = caseCode;
+ }
+
+ public String getCaseName() {
+ return caseName;
+ }
+
+ public void setCaseName(String caseName) {
+ this.caseName = caseName;
+ }
+
+ public String getCaseNature() {
+ return caseNature;
+ }
+
+ public void setCaseNature(String caseNature) {
+ this.caseNature = caseNature;
+ }
+
+ public String getCaseNatureCode() {
+ return caseNatureCode;
+ }
+
+ public void setCaseNatureCode(String caseNatureCode) {
+ this.caseNatureCode = caseNatureCode;
+ }
+
+ public String getCaseNatureName() {
+ return caseNatureName;
+ }
+
+ public void setCaseNatureName(String caseNatureName) {
+ this.caseNatureName = caseNatureName;
+ }
+
+ public String getCaseSituation() {
+ return caseSituation;
+ }
+
+ public void setCaseSituation(String caseSituation) {
+ this.caseSituation = caseSituation;
+ }
+
+ public String getCaseSolve() {
+ return caseSolve;
+ }
+
+ public void setCaseSolve(String caseSolve) {
+ this.caseSolve = caseSolve;
+ }
+
+ public int getCrimeCount() {
+ return crimeCount;
+ }
+
+ public void setCrimeCount(int crimeCount) {
+ this.crimeCount = crimeCount;
+ }
+
+ public String getHappenAddress() {
+ return happenAddress;
+ }
+
+ public void setHappenAddress(String happenAddress) {
+ this.happenAddress = happenAddress;
+ }
+
+ public String getHappenLocation() {
+ return happenLocation;
+ }
+
+ public void setHappenLocation(String happenLocation) {
+ this.happenLocation = happenLocation;
+ }
+
+ public String getHappenLocationCode() {
+ return happenLocationCode;
+ }
+
+ public void setHappenLocationCode(String happenLocationCode) {
+ this.happenLocationCode = happenLocationCode;
+ }
+
+ public String getHappenLocationName() {
+ return happenLocationName;
+ }
+
+ public void setHappenLocationName(String happenLocationName) {
+ this.happenLocationName = happenLocationName;
+ }
+
+ public String getHappenTime() {
+ return happenTime;
+ }
+
+ public void setHappenTime(String happenTime) {
+ this.happenTime = happenTime;
+ }
+
+ public int getIsSolve() {
+ return isSolve;
+ }
+
+ public void setIsSolve(int isSolve) {
+ this.isSolve = isSolve;
+ }
+
+ public String getPrincipalCardCode() {
+ return principalCardCode;
+ }
+
+ public void setPrincipalCardCode(String principalCardCode) {
+ this.principalCardCode = principalCardCode;
+ }
+
+ public String getPrincipalCardCodeCode() {
+ return principalCardCodeCode;
+ }
+
+ public void setPrincipalCardCodeCode(String principalCardCodeCode) {
+ this.principalCardCodeCode = principalCardCodeCode;
+ }
+
+ public String getPrincipalCardCodeName() {
+ return principalCardCodeName;
+ }
+
+ public void setPrincipalCardCodeName(String principalCardCodeName) {
+ this.principalCardCodeName = principalCardCodeName;
+ }
+
+ public String getPrincipalCardNum() {
+ return principalCardNum;
+ }
+
+ public void setPrincipalCardNum(String principalCardNum) {
+ this.principalCardNum = principalCardNum;
+ }
+
+ public String getPrincipalName() {
+ return principalName;
+ }
+
+ public void setPrincipalName(String principalName) {
+ this.principalName = principalName;
+ }
+
+ public String getSchoolId() {
+ return schoolId;
+ }
+
+ public void setSchoolId(String schoolId) {
+ this.schoolId = schoolId;
+ }
+}
diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/SchoolCaseDetailBean.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/SchoolCaseDetailBean.java
new file mode 100644
index 0000000..5204cf8
--- /dev/null
+++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/SchoolCaseDetailBean.java
@@ -0,0 +1,218 @@
+package com.tengshisoft.commonmodule.beans;
+
+/**
+ * 作者: adam
+ * 日期: 2021/10/26 - 4:42 下午
+ * 邮箱: itgaojian@163.com
+ * 描述:
+ */
+public class SchoolCaseDetailBean {
+
+ private int arrestCount;
+ private int atLargeCount;
+ private String caseCode;
+ private String caseName;
+ private String caseNature;
+ private String caseNatureCode;
+ private String caseNatureName;
+ private String caseSituation;
+ private String caseSolve;
+ private int crimeCount;
+ private String happenAddress;
+ private String happenLocation;
+ private String happenLocationCode;
+ private String happenLocationName;
+ private String happenTime;
+ private int isSolve;
+ private String principalCardCode;
+ private String principalCardCodeCode;
+ private String principalCardCodeName;
+ private String principalCardNum;
+ private String principalName;
+ private String schoolId;
+ private String stuTeaSafeId;
+
+ public int getArrestCount() {
+ return arrestCount;
+ }
+
+ public void setArrestCount(int arrestCount) {
+ this.arrestCount = arrestCount;
+ }
+
+ public int getAtLargeCount() {
+ return atLargeCount;
+ }
+
+ public void setAtLargeCount(int atLargeCount) {
+ this.atLargeCount = atLargeCount;
+ }
+
+ public String getCaseCode() {
+ return caseCode;
+ }
+
+ public void setCaseCode(String caseCode) {
+ this.caseCode = caseCode;
+ }
+
+ public String getCaseName() {
+ return caseName;
+ }
+
+ public void setCaseName(String caseName) {
+ this.caseName = caseName;
+ }
+
+ public String getCaseNature() {
+ return caseNature;
+ }
+
+ public void setCaseNature(String caseNature) {
+ this.caseNature = caseNature;
+ }
+
+ public String getCaseNatureCode() {
+ return caseNatureCode;
+ }
+
+ public void setCaseNatureCode(String caseNatureCode) {
+ this.caseNatureCode = caseNatureCode;
+ }
+
+ public String getCaseNatureName() {
+ return caseNatureName;
+ }
+
+ public void setCaseNatureName(String caseNatureName) {
+ this.caseNatureName = caseNatureName;
+ }
+
+ public String getCaseSituation() {
+ return caseSituation;
+ }
+
+ public void setCaseSituation(String caseSituation) {
+ this.caseSituation = caseSituation;
+ }
+
+ public String getCaseSolve() {
+ return caseSolve;
+ }
+
+ public void setCaseSolve(String caseSolve) {
+ this.caseSolve = caseSolve;
+ }
+
+ public int getCrimeCount() {
+ return crimeCount;
+ }
+
+ public void setCrimeCount(int crimeCount) {
+ this.crimeCount = crimeCount;
+ }
+
+ public String getHappenAddress() {
+ return happenAddress;
+ }
+
+ public void setHappenAddress(String happenAddress) {
+ this.happenAddress = happenAddress;
+ }
+
+ public String getHappenLocation() {
+ return happenLocation;
+ }
+
+ public void setHappenLocation(String happenLocation) {
+ this.happenLocation = happenLocation;
+ }
+
+ public String getHappenLocationCode() {
+ return happenLocationCode;
+ }
+
+ public void setHappenLocationCode(String happenLocationCode) {
+ this.happenLocationCode = happenLocationCode;
+ }
+
+ public String getHappenLocationName() {
+ return happenLocationName;
+ }
+
+ public void setHappenLocationName(String happenLocationName) {
+ this.happenLocationName = happenLocationName;
+ }
+
+ public String getHappenTime() {
+ return happenTime;
+ }
+
+ public void setHappenTime(String happenTime) {
+ this.happenTime = happenTime;
+ }
+
+ public int getIsSolve() {
+ return isSolve;
+ }
+
+ public void setIsSolve(int isSolve) {
+ this.isSolve = isSolve;
+ }
+
+ public String getPrincipalCardCode() {
+ return principalCardCode;
+ }
+
+ public void setPrincipalCardCode(String principalCardCode) {
+ this.principalCardCode = principalCardCode;
+ }
+
+ public String getPrincipalCardCodeCode() {
+ return principalCardCodeCode;
+ }
+
+ public void setPrincipalCardCodeCode(String principalCardCodeCode) {
+ this.principalCardCodeCode = principalCardCodeCode;
+ }
+
+ public String getPrincipalCardCodeName() {
+ return principalCardCodeName;
+ }
+
+ public void setPrincipalCardCodeName(String principalCardCodeName) {
+ this.principalCardCodeName = principalCardCodeName;
+ }
+
+ public String getPrincipalCardNum() {
+ return principalCardNum;
+ }
+
+ public void setPrincipalCardNum(String principalCardNum) {
+ this.principalCardNum = principalCardNum;
+ }
+
+ public String getPrincipalName() {
+ return principalName;
+ }
+
+ public void setPrincipalName(String principalName) {
+ this.principalName = principalName;
+ }
+
+ public String getSchoolId() {
+ return schoolId;
+ }
+
+ public void setSchoolId(String schoolId) {
+ this.schoolId = schoolId;
+ }
+
+ public String getStuTeaSafeId() {
+ return stuTeaSafeId;
+ }
+
+ public void setStuTeaSafeId(String stuTeaSafeId) {
+ this.stuTeaSafeId = stuTeaSafeId;
+ }
+}
diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/SchoolCaseListBean.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/SchoolCaseListBean.java
new file mode 100644
index 0000000..541efda
--- /dev/null
+++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/SchoolCaseListBean.java
@@ -0,0 +1,250 @@
+package com.tengshisoft.commonmodule.beans;
+
+import java.util.List;
+
+/**
+ * 作者: adam
+ * 日期: 2021/10/26 - 4:20 下午
+ * 邮箱: itgaojian@163.com
+ * 描述:
+ */
+public class SchoolCaseListBean {
+
+ private int page;
+ private int total;
+ private List rows;
+
+ public int getPage() {
+ return page;
+ }
+
+ public void setPage(int page) {
+ this.page = page;
+ }
+
+ public int getTotal() {
+ return total;
+ }
+
+ public void setTotal(int total) {
+ this.total = total;
+ }
+
+ public List getRows() {
+ return rows;
+ }
+
+ public void setRows(List rows) {
+ this.rows = rows;
+ }
+
+ public static class RowsBean {
+ private int arrestCount;
+ private int atLargeCount;
+ private String caseCode;
+ private String caseName;
+ private String caseNature;
+ private String caseNatureCode;
+ private String caseNatureName;
+ private String caseSituation;
+ private String caseSolve;
+ private int crimeCount;
+ private String happenAddress;
+ private String happenLocation;
+ private String happenLocationCode;
+ private String happenLocationName;
+ private String happenTime;
+ private int isSolve;
+ private String principalCardCode;
+ private String principalCardCodeCode;
+ private String principalCardCodeName;
+ private String principalCardNum;
+ private String principalName;
+ private String schoolId;
+ private String stuTeaSafeId;
+
+ public int getArrestCount() {
+ return arrestCount;
+ }
+
+ public void setArrestCount(int arrestCount) {
+ this.arrestCount = arrestCount;
+ }
+
+ public int getAtLargeCount() {
+ return atLargeCount;
+ }
+
+ public void setAtLargeCount(int atLargeCount) {
+ this.atLargeCount = atLargeCount;
+ }
+
+ public String getCaseCode() {
+ return caseCode;
+ }
+
+ public void setCaseCode(String caseCode) {
+ this.caseCode = caseCode;
+ }
+
+ public String getCaseName() {
+ return caseName;
+ }
+
+ public void setCaseName(String caseName) {
+ this.caseName = caseName;
+ }
+
+ public String getCaseNature() {
+ return caseNature;
+ }
+
+ public void setCaseNature(String caseNature) {
+ this.caseNature = caseNature;
+ }
+
+ public String getCaseNatureCode() {
+ return caseNatureCode;
+ }
+
+ public void setCaseNatureCode(String caseNatureCode) {
+ this.caseNatureCode = caseNatureCode;
+ }
+
+ public String getCaseNatureName() {
+ return caseNatureName;
+ }
+
+ public void setCaseNatureName(String caseNatureName) {
+ this.caseNatureName = caseNatureName;
+ }
+
+ public String getCaseSituation() {
+ return caseSituation;
+ }
+
+ public void setCaseSituation(String caseSituation) {
+ this.caseSituation = caseSituation;
+ }
+
+ public String getCaseSolve() {
+ return caseSolve;
+ }
+
+ public void setCaseSolve(String caseSolve) {
+ this.caseSolve = caseSolve;
+ }
+
+ public int getCrimeCount() {
+ return crimeCount;
+ }
+
+ public void setCrimeCount(int crimeCount) {
+ this.crimeCount = crimeCount;
+ }
+
+ public String getHappenAddress() {
+ return happenAddress;
+ }
+
+ public void setHappenAddress(String happenAddress) {
+ this.happenAddress = happenAddress;
+ }
+
+ public String getHappenLocation() {
+ return happenLocation;
+ }
+
+ public void setHappenLocation(String happenLocation) {
+ this.happenLocation = happenLocation;
+ }
+
+ public String getHappenLocationCode() {
+ return happenLocationCode;
+ }
+
+ public void setHappenLocationCode(String happenLocationCode) {
+ this.happenLocationCode = happenLocationCode;
+ }
+
+ public String getHappenLocationName() {
+ return happenLocationName;
+ }
+
+ public void setHappenLocationName(String happenLocationName) {
+ this.happenLocationName = happenLocationName;
+ }
+
+ public String getHappenTime() {
+ return happenTime;
+ }
+
+ public void setHappenTime(String happenTime) {
+ this.happenTime = happenTime;
+ }
+
+ public int getIsSolve() {
+ return isSolve;
+ }
+
+ public void setIsSolve(int isSolve) {
+ this.isSolve = isSolve;
+ }
+
+ public String getPrincipalCardCode() {
+ return principalCardCode;
+ }
+
+ public void setPrincipalCardCode(String principalCardCode) {
+ this.principalCardCode = principalCardCode;
+ }
+
+ public String getPrincipalCardCodeCode() {
+ return principalCardCodeCode;
+ }
+
+ public void setPrincipalCardCodeCode(String principalCardCodeCode) {
+ this.principalCardCodeCode = principalCardCodeCode;
+ }
+
+ public String getPrincipalCardCodeName() {
+ return principalCardCodeName;
+ }
+
+ public void setPrincipalCardCodeName(String principalCardCodeName) {
+ this.principalCardCodeName = principalCardCodeName;
+ }
+
+ public String getPrincipalCardNum() {
+ return principalCardNum;
+ }
+
+ public void setPrincipalCardNum(String principalCardNum) {
+ this.principalCardNum = principalCardNum;
+ }
+
+ public String getPrincipalName() {
+ return principalName;
+ }
+
+ public void setPrincipalName(String principalName) {
+ this.principalName = principalName;
+ }
+
+ public String getSchoolId() {
+ return schoolId;
+ }
+
+ public void setSchoolId(String schoolId) {
+ this.schoolId = schoolId;
+ }
+
+ public String getStuTeaSafeId() {
+ return stuTeaSafeId;
+ }
+
+ public void setStuTeaSafeId(String stuTeaSafeId) {
+ this.stuTeaSafeId = stuTeaSafeId;
+ }
+ }
+}
diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/SchoolDetailBean.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/SchoolDetailBean.java
new file mode 100644
index 0000000..7bed6dd
--- /dev/null
+++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/SchoolDetailBean.java
@@ -0,0 +1,200 @@
+package com.tengshisoft.commonmodule.beans;
+
+/**
+ * 作者: adam
+ * 日期: 2021/10/26 - 10:01 上午
+ * 邮箱: itgaojian@163.com
+ * 描述: 学校详情
+ */
+public class SchoolDetailBean {
+
+ private String belongDept;
+ private String belongDeptCode;
+ private String belongDeptName;
+ private String defendName;
+ private String defendPhone;
+ private double latitude;
+ private double longitude;
+ private String principalName;
+ private String principalPhone;
+ private String runningType;
+ private String runningTypeCode;
+ private String runningTypeName;
+ private String safeName;
+ private String safePhone;
+ private String schoolAddress;
+ private String schoolId;
+ private String schoolName;
+ private int securityCount;
+ private String securityName;
+ private String securityPhone;
+ private int stuCount;
+
+ public String getBelongDept() {
+ return belongDept;
+ }
+
+ public void setBelongDept(String belongDept) {
+ this.belongDept = belongDept;
+ }
+
+ public String getBelongDeptCode() {
+ return belongDeptCode;
+ }
+
+ public void setBelongDeptCode(String belongDeptCode) {
+ this.belongDeptCode = belongDeptCode;
+ }
+
+ public String getBelongDeptName() {
+ return belongDeptName;
+ }
+
+ public void setBelongDeptName(String belongDeptName) {
+ this.belongDeptName = belongDeptName;
+ }
+
+ public String getDefendName() {
+ return defendName;
+ }
+
+ public void setDefendName(String defendName) {
+ this.defendName = defendName;
+ }
+
+ public String getDefendPhone() {
+ return defendPhone;
+ }
+
+ public void setDefendPhone(String defendPhone) {
+ this.defendPhone = defendPhone;
+ }
+
+ public double getLatitude() {
+ return latitude;
+ }
+
+ public void setLatitude(double latitude) {
+ this.latitude = latitude;
+ }
+
+ public double getLongitude() {
+ return longitude;
+ }
+
+ public void setLongitude(double longitude) {
+ this.longitude = longitude;
+ }
+
+ public String getPrincipalName() {
+ return principalName;
+ }
+
+ public void setPrincipalName(String principalName) {
+ this.principalName = principalName;
+ }
+
+ public String getPrincipalPhone() {
+ return principalPhone;
+ }
+
+ public void setPrincipalPhone(String principalPhone) {
+ this.principalPhone = principalPhone;
+ }
+
+ public String getRunningType() {
+ return runningType;
+ }
+
+ public void setRunningType(String runningType) {
+ this.runningType = runningType;
+ }
+
+ public String getRunningTypeCode() {
+ return runningTypeCode;
+ }
+
+ public void setRunningTypeCode(String runningTypeCode) {
+ this.runningTypeCode = runningTypeCode;
+ }
+
+ public String getRunningTypeName() {
+ return runningTypeName;
+ }
+
+ public void setRunningTypeName(String runningTypeName) {
+ this.runningTypeName = runningTypeName;
+ }
+
+ public String getSafeName() {
+ return safeName;
+ }
+
+ public void setSafeName(String safeName) {
+ this.safeName = safeName;
+ }
+
+ public String getSafePhone() {
+ return safePhone;
+ }
+
+ public void setSafePhone(String safePhone) {
+ this.safePhone = safePhone;
+ }
+
+ public String getSchoolAddress() {
+ return schoolAddress;
+ }
+
+ public void setSchoolAddress(String schoolAddress) {
+ this.schoolAddress = schoolAddress;
+ }
+
+ public String getSchoolId() {
+ return schoolId;
+ }
+
+ public void setSchoolId(String schoolId) {
+ this.schoolId = schoolId;
+ }
+
+ public String getSchoolName() {
+ return schoolName;
+ }
+
+ public void setSchoolName(String schoolName) {
+ this.schoolName = schoolName;
+ }
+
+ public int getSecurityCount() {
+ return securityCount;
+ }
+
+ public void setSecurityCount(int securityCount) {
+ this.securityCount = securityCount;
+ }
+
+ public String getSecurityName() {
+ return securityName;
+ }
+
+ public void setSecurityName(String securityName) {
+ this.securityName = securityName;
+ }
+
+ public String getSecurityPhone() {
+ return securityPhone;
+ }
+
+ public void setSecurityPhone(String securityPhone) {
+ this.securityPhone = securityPhone;
+ }
+
+ public int getStuCount() {
+ return stuCount;
+ }
+
+ public void setStuCount(int stuCount) {
+ this.stuCount = stuCount;
+ }
+}
diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/SchoolEmphasesPersonDetailBean.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/SchoolEmphasesPersonDetailBean.java
new file mode 100644
index 0000000..f7b826d
--- /dev/null
+++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/SchoolEmphasesPersonDetailBean.java
@@ -0,0 +1,74 @@
+package com.tengshisoft.commonmodule.beans;
+
+/**
+ * 作者: adam
+ * 日期: 2021/10/26 - 3:20 下午
+ * 邮箱: itgaojian@163.com
+ * 描述:
+ */
+public class SchoolEmphasesPersonDetailBean {
+
+ private String baseId;
+ private String degreeOfHarm;
+ private String degreeOfHarmCode;
+ private String degreeOfHarmName;
+ private int isFollow;
+ private String schoolId;
+ private String schoolKeyId;
+
+ public String getBaseId() {
+ return baseId;
+ }
+
+ public void setBaseId(String baseId) {
+ this.baseId = baseId;
+ }
+
+ public String getDegreeOfHarm() {
+ return degreeOfHarm;
+ }
+
+ public void setDegreeOfHarm(String degreeOfHarm) {
+ this.degreeOfHarm = degreeOfHarm;
+ }
+
+ public String getDegreeOfHarmCode() {
+ return degreeOfHarmCode;
+ }
+
+ public void setDegreeOfHarmCode(String degreeOfHarmCode) {
+ this.degreeOfHarmCode = degreeOfHarmCode;
+ }
+
+ public String getDegreeOfHarmName() {
+ return degreeOfHarmName;
+ }
+
+ public void setDegreeOfHarmName(String degreeOfHarmName) {
+ this.degreeOfHarmName = degreeOfHarmName;
+ }
+
+ public int getIsFollow() {
+ return isFollow;
+ }
+
+ public void setIsFollow(int isFollow) {
+ this.isFollow = isFollow;
+ }
+
+ public String getSchoolId() {
+ return schoolId;
+ }
+
+ public void setSchoolId(String schoolId) {
+ this.schoolId = schoolId;
+ }
+
+ public String getSchoolKeyId() {
+ return schoolKeyId;
+ }
+
+ public void setSchoolKeyId(String schoolKeyId) {
+ this.schoolKeyId = schoolKeyId;
+ }
+}
diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/SchoolEmphasesPersonListBean.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/SchoolEmphasesPersonListBean.java
new file mode 100644
index 0000000..f1a8dd0
--- /dev/null
+++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/SchoolEmphasesPersonListBean.java
@@ -0,0 +1,107 @@
+package com.tengshisoft.commonmodule.beans;
+
+import java.util.List;
+
+/**
+ * 作者: adam
+ * 日期: 2021/10/26 - 2:34 下午
+ * 邮箱: itgaojian@163.com
+ * 描述:学校周边重点关注人员
+ */
+public class SchoolEmphasesPersonListBean {
+
+
+ private int page;
+ private int total;
+ private List rows;
+
+ public int getPage() {
+ return page;
+ }
+
+ public void setPage(int page) {
+ this.page = page;
+ }
+
+ public int getTotal() {
+ return total;
+ }
+
+ public void setTotal(int total) {
+ this.total = total;
+ }
+
+ public List getRows() {
+ return rows;
+ }
+
+ public void setRows(List rows) {
+ this.rows = rows;
+ }
+
+ public static class RowsBean {
+ private String baseId;
+ private String degreeOfHarm;
+ private String degreeOfHarmCode;
+ private String degreeOfHarmName;
+ private int isFollow;
+ private String schoolId;
+ private String schoolKeyId;
+
+ public String getBaseId() {
+ return baseId;
+ }
+
+ public void setBaseId(String baseId) {
+ this.baseId = baseId;
+ }
+
+ public String getDegreeOfHarm() {
+ return degreeOfHarm;
+ }
+
+ public void setDegreeOfHarm(String degreeOfHarm) {
+ this.degreeOfHarm = degreeOfHarm;
+ }
+
+ public String getDegreeOfHarmCode() {
+ return degreeOfHarmCode;
+ }
+
+ public void setDegreeOfHarmCode(String degreeOfHarmCode) {
+ this.degreeOfHarmCode = degreeOfHarmCode;
+ }
+
+ public String getDegreeOfHarmName() {
+ return degreeOfHarmName;
+ }
+
+ public void setDegreeOfHarmName(String degreeOfHarmName) {
+ this.degreeOfHarmName = degreeOfHarmName;
+ }
+
+ public int getIsFollow() {
+ return isFollow;
+ }
+
+ public void setIsFollow(int isFollow) {
+ this.isFollow = isFollow;
+ }
+
+ public String getSchoolId() {
+ return schoolId;
+ }
+
+ public void setSchoolId(String schoolId) {
+ this.schoolId = schoolId;
+ }
+
+ public String getSchoolKeyId() {
+ return schoolKeyId;
+ }
+
+ public void setSchoolKeyId(String schoolKeyId) {
+ this.schoolKeyId = schoolKeyId;
+ }
+ }
+}
diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/SchoolListBean.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/SchoolListBean.java
new file mode 100644
index 0000000..81f0254
--- /dev/null
+++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/SchoolListBean.java
@@ -0,0 +1,232 @@
+package com.tengshisoft.commonmodule.beans;
+
+import java.util.List;
+
+/**
+ * 作者: adam
+ * 日期: 2021/10/26 - 10:00 上午
+ * 邮箱: itgaojian@163.com
+ * 描述: 学校列表
+ */
+public class SchoolListBean {
+
+ private int page;
+ private int total;
+ private List rows;
+
+ public int getPage() {
+ return page;
+ }
+
+ public void setPage(int page) {
+ this.page = page;
+ }
+
+ public int getTotal() {
+ return total;
+ }
+
+ public void setTotal(int total) {
+ this.total = total;
+ }
+
+ public List getRows() {
+ return rows;
+ }
+
+ public void setRows(List rows) {
+ this.rows = rows;
+ }
+
+ public static class RowsBean {
+ private String belongDept;
+ private String belongDeptCode;
+ private String belongDeptName;
+ private String defendName;
+ private String defendPhone;
+ private double latitude;
+ private double longitude;
+ private String principalName;
+ private String principalPhone;
+ private String runningType;
+ private String runningTypeCode;
+ private String runningTypeName;
+ private String safeName;
+ private String safePhone;
+ private String schoolAddress;
+ private String schoolId;
+ private String schoolName;
+ private int securityCount;
+ private String securityName;
+ private String securityPhone;
+ private int stuCount;
+
+ public String getBelongDept() {
+ return belongDept;
+ }
+
+ public void setBelongDept(String belongDept) {
+ this.belongDept = belongDept;
+ }
+
+ public String getBelongDeptCode() {
+ return belongDeptCode;
+ }
+
+ public void setBelongDeptCode(String belongDeptCode) {
+ this.belongDeptCode = belongDeptCode;
+ }
+
+ public String getBelongDeptName() {
+ return belongDeptName;
+ }
+
+ public void setBelongDeptName(String belongDeptName) {
+ this.belongDeptName = belongDeptName;
+ }
+
+ public String getDefendName() {
+ return defendName;
+ }
+
+ public void setDefendName(String defendName) {
+ this.defendName = defendName;
+ }
+
+ public String getDefendPhone() {
+ return defendPhone;
+ }
+
+ public void setDefendPhone(String defendPhone) {
+ this.defendPhone = defendPhone;
+ }
+
+ public double getLatitude() {
+ return latitude;
+ }
+
+ public void setLatitude(double latitude) {
+ this.latitude = latitude;
+ }
+
+ public double getLongitude() {
+ return longitude;
+ }
+
+ public void setLongitude(double longitude) {
+ this.longitude = longitude;
+ }
+
+ public String getPrincipalName() {
+ return principalName;
+ }
+
+ public void setPrincipalName(String principalName) {
+ this.principalName = principalName;
+ }
+
+ public String getPrincipalPhone() {
+ return principalPhone;
+ }
+
+ public void setPrincipalPhone(String principalPhone) {
+ this.principalPhone = principalPhone;
+ }
+
+ public String getRunningType() {
+ return runningType;
+ }
+
+ public void setRunningType(String runningType) {
+ this.runningType = runningType;
+ }
+
+ public String getRunningTypeCode() {
+ return runningTypeCode;
+ }
+
+ public void setRunningTypeCode(String runningTypeCode) {
+ this.runningTypeCode = runningTypeCode;
+ }
+
+ public String getRunningTypeName() {
+ return runningTypeName;
+ }
+
+ public void setRunningTypeName(String runningTypeName) {
+ this.runningTypeName = runningTypeName;
+ }
+
+ public String getSafeName() {
+ return safeName;
+ }
+
+ public void setSafeName(String safeName) {
+ this.safeName = safeName;
+ }
+
+ public String getSafePhone() {
+ return safePhone;
+ }
+
+ public void setSafePhone(String safePhone) {
+ this.safePhone = safePhone;
+ }
+
+ public String getSchoolAddress() {
+ return schoolAddress;
+ }
+
+ public void setSchoolAddress(String schoolAddress) {
+ this.schoolAddress = schoolAddress;
+ }
+
+ public String getSchoolId() {
+ return schoolId;
+ }
+
+ public void setSchoolId(String schoolId) {
+ this.schoolId = schoolId;
+ }
+
+ public String getSchoolName() {
+ return schoolName;
+ }
+
+ public void setSchoolName(String schoolName) {
+ this.schoolName = schoolName;
+ }
+
+ public int getSecurityCount() {
+ return securityCount;
+ }
+
+ public void setSecurityCount(int securityCount) {
+ this.securityCount = securityCount;
+ }
+
+ public String getSecurityName() {
+ return securityName;
+ }
+
+ public void setSecurityName(String securityName) {
+ this.securityName = securityName;
+ }
+
+ public String getSecurityPhone() {
+ return securityPhone;
+ }
+
+ public void setSecurityPhone(String securityPhone) {
+ this.securityPhone = securityPhone;
+ }
+
+ public int getStuCount() {
+ return stuCount;
+ }
+
+ public void setStuCount(int stuCount) {
+ this.stuCount = stuCount;
+ }
+ }
+}
diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/holders/SchoolCaseHolder.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/holders/SchoolCaseHolder.java
new file mode 100644
index 0000000..41b7334
--- /dev/null
+++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/holders/SchoolCaseHolder.java
@@ -0,0 +1,38 @@
+package com.tengshisoft.commonmodule.holders;
+
+import android.view.View;
+import android.widget.Button;
+import android.widget.TextView;
+
+import com.tengshisoft.commonmodule.R;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+
+/**
+ * 作者: adam
+ * 日期: 2021年10月26日10:12:26
+ * 邮箱: itgaojian@163.com
+ * 描述: 学校案件
+ */
+public class SchoolCaseHolder extends RecyclerView.ViewHolder {
+ public TextView mTvName;
+ public TextView mTvNumber;
+ public TextView mTvTime;
+ public TextView mTvType;
+ public TextView mTvAddress;
+ public Button mBtnDel;
+ public Button mBtnEdit;
+
+ public SchoolCaseHolder(@NonNull View itemView) {
+ super(itemView);
+ mTvName = itemView.findViewById(R.id.tv_name);
+ mTvAddress = itemView.findViewById(R.id.tv_address);
+ mTvNumber = itemView.findViewById(R.id.tv_number);
+ mTvType = itemView.findViewById(R.id.tv_type);
+ mBtnDel = itemView.findViewById(R.id.btn_del);
+ mBtnEdit = itemView.findViewById(R.id.btn_edit);
+ mTvTime = itemView.findViewById(R.id.tv_time);
+ }
+}
diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/holders/SchoolEmphasesPersonHolder.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/holders/SchoolEmphasesPersonHolder.java
new file mode 100644
index 0000000..79d7500
--- /dev/null
+++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/holders/SchoolEmphasesPersonHolder.java
@@ -0,0 +1,32 @@
+package com.tengshisoft.commonmodule.holders;
+
+import android.view.View;
+import android.widget.Button;
+import android.widget.TextView;
+
+import com.tengshisoft.commonmodule.R;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+
+/**
+ * 作者: adam
+ * 日期: 2021年10月26日10:12:26
+ * 邮箱: itgaojian@163.com
+ * 描述: 学校管理周边重点人员
+ */
+public class SchoolEmphasesPersonHolder extends RecyclerView.ViewHolder {
+ public TextView mTvHarm;
+ public TextView mTvAttention;
+ public Button mBtnDel;
+ public Button mBtnEdit;
+
+ public SchoolEmphasesPersonHolder(@NonNull View itemView) {
+ super(itemView);
+ mTvHarm = itemView.findViewById(R.id.tv_harm);
+ mTvAttention = itemView.findViewById(R.id.tv_attention);
+ mBtnDel = itemView.findViewById(R.id.btn_del);
+ mBtnEdit = itemView.findViewById(R.id.btn_edit);
+ }
+}
diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/holders/SchoolListHolder.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/holders/SchoolListHolder.java
new file mode 100644
index 0000000..ad1bfb8
--- /dev/null
+++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/holders/SchoolListHolder.java
@@ -0,0 +1,40 @@
+package com.tengshisoft.commonmodule.holders;
+
+import android.view.View;
+import android.widget.Button;
+import android.widget.TextView;
+
+import com.tengshisoft.commonmodule.R;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+
+/**
+ * 作者: adam
+ * 日期: 2021年10月26日10:12:26
+ * 邮箱: itgaojian@163.com
+ * 描述: 学校管理
+ */
+public class SchoolListHolder extends RecyclerView.ViewHolder {
+ public TextView mTvName;
+ public TextView mTvNumber;
+ public TextView mTvSchoolMaster;
+ public TextView mTvSchoolMasterPhone;
+ public TextView mTvType;
+ public TextView mTvAddress;
+ public Button mBtnPerson;
+ public Button mBtnCase;
+
+ public SchoolListHolder(@NonNull View itemView) {
+ super(itemView);
+ mTvName = itemView.findViewById(R.id.tv_name);
+ mTvAddress = itemView.findViewById(R.id.tv_address);
+ mTvNumber = itemView.findViewById(R.id.tv_number);
+ mTvSchoolMaster = itemView.findViewById(R.id.tv_schoolmaster);
+ mTvSchoolMasterPhone = itemView.findViewById(R.id.tv_schoolmaster_phone);
+ mTvType = itemView.findViewById(R.id.tv_type);
+ mBtnCase = itemView.findViewById(R.id.btn_case);
+ mBtnPerson = itemView.findViewById(R.id.btn_person);
+ }
+}
diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/nets/Apis.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/nets/Apis.java
index 8ab7111..8b73c5d 100644
--- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/nets/Apis.java
+++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/nets/Apis.java
@@ -59,6 +59,12 @@ import com.tengshisoft.commonmodule.beans.PenalListBean;
import com.tengshisoft.commonmodule.beans.PenalSuspicionDetailBean;
import com.tengshisoft.commonmodule.beans.PenalSuspicionListBean;
import com.tengshisoft.commonmodule.beans.RearListBean;
+import com.tengshisoft.commonmodule.beans.SchoolCaseDetailBean;
+import com.tengshisoft.commonmodule.beans.SchoolCaseListBean;
+import com.tengshisoft.commonmodule.beans.SchoolDetailBean;
+import com.tengshisoft.commonmodule.beans.SchoolEmphasesPersonDetailBean;
+import com.tengshisoft.commonmodule.beans.SchoolEmphasesPersonListBean;
+import com.tengshisoft.commonmodule.beans.SchoolListBean;
import com.tengshisoft.commonmodule.beans.SuccessBean;
import com.tengshisoft.commonmodule.beans.TaskListBean;
import com.tengshisoft.commonmodule.beans.TroubleDetailBean;
@@ -331,6 +337,120 @@ public interface Apis {
@Headers({"base_url_name:house", "Content-Type: application/json", "Accept: application/json"})
@GET("app/buildingleader/get/{buildingLeaderId}")
Observable getBuildingManagerDetailById(@Path("buildingLeaderId") String id, @Header("token") String token);
+ /*========================================学校管理=======================================*/
+
+ /**
+ * 获取学校列表
+ */
+ @Headers({"base_url_name:security", "Content-Type: application/json", "Accept: application/json"})
+ @GET("app/school/listpageschool")
+ Observable getSchoolList(@Query("keywords") String key, @Query("page") String page, @Header("token") String token);
+
+
+ /**
+ * 获取学校详情
+ */
+ @Headers({"base_url_name:security", "Content-Type: application/json", "Accept: application/json"})
+ @GET("app/school/get/{schoolId}")
+ Observable getSchoolDetailById(@Path("schoolId") String id, @Header("token") String token);
+
+ /**
+ * 新增学校
+ */
+ @Headers({"base_url_name:security", "Content-Type: application/json", "Accept: application/json"})
+ @POST("app/school/save")
+ Observable doSaveSchool(@Body RequestBody body, @Header("token") String token);
+
+ /**
+ * 修改学校
+ */
+ @Headers({"base_url_name:security", "Content-Type: application/json", "Accept: application/json"})
+ @PUT("app/school/updateschool/{schoolId}")
+ Observable doEditSchool(@Path("schoolId") String id, @Body RequestBody body, @Header("token") String token);
+
+ /**
+ * 删除学校
+ */
+ @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"})
+ @DELETE("app/school/remove/{ids}")
+ Observable doDelSchool(@Path("ids") String id, @Header("token") String token);
+
+ /*========================================学校管理周边重点人员=======================================*/
+
+ /**
+ * 获取人员列表
+ */
+ @Headers({"base_url_name:security", "Content-Type: application/json", "Accept: application/json"})
+ @GET("app/schoolkey/listpageschoolkey")
+ Observable getSchoolEmphasesPersonListById(@Query("schoolId") String id, @Query("keywords") String key, @Query("page") String page, @Header("token") String token);
+
+
+ /**
+ * 获取人员详情
+ */
+ @Headers({"base_url_name:security", "Content-Type: application/json", "Accept: application/json"})
+ @GET("app/schoolkey/get/{schoolKeyId}")
+ Observable getSchoolEmphasesPersonDetailById(@Path("schoolKeyId") String id, @Header("token") String token);
+
+ /**
+ * 保存重点人员
+ */
+ @Headers({"base_url_name:security", "Content-Type: application/json", "Accept: application/json"})
+ @POST("app/schoolkey/save")
+ Observable doSaveSchoolEmphases(@Body RequestBody body, @Header("token") String token);
+
+ /**
+ * 修改学校重点人员
+ */
+ @Headers({"base_url_name:security", "Content-Type: application/json", "Accept: application/json"})
+ @PUT("app/schoolkey/updateschoolkey/{schoolKeyId}")
+ Observable doEditSchoolEmphases(@Path("schoolKeyId") String id, @Body RequestBody body, @Header("token") String token);
+
+ /**
+ * 删除学校人员
+ */
+ @Headers({"base_url_name:security", "Content-Type: application/json", "Accept: application/json"})
+ @DELETE("app/schoolkey/remove/{ids}")
+ Observable doDelSchoolEmphases(@Path("ids") String id, @Header("token") String token);
+
+ /*========================================学校管理==涉及师生安全案件=======================================*/
+
+ /**
+ * 获取案件列表
+ */
+ @Headers({"base_url_name:security", "Content-Type: application/json", "Accept: application/json"})
+ @GET("app/stuteasafe/listpagestuteasafe")
+ Observable getSchoolCaseListById(@Query("schoolId") String id, @Query("keywords") String key, @Query("page") String page, @Header("token") String token);
+
+
+ /**
+ * 获取案件详情
+ */
+ @Headers({"base_url_name:security", "Content-Type: application/json", "Accept: application/json"})
+ @GET("app/stuteasafe/get/{stuTeaSafeId}")
+ Observable getSchoolCaseDetailById(@Path("stuTeaSafeId") String id, @Header("token") String token);
+
+ /**
+ * 保存案件
+ */
+ @Headers({"base_url_name:security", "Content-Type: application/json", "Accept: application/json"})
+ @POST("app/stuteasafe/save")
+ Observable doSaveSchoolCase(@Body RequestBody body, @Header("token") String token);
+
+ /**
+ * 修改学校案件
+ */
+ @Headers({"base_url_name:security", "Content-Type: application/json", "Accept: application/json"})
+ @PUT("app/stuteasafe/updatestuteasafe/{stuTeaSafeId}")
+ Observable doEditSchoolCase(@Path("stuTeaSafeId") String id, @Body RequestBody body, @Header("token") String token);
+
+ /**
+ * 删除学校案件
+ */
+ @Headers({"base_url_name:security", "Content-Type: application/json", "Accept: application/json"})
+ @DELETE("app/stuteasafe/remove/{ids}")
+ Observable doDelSchoolCase(@Path("ids") String id, @Header("token") String token);
+
/*========================================人口信息=======================================*/
/**
@@ -932,7 +1052,7 @@ public interface Apis {
* 获取事件核查列表
*/
@Headers({"base_url_name:case", "Content-Type: application/json", "Accept: application/json"})
- @GET("app/check/listpage-pending")
+ @GET("app/taskbase/listpage-task-examine")
Observable getIncidentCheckList(@Query("keywords") String key, @Query("page") String page, @Header("token") String token);
/**
@@ -942,6 +1062,19 @@ public interface Apis {
@POST("app/check/save")
Observable doSaveIncidentCheck(@Body RequestBody body, @Header("token") String token);
+ /**
+ * 事件核查通过
+ */
+ @Headers({"base_url_name:case", "Content-Type: application/json", "Accept: application/json"})
+ @POST("app/taskcompetebase/save-examinepass/{reportId}")
+ Observable doSaveIncidentCheckPass(@Path("reportId") String id, @Body RequestBody body, @Header("token") String token);
+
+ /**
+ * 事件核查不通过
+ */
+ @Headers({"base_url_name:case", "Content-Type: application/json", "Accept: application/json"})
+ @POST("app/taskcompetebase/save-examinenopass/{reportId}")
+ Observable doSaveIncidentCheckUnPass(@Path("reportId") String id, @Body RequestBody body, @Header("token") String token);
/*=========================================任务=========================================*/
/**
diff --git a/commonmodule/src/main/res/drawable-xhdpi/ic_school_icon.png b/commonmodule/src/main/res/drawable-xhdpi/ic_school_icon.png
new file mode 100644
index 0000000..457ed25
Binary files /dev/null and b/commonmodule/src/main/res/drawable-xhdpi/ic_school_icon.png differ
diff --git a/commonmodule/src/main/res/layout/item_school_case.xml b/commonmodule/src/main/res/layout/item_school_case.xml
new file mode 100644
index 0000000..21b8495
--- /dev/null
+++ b/commonmodule/src/main/res/layout/item_school_case.xml
@@ -0,0 +1,128 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/commonmodule/src/main/res/layout/item_school_emphases_person.xml b/commonmodule/src/main/res/layout/item_school_emphases_person.xml
new file mode 100644
index 0000000..3cf491e
--- /dev/null
+++ b/commonmodule/src/main/res/layout/item_school_emphases_person.xml
@@ -0,0 +1,99 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/commonmodule/src/main/res/layout/item_school_list.xml b/commonmodule/src/main/res/layout/item_school_list.xml
new file mode 100644
index 0000000..142660c
--- /dev/null
+++ b/commonmodule/src/main/res/layout/item_school_list.xml
@@ -0,0 +1,135 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/gridmodule/src/main/AndroidManifest.xml b/gridmodule/src/main/AndroidManifest.xml
index ce06515..7f3da99 100644
--- a/gridmodule/src/main/AndroidManifest.xml
+++ b/gridmodule/src/main/AndroidManifest.xml
@@ -4,6 +4,15 @@
package="com.tengshisoft.gridmodule">
+
+
+
+
+
+
+
+
+
@@ -51,7 +60,6 @@
-
-
-
-
-
-
-
doConfirm("approved"));
- mBtnRollBack.setOnClickListener(v -> doConfirm("failed"));
+ mBtnConfirm.setOnClickListener(v -> doConfirm());
+ mBtnRollBack.setOnClickListener(v -> doUnPass());
}
/**
- * 提交核查信息
+ * 事件核查不通过
*/
- private void doConfirm(String state) {
+ private void doUnPass() {
if (checkParams()) {
- RequestBody body = buildParams(state);
+ RequestBody body = buildParams();
ProgressDialog dialog = UIUtil.initDialog(mActivity, "提交中...");
dialog.show();
RetrofitManager.getInstance()
.create(Apis.class)
- .doSaveIncidentCheck(body, UserLgUtils.getToken())
+ .doSaveIncidentCheckUnPass(mId, body, UserLgUtils.getToken())
+ .subscribeOn(Schedulers.io())
+ .observeOn(AndroidSchedulers.mainThread())
+ .subscribe(new Observer() {
+ @Override
+ public void onSubscribe(@NonNull Disposable d) {
+
+ }
+
+ @Override
+ public void onNext(@NonNull SuccessBean successBean) {
+ dialog.dismiss();
+ ToastUtils.show("核查成功");
+ setResult(13);
+ finish();
+ }
+
+ @Override
+ public void onError(@NonNull Throwable e) {
+ dialog.dismiss();
+ ExceptionHandler.handleException(e);
+ }
+
+ @Override
+ public void onComplete() {
+
+ }
+ });
+ }
+ }
+
+
+ /**
+ * 事件核查通过
+ */
+ private void doConfirm() {
+ if (checkParams()) {
+ RequestBody body = buildParams();
+ ProgressDialog dialog = UIUtil.initDialog(mActivity, "提交中...");
+ dialog.show();
+ RetrofitManager.getInstance()
+ .create(Apis.class)
+ .doSaveIncidentCheckPass(mId, body, UserLgUtils.getToken())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer() {
@@ -286,14 +328,13 @@ public class IncidentCheckDetailActivity extends BaseActivity {
*
* @return
*/
- private RequestBody buildParams(String state) {
+ private RequestBody buildParams() {
SaveCheckBean bean = new SaveCheckBean();
bean.setTaskId(mTaskId);
bean.setReportId(mId);
String trim = mEtContent.getText().toString().trim();
bean.setCheckContent(trim);
bean.setCheckPhotos(mPhotoIds);
- bean.setCheckStatus(state);
Gson gson = new Gson();
String obj = gson.toJson(bean);
RequestBody requestBody = RequestBody.create(MediaType.parse("application/json; charset=utf-8"), obj);
diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/normal/CensusMigrantDetailActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/normal/CensusMigrantDetailActivity.java
index 50088d9..7ac7943 100644
--- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/normal/CensusMigrantDetailActivity.java
+++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/normal/CensusMigrantDetailActivity.java
@@ -151,10 +151,10 @@ public class CensusMigrantDetailActivity extends BaseActivity {
mTvBaseGender.setText(mBaseInfo.getGenderDictionaryName());
mTvBaseIdCard.setText(mBaseInfo.getIdCardNumber());//身份证
mTvBasePhone.setText(mBaseInfo.getTelephone());//联系电话
- mTvBaseNative.setText(mBaseInfo.getNativePlace());//籍贯
+ mTvBaseNative.setText(mBaseInfo.getNativePlaceDictionaryName());//籍贯
mTvBaseNation.setText(mBaseInfo.getNationDictionaryName());//名族
- mTvBaseRegisterLoc.setText(mBaseInfo.getRegisteredResidence());//户籍地
- mTvBaseCurLoc.setText(mBaseInfo.getCurrentResidence());//现住址
+ mTvBaseRegisterLoc.setText(mBaseInfo.getRegisteredResidenceDictionaryName());//户籍地
+ mTvBaseCurLoc.setText(mBaseInfo.getCurrentResidenceDictionaryName());//现住址
mTvBaseCurAddress.setText(mBaseInfo.getCurrentResidenceAddr());//现住址详情
}
diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/schools/SchoolCaseAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/schools/SchoolCaseAddActivity.java
new file mode 100644
index 0000000..87a189a
--- /dev/null
+++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/schools/SchoolCaseAddActivity.java
@@ -0,0 +1,542 @@
+package com.tengshisoft.gridmodule.incident.activitys.schools;
+
+import android.app.ProgressDialog;
+import android.graphics.Color;
+import android.text.Html;
+import android.text.TextUtils;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.TextView;
+
+import com.alibaba.android.arouter.facade.annotation.Route;
+import com.bigkoo.pickerview.builder.OptionsPickerBuilder;
+import com.bigkoo.pickerview.builder.TimePickerBuilder;
+import com.bigkoo.pickerview.view.OptionsPickerView;
+import com.bigkoo.pickerview.view.TimePickerView;
+import com.google.gson.Gson;
+import com.hjq.toast.ToastUtils;
+import com.tengshisoft.commonmodule.beans.SaveSchoolCaseBean;
+import com.tengshisoft.commonmodule.beans.SchoolCaseDetailBean;
+import com.tengshisoft.commonmodule.beans.SuccessBean;
+import com.tengshisoft.commonmodule.nets.Apis;
+import com.tengshisoft.gridmodule.R;
+import com.tengshisoft.gridmodule.R2;
+import com.tenlionsoft.baselib.constant.PathConfig;
+import com.tenlionsoft.baselib.core.beans.DicBean;
+import com.tenlionsoft.baselib.core.retrofit_net.RetrofitManager;
+import com.tenlionsoft.baselib.core.widget.base.BaseActivity;
+import com.tenlionsoft.baselib.core.widget.views.AreaChooseDialog;
+import com.tenlionsoft.baselib.utils.ExceptionHandler;
+import com.tenlionsoft.baselib.utils.TimeUtils;
+import com.tenlionsoft.baselib.utils.UIUtil;
+import com.tenlionsoft.baselib.utils.UserLgUtils;
+
+import java.util.List;
+
+import androidx.appcompat.widget.SwitchCompat;
+import androidx.core.widget.NestedScrollView;
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.Unbinder;
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
+import io.reactivex.rxjava3.annotations.NonNull;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import okhttp3.MediaType;
+import okhttp3.RequestBody;
+
+/**
+ * 作者: Adam
+ * 日期: 2021年10月26日16:28:13
+ * 邮箱: itgaojian@163.com
+ * 描述: 涉及师生案件
+ */
+@Route(path = PathConfig.PATH_MODULE_GRID_ACTIVITY_SCHOOL_CASE_ADD)
+public class SchoolCaseAddActivity extends BaseActivity {
+
+
+ @BindView(R2.id.et_number)
+ EditText mEtNumber;
+ @BindView(R2.id.et_name)
+ EditText mEtName;
+ @BindView(R2.id.tv_date)
+ TextView mTvDate;
+ @BindView(R2.id.tv_area)
+ TextView mTvArea;
+ @BindView(R2.id.et_address)
+ EditText mEtAddress;
+ @BindView(R2.id.tv_nature_type)
+ TextView mTvNatureType;
+ @BindView(R2.id.et_info)
+ EditText mEtInfo;
+ @BindView(R2.id.tv_card_type)
+ TextView mTvCardType;
+ @BindView(R2.id.et_card_number)
+ EditText mEtCardNumber;
+ @BindView(R2.id.et_crimianl_name)
+ EditText mEtCrimianlName;
+ @BindView(R2.id.sw_is_crack)
+ SwitchCompat mSwIsCrack;
+ @BindView(R2.id.et_offence_count)
+ EditText mEtOffenceCount;
+ @BindView(R2.id.et_flee_count)
+ EditText mEtFleeCount;
+ @BindView(R2.id.et_catch_count)
+ EditText mEtCatchCount;
+ @BindView(R2.id.et_detect)
+ EditText mEtDetect;
+ @BindView(R2.id.btn_submit)
+ Button mBtnSubmit;
+ @BindView(R2.id.nsv_content)
+ NestedScrollView mNsvContent;
+ private Unbinder mBind;
+ private String mId;
+ private OptionsPickerView mCardTypePicker;
+ private List mCardType;
+ private DicBean mSelCardType;
+
+ private OptionsPickerView mNaturePicker;
+ private List mNatureList;
+ private DicBean mSelNature;
+
+ private String mSelAreaCode;
+ private String mSelAreaId;
+ private String mSelAreaName;
+ private String mSchoolId;
+ private SchoolCaseDetailBean mBean;
+ private int mIsSw = 0;
+
+ @Override
+ protected int setLayoutId() {
+ return R.layout.activity_school_case_add;
+ }
+
+ @Override
+ public void initData() {
+ mBind = ButterKnife.bind(this);
+ mId = getIntent().getStringExtra("id");
+ mSchoolId = getIntent().getStringExtra("schoolId");
+ initViews();
+ if (TextUtils.isEmpty(mId)) {
+ mTvBaseTitle.setText("涉及师生安全案件信息录入");
+ refreshView(STATE_LOAD_SUCCESS);
+ } else {
+ mTvBaseTitle.setText("涉及师生安全案件信息编辑");
+ getDetailData();
+ }
+ }
+
+ /**
+ * 获取详情
+ */
+ private void getDetailData() {
+ RetrofitManager.getInstance()
+ .create(Apis.class)
+ .getSchoolCaseDetailById(mId, UserLgUtils.getToken())
+ .subscribeOn(Schedulers.io())
+ .observeOn(AndroidSchedulers.mainThread())
+ .subscribe(new Observer() {
+ @Override
+ public void onSubscribe(@NonNull Disposable d) {
+
+ }
+
+ @Override
+ public void onNext(@NonNull SchoolCaseDetailBean schoolCaseDetailBean) {
+ mBean = schoolCaseDetailBean;
+ setDataToView();
+ }
+
+ @Override
+ public void onError(@NonNull Throwable e) {
+ refreshView(STATE_LOAD_ERROR);
+ ExceptionHandler.handleException(e);
+ }
+
+ @Override
+ public void onComplete() {
+
+ }
+ });
+ }
+
+
+ /**
+ * 初始化视图
+ */
+ private void initViews() {
+ mTvCardType.setOnClickListener(v -> onShowCardType());
+ mTvNatureType.setOnClickListener(v -> onShowNature());
+ mTvArea.setOnClickListener(v -> onShowArea());
+ mTvDate.setOnClickListener(v -> onShowDate());
+ mBtnSubmit.setOnClickListener(v -> doConfirm());
+ mSwIsCrack.setOnCheckedChangeListener((buttonView, isChecked) -> mIsSw = isChecked ? 1 : 0);
+ }
+
+ /**
+ * 提交
+ */
+ private void doConfirm() {
+ if (!TextUtils.isEmpty(mId)) {
+ doEdit();
+ } else {
+ doSave();
+ }
+ }
+
+ /**
+ * 保存
+ */
+ private void doSave() {
+ if (checkParams()) {
+ ProgressDialog dialog = UIUtil.initDialog(mActivity, "提交中...");
+ dialog.show();
+ RequestBody body = buildParams();
+ RetrofitManager.getInstance()
+ .create(Apis.class)
+ .doSaveSchoolCase(body, UserLgUtils.getToken())
+ .subscribeOn(Schedulers.io())
+ .observeOn(AndroidSchedulers.mainThread())
+ .subscribe(new Observer() {
+ @Override
+ public void onSubscribe(@NonNull Disposable d) {
+
+ }
+
+ @Override
+ public void onNext(@NonNull SuccessBean successBean) {
+ dialog.dismiss();
+ ToastUtils.show("录入成功");
+ setResult(13);
+ finish();
+ }
+
+ @Override
+ public void onError(@NonNull Throwable e) {
+ dialog.dismiss();
+ ExceptionHandler.handleException(e);
+ }
+
+ @Override
+ public void onComplete() {
+
+ }
+ });
+ }
+ }
+
+ /**
+ * 编辑
+ */
+ private void doEdit() {
+ if (checkParams()) {
+ ProgressDialog dialog = UIUtil.initDialog(mActivity, "提交中...");
+ dialog.show();
+ RequestBody body = buildParams();
+ RetrofitManager.getInstance()
+ .create(Apis.class)
+ .doEditSchoolCase(mId, body, UserLgUtils.getToken())
+ .subscribeOn(Schedulers.io())
+ .observeOn(AndroidSchedulers.mainThread())
+ .subscribe(new Observer() {
+ @Override
+ public void onSubscribe(@NonNull Disposable d) {
+
+ }
+
+ @Override
+ public void onNext(@NonNull SuccessBean successBean) {
+ dialog.dismiss();
+ ToastUtils.show("编辑成功");
+ setResult(13);
+ finish();
+ }
+
+ @Override
+ public void onError(@NonNull Throwable e) {
+ dialog.dismiss();
+ ExceptionHandler.handleException(e);
+ }
+
+ @Override
+ public void onComplete() {
+
+ }
+ });
+ }
+ }
+
+
+ /**
+ * 显示案件性质
+ */
+ private void onShowNature() {
+ hideSoftKeyboard();
+ if (mNatureList != null && mNatureList.size() > 0) {
+ if (mNaturePicker == null) {
+ mNaturePicker = new OptionsPickerBuilder(mActivity, (o1, o2, o3, v) -> {
+ mSelNature = mNatureList.get(o1);
+ mTvNatureType.setText(mSelNature.getDataName());
+ })
+ .setTitleText("请选择")
+ .setCancelColor(Color.parseColor("#1189FF"))
+ .setSubmitColor(Color.parseColor("#1189FF"))
+ .setTitleColor(Color.parseColor("#1189FF"))
+ .build();
+ mNaturePicker.setPicker(mNatureList);
+ }
+ mNaturePicker.show();
+ } else {
+ getDicListByType(PathConfig.DIC_CASE_NATURE, 1);
+ }
+ }
+
+ /**
+ * 显示证件类型
+ */
+ private void onShowCardType() {
+ hideSoftKeyboard();
+ if (mCardType != null && mCardType.size() > 0) {
+ if (mCardTypePicker == null) {
+ mCardTypePicker = new OptionsPickerBuilder(mActivity, (o1, o2, o3, v) -> {
+ mSelCardType = mCardType.get(o1);
+ mTvCardType.setText(mSelCardType.getDataName());
+ })
+ .setTitleText("请选择")
+ .setCancelColor(Color.parseColor("#1189FF"))
+ .setSubmitColor(Color.parseColor("#1189FF"))
+ .setTitleColor(Color.parseColor("#1189FF"))
+ .build();
+ mCardTypePicker.setPicker(mCardType);
+ }
+ mCardTypePicker.show();
+ } else {
+ getDicListByType(PathConfig.DIC_CARD_TYPE, 2);
+ }
+ }
+
+ /**
+ * 显示地区选择
+ */
+ private void onShowArea() {
+ AreaChooseDialog dialog = new AreaChooseDialog
+ .DialogBuilder(mActivity)
+ .setDefault(true)
+ .build();
+ dialog.addOnChoseListener((names, id, code) -> {
+ mSelAreaCode = code;
+ mSelAreaId = id;
+ mSelAreaName = names;
+ mTvArea.setText(names);
+ dialog.dismiss();
+ });
+ dialog.show();
+ }
+
+ /**
+ * 日期
+ */
+ private void onShowDate() {
+ hideSoftKeyboard();
+ TimePickerView mTimePickerView = new TimePickerBuilder(mActivity, (date, v) -> mTvDate.setText(TimeUtils.dateToString(date)))
+ .setTitleText("请选日期")
+ .setCancelColor(Color.parseColor("#1189FF"))
+ .setSubmitColor(Color.parseColor("#1189FF"))
+ .setType(new boolean[]{true, true, true, false, false, false})
+ .setTitleColor(Color.parseColor("#1189FF"))
+ .build();
+ mTimePickerView.show();
+ }
+
+ /**
+ * 字典
+ */
+ private void getDicListByType(String pId, int i) {
+ ProgressDialog dialog = UIUtil.initDialog(mActivity, "获取中...");
+ dialog.show();
+ RetrofitManager.getInstance()
+ .create(Apis.class)
+ .getDictListAllByPid(pId, UserLgUtils.getToken())
+ .subscribeOn(Schedulers.io())
+ .observeOn(AndroidSchedulers.mainThread())
+ .subscribe(new Observer>() {
+ @Override
+ public void onSubscribe(@NonNull Disposable d) {
+
+ }
+
+ @Override
+ public void onNext(@NonNull List typeListBeans) {
+ dialog.dismiss();
+ if (typeListBeans.size() > 0) {
+ switch (i) {
+ case 1:
+ mNatureList = typeListBeans;
+ onShowNature();
+ break;
+ case 2:
+ mCardType = typeListBeans;
+ onShowCardType();
+ break;
+ }
+ } else {
+ ToastUtils.show("暂无数据");
+ }
+ }
+
+ @Override
+ public void onError(@NonNull Throwable e) {
+ dialog.dismiss();
+ ExceptionHandler.handleException(e);
+ }
+
+ @Override
+ public void onComplete() {
+
+ }
+ });
+ }
+
+ /**
+ * 校验参数
+ */
+ private boolean checkParams() {
+ String name = mEtName.getText().toString().trim();
+ if (TextUtils.isEmpty(name)) {
+ ToastUtils.show("请输入案(事)件名称");
+ return false;
+ }
+ String date = mTvDate.getText().toString().trim();
+ if (TextUtils.isEmpty(date)) {
+ ToastUtils.show("请选择发生日期");
+ return false;
+ }
+ if (TextUtils.isEmpty(mSelAreaId)) {
+ ToastUtils.show("请选择案发地");
+ return false;
+ }
+ String address = mEtAddress.getText().toString().trim();
+ if (TextUtils.isEmpty(address)) {
+ ToastUtils.show("请输入案发地点详址");
+ return false;
+ }
+ if (mSelNature == null) {
+ ToastUtils.show("请选择案(事)件性质");
+ return false;
+ }
+ String info = mEtInfo.getText().toString().trim();
+ if (TextUtils.isEmpty(info)) {
+ ToastUtils.show("请输入案(事)件情况");
+ return false;
+ }
+ if (mSelCardType == null) {
+ ToastUtils.show("请选择主犯(嫌疑人)证件类型");
+ return false;
+ }
+ String cardNum = mEtCardNumber.getText().toString().trim();
+ if (TextUtils.isEmpty(cardNum)) {
+ ToastUtils.show("请输入主犯(嫌疑人)证件号码");
+ return false;
+ }
+ String crimeName = mEtCrimianlName.getText().toString().trim();
+ if (TextUtils.isEmpty(crimeName)) {
+ ToastUtils.show("请输入主犯(嫌疑人)姓名");
+ return false;
+ }
+ String detect = mEtDetect.getText().toString().trim();
+ if (TextUtils.isEmpty(detect)) {
+ ToastUtils.show("请输入案件侦破情况");
+ return false;
+ }
+ return true;
+ }
+
+ /**
+ * 回显数据
+ */
+ private void setDataToView() {
+ refreshView(STATE_LOAD_SUCCESS);
+ mEtNumber.setText(mBean.getCaseCode());
+ mEtName.setText(mBean.getCaseName());
+ mTvDate.setText(mBean.getHappenTime());
+ mSelAreaId = mBean.getHappenLocation();
+ mSelAreaCode = mBean.getHappenLocationCode();
+ mSelAreaName = mBean.getHappenLocationName();
+ mTvArea.setText(mSelAreaName);
+ mEtAddress.setText(mBean.getHappenAddress());
+ mSelNature = new DicBean();
+ mSelNature.setDataName(mBean.getCaseNatureName());
+ mSelNature.setDataId(mBean.getCaseNature());
+ mSelNature.setDataSummary(mBean.getCaseNatureCode());
+ mTvNatureType.setText(mBean.getCaseNatureName());
+
+ mEtInfo.setText(Html.fromHtml(mBean.getCaseSituation()));
+ mSelCardType = new DicBean();
+ mSelCardType.setDataSummary(mBean.getPrincipalCardCodeCode());
+ mSelCardType.setDataId(mBean.getPrincipalCardCode());
+ mSelCardType.setDataName(mBean.getPrincipalCardCodeName());
+ mTvCardType.setText(mBean.getPrincipalCardCodeName());
+
+ mEtCardNumber.setText(mBean.getPrincipalCardNum());
+ mEtCrimianlName.setText(mBean.getPrincipalName());
+ mSwIsCrack.setChecked(mBean.getIsSolve() == 1);
+ mIsSw = mBean.getIsSolve();
+ mEtOffenceCount.setText(mBean.getCrimeCount() + "");
+ mEtFleeCount.setText(mBean.getAtLargeCount() + "");
+ mEtCatchCount.setText(mBean.getArrestCount() + "");
+ mEtDetect.setText(Html.fromHtml(mBean.getCaseSolve()));
+ }
+
+ private RequestBody buildParams() {
+ SaveSchoolCaseBean bean = new SaveSchoolCaseBean();
+ bean.setSchoolId(mSchoolId);
+ String number = mEtNumber.getText().toString().trim();
+ if (!TextUtils.isEmpty(number)) {
+ bean.setCaseCode(number);
+ }
+ String name = mEtName.getText().toString().trim();
+ bean.setCaseName(name);
+ String date = mTvDate.getText().toString().trim();
+ bean.setHappenTime(date);
+ bean.setHappenLocation(mSelAreaId);
+ bean.setHappenLocationCode(mSelAreaCode);
+ bean.setHappenLocationName(mSelAreaName);
+ String addres = mEtAddress.getText().toString().trim();
+ bean.setHappenAddress(addres);
+ bean.setCaseNature(mSelNature.getDataId());
+ bean.setCaseNatureCode(mSelNature.getDataSummary());
+ bean.setCaseNatureName(mSelNature.getDataName());
+
+ String info = mEtInfo.getText().toString().trim();
+ bean.setCaseSituation(info);
+ bean.setPrincipalCardCode(mSelCardType.getDataId());
+ bean.setPrincipalCardCodeCode(mSelCardType.getDataSummary());
+ bean.setPrincipalCardCodeName(mSelCardType.getDataName());
+ String cardNumber = mEtCardNumber.getText().toString().trim();
+ bean.setPrincipalCardNum(cardNumber);
+ String criminalName = mEtCrimianlName.getText().toString().trim();
+ bean.setPrincipalName(criminalName);
+ bean.setIsSolve(mIsSw);
+
+ String offenceCount = mEtOffenceCount.getText().toString().trim();
+ if (!TextUtils.isEmpty(offenceCount)) {
+ bean.setCrimeCount(Integer.parseInt(offenceCount));
+ }
+ String catchCount = mEtCatchCount.getText().toString().trim();
+ if (!TextUtils.isEmpty(catchCount)) {
+ bean.setArrestCount(Integer.parseInt(catchCount));
+ }
+ String fleeCount = mEtFleeCount.getText().toString().trim();
+ if (!TextUtils.isEmpty(fleeCount)) {
+ bean.setAtLargeCount(Integer.parseInt(fleeCount));
+ }
+ String detect = mEtDetect.getText().toString().trim();
+ bean.setCaseSolve(detect);
+ Gson gson = new Gson();
+ String obj = gson.toJson(bean);
+ RequestBody requestBody = RequestBody.create(MediaType.parse("application/json; charset=utf-8"), obj);
+ return requestBody;
+ }
+
+}
\ No newline at end of file
diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/schools/SchoolCaseDetailActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/schools/SchoolCaseDetailActivity.java
new file mode 100644
index 0000000..0dffc97
--- /dev/null
+++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/schools/SchoolCaseDetailActivity.java
@@ -0,0 +1,141 @@
+package com.tengshisoft.gridmodule.incident.activitys.schools;
+
+import android.text.Html;
+import android.widget.TextView;
+
+import com.alibaba.android.arouter.facade.annotation.Route;
+import com.tengshisoft.commonmodule.beans.SchoolCaseDetailBean;
+import com.tengshisoft.commonmodule.nets.Apis;
+import com.tengshisoft.gridmodule.R;
+import com.tengshisoft.gridmodule.R2;
+import com.tenlionsoft.baselib.constant.PathConfig;
+import com.tenlionsoft.baselib.core.beans.DicBean;
+import com.tenlionsoft.baselib.core.retrofit_net.RetrofitManager;
+import com.tenlionsoft.baselib.core.widget.base.BaseActivity;
+import com.tenlionsoft.baselib.utils.ExceptionHandler;
+import com.tenlionsoft.baselib.utils.UserLgUtils;
+
+import androidx.appcompat.widget.SwitchCompat;
+import androidx.core.widget.NestedScrollView;
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
+import io.reactivex.rxjava3.annotations.NonNull;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+
+/**
+ * 作者: Adam
+ * 日期: 2021年10月26日16:28:13
+ * 邮箱: itgaojian@163.com
+ * 描述: 涉及师生案件
+ */
+@Route(path = PathConfig.PATH_MODULE_GRID_ACTIVITY_SCHOOL_CASE_DETAIL)
+public class SchoolCaseDetailActivity extends BaseActivity {
+
+
+ @BindView(R2.id.tv_number)
+ TextView mTvNumber;
+ @BindView(R2.id.tv_name)
+ TextView mTvName;
+ @BindView(R2.id.tv_date)
+ TextView mTvDate;
+ @BindView(R2.id.tv_area)
+ TextView mTvArea;
+ @BindView(R2.id.tv_address)
+ TextView mTvAddress;
+ @BindView(R2.id.tv_nature_type)
+ TextView mTvNatureType;
+ @BindView(R2.id.tv_info)
+ TextView mTvInfo;
+ @BindView(R2.id.tv_card_type)
+ TextView mTvCardType;
+ @BindView(R2.id.tv_card_number)
+ TextView mTvCardNumber;
+ @BindView(R2.id.tv_criminal_name)
+ TextView mTvCriminalName;
+ @BindView(R2.id.sw_is_crack)
+ SwitchCompat mSwIsCrack;
+ @BindView(R2.id.tv_offence_count)
+ TextView mTvOffenceCount;
+ @BindView(R2.id.tv_flee_count)
+ TextView mTvFleeCount;
+ @BindView(R2.id.tv_catch_count)
+ TextView mTvCatchCount;
+ @BindView(R2.id.tv_detect)
+ TextView mTvDetect;
+ @BindView(R2.id.nsv_content)
+ NestedScrollView mNsvContent;
+ private SchoolCaseDetailBean mBean;
+ private String mId;
+
+ @Override
+ protected int setLayoutId() {
+ return R.layout.activity_school_case_detail;
+ }
+
+ @Override
+ public void initData() {
+ ButterKnife.bind(this);
+ mTvBaseTitle.setText("涉及师生安全案件详情");
+ mId = getIntent().getStringExtra("id");
+ getDetailData();
+ }
+
+ /**
+ * 获取详情
+ */
+ private void getDetailData() {
+ RetrofitManager.getInstance()
+ .create(Apis.class)
+ .getSchoolCaseDetailById(mId, UserLgUtils.getToken())
+ .subscribeOn(Schedulers.io())
+ .observeOn(AndroidSchedulers.mainThread())
+ .subscribe(new Observer() {
+ @Override
+ public void onSubscribe(@NonNull Disposable d) {
+
+ }
+
+ @Override
+ public void onNext(@NonNull SchoolCaseDetailBean schoolCaseDetailBean) {
+ mBean = schoolCaseDetailBean;
+ setDataToView();
+ }
+
+ @Override
+ public void onError(@NonNull Throwable e) {
+ refreshView(STATE_LOAD_ERROR);
+ ExceptionHandler.handleException(e);
+ }
+
+ @Override
+ public void onComplete() {
+
+ }
+ });
+ }
+
+ /**
+ * 回显数据
+ */
+ private void setDataToView() {
+ refreshView(STATE_LOAD_SUCCESS);
+ mTvNumber.setText(mBean.getCaseCode());
+ mTvName.setText(mBean.getCaseName());
+ mTvDate.setText(mBean.getHappenTime());
+ mTvArea.setText(mBean.getHappenLocationName());
+ mTvAddress.setText(mBean.getHappenAddress());
+ mTvNatureType.setText(mBean.getCaseNatureName());
+ mTvInfo.setText(Html.fromHtml(mBean.getCaseSituation()));
+ mTvCardType.setText(mBean.getPrincipalCardCodeName());
+ mTvCardNumber.setText(mBean.getPrincipalCardNum());
+ mTvCriminalName.setText(mBean.getPrincipalName());
+ mTvOffenceCount.setText(mBean.getCrimeCount() + "");
+ mTvFleeCount.setText(mBean.getAtLargeCount() + "");
+ mTvCatchCount.setText(mBean.getArrestCount() + "");
+ mSwIsCrack.setChecked(mBean.getIsSolve() == 1);
+ mTvDetect.setText(Html.fromHtml(mBean.getCaseSolve()));
+ }
+}
\ No newline at end of file
diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/schools/SchoolCaseListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/schools/SchoolCaseListActivity.java
new file mode 100644
index 0000000..1e4da2c
--- /dev/null
+++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/schools/SchoolCaseListActivity.java
@@ -0,0 +1,353 @@
+package com.tengshisoft.gridmodule.incident.activitys.schools;
+
+import android.app.AlertDialog;
+import android.app.ProgressDialog;
+import android.content.Intent;
+import android.text.TextUtils;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+
+import com.alibaba.android.arouter.facade.annotation.Route;
+import com.alibaba.android.arouter.launcher.ARouter;
+import com.hjq.toast.ToastUtils;
+import com.scwang.smart.refresh.layout.SmartRefreshLayout;
+import com.tengshisoft.commonmodule.adapters.SchoolCaseAdapter;
+import com.tengshisoft.commonmodule.adapters.SchoolEmphasesPersonAdapter;
+import com.tengshisoft.commonmodule.beans.SchoolCaseListBean;
+import com.tengshisoft.commonmodule.beans.SchoolEmphasesPersonListBean;
+import com.tengshisoft.commonmodule.beans.SuccessBean;
+import com.tengshisoft.commonmodule.nets.Apis;
+import com.tengshisoft.gridmodule.R;
+import com.tengshisoft.gridmodule.R2;
+import com.tenlionsoft.baselib.constant.PathConfig;
+import com.tenlionsoft.baselib.core.retrofit_net.RetrofitManager;
+import com.tenlionsoft.baselib.core.widget.base.BaseActivity;
+import com.tenlionsoft.baselib.utils.ExceptionHandler;
+import com.tenlionsoft.baselib.utils.UIUtil;
+import com.tenlionsoft.baselib.utils.UserLgUtils;
+
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.Unbinder;
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
+import io.reactivex.rxjava3.annotations.NonNull;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+
+/**
+ * 作者: Adam
+ * 日期: 2021年10月26日16:28:13
+ * 邮箱: itgaojian@163.com
+ * 描述: 涉及师生案件
+ */
+@Route(path = PathConfig.PATH_MODULE_GRID_ACTIVITY_SCHOOL_CASE_LIST)
+public class SchoolCaseListActivity extends BaseActivity {
+
+
+ @BindView(R2.id.srl_content)
+ SmartRefreshLayout mSrlContent;
+ @BindView(R2.id.rlv_buildings)
+ RecyclerView mRlvBuildings;
+ @BindView(R2.id.et_base_search_content)
+ EditText mEtBaseSearchContent;
+ @BindView(R2.id.iv_base_clear)
+ ImageView mIvBaseClear;
+ @BindView(R2.id.btn_base_search)
+ Button mBtnBaseSearch;
+ @BindView(R2.id.ll_base_search_content)
+ LinearLayout mLlBaseSearchContent;
+ @BindView(R2.id.pb_loading)
+ ProgressBar mPbLoading;
+ @BindView(R2.id.iv_empty_data)
+ ImageView mIvEmptyData;
+ @BindView(R2.id.tv_error_hint)
+ TextView mTvErrorHint;
+
+
+ private Unbinder mBind;
+ private int mCurrentPage = 1;//当前页数
+ private int mTotalSize;//总数
+ private List mDatas;
+ private SchoolCaseAdapter mAdapter;
+ private String mKeywords = "";
+ private int mType;
+ private String mId;
+
+ @Override
+ protected int setLayoutId() {
+ return R.layout.activity_school_case_list;
+ }
+
+ @Override
+ public void initData() {
+ mBind = ButterKnife.bind(this);
+ mTvBaseTitle.setText("涉及师生安全案件");
+ mId = getIntent().getStringExtra("schoolId");
+ mDatas = new ArrayList<>();
+ mTvPublish.setVisibility(View.VISIBLE);
+ mTvPublish.setText("录入");
+ mTvPublish.setOnClickListener(v -> ARouter.getInstance()
+ .build(PathConfig.PATH_MODULE_GRID_ACTIVITY_SCHOOL_CASE_ADD)
+ .withString("schoolId", mId)
+ .navigation(mActivity, 12));
+ mAdapter = new SchoolCaseAdapter(mActivity, mDatas);
+ mSrlContent.setOnLoadMoreListener(refreshLayout -> loadMore());
+ mSrlContent.setOnRefreshListener(refreshLayout -> doRefresh());
+ mRlvBuildings.setLayoutManager(new LinearLayoutManager(mActivity));
+ mRlvBuildings.setAdapter(mAdapter);
+
+ refreshView(STATE_LOAD_SUCCESS);
+ setStateView(13);
+ getSchoolEmphasesPersonList(1);
+ mBtnBaseSearch.setOnClickListener(v -> doSearch());
+ mIvBaseClear.setOnClickListener(v -> {
+ mKeywords = "";
+ mEtBaseSearchContent.setText("");
+ doRefresh();
+ });
+ mAdapter.addOnItemClickListener(this::showDetail);
+ mAdapter.addOnEditListener(new SchoolCaseAdapter.OnEditListener() {
+ @Override
+ public void onEdit(SchoolCaseListBean.RowsBean bean, int pos) {
+ ARouter.getInstance()
+ .build(PathConfig.PATH_MODULE_GRID_ACTIVITY_SCHOOL_CASE_ADD)
+ .withString("id", bean.getStuTeaSafeId())
+ .withString("schoolId", bean.getSchoolId())
+ .navigation(mActivity, 12);
+ }
+
+ @Override
+ public void onDel(SchoolCaseListBean.RowsBean bean, int pos) {
+ doDel(bean, pos);
+ }
+ });
+ }
+
+ /**
+ * 删除人员
+ */
+ private void doDel(SchoolCaseListBean.RowsBean bean, int pos) {
+ AlertDialog.Builder builder = new AlertDialog.Builder(mActivity);
+ builder.setTitle("提示")
+ .setMessage("确定要删除该条信息吗?")
+ .setPositiveButton("确定", (dialog, which) -> {
+ dialog.dismiss();
+ ProgressDialog dialog1 = UIUtil.initDialog(mActivity, "删除中...");
+ dialog1.show();
+ RetrofitManager.getInstance()
+ .create(Apis.class)
+ .doDelSchoolCase(bean.getStuTeaSafeId(), UserLgUtils.getToken())
+ .subscribeOn(Schedulers.io())
+ .observeOn(AndroidSchedulers.mainThread())
+ .subscribe(new Observer() {
+ @Override
+ public void onSubscribe(@NonNull Disposable d) {
+
+ }
+
+ @Override
+ public void onNext(@NonNull SuccessBean successBean) {
+ dialog1.dismiss();
+ ToastUtils.show("删除成功");
+ doRefresh();
+ }
+
+ @Override
+ public void onError(@NonNull Throwable e) {
+ dialog1.dismiss();
+ ExceptionHandler.handleException(e);
+ }
+
+ @Override
+ public void onComplete() {
+
+ }
+ });
+ })
+ .setNegativeButton("取消", (dialog, which) -> dialog.dismiss())
+ .create()
+ .show();
+ }
+
+ /**
+ * 显示详情
+ */
+ private void showDetail(SchoolCaseListBean.RowsBean b) {
+ ARouter.getInstance()
+ .build(PathConfig.PATH_MODULE_GRID_ACTIVITY_SCHOOL_CASE_DETAIL)
+ .withString("id", b.getStuTeaSafeId())
+ .navigation();
+ }
+
+ @Override
+ protected void onActivityResult(int requestCode, int resultCode, @Nullable @org.jetbrains.annotations.Nullable Intent data) {
+ super.onActivityResult(requestCode, resultCode, data);
+ if (requestCode == 12) {
+ if (resultCode == 13) {
+ doRefresh();
+ }
+ }
+ }
+
+ /**
+ * 获取学校列表
+ *
+ * @param currentPage
+ */
+ private void getSchoolEmphasesPersonList(int currentPage) {
+ mCurrentPage = currentPage;
+ RetrofitManager.getInstance()
+ .create(Apis.class)
+ .getSchoolCaseListById(mId, mKeywords, mCurrentPage + "", UserLgUtils.getToken())
+ .subscribeOn(Schedulers.io())
+ .observeOn(AndroidSchedulers.mainThread())
+ .subscribe(new Observer() {
+ @Override
+ public void onSubscribe(@NonNull Disposable d) {
+
+ }
+
+ @Override
+ public void onNext(@NonNull SchoolCaseListBean communityListBean) {
+ if (communityListBean != null && communityListBean.getRows() != null && communityListBean.getRows().size() > 0) {
+ ++mCurrentPage;
+ if (currentPage == 1) {
+ mDatas.clear();
+ mDatas.addAll(communityListBean.getRows());
+ } else {
+ mDatas.addAll(communityListBean.getRows());
+ }
+ setStateView(14);
+ mAdapter.notifyDataSetChanged();
+ mSrlContent.finishRefresh();
+ if (mDatas.size() >= communityListBean.getTotal()) {
+ mSrlContent.finishLoadMore();
+ mSrlContent.setNoMoreData(true);
+ } else {
+ mSrlContent.finishLoadMore();
+ mSrlContent.setNoMoreData(false);
+ }
+ } else {
+ mSrlContent.finishLoadMore();
+ mSrlContent.setNoMoreData(true);
+ if (currentPage > 1) {
+ setStateView(14);
+ } else {
+ if (TextUtils.isEmpty(mKeywords)) {
+ //无数据
+ setStateView(15);
+ } else {
+ setStateView(15);
+ ToastUtils.show("未查询到相关内容");
+ }
+ }
+ }
+ }
+
+ @Override
+ public void onError(@NonNull Throwable e) {
+ mSrlContent.finishLoadMore();
+ mSrlContent.finishRefresh();
+ ExceptionHandler.handleException(e);
+ setStateView(16);
+ }
+
+ @Override
+ public void onComplete() {
+
+ }
+ });
+ }
+
+ /**
+ *
+ */
+ private void doSearch() {
+ hideSoftKeyboard();
+ String searchContent = mEtBaseSearchContent.getText().toString().trim();
+ if (!TextUtils.isEmpty(searchContent)) {
+ hideSoftKeyboard();
+ setStateView(13);
+ mKeywords = searchContent;
+ mCurrentPage = 1;
+ getSchoolEmphasesPersonList(mCurrentPage);
+
+ } else {
+ ToastUtils.show("请输入要查询的内容");
+ }
+ }
+
+ //加载更多
+ private void loadMore() {
+ getSchoolEmphasesPersonList(mCurrentPage);
+ }
+
+ //刷新
+ private void doRefresh() {
+ mDatas.clear();
+ mAdapter.setData(mDatas);
+ getSchoolEmphasesPersonList(1);
+ }
+
+ /**
+ * 根据状态显示
+ * 12 默认
+ * 13 搜索中
+ * 14 搜索完成有数据
+ * 15 搜索完成没有数据
+ * 16 搜索失败
+ *
+ * @param state
+ */
+ private void setStateView(int state) {
+ switch (state) {
+ case 12://默认
+ mPbLoading.setVisibility(View.GONE);
+ mSrlContent.setVisibility(View.GONE);
+ mIvEmptyData.setVisibility(View.VISIBLE);
+ mTvErrorHint.setVisibility(View.VISIBLE);
+ mTvErrorHint.setText("请输入要查询的社区名称或楼宇(房屋)名称");
+ break;
+ case 13://搜索中
+ mPbLoading.setVisibility(View.VISIBLE);
+ mSrlContent.setVisibility(View.GONE);
+ mIvEmptyData.setVisibility(View.GONE);
+ mTvErrorHint.setVisibility(View.VISIBLE);
+ mTvErrorHint.setText("加载中...");
+ break;
+ case 14://搜索完成有数据
+ mPbLoading.setVisibility(View.GONE);
+ mSrlContent.setVisibility(View.VISIBLE);
+ mIvEmptyData.setVisibility(View.GONE);
+ mTvErrorHint.setVisibility(View.GONE);
+ break;
+ case 15://搜索完成没有数据
+ mPbLoading.setVisibility(View.GONE);
+ mSrlContent.setVisibility(View.GONE);
+ mIvEmptyData.setVisibility(View.VISIBLE);
+ mTvErrorHint.setVisibility(View.VISIBLE);
+ mTvErrorHint.setText("没有搜索到数据");
+ break;
+ case 16://搜索失败
+ mPbLoading.setVisibility(View.GONE);
+ mSrlContent.setVisibility(View.GONE);
+ mIvEmptyData.setVisibility(View.VISIBLE);
+ mTvErrorHint.setVisibility(View.VISIBLE);
+ mTvErrorHint.setText("加载失败,请稍后重试");
+ break;
+ }
+ }
+}
\ No newline at end of file
diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/schools/SchoolEmphasesAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/schools/SchoolEmphasesAddActivity.java
new file mode 100644
index 0000000..c019ed0
--- /dev/null
+++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/schools/SchoolEmphasesAddActivity.java
@@ -0,0 +1,465 @@
+package com.tengshisoft.gridmodule.incident.activitys.schools;
+
+import android.app.ProgressDialog;
+import android.graphics.Color;
+import android.text.TextUtils;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.alibaba.android.arouter.facade.annotation.Route;
+import com.bigkoo.pickerview.builder.OptionsPickerBuilder;
+import com.bigkoo.pickerview.view.OptionsPickerView;
+import com.google.gson.Gson;
+import com.hjq.toast.ToastUtils;
+import com.tengshisoft.commonmodule.beans.SaveEmphasesBean;
+import com.tengshisoft.commonmodule.beans.SchoolEmphasesPersonDetailBean;
+import com.tengshisoft.commonmodule.beans.SuccessBean;
+import com.tengshisoft.commonmodule.nets.Apis;
+import com.tengshisoft.gridmodule.R;
+import com.tengshisoft.gridmodule.R2;
+import com.tenlionsoft.baselib.constant.PathConfig;
+import com.tenlionsoft.baselib.core.beans.DicBean;
+import com.tenlionsoft.baselib.core.beans.PersonSearchBean;
+import com.tenlionsoft.baselib.core.retrofit_net.RetrofitManager;
+import com.tenlionsoft.baselib.core.retrofit_net.api.BaseApiService;
+import com.tenlionsoft.baselib.core.widget.base.BaseActivity;
+import com.tenlionsoft.baselib.utils.ExceptionHandler;
+import com.tenlionsoft.baselib.utils.RegexUtils;
+import com.tenlionsoft.baselib.utils.UIUtil;
+import com.tenlionsoft.baselib.utils.UserLgUtils;
+
+import java.util.List;
+
+import androidx.appcompat.widget.SwitchCompat;
+import androidx.cardview.widget.CardView;
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.Unbinder;
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
+import io.reactivex.rxjava3.annotations.NonNull;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import okhttp3.MediaType;
+import okhttp3.RequestBody;
+
+/**
+ * 作者: Adam
+ * 日期: 2021年10月26日14:54:53
+ * 邮箱: itgaojian@163.com
+ * 描述: 学校管理-周边重点人员
+ */
+@Route(path = PathConfig.PATH_MODULE_GRID_ACTIVITY_SCHOOL_EMPHASES_PERSON_ADD)
+public class SchoolEmphasesAddActivity extends BaseActivity {
+
+
+ @BindView(R2.id.et_search_centent)
+ EditText mEtSearchCentent;
+ @BindView(R2.id.iv_clear)
+ ImageView mIvClear;
+ @BindView(R2.id.btn_search)
+ Button mBtnSearch;
+ @BindView(R2.id.ll_search_content)
+ LinearLayout mLlSearchContent;
+ @BindView(R2.id.tv_base_name)
+ TextView mTvBaseName;
+ @BindView(R2.id.tv_base_former_name)
+ TextView mTvBaseFormerName;
+ @BindView(R2.id.tv_base_gender)
+ TextView mTvBaseGender;
+ @BindView(R2.id.tv_base_id_card)
+ TextView mTvBaseIdCard;
+ @BindView(R2.id.tv_base_phone)
+ TextView mTvBasePhone;
+ @BindView(R2.id.tv_base_native)
+ TextView mTvBaseNative;
+ @BindView(R2.id.tv_base_nation)
+ TextView mTvBaseNation;
+ @BindView(R2.id.tv_base_register_loc)
+ TextView mTvBaseRegisterLoc;
+ @BindView(R2.id.tv_base_cur_loc)
+ TextView mTvBaseCurLoc;
+ @BindView(R2.id.tv_base_cur_address)
+ TextView mTvBaseCurAddress;
+ @BindView(R2.id.cv_base_info_detail)
+ CardView mCvBaseInfoDetail;
+ @BindView(R2.id.tv_harm)
+ TextView mTvHarm;
+ @BindView(R2.id.sw_attention)
+ SwitchCompat mSwAttention;
+ @BindView(R2.id.btn_confirm)
+ Button mBtnConfirm;
+ @BindView(R2.id.ll_content)
+ LinearLayout mLlContent;
+ private Unbinder mBind;
+ private String mPersonId;
+ private String mId;
+ private String mSchoolId;
+ private PersonSearchBean mBaseInfo;
+ private SchoolEmphasesPersonDetailBean mDetailBean;
+ private int mIsAttention = 0;
+ private OptionsPickerView mTypePicker;
+ private List mTypeList;
+ private DicBean mSelType;
+
+
+ @Override
+ protected int setLayoutId() {
+ return R.layout.activity_school_emphases_add;
+ }
+
+ @Override
+ public void initData() {
+ mBind = ButterKnife.bind(this);
+ mPersonId = getIntent().getStringExtra("personId");
+ mId = getIntent().getStringExtra("id");
+ mSchoolId = getIntent().getStringExtra("schoolId");
+ initView();
+ if (TextUtils.isEmpty(mId)) {
+ //添加
+ mLlSearchContent.setVisibility(View.VISIBLE);
+ refreshView(STATE_LOAD_SUCCESS);
+ mTvBaseTitle.setText("学校周边重点人员录入");
+ } else {
+ //编辑
+ mLlSearchContent.setVisibility(View.GONE);
+ refreshView(STATE_LOAD_LOADING);
+ getDetailData();
+ mTvBaseTitle.setText("学校周边重点人员信息编辑");
+ }
+ }
+
+ /**
+ * 获取详情
+ */
+ private void getDetailData() {
+ Observable personBaseBean = RetrofitManager.getInstance().create(Apis.class).getBaseInfoDetailById(mPersonId, UserLgUtils.getToken());
+ Observable detailById = RetrofitManager.getInstance().create(Apis.class).getSchoolEmphasesPersonDetailById(mId, UserLgUtils.getToken());
+ Observable.merge(personBaseBean, detailById)
+ .subscribeOn(Schedulers.io())
+ .observeOn(AndroidSchedulers.mainThread())
+ .subscribe(new Observer