Skip to content

C
chinafrica
提交 4b9bc6a1 authored 作者: 吴德鹏's avatar 吴德鹏
浏览文件
操作

国家管理

上级 99dec99f
隐藏空白字符变更
内嵌 并排
正在显示 包含 290 行增加 和 110 行删除
platform-admin/src/main/java/com/platform/controller/CountryController.java
浏览文件 @ 4b9bc6a1
package com.platform.controller; package com.platform.controller;
import com.platform.annotation.IgnoreAuth;
import com.platform.entity.CountryEntity; import com.platform.entity.CountryEntity;
import com.platform.service.CountryService; import com.platform.service.CountryService;
import com.platform.utils.PageUtils; import com.platform.utils.PageUtils;
...@@ -62,6 +63,7 @@ public class CountryController { ...@@ -62,6 +63,7 @@ public class CountryController {
/** /**
* 保存 * 保存
*/ */
@IgnoreAuth
@RequestMapping("/save") @RequestMapping("/save")
@RequiresPermissions("country:save") @RequiresPermissions("country:save")
@ResponseBody @ResponseBody
......
platform-admin/src/main/java/com/platform/entity/CountryEntity.java
浏览文件 @ 4b9bc6a1
...@@ -8,7 +8,7 @@ import java.util.Date; ...@@ -8,7 +8,7 @@ import java.util.Date;
* 表名 country * 表名 country
* *
* @author lipengjun * @author lipengjun
* @date 2020-08-27 19:16:32 * @date 2021-01-14 08:18:53
*/ */
public class CountryEntity implements Serializable { public class CountryEntity implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -21,6 +21,18 @@ public class CountryEntity implements Serializable { ...@@ -21,6 +21,18 @@ public class CountryEntity implements Serializable {
* 国家名称 * 国家名称
*/ */
private String countryName; private String countryName;
/**
* 国家（中文）
*/
private String countryCname;
/**
* 区号
*/
private String areaCode;
/**
* 国旗
*/
private String nationalFlag;
/** /**
* 状态 0：删除 1：正常 * 状态 0：删除 1：正常
*/ */
...@@ -60,6 +72,45 @@ public class CountryEntity implements Serializable { ...@@ -60,6 +72,45 @@ public class CountryEntity implements Serializable {
public String getCountryName() { public String getCountryName() {
return countryName; return countryName;
} }
/**
* 设置：国家（中文）
*/
public void setCountryCname(String countryCname) {
this.countryCname = countryCname;
}
/**
* 获取：国家（中文）
*/
public String getCountryCname() {
return countryCname;
}
/**
* 设置：区号
*/
public void setAreaCode(String areaCode) {
this.areaCode = areaCode;
}
/**
* 获取：区号
*/
public String getAreaCode() {
return areaCode;
}
/**
* 设置：国旗
*/
public void setNationalFlag(String nationalFlag) {
this.nationalFlag = nationalFlag;
}
/**
* 获取：国旗
*/
public String getNationalFlag() {
return nationalFlag;
}
/** /**
* 设置：状态 0：删除 1：正常 * 设置：状态 0：删除 1：正常
*/ */
......
platform-admin/src/main/resources/com/platform/dao/CountryDao.xml
浏览文件 @ 4b9bc6a1
...@@ -6,15 +6,21 @@ ...@@ -6,15 +6,21 @@
<resultMap type="com.platform.entity.CountryEntity" id="countryMap"> <resultMap type="com.platform.entity.CountryEntity" id="countryMap">
<result property="id" column="id"/> <result property="id" column="id"/>
<result property="countryName" column="country_name"/> <result property="countryName" column="country_name"/>
<result property="countryCname" column="country_cname"/>
<result property="areaCode" column="area_code"/>
<result property="nationalFlag" column="national_flag"/>
<result property="status" column="status"/> <result property="status" column="status"/>
<result property="createTime" column="create_time"/> <result property="createTime" column="create_time"/>
<result property="updateTime" column="update_time"/> <result property="updateTime" column="update_time"/>
</resultMap> </resultMap>
<select id="queryObject" resultType="com.platform.entity.CountryEntity"> <select id="queryObject" resultType="com.platform.entity.CountryEntity">
select select
`id`, `id`,
`country_name`, `country_name`,
`country_cname`,
`area_code`,
`national_flag`,
`status`, `status`,
`create_time`, `create_time`,
`update_time` `update_time`
...@@ -22,74 +28,86 @@ ...@@ -22,74 +28,86 @@
where id = #{id} where id = #{id}
</select> </select>
<select id="queryList" resultType="com.platform.entity.CountryEntity"> <select id="queryList" resultType="com.platform.entity.CountryEntity">
select select
`id`, `id`,
`country_name`, `country_name`,
`status`, `country_cname`,
`create_time`, `area_code`,
`update_time` `national_flag`,
from country `status`,
WHERE 1=1 `create_time`,
<if test="name != null and name.trim() != ''"> `update_time`
AND name LIKE concat('%',#{name},'%') from country
</if> WHERE 1=1
<if test="name != null and name.trim() != ''">
AND (country_name LIKE concat('%',#{name},'%') or country_cname LIKE concat('%',#{name},'%'))
</if>
<choose> <choose>
<when test="sidx != null and sidx.trim() != ''"> <when test="sidx != null and sidx.trim() != ''">
order by ${sidx} ${order} order by ${sidx} ${order}
</when> </when>
<otherwise> <otherwise>
order by id desc order by isnull(sort), sort asc ,country_name asc
</otherwise> </otherwise>
</choose> </choose>
<if test="offset != null and limit != null"> <if test="offset != null and limit != null">
limit #{offset}, #{limit} limit #{offset}, #{limit}
</if>
</select>
<select id="queryTotal" resultType="int">
select count(*) from country
WHERE 1=1
<if test="name != null and name.trim() != ''">
AND name LIKE concat('%',#{name},'%')
</if> </if>
</select> </select>
<insert id="save" parameterType="com.platform.entity.CountryEntity"> <select id="queryTotal" resultType="int">
select count(*) from country
WHERE 1=1
<if test="name != null and name.trim() != ''">
AND (country_name LIKE concat('%',#{name},'%') or country_cname LIKE concat('%',#{name},'%'))
</if>
</select>
<insert id="save" parameterType="com.platform.entity.CountryEntity">
insert into country( insert into country(
`id`, `id`,
`country_name`, `country_name`,
`country_cname`,
`area_code`,
`national_flag`,
`status`, `status`,
`create_time`, `create_time`,
`update_time`) `update_time`)
values( values(
#{id}, #{id},
#{countryName}, #{countryName},
#{countryCname},
#{areaCode},
#{nationalFlag},
#{status}, #{status},
#{createTime}, #{createTime},
#{updateTime}) #{updateTime})
</insert> </insert>
<update id="update" parameterType="com.platform.entity.CountryEntity"> <update id="update" parameterType="com.platform.entity.CountryEntity">
update country update country
<set> <set>
<if test="countryName != null">`country_name` = #{countryName}, </if> <if test="countryName != null">`country_name` = #{countryName},</if>
<if test="status != null">`status` = #{status}, </if> <if test="countryCname != null">`country_cname` = #{countryCname},</if>
<if test="createTime != null">`create_time` = #{createTime}, </if> <if test="areaCode != null">`area_code` = #{areaCode},</if>
<if test="updateTime != null">`update_time` = #{updateTime}</if> <if test="nationalFlag != null">`national_flag` = #{nationalFlag},</if>
</set> <if test="status != null">`status` = #{status},</if>
where id = #{id} <if test="createTime != null">`create_time` = #{createTime},</if>
</update> <if test="updateTime != null">`update_time` = #{updateTime}</if>
</set>
<delete id="delete"> where id = #{id}
</update>
<delete id="delete">
delete from country where id = #{value} delete from country where id = #{value}
</delete> </delete>
<delete id="deleteBatch">
delete from country where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper> <delete id="deleteBatch">
\ No newline at end of file delete from country where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>
platform-admin/src/main/webapp/WEB-INF/page/sys/country.html
浏览文件 @ 4b9bc6a1
...@@ -33,8 +33,35 @@ ...@@ -33,8 +33,35 @@
<Card v-show="!showList"> <Card v-show="!showList">
<p slot="title">{{title}}</p> <p slot="title">{{title}}</p>
<i-form ref="formValidate" :model="country" :rules="ruleValidate" :label-width="80"> <i-form ref="formValidate" :model="country" :rules="ruleValidate" :label-width="80">
<Form-item label="国家名称" prop="countryName"> <Form-item label="国家（英文）" prop="countryName" style="width: 800px">
<i-input v-model="country.countryName" placeholder="国家名称"/> <i-input v-model="country.countryName" placeholder="国家（英文）"/>
</Form-item>
<Form-item label="国家（中文）" prop="countryCname" style="width: 800px">
<i-input v-model="country.countryCname" placeholder="国家（中文）" />
</Form-item>
<Form-item label="区号" prop="areaCode" style="width: 800px">
<i-input v-model="country.areaCode" placeholder="区号"/>
</Form-item>
<!-- <Form-item label="国旗" prop="nationalFlag" style="width: 800px">-->
<!-- <i-input v-model="country.nationalFlag" placeholder="国旗"/>-->
<!-- </Form-item>-->
<Form-item label="国旗" prop="nationalFlag" >
<!-- <i-input v-model="xPicture.pictureUrl" placeholder="图片地址"/> -->
<upload
multiple
action="../api/osstest/uploadtest"
:before-upload="handleBeforeUpload"
:on-success="vhandleSuccess" :show-upload-list="false" accept="image/jpeg, image/png">
<i-button icon="ios-cloud-upload-outline">请选择图片</i-button>
</upload>
<div id="imgWrapper" style="display: flex;position: relative;">
<div v-for="item in uploadList" style="margin-left: 5px;" :data-img-path="item">
<img :src="item" width="100" height="100" id="itemImg">
<i class="ivu-icon ivu-icon-ios-trash-outline"
style="cursor:pointer;display: flex;font-size: 24px;position: relative;left:11px"
@click="delImg1(item)"></i>
</div>
</div>
</Form-item> </Form-item>
<Form-item> <Form-item>
<i-button type="primary" @click="handleSubmit('formValidate')">提交</i-button> <i-button type="primary" @click="handleSubmit('formValidate')">提交</i-button>
......
platform-admin/src/main/webapp/js/sys/country.js
浏览文件 @ 4b9bc6a1
...@@ -2,101 +2,183 @@ $(function () { ...@@ -2,101 +2,183 @@ $(function () {
$("#jqGrid").Grid({ $("#jqGrid").Grid({
url: '../country/list', url: '../country/list',
colModel: [ colModel: [
{label: 'id', name: 'id', index: 'id', key: true, hidden: true}, {label: 'id', name: 'id', index: 'id', key: true, hidden: true},
{label: '国家名称', name: 'countryName', index: 'country_name', width: 80}, {label: '国旗', name: 'nationalFlag', index: 'national_flag', width: 80, formatter: imageFormat},
{label: '状态', name: 'status', index: 'status', width: 80,formatter:statusFormat1}, {label: '国家（英文）', name: 'countryName', index: 'country_name', width: 80},
{label: '创建时间', name: 'createTime', index: 'create_time', width: 80} {label: '国家（中文）', name: 'countryCname', index: 'country_cname', width: 80},
] {label: '区号', name: 'areaCode', index: 'area_code', width: 80},
{label: '状态', name: 'status', index: 'status', width: 80, formatter: statusFormat1},
{label: '创建时间', name: 'createTime', index: 'create_time', width: 80}
]
}); });
}); });
let vm = new Vue({ let vm = new Vue({
el: '#rrapp', el: '#rrapp',
data: { data: {
uploadList: [],
showList: true, showList: true,
title: null, title: null,
country: {}, country: {},
ruleValidate: { ruleValidate: {
name: [ name: [
{required: true, message: '名称不能为空', trigger: 'blur'} {required: true, message: '名称不能为空', trigger: 'blur'}
] ]
}, },
q: { q: {
name: '' name: ''
} }
}, },
methods: { methods: {
query: function () { query: function () {
vm.reload(); vm.reload();
}, },
add: function () { add: function () {
vm.showList = false; vm.showList = false;
vm.title = "新增"; vm.title = "新增";
vm.country = {}; vm.country = {};
}, },
update: function (event) { update: function (event) {
let id = getSelectedRow("#jqGrid"); let id = getSelectedRow("#jqGrid");
if (id == null) { if (id == null) {
return; return;
} }
vm.showList = false; vm.showList = false;
vm.title = "修改"; vm.title = "修改";
vm.getInfo(id); vm.getInfo(id);
}, },
saveOrUpdate: function (event) { saveOrUpdate: function (event) {
let url = vm.country.id == null ? "../country/save" : "../country/update"; let url = vm.country.id == null ? "../country/save" : "../country/update";
vm.country.nationalFlag = vm.uploadList[0];
Ajax.request({ Ajax.request({
url: url, url: url,
params: JSON.stringify(vm.country), params: JSON.stringify(vm.country),
type: "POST", type: "POST",
contentType: "application/json", contentType: "application/json",
successCallback: function (r) { successCallback: function (r) {
alert('操作成功', function (index) { alert('操作成功', function (index) {
vm.reload(); vm.reload();
}); });
} }
}); });
}, },
del: function (event) { del: function (event) {
let ids = getSelectedRows("#jqGrid"); let ids = getSelectedRows("#jqGrid");
if (ids == null){ if (ids == null) {
return; return;
} }
confirm('确定要删除选中的记录？', function () { confirm('确定要删除选中的记录？', function () {
Ajax.request({ Ajax.request({
url: "../country/delete", url: "../country/delete",
params: JSON.stringify(ids), params: JSON.stringify(ids),
type: "POST", type: "POST",
contentType: "application/json", contentType: "application/json",
successCallback: function () { successCallback: function () {
alert('操作成功', function (index) { alert('操作成功', function (index) {
vm.reload(); vm.reload();
}); });
} }
}); });
}); });
}, },
getInfo: function(id){ vhandleSuccess(response, file, fileList) {
// "http://diaosaas-prod.oss-cn-shenzhen.aliyuncs.com/education/155728894307110106.jpg"
console.log('shangchuan', response)
vm.uploadList.push(response);
$("#itemImg").show();
},
handleSuccess(response, file, fileList) {
// "http://diaosaas-prod.oss-cn-shenzhen.aliyuncs.com/education/155728894307110106.jpg"
vm.uploadList1.push(response);
$("#skuImg").show();
},
handleBeforeUpload(file) {
// 上传图片大小不超过5M
if (file.size > 5 * 1024 * 1024) {
alert('请上传不超过5M的图片');
return false;
}
// const check = this.uploadList.length < 1;
// if (!check) {
// this.$Notice.warning({
// title: '最多只能上传一张图片'
// });
// return false;
// }
// 限制上传文件的宽高
// return this.checkImageWH(file,750,320);
},
// 限制上传图片的宽高
checkImageWH: function (file, width, height) {
let self = this;
return new Promise(function (resolve, reject) {
let filereader = new FileReader();
filereader.onload = e => {
let src = e.target.result;
const image = new Image();
image.onload = function () {
if (width && image.width != width) {
self.$Notice.error({
title: '请上传宽为' + width + "的图片",
});
reject();
} else if (height && image.height != height) {
self.$Notice.error({
title: '请上传高为' + height + "的图片",
});
reject();
} else {
resolve();
}
};
image.onerror = reject;
image.src = src;
};
filereader.readAsDataURL(file);
});
},
// 删除上传图片
delImg1: function (url) {
if (vm.title != "详情") {
vm.uploadList.remove(url);
console.log(url);
Ajax.request({
url: "../api/upload/delFile?url=" + url,
async: false,
type: "POST",
contentType: "application/json",
successCallback: function (resultData) {
// console.log(resultData);
iview.Message.success(resultData.success);
}
});
}
},
getInfo: function (id) {
vm.uploadList=[];
Ajax.request({ Ajax.request({
url: "../country/info/"+id, url: "../country/info/" + id,
async: true, async: true,
successCallback: function (r) { successCallback: function (r) {
vm.country = r.country; vm.country = r.country;
vm.uploadList.push(vm.country.nationalFlag);
} }
}); });
}, },
reload: function (event) { reload: function (event) {
vm.showList = true; vm.showList = true;
let page = $("#jqGrid").jqGrid('getGridParam', 'page'); let page = $("#jqGrid").jqGrid('getGridParam', 'page');
$("#jqGrid").jqGrid('setGridParam', { $("#jqGrid").jqGrid('setGridParam', {
postData: {'name': vm.q.name}, postData: {'name': vm.q.name},
page: page page: page
}).trigger("reloadGrid"); }).trigger("reloadGrid");
vm.handleReset('formValidate'); vm.handleReset('formValidate');
}, },
reloadSearch: function() { reloadSearch: function () {
vm.q = { vm.q = {
name: '' name: ''
}; };
...@@ -110,5 +192,5 @@ let vm = new Vue({ ...@@ -110,5 +192,5 @@ let vm = new Vue({
handleReset: function (name) { handleReset: function (name) {
handleResetForm(this, name); handleResetForm(this, name);
} }
} }
}); });
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论