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

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/controller/manager/device/DeviceManufacturerController.java

@@ -0,0 +1,127 @@
package com.yihu.wlyy.controller.manager.device;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.wlyy.controller.BaseController;
import com.yihu.wlyy.device.entity.DeviceManufacturer;
import com.yihu.wlyy.service.manager.device.DeviceManufacturerService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.stereotype.Controller;
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 java.util.List;
/**
 * Created by humingfen on 2018/6/6.
 * 设备管理
 */
@Controller
@RequestMapping("admin/manufacturer")
public class DeviceManufacturerController extends BaseController {
    @Autowired
    private DeviceManufacturerService deviceManufacturerService;
    @Autowired
    private ObjectMapper objectMapper;
    @RequestMapping(value = "initial", method = RequestMethod.GET)
    public String initListPage(){
        return "device/deviceManufacturer_list";
    }
    @RequestMapping(value = "infoInit")
    public String initInfoPage(@RequestParam(value = "id") Integer id,String type){
        request.setAttribute("id",id);
        request.setAttribute("type",type);
        return "device/deviceManufacturer_modify";
    }
    @RequestMapping(value ="list",method = RequestMethod.POST)
    @ResponseBody
    public String searchList(
            @RequestParam(value = "manufacturerName",required = false) String manufacturerName,
            @RequestParam(value = "manufacturerCode",required = false) String manufacturerCode,
            @RequestParam(value = "address",required = false) String address,
            @RequestParam(value = "page",required = false) Integer page,
            @RequestParam(value = "rows",required = false) Integer pageSize){
        try{
            Page<DeviceManufacturer> deviceManufacturer = deviceManufacturerService.searchList(manufacturerName,manufacturerCode, address, page, pageSize);
            return write(200,"操作成功",page,pageSize,deviceManufacturer);
        }catch (Exception ex){
            error(ex);
            return error(-1,"操作失败！");
        }
    }
    @RequestMapping(value = "findById", method = RequestMethod.POST)
    @ResponseBody
    public String getManufacturer(@RequestParam(value = "id") Long id){
        try {
            DeviceManufacturer manufacturer = deviceManufacturerService.findById(id);
            return  write(200,"操作成功","data",manufacturer);
        }catch (Exception ex){
            error(ex);
            return error(-1,"操作失败！");
        }
    }
    @RequestMapping(value = "create")
    @ResponseBody
    public String createManufacturer(String jsonData, String code){
        try{
            DeviceManufacturer manufacturer = objectMapper.readValue(jsonData, DeviceManufacturer.class);
            // 判断是否存在code，存在直接
            Boolean b = deviceManufacturerService.existCode(code);
            if(b){
                return error(-1,"厂商标识已存在");
            }
            deviceManufacturerService.createManufacturer(manufacturer);
            return write(200,"操作成功");
        }catch (Exception ex){
            error(ex);
            return error(-1,"操作失败");
        }
    }
    @RequestMapping(value = "update")
    @ResponseBody
    public String updateManufacturer(String jsonData){
        try{
            DeviceManufacturer manufacturer = objectMapper.readValue(jsonData, DeviceManufacturer.class);
            deviceManufacturerService.updateManufacturer(manufacturer);
            return write(200,"操作成功");
        }catch (Exception ex){
            error(ex);
            return error(-1,"操作失败");
        }
    }
    @RequestMapping(value = "delete")
    @ResponseBody
    public String deleteDevice(Long id){
        try{
            deviceManufacturerService.deleteManufacturer(id);
            return write(200,"操作成功");
        }catch (Exception ex){
            error(ex);
            return error(-1,"操作失败");
        }
    }
    @RequestMapping(value = "findAll")
    @ResponseBody
    public String findAll(){
        try{
            List<DeviceManufacturer> manufacturer = deviceManufacturerService.findAll();
            return write(200,"操作成功","data",manufacturer);
        }catch (Exception ex){
            error(ex);
            return error(-1,"操作失败");
        }
    }
}

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/controller/manager/device/WlyyDeviceController.java

@@ -1,6 +1,5 @@
package com.yihu.wlyy.controller.manager.device;
import com.fasterxml.jackson.databind.JavaType;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.wlyy.controller.BaseController;
import com.yihu.wlyy.device.entity.WlyyDevice;
@@ -18,7 +17,6 @@ import org.springframework.web.bind.annotation.ResponseBody;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.OutputStream;
import java.util.ArrayList;
import java.util.List;
/**
@@ -47,8 +45,8 @@ public class WlyyDeviceController extends BaseController {
    }
    @RequestMapping(value = "createInit")
    public String initCreatePage(@RequestParam(value = "id",required = false) Integer id){
        request.setAttribute("id",id);
    public String initCreatePage(){
//        request.setAttribute("id",id);
        return  "device/device_create";
    }

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/device/entity/DeviceManufacturer.java

@@ -0,0 +1,88 @@
package com.yihu.wlyy.device.entity;
import com.yihu.wlyy.entity.IdEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
/**
 * create by humingfen on 2018/6/6
 * 设备厂商表
 */
