Skip to content

S
smart_gov_platform
Commit a2645902 authored by “yiyousong”'s avatar “yiyousong”
Browse files
Options

Merge branch 'master' of http://gitlab.scsmile.cn/zxf/smart_gov_platform

parents 4c16da35 bf85c44a
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1455 additions and 109 deletions
base-manager/db/add.sql
View file @ a2645902
......@@ -15,3 +15,14 @@ INSERT INTO `mortals_xhx_task` VALUES (null, '统计站点部门事项数', 'Sta
2023-3-11
-- ----------------------------
ALTER TABLE mortals_sys_workman ADD COLUMN `operatorId` varchar (128) default "" COMMENT '一体化经办人id' AFTER modelIds;
-- ----------------------------
2023-3-28
-- ----------------------------
ALTER TABLE mortals_sys_app_info_field ADD COLUMN `fieldTypeValue` varchar (255) default "" COMMENT '字段类型值，当字段类型为多选，单选时候，预设复选值' AFTER fieldType;
ALTER TABLE mortals_sys_app_info_field ADD COLUMN `defaultValue` varchar (255) default "" COMMENT '字段默认值' AFTER fieldValue;
ALTER TABLE mortals_sys_app_info_templete_field ADD COLUMN `fieldTypeValue` varchar (255) default "" COMMENT '字段类型值，当字段类型为多选，单选时候，预设复选值' AFTER fieldType;
ALTER TABLE mortals_sys_app_info_templete_field ADD COLUMN `defaultValue` varchar (255) default "" COMMENT '字段默认值' AFTER fieldValue;
base-manager/doc/api.md
View file @ a2645902
......@@ -10976,6 +10976,8 @@ data|object|数据对象
  createUserId|Long|创建用户
  updateTime|Date|修改时间
  updateUserId|Long|修改用户
  fieldTypeValue|String|字段类型值，当字段类型为多选，单选时候，预设复选值
  defaultValue|String|字段默认值
dict|object|字典对象
 fieldType|object|字典属性对象，详见附录
 dataType|object|字典属性对象，详见附录
......@@ -11037,6 +11039,8 @@ data|object|数据对象
 createUserId|Long|创建用户
 updateTime|Date|修改时间
 updateUserId|Long|修改用户
 fieldTypeValue|String|字段类型值，当字段类型为多选，单选时候，预设复选值
 defaultValue|String|字段默认值
dict|object|字典对象
 fieldType|object|字典属性对象，详见附录
 dataType|object|字典属性对象，详见附录
......@@ -11094,6 +11098,8 @@ fieldNull|Integer|否|是否允许为空，(0.否,1.是)
isList|Integer|否|字段是否列表显示(0.否,1.是)
fieldOrderNo|String|否|排序号
remark|String|否|备注
fieldTypeValue|String|否|字段类型值，当字段类型为多选，单选时候，预设复选值
defaultValue|String|否|字段默认值
**请求样例:**
......@@ -11250,6 +11256,8 @@ data|object|数据对象
  createUserId|Long|创建用户
  updateTime|Date|修改时间
  updateUserId|Long|修改用户
  fieldTypeValue|String|字段类型值，当字段类型为多选，单选时候，预设复选值
  defaultValue|String|字段默认值
dict|object|字典对象
 fieldType|object|字典属性对象，详见附录
 dataType|object|字典属性对象，详见附录
......@@ -11311,6 +11319,8 @@ data|object|数据对象
 createUserId|Long|创建用户
 updateTime|Date|修改时间
 updateUserId|Long|修改用户
 fieldTypeValue|String|字段类型值，当字段类型为多选，单选时候，预设复选值
 defaultValue|String|字段默认值
dict|object|字典对象
 fieldType|object|字典属性对象，详见附录
 dataType|object|字典属性对象，详见附录
......@@ -11368,6 +11378,8 @@ fieldNull|Integer|否|是否允许为空，(0.否,1.是)
isList|Integer|否|字段是否列表显示(0.否,1.是)
fieldOrderNo|String|否|排序号
remark|String|否|备注
fieldTypeValue|String|否|字段类型值，当字段类型为多选，单选时候，预设复选值
defaultValue|String|否|字段默认值
**请求样例:**
......
base-manager/src/main/java/com/mortals/xhx/busiz/web/MidSignApiController.java
View file @ a2645902
package com.mortals.xhx.busiz.web;
import cn.hutool.core.codec.Base64;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.net.url.UrlBuilder;
import cn.hutool.core.util.RandomUtil;
import cn.hutool.core.util.URLUtil;
import cn.hutool.crypto.digest.DigestAlgorithm;
import cn.hutool.crypto.digest.Digester;
import cn.hutool.http.HttpUtil;
import cn.hutool.http.Method;
import com.alibaba.fastjson.JSON;
......@@ -16,40 +11,15 @@ import com.mortals.framework.common.Rest;
import com.mortals.xhx.busiz.req.MidReq;
import com.mortals.xhx.busiz.rsp.SignResp;
import com.mortals.xhx.common.utils.EncryptionUtils;
import com.mortals.xhx.module.dept.model.DeptEntity;
import com.mortals.xhx.module.dept.model.DeptQuery;
import com.mortals.xhx.module.dept.service.DeptService;
import com.mortals.xhx.module.matter.model.MatterEntity;
import com.mortals.xhx.module.matter.model.MatterQuery;
import com.mortals.xhx.module.matter.service.MatterService;
import com.mortals.xhx.module.site.model.SiteMatterEntity;
import com.mortals.xhx.module.site.model.SiteMatterQuery;
import com.mortals.xhx.module.site.service.SiteMatterService;
import com.mortals.xhx.module.window.model.WindowEntity;
import com.mortals.xhx.module.window.model.WindowMatterEntity;
import com.mortals.xhx.module.window.model.WindowMatterQuery;
import com.mortals.xhx.module.window.model.WindowQuery;
import com.mortals.xhx.module.window.service.WindowMatterService;
import com.mortals.xhx.module.window.service.WindowService;
import lombok.extern.slf4j.Slf4j;
import org.apache.http.HttpResponse;
import org.apache.http.client.CookieStore;
import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.impl.client.BasicCookieStore;
import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.http.util.EntityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpMethod;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.*;
import java.util.stream.Collectors;
import java.util.HashMap;
import java.util.Map;
/**
* 微中台签名接口
......@@ -104,6 +74,8 @@ public class MidSignApiController {
headerMap.put(entry.getKey(), entry.getValue());
}
}
}else {
}
StringBuilder signSb = new StringBuilder();
......@@ -157,6 +129,9 @@ public class MidSignApiController {
headerMap.put(entry.getKey(), entry.getValue());
}
}*/
}else{
JSONObject object1 = JSONObject.parseObject(midReq.getBody());
headerMap.put("body", object1.toJSONString());
}
signSb.append("appId").append("=").append(headerMap.get("appId")).append("&");
......@@ -172,9 +147,14 @@ public class MidSignApiController {
headerMap.put("sign", sign);
//请求转发
String fullUrl = URLUtil.completeUrl(midUrl, midReq.getPath());
String fullUrl =UrlBuilder.ofHttp(midUrl).addPath(midReq.getPath()).build();
//String fullUrl = URLUtil.completeUrl(midUrl, midReq.getPath());
log.info("mid url:{},body:{}",fullUrl,headerMap.get("body"));
String body = HttpUtil.createRequest(Method.POST, fullUrl).headerMap(headerMap, true).body(headerMap.get("body")).execute().body();
return Rest.ok(body);
JSONObject bodyJson = JSONObject.parseObject(body);
log.info("mid resp:"+bodyJson.toJSONString());
return Rest.ok(bodyJson.toJSONString());
} catch (Exception e) {
log.error("透传请求异常",e);
return Rest.fail("透传请求异常！");
......
base-manager/src/main/java/com/mortals/xhx/module/app/model/AppInfoFieldEntity.java
View file @ a2645902
......@@ -7,17 +7,17 @@ import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.app.model.vo.AppInfoFieldVo;
/**
* 自助终端应用信息字段实体对象
* 自助终端应用模板信息字段实体对象
*
* @author zxfei
* @date 2022-12-02
* @date 2023-03-28
*/
public class AppInfoFieldEntity extends AppInfoFieldVo {
private static final long serialVersionUID = 1L;
/**
* 应用数据集id
* 数据集id
*/
private Long datasetId;
/**
......@@ -29,9 +29,13 @@ public class AppInfoFieldEntity extends AppInfoFieldVo {
*/
private String fieldName;
/**
* 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框）
* 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框,editer.富文本）
*/
private String fieldType;
/**
* 字段类型值，当字段类型为多选，单选时候，预设复选值
*/
private String fieldTypeValue;
/**
* 数据类型（number.数字,string.字符串）
*/
......@@ -40,6 +44,10 @@ public class AppInfoFieldEntity extends AppInfoFieldVo {
* 字段值
*/
private String fieldValue;
/**
* 字段默认值
*/
private String defaultValue;
/**
* 数据长度，默认128
*/
......@@ -65,14 +73,14 @@ public class AppInfoFieldEntity extends AppInfoFieldVo {
public AppInfoFieldEntity(){}
/**
* 获取 应用数据集id
* 获取 数据集id
* @return Long
*/
public Long getDatasetId(){
return datasetId;
}
/**
* 设置 应用数据集id
* 设置 数据集id
* @param datasetId
*/
public void setDatasetId(Long datasetId){
......@@ -107,19 +115,33 @@ public class AppInfoFieldEntity extends AppInfoFieldVo {
this.fieldName = fieldName;
}
/**
* 获取 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框）
* 获取 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框,editer.富文本）
* @return String
*/
public String getFieldType(){
return fieldType;
}
/**
* 设置 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框）
* 设置 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框,editer.富文本）
* @param fieldType
*/
public void setFieldType(String fieldType){
this.fieldType = fieldType;
}
/**
* 获取 字段类型值，当字段类型为多选，单选时候，预设复选值
* @return String
*/
public String getFieldTypeValue(){
return fieldTypeValue;
}
/**
* 设置 字段类型值，当字段类型为多选，单选时候，预设复选值
* @param fieldTypeValue
*/
public void setFieldTypeValue(String fieldTypeValue){
this.fieldTypeValue = fieldTypeValue;
}
/**
* 获取 数据类型（number.数字,string.字符串）
* @return String
......@@ -148,6 +170,20 @@ public class AppInfoFieldEntity extends AppInfoFieldVo {
public void setFieldValue(String fieldValue){
this.fieldValue = fieldValue;
}
/**
* 获取 字段默认值
* @return String
*/
public String getDefaultValue(){
return defaultValue;
}
/**
* 设置 字段默认值
* @param defaultValue
*/
public void setDefaultValue(String defaultValue){
this.defaultValue = defaultValue;
}
/**
* 获取 数据长度，默认128
* @return Integer
......@@ -244,8 +280,10 @@ public class AppInfoFieldEntity extends AppInfoFieldVo {
sb.append(",fieldCode:").append(getFieldCode());
sb.append(",fieldName:").append(getFieldName());
sb.append(",fieldType:").append(getFieldType());
sb.append(",fieldTypeValue:").append(getFieldTypeValue());
sb.append(",dataType:").append(getDataType());
sb.append(",fieldValue:").append(getFieldValue());
sb.append(",defaultValue:").append(getDefaultValue());
sb.append(",fieldLen:").append(getFieldLen());
sb.append(",fieldNull:").append(getFieldNull());
sb.append(",isList:").append(getIsList());
......@@ -264,10 +302,14 @@ public class AppInfoFieldEntity extends AppInfoFieldVo {
this.fieldType = "";
this.fieldTypeValue = "";
this.dataType = "";
this.fieldValue = "";
this.defaultValue = "";
this.fieldLen = 0;
this.fieldNull = 1;
......
base-manager/src/main/java/com/mortals/xhx/module/app/model/AppInfoTempleteFieldEntity.java
View file @ a2645902
......@@ -10,7 +10,7 @@ import com.mortals.xhx.module.app.model.vo.AppInfoTempleteFieldVo;
* 自助终端应用模板信息字段实体对象
*
* @author zxfei
* @date 2022-12-02
* @date 2023-03-28
*/
public class AppInfoTempleteFieldEntity extends AppInfoTempleteFieldVo {
......@@ -60,6 +60,14 @@ public class AppInfoTempleteFieldEntity extends AppInfoTempleteFieldVo {
* 备注
*/
private String remark;
/**
* 字段类型值，当字段类型为多选，单选时候，预设复选值
*/
private String fieldTypeValue;
/**
* 字段默认值
*/
private String defaultValue;
......@@ -218,6 +226,34 @@ public class AppInfoTempleteFieldEntity extends AppInfoTempleteFieldVo {
public void setRemark(String remark){
this.remark = remark;
}
/**
* 获取 字段类型值，当字段类型为多选，单选时候，预设复选值
* @return String
*/
public String getFieldTypeValue(){
return fieldTypeValue;
}
/**
* 设置 字段类型值，当字段类型为多选，单选时候，预设复选值
* @param fieldTypeValue
*/
public void setFieldTypeValue(String fieldTypeValue){
this.fieldTypeValue = fieldTypeValue;
}
/**
* 获取 字段默认值
* @return String
*/
public String getDefaultValue(){
return defaultValue;
}
/**
* 设置 字段默认值
* @param defaultValue
*/
public void setDefaultValue(String defaultValue){
this.defaultValue = defaultValue;
}
......@@ -251,6 +287,8 @@ public class AppInfoTempleteFieldEntity extends AppInfoTempleteFieldVo {
sb.append(",isList:").append(getIsList());
sb.append(",fieldOrderNo:").append(getFieldOrderNo());
sb.append(",remark:").append(getRemark());
sb.append(",fieldTypeValue:").append(getFieldTypeValue());
sb.append(",defaultValue:").append(getDefaultValue());
return sb.toString();
}
......@@ -277,5 +315,9 @@ public class AppInfoTempleteFieldEntity extends AppInfoTempleteFieldVo {
this.fieldOrderNo = 1;
this.remark = "";
this.fieldTypeValue = "";
this.defaultValue = "";
}
}
\ No newline at end of file
base-manager/src/main/java/com/mortals/xhx/module/app/service/impl/AppVersionServiceImpl.java
View file @ a2645902
......@@ -110,4 +110,8 @@ public class AppVersionServiceImpl extends AbstractCRUDServiceImpl<AppVersionDao
appService.getAppDao().update(appEntity);
return Rest.ok("使用应用成功！");
}
public static void main(String[] args) {
//写一个循环1到10
}
}
\ No newline at end of file
base-manager/src/main/resources/sqlmap/module/app/AppDatasetMapper.xml
View file @ a2645902
......@@ -18,8 +18,10 @@
<result property="fieldCode" column="fieldCode" />
<result property="fieldName" column="fieldName" />
<result property="fieldType" column="fieldType" />
<result property="fieldTypeValue" column="fieldTypeValue" />
<result property="dataType" column="dataType" />
<result property="fieldValue" column="fieldValue" />
<result property="defaultValue" column="defaultValue" />
<result property="fieldLen" column="fieldLen" />
<result property="fieldNull" column="fieldNull" />
<result property="isList" column="isList" />
......@@ -55,7 +57,7 @@
<!-- 子表所有列 -->
<sql id="_columns_sub">
<trim suffixOverrides="," suffix="">
b.id,b.datasetId,b.fieldCode,b.fieldName,b.fieldType,b.dataType,b.fieldValue,b.fieldLen,b.fieldNull,b.isList,b.fieldOrderNo,b.remark,b.createTime,b.createUserId,b.updateTime,b.updateUserId,
b.id,b.datasetId,b.fieldCode,b.fieldName,b.fieldType,b.fieldTypeValue,b.dataType,b.fieldValue,b.defaultValue,b.fieldLen,b.fieldNull,b.isList,b.fieldOrderNo,b.remark,b.createTime,b.createUserId,b.updateTime,b.updateUserId,
</trim>
</sql>
<!-- 新增 区分主键自增加还是业务插入 -->
......
base-manager/src/test/java/com/mortals/httpclient/app/AppInfoFieldController.http
View file @ a2645902
......@@ -19,7 +19,6 @@ Authorization: {{authToken}}
Content-Type: application/json
{
"datasetId": 1,
"page": 1,
"size": 10
}
......
base-manager/src/test/java/com/mortals/httpclient/dept/DeptController.http
View file @ a2645902
......@@ -43,7 +43,7 @@ POST {{baseUrl}}/dept/getBusinessByDept
Content-Type: application/json
{
"idList":[450,451]
"idList":[426]
}
###部门查看
......
base-manager/src/test/java/com/mortals/httpclient/system/system.http
View file @ a2645902
......@@ -115,6 +115,17 @@ Content-Type: application/json
"body":"{\"test\":\"哈哈哈\"}"
}
### trans
POST {{baseUrl}}/mid/trans
Content-Type: application/json
{
"method":"post",
"path":"/api/edge-service-agent/V2.10/59522c3302b699fd/jbxx",
"body":"{\"areaCode\":\"510727000000\"}"
}
###短信设置编辑
GET {{baseUrl}}/sms/set/edit?id={{SmsSet_id}}
Accept: application/json
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment