Merge branch 'dev' of humingfen/patient-co-management into dev

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/controller/manager/healthbank/ActivityController.java

@@ -2,12 +2,26 @@ package com.yihu.wlyy.controller.manager.healthbank;
import com.yihu.wlyy.controller.BaseController;
import com.yihu.wlyy.service.manager.healthbank.ActivityService;
import org.json.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.util.FileCopyUtils;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import javax.servlet.http.HttpServletRequest;
import java.io.File;
import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Map;
import java.util.Random;
/**
 * Created by humingfen on 2018/6/19.
@@ -16,6 +30,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
@Controller
@RequestMapping("admin/activity")
public class ActivityController extends BaseController {
    private Logger logger = LoggerFactory.getLogger(ActivityController.class);
    @Autowired
    private ActivityService activityService;
@@ -89,6 +104,39 @@ public class ActivityController extends BaseController {
        }
    }
    @RequestMapping(value = "upload", produces = "application/json;charset=UTF-8")
    @ResponseBody
    public String upload(@RequestParam(value = "file") MultipartFile file, HttpServletRequest request) throws IOException {
        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
        Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
        // 创建文件夹
        String rootpath = request.getSession().getServletContext().getRealPath("/");
        File folder = new File(rootpath + "/image/");
        if (!folder.exists()) {
            folder.mkdirs();
        }
        String fileName = null;
        String newFileName = null;
        for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
            // 上传文件
            MultipartFile mf = entity.getValue();
            fileName = mf.getOriginalFilename();
            String fileExt = fileName.substring(fileName.lastIndexOf(".") + 1).toLowerCase();
            // 重命名文件
            SimpleDateFormat df = new SimpleDateFormat("yyyyMMddHHmmss");
            newFileName = df.format(new Date()) + "_" + new Random().nextInt(1000) + "." + fileExt;
            File uploadFile = new File(rootpath + "/image/" + newFileName);
            // 拷贝文件流到指定文件路径
            FileCopyUtils.copy(mf.getBytes(), uploadFile);
        }
        JSONObject json = new JSONObject();
        json.put("status", 200);
        json.put("msg", "上传成功");
        // 图片标识对象的HTTP链接
        json.put("urls", String.join(",", "/image/" + newFileName));
        return json.toString();
    }
    /*@RequestMapping(value = "delete")
    @ResponseBody
    public String delete(String id) {

patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/healthbank/activity_list_js.jsp

@@ -153,7 +153,7 @@
                    $.subscribe('activity:info:view', function (event, id) {
                        var title = '查看信息';
                        self.deviceInfoDialog = $.ligerDialog.open({
                            height: 600,
                            height: 700,
                            width: 560,
                            urlParms: {"id": id, "type": "view"},
                            title: title,
@@ -163,7 +163,7 @@
                    $.subscribe('activity:info:edit', function (event, id) {
                        var title = '编辑信息';
                        self.activityInfoDialog = $.ligerDialog.open({
                            height: 600,
                            height: 700,
                            width: 560,
                            urlParms: {"id": id, "type": "edit"},
                            title: title,
@@ -174,7 +174,7 @@
                    $.subscribe('activity:info:create', function (event) {
                        var title = '新增活动';
                        self.activityInfoDialog = $.ligerDialog.open({
                            height: 600,
                            height: 700,
                            width: 560,
                            urlParms: {"type": "create"},
                            title: title,

patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/healthbank/activity_modify.jsp

@@ -15,7 +15,7 @@
    </style>
</head>
<body>
<div id="div_activity_info_form" data-role-form class="m-form-inline f-mt20 f-ml30" data-role-form>
<div id="div_activity_info_form" data-role-form class="m-form-inline f-mt20 f-ml30" >
    <input type="hidden" id="inp_id" value='${id}' data-attr-scan="id"/>
    <input type="hidden" id="type" value='${type}'/>
    <div class="m-form-group" style="padding:10 0 10 0">
@@ -48,6 +48,12 @@
            <input type="text"  id="inp_type" class="f-w240 validate-special-char" data-attr-scan="type"/>
        </div>
    </div>
    <div class="m-form-group">
        <label class="label_title" style="width:120px">活动图片</label>
        <div class="l-text-wrapper m-form-control">
            <input type="file"  id="img_upload" class="f-w240 validate-special-char" data-attr-scan="img" accept="image/*" multiple />
        </div>
    </div>
    <div class="m-form-group">
        <label class="label_title" style="width:120px">开始时间</label>
        <div class="l-text-wrapper m-form-control essential">

patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/healthbank/activity_modify_js.jsp

@@ -20,6 +20,7 @@
            activityInfo = {
                //变量
                $form: $("#div_activity_info_form"),
                $imgUrl: $("#img_upload"),
                init: function () {
                    _this = this;
                    this.$form.attrScan();
@@ -69,6 +70,35 @@
                            {text: 'HOSPITAL', id: '4'},
                        ]
                    })//城市类型
                    $("#img_upload").on("change",function () {
                        $("#url").remove();
                        var length = this.files.length;
                        var imgUrl = '';
                        for(var i=0;i<length;i++){
                            var fileObj = document.getElementById('img_upload').files[i];
                            if(fileObj == null){
                                confirmx('请先选择一个文件',"${ctx}")
                            }else {
                                var formData = new FormData();
                                formData.append("file", fileObj);
                                $.ajax({
                                    url:ctx + "/admin/activity/upload",
                                    method: "post",
                                    data:formData,
                                    cache: false,
                                    processData: false,
                                    contentType: false,
                                    success: function (data) {
                                        if(imgUrl != ''){
                                            imgUrl = imgUrl +',';
                                        }
                                        imgUrl = imgUrl + data.urls;
                                        _this.$imgUrl = imgUrl;
                                    },
                                });
                            }
                        }
                    })
                },
                initForm: function () {
@@ -99,6 +129,8 @@
                                $("#inp_status").ligerComboBox("selectValue",data.status);
                                $("#inp_isFlag").ligerComboBox("selectValue",data.isFlag);
                                $("#inp_areaType").ligerComboBox("selectValue",data.areaType);
                                var length = data.img.split(',').length;
                                $('#img_upload').after('<li id="url">'+length+'张图片</li>');
                            } else {
                                $.Notice.error(result.msg);
                            }
@@ -132,7 +164,7 @@
                    var self = this;
                    $("#btn_save").click(function () {
                        var values = self.$form.Fields.getValues();
                        values.img = self.$imgUrl;
                        values.status = $("#inp_status").ligerComboBox("getValue");
                        values.isFlag = $("#inp_isFlag").ligerComboBox("getValue");
                        values.areaType = $("#inp_areaType").ligerComboBox("getValue");