@Entity
@Table(name = "wlyy_manufacturer")
public class DeviceManufacturer extends IdEntity {
    private String code;//关联标识
    private String manufacturerCode;//厂商代码
    private String manufacturerName;//厂商名称
    private String address;//厂商地址
    private String representative;//法人代表
    private Date czrq;//创建时间
    private Integer del;//逻辑删除(1删除 0保留)
    @Column(name = "code")
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    @Column(name = "manufacturer_code")
    public String getManufacturerCode() {
        return manufacturerCode;
    }
    public void setManufacturerCode(String manufacturerCode) {
        this.manufacturerCode = manufacturerCode;
    }
    @Column(name = "manufacturer_name")
    public String getManufacturerName() {
        return manufacturerName;
    }
    public void setManufacturerName(String manufacturerName) {
        this.manufacturerName = manufacturerName;
    }
    @Column(name = "address")
    public String getAddress() {
        return address;
    }
    public void setAddress(String address) {
        this.address = address;
    }
    @Column(name = "representative")
    public String getRepresentative() {
        return representative;
    }
    public void setRepresentative(String representative) {
        this.representative = representative;
    }
    @Column(name = "czrq")
    public Date getCzrq() {
        return czrq;
    }
    public void setCzrq(Date czrq) {
        this.czrq = czrq;
    }
    @Column(name = "del")
    public Integer getDel() {
        return del;
    }
    public void setDel(Integer del) {
        this.del = del;
    }
}

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/device/repository/DeviceManufacturerDao.java

@@ -0,0 +1,28 @@
package com.yihu.wlyy.device.repository;
import com.yihu.wlyy.device.entity.DeviceManufacturer;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.transaction.annotation.Transactional;
/**
 * Created by humingfen on 2018/6/6.
 */
public interface DeviceManufacturerDao extends PagingAndSortingRepository<DeviceManufacturer, Integer>, JpaSpecificationExecutor<DeviceManufacturer> {
    @Query("select dm from DeviceManufacturer dm where dm.id = ?1")
    DeviceManufacturer findById(Long id);
    @Transactional
    @Modifying
    @Query("update DeviceManufacturer dm set dm.manufacturerName = ?1, dm.manufacturerCode = ?2, dm.address = ?3, dm.representative = ?4, dm.del = ?5 where dm.id = ?6")
    void updateManufacturer(String manufacturerName, String manufacturerCode, String address, String representative, Integer del, Long id);
    DeviceManufacturer findByCode(String code);
    @Transactional
    @Modifying
    @Query("delete from DeviceManufacturer dm where dm.id = ?1")
    void delete(Long id);
}

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/service/manager/device/DeviceManufacturerService.java

@@ -0,0 +1,81 @@
package com.yihu.wlyy.service.manager.device;
import com.yihu.wlyy.device.entity.DeviceManufacturer;
import com.yihu.wlyy.device.repository.DeviceManufacturerDao;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.jpa.domain.Specification;
import org.springframework.stereotype.Service;
import org.springside.modules.persistence.DynamicSpecifications;
import org.springside.modules.persistence.SearchFilter;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
 * Created by humingfen on 2018/6/6.
 * manufacturer数据库
 */
@Service
public class DeviceManufacturerService  {
    @Autowired
    private DeviceManufacturerDao deviceManufacturerDao;
    public Page<DeviceManufacturer> searchList(String manufacturerName, String manufacturerCode, String address, Integer page, Integer pageSize){
        if(page == null){
            page = 1;
        }
        if(pageSize == null){
            pageSize = 15;
        }
        PageRequest pageRequest = new PageRequest(page - 1, pageSize);
        Map<String,SearchFilter> filter = new HashMap<>();
        if(!StringUtils.isEmpty(manufacturerName)){
            filter.put("manufacturerName",new SearchFilter("manufacturerName", SearchFilter.Operator.LIKE,manufacturerName));
        }
        if(!StringUtils.isEmpty(manufacturerCode)){
            filter.put("manufacturerCode",new SearchFilter("manufacturerCode",SearchFilter.Operator.LIKE,manufacturerCode));
        }
        if(!StringUtils.isEmpty(address)){
            filter.put("address",new SearchFilter("address",SearchFilter.Operator.LIKE,address));
        }
        Specification<DeviceManufacturer> spec = DynamicSpecifications.bySearchFilter(filter.values(), DeviceManufacturer.class);
        return deviceManufacturerDao.findAll(spec,pageRequest);
    }
    public DeviceManufacturer findById(Long id) {
        return deviceManufacturerDao.findById(id);
    }
    public void  updateManufacturer(DeviceManufacturer manufacturer) {
        deviceManufacturerDao.updateManufacturer(manufacturer.getManufacturerName(), manufacturer.getManufacturerCode(), manufacturer.getAddress(), manufacturer.getRepresentative(), manufacturer.getDel(), manufacturer.getId());
    }
    public void createManufacturer(DeviceManufacturer manufacturer) {
        manufacturer.setCzrq(new Date());
        deviceManufacturerDao.save(manufacturer);
    }
    public Boolean existCode(String code) {
        DeviceManufacturer manufacturer = deviceManufacturerDao.findByCode(code);
        if(manufacturer == null){
            return false;
        }
        return true;
    }
    public void deleteManufacturer(Long id) {
        deviceManufacturerDao.delete(id);
    }
    public List<DeviceManufacturer> findAll() {
        List<DeviceManufacturer> deviceManufacturer = (List<DeviceManufacturer>) deviceManufacturerDao.findAll();
        return deviceManufacturer;
    }
}

patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/device/deviceManufacturer_list.jsp

@@ -0,0 +1,58 @@
<%--
  Created by IntelliJ IDEA.
  User: hmf
  Date: 2018/6/6
  Time: 10:19
  To change this template use File | Settings | File Templates.
--%>
<%@ page contentType="text/html; charset=UTF-8" language="java" pageEncoding="UTF-8" %>
<!DOCTYPE html>
<html lang="en">
<head>
    <%@ include file="../head/page_head.jsp" %>
    <title>设备厂商管理</title>
</head>
<body>
<div id="div_wrapper">
    <!-- 检索条件 -->
    <div class="m-retrieve-area f-h50 f-dn f-pr m-form-inline" data-role-form style='display: block;'>
        <div class="m-form-group f-mt10">
            <div class="m-form-control f-ml15">
                <input type="text" id="inp_manufacturer_name" placeholder="请输入设备厂商名称" class="f-ml10" data-attr-scan="manufacturerName"/>
            </div>
            <div class="m-form-control f-ml15">
                <input type="text" id="inp_manufacturer_code" placeholder="请输入设备厂商代码" class="f-ml10" data-attr-scan="manufacturerCode"/>
            </div>
            <div class="m-form-control f-ml15">
                <input type="text" id="inp_address" placeholder="请输入厂商地址" class="f-ml10" data-attr-scan="address"/>
            </div>
            <sec:authorize url="/admin/manufacturer/list">
            <div id="btn_search" class="l-button u-btn u-btn-primary u-btn-small f-ib f-vam  f-ml10" >
                <span>查询</span>
            </div>
            </sec:authorize>
            <sec:authorize url="/admin/manufacturer/create">
                <div id="btn_add" class="l-button u-btn u-btn-primary u-btn-small f-ib f-vam  f-ml10" >
                    <span>新增</span>
                </div>
            </sec:authorize>
            <%--<sec:authorize url="/admin/device/toExcel">
                <div class="m-form-control m-form-control-fr">
                    <div id="btn_export" class="l-button u-btn u-btn-primary u-btn-small f-ib f-vam">
                        <span>导出</span>
                    </div>
                </div>
            </sec:authorize>--%>
        </div>
    </div>
        <!-- 列表 -->
    <div id="div_manufacturer_list">
    </div>
</div>
</body>
<%@ include file="../head/page_foot.jsp" %>
<%@ include file="deviceManufacturer_list_js.jsp" %>
</html>

patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/device/deviceManufacturer_list_js.jsp

@@ -0,0 +1,209 @@
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="utf-8" %>
<%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %>
<script>
	(function ($, win) {
		$(function () {
			/* ************************** 变量定义 ******************************** */
			// 通用工具类库
			var Util = $.Util;
			var retrieve = null;
			var master = null;
			var isFirstPage = false;
			/* *************************** 函数定义 ******************************* */
			function pageInit() {
				retrieve.init();
				master.init();
			}
			function reloadGrid(params) {
				if (isFirstPage) {
					this.grid.options.newPage = 1;
				}
				this.grid.setOptions({parms: params});
				this.grid.loadData(true);
			}
			/* *************************** 模块初始化 ***************************** */
			retrieve = {
				$element: $('.m-retrieve-area'),
				$searchBtn: $('#btn_search'),
				$addBtn: $('#btn_add'),
                $manufacturerName: $("#inp_manufacturer_name"),//设备厂商名称
                $manufacturerCode: $("#inp_manufacturer_code"),
                $address: $("#inp_address"),
                init: function () {
                    this.$element.show();
                    this.$element.attrScan();
                    window.form = this.$element;
                    this.$manufacturerName.ligerTextBox({width: 200});
                    this.$manufacturerCode.ligerTextBox({width: 200});
                    this.$address.ligerTextBox({width: 150});
                    this.bindEvents();
                },
                bindEvents: function () {
                    var self = this;
                    self.$searchBtn.click(function () {
                        master.grid.options.newPage = 1;
                        master.reloadGrid();
                    });
                    self.$addBtn.click(function () {
                        $.publish("manufacturer:info:create", [0]);
                    });
                    //导出
                    //生成Excel表
                    /*self.$exportBtn.click(function () {
                        //定义一个form表单
                        var myform = $("<form></form>");
                        myform.attr('method','post')
                        myform.attr('action',ctx + '/admin/device/toExcel');
                        //设备名称
                        var deviceName = $("<input type='hidden' name='deviceName' />")
                        deviceName.attr('value',$("#inp_device_name").val());
                        //设备编号
                        var deviceCode = $("<input type='hidden' name='deviceCode' />")
                        deviceCode.attr('value',$("#inp_device_code").val());
                        //社区名称
                        var orgName = $("<input type='hidden' name='orgName' />")
                        orgName.attr('value',$("#inp_org_name").val());
                        //联系人
                        var linkman = $("<input type='hidden' name='linkman' />")
                        linkman.attr('value',$("#inp_linkman").val());
                        myform.append(deviceName);
                        myform.append(deviceCode);
                        myform.append(orgName);
                        myform.append(linkman);
                        myform.appendTo('body').submit(); //must add this line for higher html spec
                    })*/
                }
            };
            master = {
                deviceManufacturerInfoDialog: null,
                grid: null,
                init: function () {
                    this.grid = $("#div_manufacturer_list").ligerGrid($.LigerGridEx.config({
                        url: ctx + '/admin/manufacturer/list',
                        parms: {},
                        ajaxHeader: ajaxHeaderName,
                        ajaxHeaderValue: ajaxHeaderValue,
                        columns: [
                            {display: 'id', name: 'id', hide: true},
                            {display: '厂商标识', name: 'code', width: '10%', align: "left"},
                            {display: '厂商代码', name: 'manufacturerCode', width: '10%', align: "left"},
                            {display: '厂商名称', name: 'manufacturerName', width: '10%', align: "left"},
                            {display: '厂家地址', name: 'address', width: '10%', align: "left"},
                            {display: '法人代表', name: 'representative', width: '10%', align: "left"},
                            {
                                display: '是否有效', name: 'del', width: '10%', align: "left",
                                render: function (row) {
                                    if (row.del == 0) {
                                        return "有效"
                                    }
                                    if (row.del == 1) {
                                        return "无效"
                                    }
                                }
                            },
                            {display: '创建时间', name: 'czrq', width: '10%', align: "left"},
                            {
                                display: '操作', name: 'operator', width: '10%', align: "center", isSort: false,
                                render: function (row) {
                                    var html = '';
                                    <sec:authorize url="/admin/manufacturer/update">
                                    html += '<a  style="margin-left:10px;"href="javascript:void(0)" onclick="javascript:' + Util.format("$.publish('{0}',['{1}'])", "manufacturer:info:edit", row.id) + '">编辑</a>';
                                    </sec:authorize>
                                    <sec:authorize url="/admin/manufacturer/delete">
                                    html += '<a  style="margin-left:10px;"href="javascript:void(0)" onclick="javascript:' + Util.format("$.publish('{0}',['{1}'])", "manufacturer:info:del", row.id) + '">删除</a>';
                                    </sec:authorize>
                                    <%--<sec:authorize url="/admin/manufacturer/create">
                                    html += '<a  style="margin-left:10px;"href="javascript:void(0)" onclick="javascript:' + Util.format("$.publish('{0}',['{1}'])", "manufacturer:info:create", row.id) + '">新增</a>';
                                    </sec:authorize>--%>
                                    return html;
                                }
                            }
                        ],
                    }));
                    // 自适应宽度
                    this.grid.adjustToWidth();
                    this.bindEvents();
                },
                reloadGrid: function (msg) {
                    retrieve.$element.attrScan();
                    var values = retrieve.$element.Fields.getValues();
                    reloadGrid.call(this, values);
                },
                delRecord: function (id, code) {
                    var self = this;
                    $.ajax({
                        url: ctx + "/admin/manufacturer/delete",
                        data: {"id": id},
                        method: "post",
                        dataType: "json",
                        success: function (result) {
                            if (result.status == '200') {
                                window.reloadMasterGrid(result.msg);
                            } else {
                                $.Notice.error(result.msg);
                            }
                        },
                        error: function (data) {
                            $.Notice.error("系统异常,请联系管理员！");
                        }
                    })
                },
                bindEvents: function () {
                    var self = this;
                    $.subscribe('manufacturer:info:edit', function (event, id) {
                        var title = '编辑信息';
                        self.deviceManufacturerInfoDialog = $.ligerDialog.open({
                            height: 600,
                            width: 560,
                            urlParms: {"id": id, "type": "edit"},
                            title: title,
                            url: ctx + '/admin/manufacturer/infoInit'
                        })
                    });
                    $.subscribe('manufacturer:info:create', function (event, id) {
                        var title = '新增设备厂商';
                        self.deviceManufacturerInfoDialog = $.ligerDialog.open({
                            height: 600,
                            width: 560,
                            urlParms: {"id": id, "type": "create"},
                            title: title,
                            url: ctx + '/admin/manufacturer/infoInit'
                        })
                    });
                    $.subscribe('manufacturer:info:del', function (event, id, code) {
                        $.ligerDialog.confirm('确认删除该行信息？<br>如果是请点击确认按钮，否则请点击取消。', function (yes) {
                            if (yes) {
                                self.delRecord(id, code);
                            }
                        });
                    })
                }
            };
            /* ************************* Dialog页面回调接口 ************************** */
            win.reloadMasterGrid = function (msg) {
                if (isNoEmpty(msg)) {
                    $.Notice.success(msg);
                }
                master.reloadGrid(msg);
            };
            win.closeDeviceManufacturerInfoDialog = function () {
                master.deviceManufacturerInfoDialog.close();
            };
            /* *************************** 页面初始化 **************************** */
            pageInit();
        });
    })(jQuery, window);
</script>

patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/device/deviceManufacturer_modify.jsp

@@ -0,0 +1,71 @@
<%--
  Created by IntelliJ IDEA.
  User: hmf
  Date: 2018/6/7 0007
  Time: 下午 3:43
  To change this template use File | Settings | File Templates.
--%>
<%@ page contentType="text/html; charset=UTF-8" language="java" pageEncoding="UTF-8" %>
<html>
<head>
    <%@ include file="../head/page_head.jsp"%>
    <title>设备厂商详情</title>
    <style type="text/css">
        .m-form-group label.label_title{width: 100px}
    </style>
</head>
<body>
<div id="div_manufacturer_info_form" data-role-form class="m-form-inline f-mt20 f-ml30" data-role-form>
    <input type="hidden" id="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">
        <label class="label_title" style="width:120px">厂商标识</label>
        <div class="l-text-wrapper m-form-control essential">
            <input type="text"  id="inp_code" class="required useTitle f-w240 validate-special-char"  required-title="厂商标识不能为空"  data-attr-scan="code"/>
        </div>
    </div>
    <div class="m-form-group" style="padding:10 0 10 0">
        <label class="label_title" style="width:120px">厂商代码</label>
        <div class="l-text-wrapper m-form-control essential">
            <input type="text"  id="inp_manufacturer_code" class="required useTitle f-w240 validate-special-char"  required-title="厂商代码不能为空"  data-attr-scan="manufacturerCode"/>
        </div>
    </div>
    <div class="m-form-group">
        <label class="label_title" style="width:120px">厂商名称</label>
        <div class="l-text-wrapper m-form-control essential">
            <input type="text"  id="inp_manufacturer_name" class="required useTitle f-w240 validate-special-char"  required-title="厂商名称不能为空"  data-attr-scan="manufacturerName"/>
        </div>
    </div>
    <div class="m-form-group">
        <label class="label_title" style="width:120px">厂商地址</label>
        <div class="l-text-wrapper m-form-control essential">
            <input type="text"  id="inp_address" class="required useTitle ajax f-w240 validate-special-char"  required-title="厂商地址不能为空"  data-attr-scan="address"/>
        </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="text"  id="inp_representative" class="useTitle ajax f-w240 validate-special-char" required-title="法人代表不能为空" data-attr-scan="representative"/>
        </div>
    </div>
    <div class="m-form-group">
        <label class="label_title" style="width:120px">是否有效</label>
        <div class="l-text-wrapper m-form-control essential">
            <input type="text"  id="inp_del" data_type='select' class="required useTitle f-w240 validate-special-char" data-attr-scan="del"/>
        </div>
    </div>
    <div class="m-form-group f-pa" id="btn_save_close" style="right: 10px;bottom: 0;">
        <div class="m-form-control">
            <input type="button" value="保存" id="btn_save" class="l-button u-btn u-btn-primary u-btn-large f-ib f-vam" />
            <div id="btn_cancel" class="l-button u-btn u-btn-cancel u-btn-large f-ib f-vam" >
                <span>关闭</span>
            </div>
        </div>
    </div>
</div>
</body>
<%@ include file="../head/page_foot.jsp"%>
<%@ include file="deviceManufacturer_modify_js.jsp" %>
<%--<script src="${ctx}/static/js/device/device_modify.js"></script>--%>
</html>

patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/device/deviceManufacturer_modify_js.jsp

@@ -0,0 +1,137 @@
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="utf-8" %>
<%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %>
<script>
    (function ($, win) {
        $(function () {
            var Util = $.Util;
            var type = $('#type').val();
            var id = $('#id').val();
            var manufacturerInfo = "";
            var jValidation = $.jValidation;
            function pageInit() {
                manufacturerInfo.init();
                if(type == "edit") {
                    manufacturerInfo.initForm();
                }
            }
            manufacturerInfo = {
                //变量
                $form: $("#div_manufacturer_info_form"),
                init: function () {
                    this.$form.attrScan();
                    $("#inp_code").ligerTextBox({width: 240})//厂家标识
                    $("#inp_manufacturer_code").ligerTextBox({width: 240})//厂家代码
                    $("#inp_manufacturer_name").ligerTextBox({width: 240})//厂家名称
                    $("#inp_address").ligerTextBox({width: 240})//厂家地址
                    $("#inp_representative").ligerTextBox({width: 240})//法人代表
                    $("#inp_del").ligerComboBox({
                        width: 240,
                        data: [
                            {text: '有效', id: '0'},
                            {text: '无效', id: '1'},
                        ]
                    })//是否有效
                    this.bindEvents();
                },
                initForm: function () {
                    var _this = this;
                    //修改、查看
                    $.ajax({
                        url: ctx + "/admin/manufacturer/findById",
                        method: "post",
                        dataType: "json",
                        async: false,
                        data: {id: id},
                        success: function (result) {
                            if (result.status == '200') {
                                var data = result.data;
                                _this.$form.Fields.fillValues({
                                    code: data.code,
                                    manufacturerCode: data.manufacturerCode,
                                    manufacturerName: data.manufacturerName,
                                    address: data.address,
                                    representative: data.representative,
                                });
                                //填值
                                $("#inp_del").ligerComboBox("selectValue",data.del);
                            } else {
                                $.Notice.error(result.msg);
                            }
                        },
                        error: function (data) {
                            $.Notice.error("系统异常,请联系管理员！");
                        }
                    });
                    this.$form.show();
                },
                //绑定事件
                bindEvents: function () {
                    var validator = new jValidation.Validation(this.$form, {
                        immediate: true, onSubmit: false,
                        onElementValidateForAjax: function (elm) {
                            /*if (Util.isStrEquals($(elm).attr("id"), 'inp_code')) {
                                var result = new jValidation.ajax.Result();
                                var codeNew = $('#inp_code').val();
                                $.ajax({
                                    url: ctx + "/admin/manufacturer/isCodeExist",
                                    async: false,
                                    method: "post",
                                    dataType: "json",
                                    data: {code: codeNew},
                                    success: function (data) {
                                        if (data == true) {
                                            result.setResult(false);
                                            result.setErrorMsg("厂商标识已注册过");
                                        } else {
                                            result.setResult(true);
                                        }
                                    }
                                });
                                return result;
                            };*/
                        }
                    });
                    var self = this;
                    $("#btn_save").click(function () {
                        var values = self.$form.Fields.getValues();
                        values.del = $("#inp_del").ligerComboBox("getValue");
                        if (!validator.validate()) {
                            return;
                        }
                        update(values);
                    });
                    function update(values) {
                        var dataModel = $.DataModel.init();
                        var url = "update";
                        if (type == "create") {
                            url = "create";
                        }
                        dataModel.updateRemote(ctx + "/admin/manufacturer/" + url, {
                            data: {jsonData: JSON.stringify(values), code: values.code},
                            success: function (data) {
                                if (data.status == 200) {
                                    parent.window.reloadMasterGrid(data.msg);
                                    parent.window.closeDeviceManufacturerInfoDialog();
                                } else {
                                    $.Notice.error(data.msg);
                                }
                            }
                        });
                    }
                    $("#btn_cancel").click(function () {
                        parent.window.closeDeviceManufacturerInfoDialog();
                    });
                }
            }
            pageInit();
        });
    })(jQuery, window)
</script>

patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/device/device_create.jsp

@@ -9,7 +9,6 @@
</head>
<body>
<div id="div_patient_info_form" data-role-form class="m-form-inline f-mt20 f-ml30" data-role-form>
	<input type="hidden" id="inp_id" value='${id}'/>
	<div class="m-form-group" style="padding:10 0 10 0">
		<label class="label_title" style="width:120px">设备名称</label>
		<div class="l-text-wrapper m-form-control essential">
@@ -115,5 +114,4 @@
</body>
<%@ include file="../head/page_foot.jsp"%>
<%@ include file="device_create_js.jsp" %>
<%--<script src="${ctx}/static/js/device/device_create.js"></script>--%>
</html>

patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/device/device_create_js.jsp

@@ -4,22 +4,26 @@
	(function ($, win) {
		$(function () {
			var Util = $.Util;
			var id = $('#inp_id').val();
			var deviceInfo = "";
			var jValidation = $.jValidation;
			var deviceCodeOld = '';
			function pageInit() {
				deviceInfo.init();
				if (id) {
					deviceInfo.initForm();
				}
			}
			deviceInfo = {
				//变量
				$form: $("#div_patient_info_form"),
                url: {
				    /*
				     *设备厂商列表
				     */
				    manufacturerList: '/admin/manufacturer/findAll'
                },
				init: function () {
                    this.initComboBox();
					this.$form.attrScan();
					$("#inp_applyDate").ligerTextBox({width: 240}) //申请日期
					$("#inp_orgName").ligerTextBox({width: 240})//机构名称
@@ -30,69 +34,36 @@
					$("#inp_deviceModel").ligerTextBox({width: 240})//设备型号
					$("#inp_deviceCode").ligerTextBox({width: 240})//设备唯一标识
					$("#inp_sim").ligerTextBox({width: 240})//设备sim码
					$("#inp_manufacturer").ligerTextBox({width: 240})//厂家名称
					//$("#inp_manufacturer").ligerTextBox({width: 240})//厂家名称
					$("#inp_address").ligerTextBox({width: 240})//厂家地址
					$("#inp_representative").ligerTextBox({width: 240})//法人代表
					$("#inp_applicantName").ligerTextBox({width: 240})//申请注册人
					$("#inp_applicantIdentity").ligerTextBox({width: 240})//申请人身份证号
					$("#inp_applicantTel").ligerTextBox({width: 240})//申请人手机
					$("#inp_applicantMail").ligerTextBox({width: 240})//申请人邮箱
					$("#sel_manufacturer").ligerComboBox({
						data: [
							{text: '三诺生物传感股份有限公司', id: 'threeNod'},
							{text: '深圳市优瑞恩科技有限公司', id: 'urion'},
							{text: '爱奥乐医疗器械（深圳）有限公司', id: 'bioland'} ,
							{text: '中兴云湃*脉搏波', id: 'yunpai'} ,
							{text: '康为血糖仪', id: 'comvee'}
						]
					});
					this.bindEvents();
				},
				initForm: function () {
					var _this = this;
					//修改、查看
					$.ajax({
						url: ctx + "/admin/device/device",
						method: "post",
						dataType: "json",
						async: false,
						data: {id: id},
						success: function (result) {
							if (result.status == '200') {
								var data = result.data;
								deviceCodeOld = data.deviceCode;
								_this.$form.Fields.fillValues({
									applyDate: data.applyDate,
									orgName: data.orgName,
									linkman: data.linkman,
									tel: data.tel,
									serverIp: data.serverIp,
									deviceName: data.deviceName,
									sim: data.sim,
									deviceModel: data.deviceModel,
									address: data.address,
									representative: data.representative,
									applicantName: data.applicantName,
									applicantIdentity: data.applicantIdentity,
									applicantTel: data.applicantTel,
									applicantMail: data.applicantMail
								});
								//填值
								$("#sel_manufacturer").ligerComboBox("selectValue",data.manufacturerCode);
							} else {
								$.Notice.error(result.msg);
							}
						},
						error: function (data) {
							$.Notice.error("系统异常,请联系管理员！");
						}
					});
					this.$form.show();
				},
                //请求初始化设备厂商
                initComboBox: function () {
				    var that = this;
                    this.rAjax( this.url.manufacturerList,{} ,function (data) {
                        var d = [];
                        for (var i = 0; i < data.data.length; i++) {
                            d.push({
                                text: data.data[i].manufacturerName,
                                id: data.data[i].manufacturerCode
                            });
                        }
                        that.initInpCat( d, that);
                    })
                },
                //设备厂商下拉框
                initInpCat: function ( d, me) {
                    $("#sel_manufacturer").ligerComboBox({
                        data: d,
                    });
                },
				//绑定事件
				bindEvents: function () {
@@ -149,7 +120,22 @@
					$("#btn_cancel").click(function () {
						parent.window.closeDeviceInfoDialog();
					});
				}
				},
                rAjax: function ( url, d, cb) {
                    $.ajax({
                        url: ctx + url,
                        data: d,
                        type: 'POST',
                        dataType: 'json',
                        success: function (data) {
                            if (data.status == 200) {
                                cb && cb.call( this, data);
                            } else {
                                $.Notice.error(data.msg);
                            }
                        }
                    });
                },
			}
			pageInit();
		});

patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/device/device_list_js.jsp

@@ -190,7 +190,7 @@
						self.deviceInfoDialog = $.ligerDialog.open({
							height: 770,
							width: 560,
							urlParms: {"id": id},
							// urlParms: {"id": id},
							title: title,
							url: ctx + '/admin/device/createInit'
						})

patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/device/device_modify_js.jsp

@@ -18,8 +18,11 @@
			deviceInfo = {
				//变量
				$form: $("#div_patient_info_form"),
                $manufacturer: $("#sel_manufacturer"),
				init: function () {
					this.$form.attrScan();
                    _this = this;
                    this.$form.attrScan();
					$("#inp_applyDate").ligerTextBox({width: 240}) //申请日期
					$("#inp_orgName").ligerTextBox({width: 240})//机构名称
					$("#inp_linkman").ligerTextBox({width: 240})//联系人
@@ -29,26 +32,37 @@
					$("#inp_deviceModel").ligerTextBox({width: 240})//设备型号
					$("#inp_deviceCode").ligerTextBox({width: 240})//设备唯一标识
					$("#inp_sim").ligerTextBox({width: 240})//设备sim
					$("#inp_manufacturer").ligerTextBox({width: 240})//厂家名称
					// $("#inp_manufacturer").ligerTextBox({width: 240})//厂家名称
					$("#inp_address").ligerTextBox({width: 240})//厂家地址
					$("#inp_representative").ligerTextBox({width: 240})//法人代表
					$("#inp_applicantName").ligerTextBox({width: 240})//申请注册人
					$("#inp_applicantIdentity").ligerTextBox({width: 240})//申请人身份证号
					$("#inp_applicantTel").ligerTextBox({width: 240})//申请人手机
					$("#inp_applicantMail").ligerTextBox({width: 240})//申请人邮箱
				},
				initForm: function () {
					var _this = this;
					_this.manufacturerBox = $("#sel_manufacturer").ligerComboBox({
						data: [
							{text: '三诺生物传感股份有限公司', id: 'threeNod'},
							{text: '深圳市优瑞恩科技有限公司', id: 'urion'},
							{text: '爱奥乐医疗器械（深圳）有限公司', id: 'bioland'} ,
                            {text: '中兴云湃*脉搏波', id: 'yunpai'} ,
							{text: '康为血糖仪', id: 'comvee'}
						]
					});
                    //厂商下拉框
                    _this.manufacturerBox = _this.$manufacturer.ligerComboBox({
                        url: ctx + "/admin/manufacturer/findAll",
                        parms: {},
                        dataParmName: "data",
                        textField: "manufacturerName",
                        valueField: "manufacturerCode",
                        isMultiSelect: false,
                        ajaxBeforeSend: function (xhr) {
                            if (ajaxHeaderName) {
                                xhr.setRequestHeader(ajaxHeaderName, ajaxHeaderValue);
                            }
                        },
                    });
                    //厂商下拉框刷新
                    _this.reloadManufacturerBox = function () {
                        deviceInfo.manufacturerBox.reload();
                    };
                },
				initForm: function () {
                    _this = this;
					//修改、查看
					$.ajax({
@@ -76,11 +90,10 @@
									applicantName: data.applicantName,
									applicantIdentity: data.applicantIdentity,
									applicantTel: data.applicantTel,
									applicantMail: data.applicantMail
									applicantMail: data.applicantMail,
								});
								//填值
								_this.manufacturerBox.selectValue(data.manufacturerCode);
							} else {
								$.Notice.error(result.msg);
							}
@@ -144,8 +157,9 @@
					$("#btn_save").click(function () {
						var values = self.$form.Fields.getValues();
						//厂家代码
						values.manufacturerCode = $("#sel_manufacturer").ligerComboBox("getValue");
						//厂家名称
						values.manufacturerCode = self.manufacturerBox.getValue();
                        values.manufacturer = self.manufacturerBox.getText();
						if (!validator.validate()) {
							return;
						}
@@ -173,7 +187,7 @@
					$("#btn_cancel").click(function () {
						parent.window.closeDeviceInfoDialog();
					});
				}
				},
			}
			pageInit();
		});

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

@@ -111,6 +111,9 @@
							<sec:authorize url="/admin/patientDevice/initial">
							<li><a href="javascript:locationMenu('patientDevice');">居民设备查询</a></li>
							</sec:authorize>
							<sec:authorize url="/admin/manufacturer/initial">
							<li><a href="javascript:locationMenu('manufacturer');">设备厂商查询</a></li>
							</sec:authorize>
							<sec:authorize url="/admin/device/center">
						</ul>
					</div>

patient-co-manage/wlyy-manage/src/main/webapp/static/js/menu.js

@@ -20,6 +20,7 @@ var menu = {
    "device": "/admin/device/initial",//设备管理界面
    "deviceHealthIndex": "/admin/healthIndex/initial",//健康体征数据查询页面
    "patientDevice": "/admin/patientDevice/initial",//居民设备查询页面
    "manufacturer": "/admin/manufacturer/initial",//设备厂商页面
    //数据统计
    "static": "/admin/static/center",//数据统计